Authored by 于良

Merge branch 'local' into develop

@@ -504,7 +504,7 @@ @@ -504,7 +504,7 @@
504 ); 504 );
505 runOnlyForDeploymentPostprocessing = 0; 505 runOnlyForDeploymentPostprocessing = 0;
506 shellPath = /bin/sh; 506 shellPath = /bin/sh;
507 - shellScript = "releaseConfig=\"Release\"\n\nif [ \"$releaseConfig\" = \"${CONFIGURATION}\" ]; then\necho \"Running Crashlytics\"\n\"${PODS_ROOT}/Fabric/run\" 1ab4b0c889f86df2b099df01ddcba91b76de13c8 ee52d43af5eabd8e00bdab9af38a02bdb5b931734522f63f13ded664e61b54af\nfi\n"; 507 + shellScript = "releaseConfig=\"Release\"\n\nif [ \"$releaseConfig\" = \"${CONFIGURATION}\" ]; then\necho \"Running Crashlytics\"\n\"${PODS_ROOT}/Fabric/run\" 00fd3f8eb2d9665e7b61964caaa7e90104328efd 59f6c182e8506f71f2efcaa842ffe63fd9207b89dbedfb399a47432997776883\nfi";
508 }; 508 };
509 87561E5B1D0FC3F100C6AEE8 /* ShellScript */ = { 509 87561E5B1D0FC3F100C6AEE8 /* ShellScript */ = {
510 isa = PBXShellScriptBuildPhase; 510 isa = PBXShellScriptBuildPhase;
@@ -517,7 +517,7 @@ @@ -517,7 +517,7 @@
517 ); 517 );
518 runOnlyForDeploymentPostprocessing = 0; 518 runOnlyForDeploymentPostprocessing = 0;
519 shellPath = /bin/sh; 519 shellPath = /bin/sh;
520 - shellScript = "releaseConfig=\"Release\"\n\nif [ \"$releaseConfig\" = \"${CONFIGURATION}\" ]; then\necho \"Running Crashlytics\"\n\"${PODS_ROOT}/Fabric/run\" 1ab4b0c889f86df2b099df01ddcba91b76de13c8 ee52d43af5eabd8e00bdab9af38a02bdb5b931734522f63f13ded664e61b54af\nfi"; 520 + shellScript = "releaseConfig=\"Release\"\n\nif [ \"$releaseConfig\" = \"${CONFIGURATION}\" ]; then\necho \"Running Crashlytics\"\n\"${PODS_ROOT}/Fabric/run\" 00fd3f8eb2d9665e7b61964caaa7e90104328efd 59f6c182e8506f71f2efcaa842ffe63fd9207b89dbedfb399a47432997776883\nfi";
521 }; 521 };
522 BB9436B3EA79AB165412E5BB /* Embed Pods Frameworks */ = { 522 BB9436B3EA79AB165412E5BB /* Embed Pods Frameworks */ = {
523 isa = PBXShellScriptBuildPhase; 523 isa = PBXShellScriptBuildPhase;
@@ -22,6 +22,20 @@ @@ -22,6 +22,20 @@
22 <string>????</string> 22 <string>????</string>
23 <key>CFBundleVersion</key> 23 <key>CFBundleVersion</key>
24 <string>1.0.0.2016061302</string> 24 <string>1.0.0.2016061302</string>
  25 + <key>Fabric</key>
  26 + <dict>
  27 + <key>APIKey</key>
  28 + <string>00fd3f8eb2d9665e7b61964caaa7e90104328efd</string>
  29 + <key>Kits</key>
  30 + <array>
  31 + <dict>
  32 + <key>KitInfo</key>
  33 + <dict/>
  34 + <key>KitName</key>
  35 + <string>Crashlytics</string>
  36 + </dict>
  37 + </array>
  38 + </dict>
25 <key>LSRequiresIPhoneOS</key> 39 <key>LSRequiresIPhoneOS</key>
26 <true/> 40 <true/>
27 <key>NSAppTransportSecurity</key> 41 <key>NSAppTransportSecurity</key>
@@ -43,19 +57,5 @@ @@ -43,19 +57,5 @@
43 </array> 57 </array>
44 <key>UIViewControllerBasedStatusBarAppearance</key> 58 <key>UIViewControllerBasedStatusBarAppearance</key>
45 <false/> 59 <false/>
46 - <key>Fabric</key>  
47 - <dict>  
48 - <key>APIKey</key>  
49 - <string>1ab4b0c889f86df2b099df01ddcba91b76de13c8</string>  
50 - <key>Kits</key>  
51 - <array>  
52 - <dict>  
53 - <key>KitInfo</key>  
54 - <dict/>  
55 - <key>KitName</key>  
56 - <string>Crashlytics</string>  
57 - </dict>  
58 - </array>  
59 - </dict>  
60 </dict> 60 </dict>
61 </plist> 61 </plist>
@@ -22,20 +22,20 @@ @@ -22,20 +22,20 @@
22 <string>????</string> 22 <string>????</string>
23 <key>CFBundleVersion</key> 23 <key>CFBundleVersion</key>
24 <string>1.0.0.2016060602</string> 24 <string>1.0.0.2016060602</string>
25 - <key>Fabric</key>  
26 - <dict>  
27 - <key>APIKey</key>  
28 - <string>1ab4b0c889f86df2b099df01ddcba91b76de13c8</string>  
29 - <key>Kits</key>  
30 - <array>  
31 - <dict>  
32 - <key>KitInfo</key>  
33 - <dict/>  
34 - <key>KitName</key>  
35 - <string>Crashlytics</string>  
36 - </dict>  
37 - </array>  
38 - </dict> 25 + <key>Fabric</key>
  26 + <dict>
  27 + <key>APIKey</key>
  28 + <string>00fd3f8eb2d9665e7b61964caaa7e90104328efd</string>
  29 + <key>Kits</key>
  30 + <array>
  31 + <dict>
  32 + <key>KitInfo</key>
  33 + <dict/>
  34 + <key>KitName</key>
  35 + <string>Crashlytics</string>
  36 + </dict>
  37 + </array>
  38 + </dict>
39 <key>LSRequiresIPhoneOS</key> 39 <key>LSRequiresIPhoneOS</key>
40 <true/> 40 <true/>
41 <key>NSAppTransportSecurity</key> 41 <key>NSAppTransportSecurity</key>