Merge branch 'master' of ssh://10.10.100.21/source/iOSUU

# Conflicts:
#	shiku_im/shiku_im/controller/myOA/ALLURLHeader.h

shiku_im/Podfile.lock

@@ -200,7 +200,7 @@ SPEC CHECKSUMS:
   Base64: cecfb41a004124895a7bcee567a89bae5a89d49b
   boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c
   Bugtags: 3ea74dc1a2a0a24989c2243ab2e075bf60b48d56
-  CodePush: b56e29c56dba8121898f601ca48a9a48b2ff5efb
+  CodePush: f6b348759cdc42c734d9c3a46ceb2997c270b12e
   DoubleConversion: bb338842f62ab1d708ceb63ec3d999f0f3d98ecd
   EGOCache: 191fd213da6804d487b49b1a91772ba904f3e324
   FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
@@ -213,17 +213,17 @@ SPEC CHECKSUMS:
   MJExtension: d86aacb740c87519d20e3cca55b6fa4be6cc7548
   MJRefresh: ed450d6eb9d3346a2cb033ab7eb6de090aeef437
   pop: d582054913807fd11fd50bfe6a539d91c7e1a55a
-  React: a86b92f00edbe1873a63e4a212c29b7a7ad5224f
-  react-native-orientation: d4a97266b06ec8d45d74e626656a730ebbebbb6f
+  React: 1d605e098d69bdf08960787f3446f0a9dc2e2ccf
+  react-native-orientation: 3d9a0a8273d18260f7528414093a6a36491382b6
   ReactiveObjC: 011caa393aa0383245f2dcf9bf02e86b80b36040
-  RNGestureHandler: 5329a942fce3d41c68b84c2c2276ce06a696d8b0
+  RNGestureHandler: 7ccf2f3f60458e084f9ada01fbaf610f6fef073c
   SDWebImage: 3f3f0c02f09798048c47a5ed0a13f17b063572d8
   SSZipArchive: fa16b8cc4cdeceb698e5e5d9f67e9558532fbf23
   SVProgressHUD: 1428aafac632c1f86f62aa4243ec12008d7a51d6
   TZImagePickerController: bf4c57b98d8707fce41ea6be872414a71c7a8c9d
   WechatOpenSDK: 9b721089507c895d05f997408c30bb6e6f5f9b60
-  yoga: 03ff42a6f223fb88deeaed60249020d80c3091ee
+  yoga: 128daf064cacaede0c3bb27424b6b4c71052e6cd
 
 PODFILE CHECKSUM: a42707a0298bb0bf53d873026337e053bfdbf4e0
 
-COCOAPODS: 1.6.0
+COCOAPODS: 1.5.2

shiku_im/app.json

@@ -1,4 +0,0 @@
-{
-  "name": "UU_RN",
-  "displayName": "UU_RN"
-}

shiku_im/shiku_im.xcodeproj/project.pbxproj

@@ -778,7 +778,6 @@
 		27A921CF1EF91C1500DA5E1D /* HypPaomaView.m in Sources */ = {isa = PBXBuildFile; fileRef = 27A921CE1EF91C1500DA5E1D /* HypPaomaView.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; };
 		27A921D11EF91EFC00DA5E1D /* UU_appointment_send.png in Resources */ = {isa = PBXBuildFile; fileRef = 27A921D01EF91EFB00DA5E1D /* UU_appointment_send.png */; };
 		27AEAD901E80D46000F2CE94 /* B2BReplyTaskVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 27AEAD8F1E80D46000F2CE94 /* B2BReplyTaskVC.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; };
-		27B14B852303B88F00F8F6A8 /* app.json in Resources */ = {isa = PBXBuildFile; fileRef = 27B14B792303B88F00F8F6A8 /* app.json */; };
 		27B17F6121532CFB00C2345E /* NicheDetailFooterView.m in Sources */ = {isa = PBXBuildFile; fileRef = 27B17F6021532CFB00C2345E /* NicheDetailFooterView.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; };
 		27B17F6621536C9B00C2345E /* CPAnnulusView.m in Sources */ = {isa = PBXBuildFile; fileRef = 27B17F6421536C9A00C2345E /* CPAnnulusView.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; };
 		27B17F6721536C9B00C2345E /* CPArcModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 27B17F6521536C9B00C2345E /* CPArcModel.m */; };
@@ -4277,7 +4276,6 @@
 		27EF3C0A1D47722300E547A4 /* AddClientInputVC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AddClientInputVC.h; sourceTree = "<group>"; };
 		27EF3C0B1D47722300E547A4 /* AddClientInputVC.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AddClientInputVC.m; sourceTree = "<group>"; };
 		27F000771DD9877F0013949A /* shiku_im.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; name = shiku_im.entitlements; path = ../shiku_im.entitlements; sourceTree = "<group>"; };
-		27F0C17B230BE07A0066D67D /* app.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = app.json; sourceTree = "<group>"; };
 		27F1DD7C1D67FEAC005D35FF /* crm_niche_fenpei.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = crm_niche_fenpei.png; sourceTree = "<group>"; };
 		27F1DD7D1D67FEAC005D35FF /* crm_niche_qiang.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = crm_niche_qiang.png; sourceTree = "<group>"; };
 		27F504581FAABDF600704DF6 /* UU_serveBook_storeTel.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = UU_serveBook_storeTel.png; sourceTree = "<group>"; };
@@ -12122,7 +12120,6 @@
 		8409054D17B693CF00F5C28D = {
 			isa = PBXGroup;
 			children = (
-				27F0C17B230BE07A0066D67D /* app.json */,
 				CCE23E8C18FFB8EA00A3CB5A /* shiku_im */,
 				276302911FDA964D0047C922 /* Images.xcassets */,
 				8409055817B693CF00F5C28D /* Frameworks */,
@@ -17425,7 +17422,6 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				27B14B852303B88F00F8F6A8 /* app.json in Resources */,
 				7D185DFC1FAAEE1C007F38BB /* icon_Merchant_tatistics_nor1.png in Resources */,
 				7D185DFD1FAAEE1C007F38BB /* icon_Merchant_tatistics_nor2.png in Resources */,
 				7D185DFE1FAAEE1C007F38BB /* icon_Merchant_tatistics_nor3.png in Resources */,
@@ -18993,7 +18989,7 @@
 			files = (
 			);
 			inputPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-shiku_im/Pods-shiku_im-resources.sh",
+				"${SRCROOT}/Pods/Target Support Files/Pods-shiku_im/Pods-shiku_im-resources.sh",
 				"${PODS_ROOT}/AliPay/AlipaySDK.bundle",
 				"${PODS_ROOT}/Bugtags/Bugtags.bundle",
 				"${PODS_ROOT}/IQKeyboardManager/IQKeyboardManager/Resources/IQKeyboardManager.bundle",
@@ -19012,7 +19008,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-shiku_im/Pods-shiku_im-resources.sh\"\n";
+			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-shiku_im/Pods-shiku_im-resources.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
 /* End PBXShellScriptBuildPhase section */

shiku_im/shiku_im/AppDelegate.mm

@@ -558,7 +558,6 @@
 {
     
     
-    
     if (self.allowRotation == YES) {
         //横屏
        return UIInterfaceOrientationMaskLandscapeRight;
@@ -603,10 +602,7 @@
             
             NSString *errorStr = [NSString stringWithFormat:@"%@",[content objectForKey:@"exceptionInfo"]];
             
-           
-
-        }
-        else{
+        }else{
       
         }