huangyp 6 rokov pred
rodič
commit
a42127c418

+ 4 - 25
shiku_im/Podfile.lock

@@ -195,7 +195,7 @@ SPEC CHECKSUMS:
   Base64: cecfb41a004124895a7bcee567a89bae5a89d49b
   boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c
   Bugtags: 3ea74dc1a2a0a24989c2243ab2e075bf60b48d56
-  CodePush: f6b348759cdc42c734d9c3a46ceb2997c270b12e
+  CodePush: b56e29c56dba8121898f601ca48a9a48b2ff5efb
   DoubleConversion: bb338842f62ab1d708ceb63ec3d999f0f3d98ecd
   EGOCache: 191fd213da6804d487b49b1a91772ba904f3e324
   FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
@@ -208,36 +208,15 @@ SPEC CHECKSUMS:
   MJExtension: d86aacb740c87519d20e3cca55b6fa4be6cc7548
   MJRefresh: ed450d6eb9d3346a2cb033ab7eb6de090aeef437
   pop: d582054913807fd11fd50bfe6a539d91c7e1a55a
-
-  React: ac23e9cc8d2d4cfe9b536b5cc0c32d19b9937bcf
-  React-Core: 84de3cf80e31f0267c5ce0b5b482d59ce30a8a57
-  React-cxxreact: a802a1c6b14f3de66ba032460b424c17ececd1e2
-  React-DevSupport: ae72c4fc86c03197f007bb24404077c85f6dabc1
-  React-fishhook: 12bd79b4461280f441937dea83f11d9fb660edfc
-  React-jsi: c2b6e57836bcae2677a036384111dc2c58e94369
-  React-jsiexecutor: d9023c5c199114d2b6f38ec861a4d923c73d0735
-  React-jsinspector: 817b64f3c8a807f09d78620f4f505868d89b26f3
-  React-RCTActionSheet: 9c42321fd5652515d706dd722c5a10b1970d7ec8
-  React-RCTAnimation: fabb087dde8964c9a835a7fabd0e7e5701787913
-  React-RCTBlob: 93f34281d9c9c9e216b25824309eed9fe22a5d41
-  React-RCTImage: b09f30159b048eb9a0f859f8f9b0878f3311e8eb
-  React-RCTLinking: 9dba672b3d5aadab59e93f9ab8c65e5e24b9fb73
-  React-RCTNetwork: 4b2f706819f08b6fa15c47909985f96b80859832
-  React-RCTSettings: 59c0eedc36b9aa9dd21cdbb5ab9591ba04132b1f
-  React-RCTText: b026f8350c2cbe0daeb9880dd9c6e018fce0daf7
-  React-RCTVibration: 5d9ed4a968e9d42880ddcc7c29bee3417c745408
-  React-RCTWebSocket: 69d8565d66043f244b4129f3d7154c5689fb7d3e
-
+  React: a86b92f00edbe1873a63e4a212c29b7a7ad5224f
   ReactiveObjC: 011caa393aa0383245f2dcf9bf02e86b80b36040
-  RNGestureHandler: 7ccf2f3f60458e084f9ada01fbaf610f6fef073c
+  RNGestureHandler: 5329a942fce3d41c68b84c2c2276ce06a696d8b0
   SDWebImage: 3f3f0c02f09798048c47a5ed0a13f17b063572d8
   SSZipArchive: fa16b8cc4cdeceb698e5e5d9f67e9558532fbf23
   SVProgressHUD: 1428aafac632c1f86f62aa4243ec12008d7a51d6
   TZImagePickerController: bf4c57b98d8707fce41ea6be872414a71c7a8c9d
   WechatOpenSDK: 9b721089507c895d05f997408c30bb6e6f5f9b60
-
-  yoga: 128daf064cacaede0c3bb27424b6b4c71052e6cd
-
+  yoga: 03ff42a6f223fb88deeaed60249020d80c3091ee
 
 PODFILE CHECKSUM: a7427ed79027131c798a61cdaacdfea73b1b9f9c
 

+ 89 - 25
shiku_im/shiku_im.xcodeproj/project.pbxproj

@@ -773,6 +773,12 @@
 		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"; }; };
+		27B14B842303B88F00F8F6A8 /* main.jsbundle in Resources */ = {isa = PBXBuildFile; fileRef = 27B14B772303B88F00F8F6A8 /* main.jsbundle */; };
+		27B14B852303B88F00F8F6A8 /* app.json in Resources */ = {isa = PBXBuildFile; fileRef = 27B14B792303B88F00F8F6A8 /* app.json */; };
+		27B14B862303B88F00F8F6A8 /* back-icon@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 27B14B802303B88F00F8F6A8 /* back-icon@3x.png */; };
+		27B14B872303B88F00F8F6A8 /* back-icon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 27B14B812303B88F00F8F6A8 /* back-icon@2x.png */; };
+		27B14B882303B88F00F8F6A8 /* back-icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 27B14B822303B88F00F8F6A8 /* back-icon.png */; };
+		27B14B892303B89000F8F6A8 /* back-icon-mask.png in Resources */ = {isa = PBXBuildFile; fileRef = 27B14B832303B88F00F8F6A8 /* back-icon-mask.png */; };
 		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 */; };
@@ -1441,8 +1447,6 @@
 		8472A9F217B697E900129DBB /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8472A9F117B697E900129DBB /* QuartzCore.framework */; };
 		8472A9F417B6980E00129DBB /* CoreData.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8472A9F317B6980E00129DBB /* CoreData.framework */; };
 		99040D7F2149F745004F5503 /* UASClientMapCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 99040D7E2149F745004F5503 /* UASClientMapCell.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; };
-		993E56162302CA60006AA2B7 /* main.jsbundle in Resources */ = {isa = PBXBuildFile; fileRef = 993E56132302CA5F006AA2B7 /* main.jsbundle */; };
-		993E56172302CA60006AA2B7 /* app.json in Resources */ = {isa = PBXBuildFile; fileRef = 993E56152302CA5F006AA2B7 /* app.json */; };
 		9952309E21476AF900BBEFAD /* UASClientMaBoardCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 9952309D21476AF900BBEFAD /* UASClientMaBoardCell.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; };
 		995230A121476B2400BBEFAD /* UASClientMaForgetCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 995230A021476B2400BBEFAD /* UASClientMaForgetCell.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; };
 		995230A421476B4000BBEFAD /* UASClientMaCarefulCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 995230A321476B4000BBEFAD /* UASClientMaCarefulCell.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; };
@@ -4103,6 +4107,12 @@
 		27A921D01EF91EFB00DA5E1D /* UU_appointment_send.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = UU_appointment_send.png; sourceTree = "<group>"; };
 		27AEAD8E1E80D46000F2CE94 /* B2BReplyTaskVC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = B2BReplyTaskVC.h; sourceTree = "<group>"; };
 		27AEAD8F1E80D46000F2CE94 /* B2BReplyTaskVC.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = B2BReplyTaskVC.m; sourceTree = "<group>"; };
+		27B14B772303B88F00F8F6A8 /* main.jsbundle */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = main.jsbundle; sourceTree = "<group>"; };
+		27B14B792303B88F00F8F6A8 /* app.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = app.json; sourceTree = "<group>"; };
+		27B14B802303B88F00F8F6A8 /* back-icon@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "back-icon@3x.png"; sourceTree = "<group>"; };
+		27B14B812303B88F00F8F6A8 /* back-icon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "back-icon@2x.png"; sourceTree = "<group>"; };
+		27B14B822303B88F00F8F6A8 /* back-icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "back-icon.png"; sourceTree = "<group>"; };
+		27B14B832303B88F00F8F6A8 /* back-icon-mask.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "back-icon-mask.png"; sourceTree = "<group>"; };
 		27B17F5F21532CFB00C2345E /* NicheDetailFooterView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NicheDetailFooterView.h; sourceTree = "<group>"; };
 		27B17F6021532CFB00C2345E /* NicheDetailFooterView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = NicheDetailFooterView.m; sourceTree = "<group>"; };
 		27B17F6221536C9900C2345E /* CPArcModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CPArcModel.h; sourceTree = "<group>"; };
@@ -5098,8 +5108,6 @@
 		8472A9F317B6980E00129DBB /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = System/Library/Frameworks/CoreData.framework; sourceTree = SDKROOT; };
 		99040D7D2149F745004F5503 /* UASClientMapCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = UASClientMapCell.h; sourceTree = "<group>"; };
 		99040D7E2149F745004F5503 /* UASClientMapCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = UASClientMapCell.m; sourceTree = "<group>"; };
-		993E56132302CA5F006AA2B7 /* main.jsbundle */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = main.jsbundle; sourceTree = "<group>"; };
-		993E56152302CA5F006AA2B7 /* app.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = app.json; sourceTree = "<group>"; };
 		9952309C21476AF900BBEFAD /* UASClientMaBoardCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = UASClientMaBoardCell.h; sourceTree = "<group>"; };
 		9952309D21476AF900BBEFAD /* UASClientMaBoardCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = UASClientMaBoardCell.m; sourceTree = "<group>"; };
 		9952309F21476B2400BBEFAD /* UASClientMaForgetCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = UASClientMaForgetCell.h; sourceTree = "<group>"; };
@@ -9825,6 +9833,76 @@
 			path = "图片移动";
 			sourceTree = "<group>";
 		};
+		27B14B762303B88F00F8F6A8 /* bundle */ = {
+			isa = PBXGroup;
+			children = (
+				27B14B772303B88F00F8F6A8 /* main.jsbundle */,
+				27B14B782303B88F00F8F6A8 /* assets */,
+			);
+			name = bundle;
+			path = UU_RN/bundle;
+			sourceTree = SOURCE_ROOT;
+		};
+		27B14B782303B88F00F8F6A8 /* assets */ = {
+			isa = PBXGroup;
+			children = (
+				27B14B792303B88F00F8F6A8 /* app.json */,
+				27B14B7A2303B88F00F8F6A8 /* node_modules */,
+			);
+			path = assets;
+			sourceTree = "<group>";
+		};
+		27B14B7A2303B88F00F8F6A8 /* node_modules */ = {
+			isa = PBXGroup;
+			children = (
+				27B14B7B2303B88F00F8F6A8 /* react-navigation-stack */,
+			);
+			path = node_modules;
+			sourceTree = "<group>";
+		};
+		27B14B7B2303B88F00F8F6A8 /* react-navigation-stack */ = {
+			isa = PBXGroup;
+			children = (
+				27B14B7C2303B88F00F8F6A8 /* lib */,
+			);
+			path = "react-navigation-stack";
+			sourceTree = "<group>";
+		};
+		27B14B7C2303B88F00F8F6A8 /* lib */ = {
+			isa = PBXGroup;
+			children = (
+				27B14B7D2303B88F00F8F6A8 /* module */,
+			);
+			path = lib;
+			sourceTree = "<group>";
+		};
+		27B14B7D2303B88F00F8F6A8 /* module */ = {
+			isa = PBXGroup;
+			children = (
+				27B14B7E2303B88F00F8F6A8 /* views */,
+			);
+			path = module;
+			sourceTree = "<group>";
+		};
+		27B14B7E2303B88F00F8F6A8 /* views */ = {
+			isa = PBXGroup;
+			children = (
+				27B14B7F2303B88F00F8F6A8 /* assets */,
+			);
+			path = views;
+			sourceTree = "<group>";
+		};
+		27B14B7F2303B88F00F8F6A8 /* assets */ = {
+			isa = PBXGroup;
+			children = (
+				27B14B802303B88F00F8F6A8 /* back-icon@3x.png */,
+				27B14B812303B88F00F8F6A8 /* back-icon@2x.png */,
+				27B14B822303B88F00F8F6A8 /* back-icon.png */,
+				27B14B832303B88F00F8F6A8 /* back-icon-mask.png */,
+			);
+			path = assets;
+			sourceTree = "<group>";
+		};
 		27B3E1441E6E84E100915825 /* B2B独立版单据 */ = {
 			isa = PBXGroup;
 			children = (
@@ -12075,24 +12153,6 @@
 			name = Frameworks;
 			sourceTree = "<group>";
 		};
-		993E56122302CA5F006AA2B7 /* bundle */ = {
-			isa = PBXGroup;
-			children = (
-				993E56132302CA5F006AA2B7 /* main.jsbundle */,
-				993E56142302CA5F006AA2B7 /* assets */,
-			);
-			name = bundle;
-			path = UU_RN/bundle;
-			sourceTree = SOURCE_ROOT;
-		};
-		993E56142302CA5F006AA2B7 /* assets */ = {
-			isa = PBXGroup;
-			children = (
-				993E56152302CA5F006AA2B7 /* app.json */,
-			);
-			path = assets;
-			sourceTree = "<group>";
-		};
 		99B02ADC22EED6650014A144 /* RN */ = {
 			isa = PBXGroup;
 			children = (
@@ -12107,7 +12167,7 @@
 		99B02ADD22EED6650014A144 /* Others */ = {
 			isa = PBXGroup;
 			children = (
-				993E56122302CA5F006AA2B7 /* bundle */,
+				27B14B762303B88F00F8F6A8 /* bundle */,
 			);
 			path = Others;
 			sourceTree = "<group>";
@@ -17331,6 +17391,7 @@
 				27D63BC41C59BB4D0034EDDC /* im_musicPause.png in Resources */,
 				CC3017111951BABF0059BADA /* f057@2x.png in Resources */,
 				CC6E17D219794BC7006ADA8A /* sideslip_bg_press@2x.png in Resources */,
+				27B14B862303B88F00F8F6A8 /* back-icon@3x.png in Resources */,
 				CC6E184D19794BC7006ADA8A /* ToolViewInputText@2x.png in Resources */,
 				20EA4C5E20AD34960055577D /* loadingAd22.png in Resources */,
 				20BEEDCD1FC666D4006384DA /* 产城服务首页_PIC3.png in Resources */,
@@ -17611,7 +17672,7 @@
 				CC30175C1951BABF0059BADA /* f095.png in Resources */,
 				2732E7EC1D1A248900B2789F /* uu_crm_round.png in Resources */,
 				CC6E182319794BC7006ADA8A /* RegistrationHighlight@2x.png in Resources */,
-				993E56162302CA60006AA2B7 /* main.jsbundle in Resources */,
+				27B14B842303B88F00F8F6A8 /* main.jsbundle in Resources */,
 				CC6E186F19794BC7006ADA8A /* pub_record_button@2x.png in Resources */,
 				CCE2415018FFB8EB00A3CB5A /* recorder_trash_can2.png in Resources */,
 				20EA4C4220AD34960055577D /* loadingAd46.png in Resources */,
@@ -17967,6 +18028,7 @@
 				CC3016B81951BABF0059BADA /* f013.png in Resources */,
 				277B6E761D6F1915006910E5 /* nav_btn_back.png in Resources */,
 				20AF4B7A20ABBA2700C341CB /* loading45.png in Resources */,
+				27B14B892303B89000F8F6A8 /* back-icon-mask.png in Resources */,
 				27FEC6361D6C216A006BFE3A /* crm_clientVisit_goVisit.png in Resources */,
 				A75FA3C01C72FB86004B2D32 /* cb_mono_on@2x.png in Resources */,
 				7D3EF4681DED1A6000DBEDDE /* icon-message-nor2.png in Resources */,
@@ -18528,6 +18590,7 @@
 				27701F911CC4F6C2007AFDD7 /* uu_work_jipiaoyuding.png in Resources */,
 				7D2B42F81DD099BD00DB3DB6 /* icon-finished-nor3.png in Resources */,
 				7D3EF4701DED1AE000DBEDDE /* icon_dingwei_nor2.png in Resources */,
+				27B14B872303B88F00F8F6A8 /* back-icon@2x.png in Resources */,
 				7D258E4E1DCA0D3200BAF53D /* icon-share-nor2.png in Resources */,
 				20EA4C2620AD34960055577D /* loadingAd10.png in Resources */,
 				270FB0521FAAACA10021D971 /* HJCAdjustNumButton.bundle in Resources */,
@@ -18598,7 +18661,7 @@
 				20EA4C3C20AD34960055577D /* loadingAd51.png in Resources */,
 				CC3A1427195851280054127B /* v_cammer@2x.png in Resources */,
 				CCE2415118FFB8EB00A3CB5A /* recorder_trash_can2@2x.png in Resources */,
-				993E56172302CA60006AA2B7 /* app.json in Resources */,
+				27B14B852303B88F00F8F6A8 /* app.json in Resources */,
 				CC6E186119794BC7006ADA8A /* feeds_play_btn@2x.png in Resources */,
 				7D736AE81E0BE3DE0035B25B /* icon_banci_nor3.png in Resources */,
 				272F120A1CC4D95100452A0D /* uu_work_chaxun_press.png in Resources */,
@@ -18749,6 +18812,7 @@
 				27DE9AB01C589B9200214394 /* im_mp3.png in Resources */,
 				CCC7B027197FA18900A828A8 /* im_audio_button_press.png in Resources */,
 				27CE2D8A1E31AA6A001ABE53 /* crm_danju_qiehuan2.png in Resources */,
+				27B14B882303B88F00F8F6A8 /* back-icon.png in Resources */,
 				7D18897F1F6792C9009E79ED /* Icon_myselfimageP_nor3.png in Resources */,
 				CC3017081951BABF0059BADA /* f053.png in Resources */,
 				27924C3A1EFA249A001A0D0D /* UU_appoinment_sendDet.png in Resources */,

+ 2 - 2
shiku_im/shiku_im/RN/Controllers/YRReactVC.m

@@ -38,8 +38,8 @@
     jsCodeLocation = [CodePush bundleURL];
     
     
-    NSString * strUrl = @"http://10.1.80.96:8081/index.bundle?platform=ios";
-    jsCodeLocation = [NSURL URLWithString:strUrl] ;
+//    NSString * strUrl = @"http://10.1.80.97:8081/index.bundle?platform=ios";
+//    jsCodeLocation = [NSURL URLWithString:strUrl] ;
     
     RCTRootView * rootView = [[RCTRootView alloc] initWithBundleURL:jsCodeLocation moduleName:@"UU_RN"
                                                   initialProperties:@{@"UU":@"UU_RN"}