罗广聪

Merge branch 'dev' of gitlab.brae.co:amanda/ProtectGod into dev

@@ -663,7 +663,7 @@ @@ -663,7 +663,7 @@
663 TestTargetID = 13B07F861A680F5B00A75B9A; 663 TestTargetID = 13B07F861A680F5B00A75B9A;
664 }; 664 };
665 13B07F861A680F5B00A75B9A = { 665 13B07F861A680F5B00A75B9A = {
666 - DevelopmentTeam = S8LRX49C78; 666 + DevelopmentTeam = Q22UK2JWAC;
667 ProvisioningStyle = Automatic; 667 ProvisioningStyle = Automatic;
668 }; 668 };
669 2D02E47A1E0B4A5D006451C7 = { 669 2D02E47A1E0B4A5D006451C7 = {
@@ -1168,9 +1168,10 @@ @@ -1168,9 +1168,10 @@
1168 ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon-1"; 1168 ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon-1";
1169 ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = "LaunchImage-1"; 1169 ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = "LaunchImage-1";
1170 "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; 1170 "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
  1171 + CODE_SIGN_STYLE = Automatic;
1171 CURRENT_PROJECT_VERSION = 1; 1172 CURRENT_PROJECT_VERSION = 1;
1172 DEAD_CODE_STRIPPING = NO; 1173 DEAD_CODE_STRIPPING = NO;
1173 - DEVELOPMENT_TEAM = S8LRX49C78; 1174 + DEVELOPMENT_TEAM = Q22UK2JWAC;
1174 HEADER_SEARCH_PATHS = ( 1175 HEADER_SEARCH_PATHS = (
1175 "$(inherited)", 1176 "$(inherited)",
1176 "$(SRCROOT)/../node_modules/react-native-contacts/ios/RCTContacts", 1177 "$(SRCROOT)/../node_modules/react-native-contacts/ios/RCTContacts",
@@ -1182,7 +1183,7 @@ @@ -1182,7 +1183,7 @@
1182 "-ObjC", 1183 "-ObjC",
1183 "-lc++", 1184 "-lc++",
1184 ); 1185 );
1185 - PRODUCT_BUNDLE_IDENTIFIER = com.bhsgd.protectgod; 1186 + PRODUCT_BUNDLE_IDENTIFIER = net.bhsgd.protectgod;
1186 PRODUCT_NAME = ProtectGod; 1187 PRODUCT_NAME = ProtectGod;
1187 PROVISIONING_PROFILE_SPECIFIER = ""; 1188 PROVISIONING_PROFILE_SPECIFIER = "";
1188 TARGETED_DEVICE_FAMILY = "1,2"; 1189 TARGETED_DEVICE_FAMILY = "1,2";
@@ -1196,8 +1197,9 @@ @@ -1196,8 +1197,9 @@
1196 ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon-1"; 1197 ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon-1";
1197 ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = "LaunchImage-1"; 1198 ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = "LaunchImage-1";
1198 "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; 1199 "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
  1200 + CODE_SIGN_STYLE = Automatic;
1199 CURRENT_PROJECT_VERSION = 1; 1201 CURRENT_PROJECT_VERSION = 1;
1200 - DEVELOPMENT_TEAM = S8LRX49C78; 1202 + DEVELOPMENT_TEAM = Q22UK2JWAC;
1201 HEADER_SEARCH_PATHS = ( 1203 HEADER_SEARCH_PATHS = (
1202 "$(inherited)", 1204 "$(inherited)",
1203 "$(SRCROOT)/../node_modules/react-native-contacts/ios/RCTContacts", 1205 "$(SRCROOT)/../node_modules/react-native-contacts/ios/RCTContacts",
@@ -1209,7 +1211,7 @@ @@ -1209,7 +1211,7 @@
1209 "-ObjC", 1211 "-ObjC",
1210 "-lc++", 1212 "-lc++",
1211 ); 1213 );
1212 - PRODUCT_BUNDLE_IDENTIFIER = com.bhsgd.protectgod; 1214 + PRODUCT_BUNDLE_IDENTIFIER = net.bhsgd.protectgod;
1213 PRODUCT_NAME = ProtectGod; 1215 PRODUCT_NAME = ProtectGod;
1214 PROVISIONING_PROFILE_SPECIFIER = ""; 1216 PROVISIONING_PROFILE_SPECIFIER = "";
1215 TARGETED_DEVICE_FAMILY = "1,2"; 1217 TARGETED_DEVICE_FAMILY = "1,2";
@@ -143,6 +143,12 @@ @@ -143,6 +143,12 @@
143 "idiom" : "ipad", 143 "idiom" : "ipad",
144 "filename" : "Icon-App-83.5x83.5@2x.png", 144 "filename" : "Icon-App-83.5x83.5@2x.png",
145 "scale" : "2x" 145 "scale" : "2x"
  146 + },
  147 + {
  148 + "size" : "1024x1024",
  149 + "idiom" : "ios-marketing",
  150 + "filename" : "icon4.jpg",
  151 + "scale" : "1x"
146 } 152 }
147 ], 153 ],
148 "info" : { 154 "info" : {
@@ -47,6 +47,11 @@ @@ -47,6 +47,11 @@
47 "idiom" : "iphone", 47 "idiom" : "iphone",
48 "filename" : "180-180@3x.png", 48 "filename" : "180-180@3x.png",
49 "scale" : "3x" 49 "scale" : "3x"
  50 + },
  51 + {
  52 + "idiom" : "ios-marketing",
  53 + "size" : "1024x1024",
  54 + "scale" : "1x"
50 } 55 }
51 ], 56 ],
52 "info" : { 57 "info" : {
@@ -2,8 +2,6 @@ @@ -2,8 +2,6 @@
2 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> 2 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3 <plist version="1.0"> 3 <plist version="1.0">
4 <dict> 4 <dict>
5 - <key>NSContactsUsageDescription</key>  
6 - <string>是否允许访问通信录</string>  
7 <key>CFBundleDevelopmentRegion</key> 5 <key>CFBundleDevelopmentRegion</key>
8 <string>en</string> 6 <string>en</string>
9 <key>CFBundleDisplayName</key> 7 <key>CFBundleDisplayName</key>
@@ -21,11 +19,13 @@ @@ -21,11 +19,13 @@
21 <key>CFBundlePackageType</key> 19 <key>CFBundlePackageType</key>
22 <string>APPL</string> 20 <string>APPL</string>
23 <key>CFBundleShortVersionString</key> 21 <key>CFBundleShortVersionString</key>
24 - <string>1.0.1</string> 22 + <string>1.0.0</string>
25 <key>CFBundleSignature</key> 23 <key>CFBundleSignature</key>
26 <string>????</string> 24 <string>????</string>
27 <key>CFBundleVersion</key> 25 <key>CFBundleVersion</key>
28 <string>2</string> 26 <string>2</string>
  27 + <key>LSApplicationCategoryType</key>
  28 + <string></string>
29 <key>LSRequiresIPhoneOS</key> 29 <key>LSRequiresIPhoneOS</key>
30 <true/> 30 <true/>
31 <key>NSAppTransportSecurity</key> 31 <key>NSAppTransportSecurity</key>
@@ -33,6 +33,8 @@ @@ -33,6 +33,8 @@
33 <key>NSAllowsArbitraryLoads</key> 33 <key>NSAllowsArbitraryLoads</key>
34 <true/> 34 <true/>
35 </dict> 35 </dict>
  36 + <key>NSContactsUsageDescription</key>
  37 + <string>是否允许访问通信录</string>
36 <key>NSHumanReadableCopyright</key> 38 <key>NSHumanReadableCopyright</key>
37 <string></string> 39 <string></string>
38 <key>NSLocationWhenInUseUsageDescription</key> 40 <key>NSLocationWhenInUseUsageDescription</key>
@@ -53,7 +55,5 @@ @@ -53,7 +55,5 @@
53 </array> 55 </array>
54 <key>UIViewControllerBasedStatusBarAppearance</key> 56 <key>UIViewControllerBasedStatusBarAppearance</key>
55 <false/> 57 <false/>
56 - <key>LSApplicationCategoryType</key>  
57 - <string></string>  
58 </dict> 58 </dict>
59 </plist> 59 </plist>