rn推送

shiku_im/Podfile.lock

@@ -213,10 +213,8 @@ SPEC CHECKSUMS:
   MJExtension: d86aacb740c87519d20e3cca55b6fa4be6cc7548
   MJRefresh: ed450d6eb9d3346a2cb033ab7eb6de090aeef437
   pop: d582054913807fd11fd50bfe6a539d91c7e1a55a
-
-  React: 1d605e098d69bdf08960787f3446f0a9dc2e2ccf
-  react-native-orientation: 3d9a0a8273d18260f7528414093a6a36491382b6
-
+  React: a86b92f00edbe1873a63e4a212c29b7a7ad5224f
+  react-native-orientation: d4a97266b06ec8d45d74e626656a730ebbebbb6f
   ReactiveObjC: 011caa393aa0383245f2dcf9bf02e86b80b36040
   RNGestureHandler: 5329a942fce3d41c68b84c2c2276ce06a696d8b0
   SDWebImage: 3f3f0c02f09798048c47a5ed0a13f17b063572d8

shiku_im/shiku_im.xcodeproj/project.pbxproj

@@ -753,6 +753,12 @@
 		2797D83B1D9E46E300B23E11 /* ZXsubButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 2797D8341D9E46E300B23E11 /* ZXsubButton.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; };
 		2797D83E1D9E46FB00B23E11 /* JXActionSheet.m in Sources */ = {isa = PBXBuildFile; fileRef = 2797D83D1D9E46FB00B23E11 /* JXActionSheet.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; };
 		279A97171D90E8DB00D0D6D0 /* ShareSelectVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 279A97161D90E8DB00D0D6D0 /* ShareSelectVC.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; };
+		279E85C3230BDEA500A23BF1 /* main.jsbundle in Resources */ = {isa = PBXBuildFile; fileRef = 279E85B2230BDEA500A23BF1 /* main.jsbundle */; };
+		279E85C4230BDEA500A23BF1 /* back-icon@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 279E85BA230BDEA500A23BF1 /* back-icon@3x.png */; };
+		279E85C5230BDEA500A23BF1 /* back-icon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 279E85BB230BDEA500A23BF1 /* back-icon@2x.png */; };
+		279E85C6230BDEA500A23BF1 /* back-icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 279E85BC230BDEA500A23BF1 /* back-icon.png */; };
+		279E85C7230BDEA500A23BF1 /* back-icon-mask.png in Resources */ = {isa = PBXBuildFile; fileRef = 279E85BD230BDEA500A23BF1 /* back-icon-mask.png */; };
+		279E85C8230BDEA500A23BF1 /* tpl.html in Resources */ = {isa = PBXBuildFile; fileRef = 279E85C2230BDEA500A23BF1 /* tpl.html */; };
 		27A2053A209955E8002EE6B5 /* NewWoVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 27A20539209955E8002EE6B5 /* NewWoVC.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; };
 		27A2053D20995609002EE6B5 /* WoCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 27A2053C20995609002EE6B5 /* WoCell.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; };
 		27A4A1521F7DE732006B75AA /* UU_serveBook_btnyuyue.png in Resources */ = {isa = PBXBuildFile; fileRef = 27A4A1511F7DE70E006B75AA /* UU_serveBook_btnyuyue.png */; };
@@ -773,12 +779,7 @@
 		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 */; };
@@ -1447,11 +1448,8 @@
 		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"; }; };
-<<<<<<< HEAD
-=======
 		9911B8EC2308D6110064F498 /* UIDevice+extension.m in Sources */ = {isa = PBXBuildFile; fileRef = 9911B8EB2308D6110064F498 /* UIDevice+extension.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; };
 		9911B8EF2308D93C0064F498 /* YRRnChartsAllVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 9911B8EE2308D93C0064F498 /* YRRnChartsAllVC.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; };
->>>>>>> 3c700ea12b2d7ae1b6e133774f62967384293a96
 		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"; }; };
@@ -1495,12 +1493,6 @@
 		99E43E212152294100779FA5 /* UASClientForgetVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 99E43E202152294100779FA5 /* UASClientForgetVC.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; };
 		99E43E242152295A00779FA5 /* UASClientCarefulVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 99E43E232152295A00779FA5 /* UASClientCarefulVC.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; };
 		99E43E272152443200779FA5 /* UASClientTotalVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 99E43E262152443200779FA5 /* UASClientTotalVC.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; };
-		99E5957C2307E1130026D51A /* main.jsbundle in Resources */ = {isa = PBXBuildFile; fileRef = 99E5956B2307E1120026D51A /* main.jsbundle */; };
-		99E5957D2307E1130026D51A /* back-icon@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 99E595732307E1120026D51A /* back-icon@3x.png */; };
-		99E5957E2307E1130026D51A /* back-icon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 99E595742307E1120026D51A /* back-icon@2x.png */; };
-		99E5957F2307E1130026D51A /* back-icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 99E595752307E1120026D51A /* back-icon.png */; };
-		99E595802307E1130026D51A /* back-icon-mask.png in Resources */ = {isa = PBXBuildFile; fileRef = 99E595762307E1120026D51A /* back-icon-mask.png */; };
-		99E595812307E1130026D51A /* tpl.html in Resources */ = {isa = PBXBuildFile; fileRef = 99E5957B2307E1120026D51A /* tpl.html */; };
 		99E760F2212E8C3200A7A271 /* UASAddToScheVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 99E760F1212E8C3200A7A271 /* UASAddToScheVC.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; };
 		99E760F8212E9E7800A7A271 /* FBShimmeringLayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 99E760F3212E9E7600A7A271 /* FBShimmeringLayer.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; };
 		99E760F9212E9E7800A7A271 /* FBShimmeringView.m in Sources */ = {isa = PBXBuildFile; fileRef = 99E760F7212E9E7800A7A271 /* FBShimmeringView.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; };
@@ -4087,6 +4079,12 @@
 		2797D83D1D9E46FB00B23E11 /* JXActionSheet.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JXActionSheet.m; sourceTree = "<group>"; };
 		279A97151D90E8DB00D0D6D0 /* ShareSelectVC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ShareSelectVC.h; sourceTree = "<group>"; };
 		279A97161D90E8DB00D0D6D0 /* ShareSelectVC.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ShareSelectVC.m; sourceTree = "<group>"; };
+		279E85B2230BDEA500A23BF1 /* main.jsbundle */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = main.jsbundle; sourceTree = "<group>"; };
+		279E85BA230BDEA500A23BF1 /* back-icon@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "back-icon@3x.png"; sourceTree = "<group>"; };
+		279E85BB230BDEA500A23BF1 /* back-icon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "back-icon@2x.png"; sourceTree = "<group>"; };
+		279E85BC230BDEA500A23BF1 /* back-icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "back-icon.png"; sourceTree = "<group>"; };
+		279E85BD230BDEA500A23BF1 /* back-icon-mask.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "back-icon-mask.png"; sourceTree = "<group>"; };
+		279E85C2230BDEA500A23BF1 /* tpl.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = tpl.html; sourceTree = "<group>"; };
 		27A20538209955E8002EE6B5 /* NewWoVC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NewWoVC.h; sourceTree = "<group>"; };
 		27A20539209955E8002EE6B5 /* NewWoVC.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = NewWoVC.m; sourceTree = "<group>"; };
 		27A2053B20995609002EE6B5 /* WoCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WoCell.h; sourceTree = "<group>"; };
@@ -4119,7 +4117,6 @@
 		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>"; };
@@ -4280,6 +4277,7 @@
 		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>"; };
@@ -5120,13 +5118,10 @@
 		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>"; };
-<<<<<<< HEAD
-=======
 		9911B8EA2308D6110064F498 /* UIDevice+extension.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "UIDevice+extension.h"; sourceTree = "<group>"; };
 		9911B8EB2308D6110064F498 /* UIDevice+extension.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "UIDevice+extension.m"; sourceTree = "<group>"; };
 		9911B8ED2308D93C0064F498 /* YRRnChartsAllVC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = YRRnChartsAllVC.h; sourceTree = "<group>"; };
 		9911B8EE2308D93C0064F498 /* YRRnChartsAllVC.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = YRRnChartsAllVC.m; sourceTree = "<group>"; };
->>>>>>> 3c700ea12b2d7ae1b6e133774f62967384293a96
 		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>"; };
@@ -5210,12 +5205,6 @@
 		99E43E232152295A00779FA5 /* UASClientCarefulVC.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = UASClientCarefulVC.m; sourceTree = "<group>"; };
 		99E43E252152443200779FA5 /* UASClientTotalVC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = UASClientTotalVC.h; sourceTree = "<group>"; };
 		99E43E262152443200779FA5 /* UASClientTotalVC.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = UASClientTotalVC.m; sourceTree = "<group>"; };
-		99E5956B2307E1120026D51A /* main.jsbundle */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = main.jsbundle; sourceTree = "<group>"; };
-		99E595732307E1120026D51A /* back-icon@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "back-icon@3x.png"; sourceTree = "<group>"; };
-		99E595742307E1120026D51A /* back-icon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "back-icon@2x.png"; sourceTree = "<group>"; };
-		99E595752307E1120026D51A /* back-icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "back-icon.png"; sourceTree = "<group>"; };
-		99E595762307E1120026D51A /* back-icon-mask.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "back-icon-mask.png"; sourceTree = "<group>"; };
-		99E5957B2307E1120026D51A /* tpl.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = tpl.html; sourceTree = "<group>"; };
 		99E760F0212E8C3200A7A271 /* UASAddToScheVC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = UASAddToScheVC.h; sourceTree = "<group>"; };
 		99E760F1212E8C3200A7A271 /* UASAddToScheVC.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = UASAddToScheVC.m; sourceTree = "<group>"; };
 		99E760F3212E9E7600A7A271 /* FBShimmeringLayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FBShimmeringLayer.m; sourceTree = "<group>"; };
@@ -9835,99 +9824,130 @@
 			path = Utils;
 			sourceTree = "<group>";
 		};
-		27A921BD1EF8B83800DA5E1D /* 预约小秘书 */ = {
+		279E85B1230BDEA500A23BF1 /* bundle */ = {
 			isa = PBXGroup;
 			children = (
-				27A921BE1EF8B86F00DA5E1D /* AppointmentVC.h */,
-				27A921BF1EF8B86F00DA5E1D /* AppointmentVC.m */,
-				27504C181F7886D8004677BE /* 服务预约 */,
-				271161C61F60F40500DFBC55 /* 共享预约 */,
-				2744A4A51F5F7EE1004704A9 /* 商务预约 */,
-				2744A4A61F5F7EE1004704A9 /* 个人预约 */,
-				270FB04D1FAAAC5B0021D971 /* 预约控件 */,
-				2744A4A81F5F7F6C004704A9 /* cell&model */,
-				27924C3C1EFA414E001A0D0D /* ImageData */,
+				279E85B2230BDEA500A23BF1 /* main.jsbundle */,
+				279E85B3230BDEA500A23BF1 /* assets */,
 			);
-			path = "预约小秘书";
+			path = bundle;
 			sourceTree = "<group>";
 		};
-		27A921CC1EF91BF100DA5E1D /* 图片移动 */ = {
+		279E85B3230BDEA500A23BF1 /* assets */ = {
 			isa = PBXGroup;
 			children = (
-				27A921CD1EF91C1500DA5E1D /* HypPaomaView.h */,
-				27A921CE1EF91C1500DA5E1D /* HypPaomaView.m */,
+				279E85B4230BDEA500A23BF1 /* node_modules */,
 			);
-			path = "图片移动";
+			path = assets;
 			sourceTree = "<group>";
 		};
-		27B14B762303B88F00F8F6A8 /* bundle */ = {
+		279E85B4230BDEA500A23BF1 /* node_modules */ = {
 			isa = PBXGroup;
 			children = (
-				27B14B772303B88F00F8F6A8 /* main.jsbundle */,
-				27B14B782303B88F00F8F6A8 /* assets */,
+				279E85B5230BDEA500A23BF1 /* react-navigation-stack */,
+				279E85BE230BDEA500A23BF1 /* native-echarts */,
 			);
-			name = bundle;
-			path = UU_RN/bundle;
-			sourceTree = SOURCE_ROOT;
+			path = node_modules;
+			sourceTree = "<group>";
 		};
-		27B14B782303B88F00F8F6A8 /* assets */ = {
+		279E85B5230BDEA500A23BF1 /* react-navigation-stack */ = {
 			isa = PBXGroup;
 			children = (
-				27B14B792303B88F00F8F6A8 /* app.json */,
-				27B14B7A2303B88F00F8F6A8 /* node_modules */,
+				279E85B6230BDEA500A23BF1 /* lib */,
+			);
+			path = "react-navigation-stack";
+			sourceTree = "<group>";
+		};
+		279E85B6230BDEA500A23BF1 /* lib */ = {
+			isa = PBXGroup;
+			children = (
+				279E85B7230BDEA500A23BF1 /* module */,
+			);
+			path = lib;
+			sourceTree = "<group>";
+		};
+		279E85B7230BDEA500A23BF1 /* module */ = {
+			isa = PBXGroup;
+			children = (
+				279E85B8230BDEA500A23BF1 /* views */,
+			);
+			path = module;
+			sourceTree = "<group>";
+		};
+		279E85B8230BDEA500A23BF1 /* views */ = {
+			isa = PBXGroup;
+			children = (
+				279E85B9230BDEA500A23BF1 /* assets */,
+			);
+			path = views;
+			sourceTree = "<group>";
+		};
+		279E85B9230BDEA500A23BF1 /* assets */ = {
+			isa = PBXGroup;
+			children = (
+				279E85BA230BDEA500A23BF1 /* back-icon@3x.png */,
+				279E85BB230BDEA500A23BF1 /* back-icon@2x.png */,
+				279E85BC230BDEA500A23BF1 /* back-icon.png */,
+				279E85BD230BDEA500A23BF1 /* back-icon-mask.png */,
 			);
 			path = assets;
 			sourceTree = "<group>";
 		};
-		27B14B7A2303B88F00F8F6A8 /* node_modules */ = {
+		279E85BE230BDEA500A23BF1 /* native-echarts */ = {
 			isa = PBXGroup;
 			children = (
-				27B14B7B2303B88F00F8F6A8 /* react-navigation-stack */,
+				279E85BF230BDEA500A23BF1 /* src */,
 			);
-			path = node_modules;
+			path = "native-echarts";
 			sourceTree = "<group>";
 		};
-		27B14B7B2303B88F00F8F6A8 /* react-navigation-stack */ = {
+		279E85BF230BDEA500A23BF1 /* src */ = {
 			isa = PBXGroup;
 			children = (
-				27B14B7C2303B88F00F8F6A8 /* lib */,
+				279E85C0230BDEA500A23BF1 /* components */,
 			);
-			path = "react-navigation-stack";
+			path = src;
 			sourceTree = "<group>";
 		};
-		27B14B7C2303B88F00F8F6A8 /* lib */ = {
+		279E85C0230BDEA500A23BF1 /* components */ = {
 			isa = PBXGroup;
 			children = (
-				27B14B7D2303B88F00F8F6A8 /* module */,
+				279E85C1230BDEA500A23BF1 /* Echarts */,
 			);
-			path = lib;
+			path = components;
 			sourceTree = "<group>";
 		};
-		27B14B7D2303B88F00F8F6A8 /* module */ = {
+		279E85C1230BDEA500A23BF1 /* Echarts */ = {
 			isa = PBXGroup;
 			children = (
-				27B14B7E2303B88F00F8F6A8 /* views */,
+				279E85C2230BDEA500A23BF1 /* tpl.html */,
 			);
-			path = module;
+			path = Echarts;
 			sourceTree = "<group>";
 		};
-		27B14B7E2303B88F00F8F6A8 /* views */ = {
+		27A921BD1EF8B83800DA5E1D /* 预约小秘书 */ = {
 			isa = PBXGroup;
 			children = (
-				27B14B7F2303B88F00F8F6A8 /* assets */,
+				27A921BE1EF8B86F00DA5E1D /* AppointmentVC.h */,
+				27A921BF1EF8B86F00DA5E1D /* AppointmentVC.m */,
+				27504C181F7886D8004677BE /* 服务预约 */,
+				271161C61F60F40500DFBC55 /* 共享预约 */,
+				2744A4A51F5F7EE1004704A9 /* 商务预约 */,
+				2744A4A61F5F7EE1004704A9 /* 个人预约 */,
+				270FB04D1FAAAC5B0021D971 /* 预约控件 */,
+				2744A4A81F5F7F6C004704A9 /* cell&model */,
+				27924C3C1EFA414E001A0D0D /* ImageData */,
 			);
-			path = views;
+			path = "预约小秘书";
 			sourceTree = "<group>";
 		};
-		27B14B7F2303B88F00F8F6A8 /* assets */ = {
+		27A921CC1EF91BF100DA5E1D /* 图片移动 */ = {
 			isa = PBXGroup;
 			children = (
-				27B14B802303B88F00F8F6A8 /* back-icon@3x.png */,
-				27B14B812303B88F00F8F6A8 /* back-icon@2x.png */,
-				27B14B822303B88F00F8F6A8 /* back-icon.png */,
-				27B14B832303B88F00F8F6A8 /* back-icon-mask.png */,
+				27A921CD1EF91C1500DA5E1D /* HypPaomaView.h */,
+				27A921CE1EF91C1500DA5E1D /* HypPaomaView.m */,
 			);
-			path = assets;
+			path = "图片移动";
 			sourceTree = "<group>";
 		};
 		27B3E1441E6E84E100915825 /* B2B独立版单据 */ = {
@@ -12095,6 +12115,7 @@
 		8409054D17B693CF00F5C28D = {
 			isa = PBXGroup;
 			children = (
+				27F0C17B230BE07A0066D67D /* app.json */,
 				CCE23E8C18FFB8EA00A3CB5A /* shiku_im */,
 				276302911FDA964D0047C922 /* Images.xcassets */,
 				8409055817B693CF00F5C28D /* Frameworks */,
@@ -12180,8 +12201,6 @@
 			name = Frameworks;
 			sourceTree = "<group>";
 		};
-<<<<<<< HEAD
-=======
 		9911B8E92308D5CE0064F498 /* UIDevice */ = {
 			isa = PBXGroup;
 			children = (
@@ -12191,7 +12210,6 @@
 			name = UIDevice;
 			sourceTree = "<group>";
 		};
->>>>>>> 3c700ea12b2d7ae1b6e133774f62967384293a96
 		99B02ADC22EED6650014A144 /* RN */ = {
 			isa = PBXGroup;
 			children = (
@@ -12206,11 +12224,7 @@
 		99B02ADD22EED6650014A144 /* Others */ = {
 			isa = PBXGroup;
 			children = (
-<<<<<<< HEAD
-				27B14B762303B88F00F8F6A8 /* bundle */,
-=======
-				99E5956A2307E1120026D51A /* bundle */,
->>>>>>> 3c700ea12b2d7ae1b6e133774f62967384293a96
+				279E85B1230BDEA500A23BF1 /* bundle */,
 			);
 			path = Others;
 			sourceTree = "<group>";
@@ -12391,108 +12405,6 @@
 			path = TIPopGesture;
 			sourceTree = "<group>";
 		};
-		99E5956A2307E1120026D51A /* bundle */ = {
-			isa = PBXGroup;
-			children = (
-				99E5956B2307E1120026D51A /* main.jsbundle */,
-				99E5956C2307E1120026D51A /* assets */,
-			);
-			name = bundle;
-			path = UU_RN/bundle;
-			sourceTree = SOURCE_ROOT;
-		};
-		99E5956C2307E1120026D51A /* assets */ = {
-			isa = PBXGroup;
-			children = (
-				99E5956D2307E1120026D51A /* node_modules */,
-			);
-			path = assets;
-			sourceTree = "<group>";
-		};
-		99E5956D2307E1120026D51A /* node_modules */ = {
-			isa = PBXGroup;
-			children = (
-				99E5956E2307E1120026D51A /* react-navigation-stack */,
-				99E595772307E1120026D51A /* native-echarts */,
-			);
-			path = node_modules;
-			sourceTree = "<group>";
-		};
-		99E5956E2307E1120026D51A /* react-navigation-stack */ = {
-			isa = PBXGroup;
-			children = (
-				99E5956F2307E1120026D51A /* lib */,
-			);
-			path = "react-navigation-stack";
-			sourceTree = "<group>";
-		};
-		99E5956F2307E1120026D51A /* lib */ = {
-			isa = PBXGroup;
-			children = (
-				99E595702307E1120026D51A /* module */,
-			);
-			path = lib;
-			sourceTree = "<group>";
-		};
-		99E595702307E1120026D51A /* module */ = {
-			isa = PBXGroup;
-			children = (
-				99E595712307E1120026D51A /* views */,
-			);
-			path = module;
-			sourceTree = "<group>";
-		};
-		99E595712307E1120026D51A /* views */ = {
-			isa = PBXGroup;
-			children = (
-				99E595722307E1120026D51A /* assets */,
-			);
-			path = views;
-			sourceTree = "<group>";
-		};
-		99E595722307E1120026D51A /* assets */ = {
-			isa = PBXGroup;
-			children = (
-				99E595732307E1120026D51A /* back-icon@3x.png */,
-				99E595742307E1120026D51A /* back-icon@2x.png */,
-				99E595752307E1120026D51A /* back-icon.png */,
-				99E595762307E1120026D51A /* back-icon-mask.png */,
-			);
-			path = assets;
-			sourceTree = "<group>";
-		};
-		99E595772307E1120026D51A /* native-echarts */ = {
-			isa = PBXGroup;
-			children = (
-				99E595782307E1120026D51A /* src */,
-			);
-			path = "native-echarts";
-			sourceTree = "<group>";
-		};
-		99E595782307E1120026D51A /* src */ = {
-			isa = PBXGroup;
-			children = (
-				99E595792307E1120026D51A /* components */,
-			);
-			path = src;
-			sourceTree = "<group>";
-		};
-		99E595792307E1120026D51A /* components */ = {
-			isa = PBXGroup;
-			children = (
-				99E5957A2307E1120026D51A /* Echarts */,
-			);
-			path = components;
-			sourceTree = "<group>";
-		};
-		99E5957A2307E1120026D51A /* Echarts */ = {
-			isa = PBXGroup;
-			children = (
-				99E5957B2307E1120026D51A /* tpl.html */,
-			);
-			path = Echarts;
-			sourceTree = "<group>";
-		};
 		99F0A0F921266BC000B38B47 /* 日程管理 */ = {
 			isa = PBXGroup;
 			children = (
@@ -13024,6 +12936,11 @@
 				A7D56AF81C7BE72800DAACEE /* libz.1.2.5.tbd */,
 				AA5BD5731FB1598500037B78 /* libcrypto.a */,
 				AA5BD5721FB1598400037B78 /* libssl.a */,
+				27B14B802303B88F00F8F6A8 /* back-icon@3x.png */,
+				27B14B832303B88F00F8F6A8 /* back-icon-mask.png */,
+				27B14B812303B88F00F8F6A8 /* back-icon@2x.png */,
+				27B14B792303B88F00F8F6A8 /* app.json */,
+				27B14B822303B88F00F8F6A8 /* back-icon.png */,
 			);
 			name = "Recovered References";
 			sourceTree = "<group>";
@@ -17450,6 +17367,7 @@
 			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 */,
@@ -17541,7 +17459,6 @@
 				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 */,
@@ -17804,6 +17721,7 @@
 				27D760B61C5CBEEF00FAD457 /* im_amr1.png in Resources */,
 				CC3016DA1951BABF0059BADA /* f030.png in Resources */,
 				AA3A91181DFC01D70055DBE2 /* oa_waiqing_update.png in Resources */,
+				279E85C3230BDEA500A23BF1 /* main.jsbundle in Resources */,
 				CC3A142C195851280054127B /* v_record1@2x.png in Resources */,
 				27259FB01D2A3F0F00E30D1F /* uu_crm_state_left.png in Resources */,
 				CC6E183319794BC7006ADA8A /* tab_interview_default.png in Resources */,
@@ -17822,11 +17740,6 @@
 				CC30175C1951BABF0059BADA /* f095.png in Resources */,
 				2732E7EC1D1A248900B2789F /* uu_crm_round.png in Resources */,
 				CC6E182319794BC7006ADA8A /* RegistrationHighlight@2x.png in Resources */,
-<<<<<<< HEAD
-				27B14B842303B88F00F8F6A8 /* main.jsbundle in Resources */,
-=======
-				99E5957C2307E1130026D51A /* main.jsbundle in Resources */,
->>>>>>> 3c700ea12b2d7ae1b6e133774f62967384293a96
 				CC6E186F19794BC7006ADA8A /* pub_record_button@2x.png in Resources */,
 				CCE2415018FFB8EB00A3CB5A /* recorder_trash_can2.png in Resources */,
 				20EA4C4220AD34960055577D /* loadingAd46.png in Resources */,
@@ -18182,7 +18095,6 @@
 				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 */,
@@ -18213,6 +18125,7 @@
 				2731896C1CB348A4003A06B7 /* uu_background.png in Resources */,
 				CC3016C21951BABF0059BADA /* f018.png in Resources */,
 				B80A7E4D1D3C7172002B4534 /* list_8.png in Resources */,
+				279E85C6230BDEA500A23BF1 /* back-icon.png in Resources */,
 				27D63BCF1C5A20C10034EDDC /* im_jpeg.png in Resources */,
 				CC6E182C19794BC7006ADA8A /* sharemore_voiceinput@2x.png in Resources */,
 				CC6E17CC19794BC7006ADA8A /* menu_list_bg@2x.png in Resources */,
@@ -18239,10 +18152,10 @@
 				20AF4B9220ABBA2700C341CB /* loading29.png in Resources */,
 				B85677AF1CD8AFBD0082F244 /* f_static_038.png in Resources */,
 				B8ED16F11CDAEE8900BD9371 /* Newguanzhu.png in Resources */,
+				279E85C5230BDEA500A23BF1 /* back-icon@2x.png in Resources */,
 				4DEA59381D800AF70059C355 /* oa_huiyi_huntiao.png in Resources */,
 				7D2ADFAF1DFEA6400025BC16 /* icon_disagree_nor3.png in Resources */,
 				A75FA3611C72ABC5004B2D32 /* quest.png in Resources */,
-				99E5957E2307E1130026D51A /* back-icon@2x.png in Resources */,
 				CCC7B03B197FA18900A828A8 /* new_tips.png in Resources */,
 				CCE242ED18FFB8EB00A3CB5A /* README.txt in Resources */,
 				CC6E17A019794BC7006ADA8A /* title_set@2x.png in Resources */,
@@ -18320,7 +18233,6 @@
 				CC6E17C119794BC7006ADA8A /* avatar_icon_boy@2x.png in Resources */,
 				7D2DA5431DF55FAF00C2C4A8 /* icon_comment_nor111.png in Resources */,
 				20A828AC1F5D50CE0081F3D0 /* ic_menu_retract(1).png in Resources */,
-				99E5957D2307E1130026D51A /* back-icon@3x.png in Resources */,
 				CC6E17B019794BC7006ADA8A /* im_input_expression_press@2x.png in Resources */,
 				20AF4BA320ABBA2700C341CB /* loading8.png in Resources */,
 				20AF4B9A20ABBA2700C341CB /* loading60.png in Resources */,
@@ -18397,6 +18309,7 @@
 				7D2ADFAD1DFE8B660025BC16 /* icon_zan_nor3332.png in Resources */,
 				B8C27BBE1CBB52C1000C69BE /* uu_txl_myf.png in Resources */,
 				AA4BF8531DBDFCD5000872DD /* grayRet.png in Resources */,
+				279E85C4230BDEA500A23BF1 /* back-icon@3x.png in Resources */,
 				CC3016FE1951BABF0059BADA /* f048.png in Resources */,
 				CC6E17A319794BC7006ADA8A /* button_green_press.png in Resources */,
 				7D3294B51DE5ABC300586869 /* icon_share_nor13.png in Resources */,
@@ -18535,7 +18448,6 @@
 				27D63BD31C5A2D8E0034EDDC /* im_gif.png in Resources */,
 				20AF4BA120ABBA2700C341CB /* loading59.png in Resources */,
 				B8DB0BD11CBF367700A19BAC /* uu_note_gonggao.png in Resources */,
-				99E5957F2307E1130026D51A /* back-icon.png in Resources */,
 				273316A41D2C9CEF00BD978C /* down_dark1.png in Resources */,
 				7D5DE9832148E5F5005822C8 /* photograph@3x.png in Resources */,
 				CC6E184419794BC7006ADA8A /* tabbar_mainframeHL@2x.png in Resources */,
@@ -18575,7 +18487,6 @@
 				27CB42E81D6ECD07006983B2 /* crm_main_client.png in Resources */,
 				7D26699A1E5FC5DD00F16C15 /* btn_shensu_nor1.png in Resources */,
 				CC8A0ADB1A0E0D870051396C /* more_flag@2x.png in Resources */,
-				99E595812307E1130026D51A /* tpl.html in Resources */,
 				CC3016991951BABF0059BADA /* AlbumTriangleB@2x.png in Resources */,
 				CC3016D31951BABF0059BADA /* f026@2x.png in Resources */,
 				27DB549D20DB827F00BAB4C7 /* com.baidu.idl.face.model.bundle in Resources */,
@@ -18706,6 +18617,7 @@
 				B87A43221D685A7C0025EF5D /* oa_waiqing_shijian.png in Resources */,
 				CC3A1423195851280054127B /* 7_pause@2x.png in Resources */,
 				B860BDA61D3DC5C40006B82B /* wq_wo.png in Resources */,
+				279E85C7230BDEA500A23BF1 /* back-icon-mask.png in Resources */,
 				CC22EB041A6E6F8800FAB7AF /* 微笑.png in Resources */,
 				27F6084C1C7ED99200948A9D /* icon_deperment_name.png in Resources */,
 				7D0B61CB1F6FA73E00F35B53 /* icon_uuhelper_nor3.png in Resources */,
@@ -18737,6 +18649,7 @@
 				272492BA1CBC91F2005F3435 /* uu_background_huibai.png in Resources */,
 				CC30175F1951BABF0059BADA /* f096@2x.png in Resources */,
 				CC3AC3D819834415000BB7E8 /* im_photo_button_press.png in Resources */,
+				279E85C8230BDEA500A23BF1 /* tpl.html in Resources */,
 				20EA4C2220AD34960055577D /* loadingAd12.png in Resources */,
 				CC3017401951BABF0059BADA /* f081.png in Resources */,
 				CC6E17DF19794BC7006ADA8A /* 0_left_n@2x.png in Resources */,
@@ -18748,7 +18661,6 @@
 				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 */,
@@ -18819,10 +18731,6 @@
 				20EA4C3C20AD34960055577D /* loadingAd51.png in Resources */,
 				CC3A1427195851280054127B /* v_cammer@2x.png in Resources */,
 				CCE2415118FFB8EB00A3CB5A /* recorder_trash_can2@2x.png in Resources */,
-<<<<<<< HEAD
-				27B14B852303B88F00F8F6A8 /* app.json in Resources */,
-=======
->>>>>>> 3c700ea12b2d7ae1b6e133774f62967384293a96
 				CC6E186119794BC7006ADA8A /* feeds_play_btn@2x.png in Resources */,
 				7D736AE81E0BE3DE0035B25B /* icon_banci_nor3.png in Resources */,
 				272F120A1CC4D95100452A0D /* uu_work_chaxun_press.png in Resources */,
@@ -18939,7 +18847,6 @@
 				B856779B1CD8AFBD0082F244 /* f_static_018.png in Resources */,
 				2744A4B41F5FC965004704A9 /* UU_book_sharebookList.png in Resources */,
 				27DB549B20DB827F00BAB4C7 /* com.baidu.idl.face.faceSDK.bundle in Resources */,
-				99E595802307E1130026D51A /* back-icon-mask.png in Resources */,
 				27701F921CC4F6C2007AFDD7 /* uu_work_kucunchaxun.png in Resources */,
 				20AF4B9120ABBA2700C341CB /* loading28.png in Resources */,
 				20AF4B7420ABBA2700C341CB /* loading52.png in Resources */,
@@ -18974,7 +18881,6 @@
 				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 */,

shiku_im/shiku_im/RN/Controllers/YRReactVC.m

@@ -50,8 +50,8 @@ static NSMutableDictionary * rootDic = nil;
 //
     self.moduleName = self.moduleName?:@"UU_RN";
     
-//    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] ;
     
     if (!rootDic) {