1.交互

shiku_im/Podfile

@@ -44,10 +44,11 @@ target 'shiku_im' do
   ]
   
   pod 'yoga', :path => './UU_RN/node_modules/react-native/ReactCommon/yoga'
+  pod 'RNGestureHandler',:path => './UU_RN/node_modules/react-native-gesture-handler'
   pod 'DoubleConversion', podspec: './UU_RN/node_modules/react-native/third-party-podspecs/DoubleConversion.podspec'
   pod 'glog', podspec: './UU_RN/node_modules/react-native/third-party-podspecs/glog.podspec'
   pod 'Folly', podspec: './UU_RN/node_modules/react-native/third-party-podspecs/Folly.podspec'
-  
+  pod 'CodePush', :path => './UU_RN/node_modules/react-native-code-push'
   #0.60.0以上新版本使用
 #  pod 'React', :path => './UU_RN/node_modules/react-native/'
 #  pod 'React-Core', :path => './UU_RN/node_modules/react-native/React'

shiku_im/Podfile.lock

@@ -15,10 +15,16 @@ PODS:
   - AFNetworking/UIKit (3.2.1):
     - AFNetworking/NSURLSession
   - AliPay (2.1.2)
+  - Base64 (1.1.2)
   - boost-for-react-native (1.63.0)
   - Bugtags (3.1.3):
     - Bugtags/Core (= 3.1.3)
   - Bugtags/Core (3.1.3)
+  - CodePush (5.6.1):
+    - Base64 (~> 1.1)
+    - JWT (~> 3.0.0-beta.7)
+    - React
+    - SSZipArchive (~> 2.1)
   - DoubleConversion (1.1.6)
   - EGOCache (2.2.0)
   - FMDB (2.7.5):
@@ -31,10 +37,14 @@ PODS:
   - glog (0.3.5)
   - HMSegmentedControl (1.5.5)
   - IQKeyboardManager (6.4.0)
+  - JWT (3.0.0-beta.11):
+    - Base64 (~> 1.1.2)
   - Masonry (1.1.0)
   - MJExtension (3.0.10)
   - MJRefresh (3.2.0)
   - pop (1.0.12)
+  - React (0.59.9):
+    - React/Core (= 0.59.9)
   - React/Core (0.59.9):
     - yoga (= 0.59.9.React)
   - React/CxxBridge (0.59.9):
@@ -92,9 +102,12 @@ PODS:
     - React/fishhook
     - React/RCTBlob
   - ReactiveObjC (3.1.1)
+  - RNGestureHandler (1.3.0):
+    - React
   - SDWebImage (4.4.6):
     - SDWebImage/Core (= 4.4.6)
   - SDWebImage/Core (4.4.6)
+  - SSZipArchive (2.2.2)
   - SVProgressHUD (2.2.5)
   - TZImagePickerController (3.2.1)
   - WechatOpenSDK (1.8.4)
@@ -104,6 +117,7 @@ DEPENDENCIES:
   - AFNetworking
   - AliPay
   - Bugtags
+  - CodePush (from `./UU_RN/node_modules/react-native-code-push`)
   - DoubleConversion (from `./UU_RN/node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`)
   - EGOCache
   - FMDB
@@ -129,6 +143,7 @@ DEPENDENCIES:
   - React/RCTVibration (from `./UU_RN/node_modules/react-native`)
   - React/RCTWebSocket (from `./UU_RN/node_modules/react-native`)
   - ReactiveObjC
+  - RNGestureHandler (from `./UU_RN/node_modules/react-native-gesture-handler`)
   - SDWebImage (= 4.4.6)
   - SVProgressHUD
   - TZImagePickerController
@@ -139,23 +154,28 @@ SPEC REPOS:
   https://github.com/cocoapods/specs.git:
     - AFNetworking
     - AliPay
+    - Base64
     - boost-for-react-native
     - Bugtags
     - EGOCache
     - FMDB
     - HMSegmentedControl
     - IQKeyboardManager
+    - JWT
     - Masonry
     - MJExtension
     - MJRefresh
     - pop
     - ReactiveObjC
     - SDWebImage
+    - SSZipArchive
     - SVProgressHUD
     - TZImagePickerController
     - WechatOpenSDK
 
 EXTERNAL SOURCES:
+  CodePush:
+    :path: "./UU_RN/node_modules/react-native-code-push"
   DoubleConversion:
     :podspec: "./UU_RN/node_modules/react-native/third-party-podspecs/DoubleConversion.podspec"
   Folly:
@@ -164,14 +184,18 @@ EXTERNAL SOURCES:
     :podspec: "./UU_RN/node_modules/react-native/third-party-podspecs/glog.podspec"
   React:
     :path: "./UU_RN/node_modules/react-native"
+  RNGestureHandler:
+    :path: "./UU_RN/node_modules/react-native-gesture-handler"
   yoga:
     :path: "./UU_RN/node_modules/react-native/ReactCommon/yoga"
 
 SPEC CHECKSUMS:
   AFNetworking: b6f891fdfaed196b46c7a83cf209e09697b94057
   AliPay: 2bd35a4e486d2a8c035043023cd846e886bb21d1
+  Base64: cecfb41a004124895a7bcee567a89bae5a89d49b
   boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c
   Bugtags: 3ea74dc1a2a0a24989c2243ab2e075bf60b48d56
+  CodePush: f6b348759cdc42c734d9c3a46ceb2997c270b12e
   DoubleConversion: bb338842f62ab1d708ceb63ec3d999f0f3d98ecd
   EGOCache: 191fd213da6804d487b49b1a91772ba904f3e324
   FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
@@ -179,18 +203,21 @@ SPEC CHECKSUMS:
   glog: aefd1eb5dda2ab95ba0938556f34b98e2da3a60d
   HMSegmentedControl: f514c6dad47aa3065e0ed2e8046b73efc71221b9
   IQKeyboardManager: fcef267266379c003181fc3592f6bdb8bf4db839
+  JWT: 05028b9624591bba9681bb57df2c5f95fa258bad
   Masonry: 678fab65091a9290e40e2832a55e7ab731aad201
   MJExtension: d86aacb740c87519d20e3cca55b6fa4be6cc7548
   MJRefresh: ed450d6eb9d3346a2cb033ab7eb6de090aeef437
   pop: d582054913807fd11fd50bfe6a539d91c7e1a55a
   React: 1d605e098d69bdf08960787f3446f0a9dc2e2ccf
   ReactiveObjC: 011caa393aa0383245f2dcf9bf02e86b80b36040
+  RNGestureHandler: 7ccf2f3f60458e084f9ada01fbaf610f6fef073c
   SDWebImage: 3f3f0c02f09798048c47a5ed0a13f17b063572d8
+  SSZipArchive: fa16b8cc4cdeceb698e5e5d9f67e9558532fbf23
   SVProgressHUD: 1428aafac632c1f86f62aa4243ec12008d7a51d6
   TZImagePickerController: bf4c57b98d8707fce41ea6be872414a71c7a8c9d
   WechatOpenSDK: 9b721089507c895d05f997408c30bb6e6f5f9b60
   yoga: 128daf064cacaede0c3bb27424b6b4c71052e6cd
 
-PODFILE CHECKSUM: 798543e59399751c6e6366cdc72344ac23b1b015
+PODFILE CHECKSUM: a7427ed79027131c798a61cdaacdfea73b1b9f9c
 
 COCOAPODS: 1.5.2

shiku_im/shiku_im.xcodeproj/project.pbxproj

@@ -1434,6 +1434,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"; }; };
+		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"; }; };
@@ -1446,15 +1448,12 @@
 		9961DAD021956846007CA402 /* UASScheHeader.m in Sources */ = {isa = PBXBuildFile; fileRef = 9961DACF21956846007CA402 /* UASScheHeader.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; };
 		9961DAD32195687D007CA402 /* UASScheModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 9961DAD22195687D007CA402 /* UASScheModel.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; };
 		9961DAD6219568D4007CA402 /* UASScheduleMainCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 9961DAD5219568D4007CA402 /* UASScheduleMainCell.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; };
-		9997D58C22F187E0005292B7 /* main.jsbundle in Resources */ = {isa = PBXBuildFile; fileRef = 9997D58922F187E0005292B7 /* main.jsbundle */; };
-		9997D58D22F187E0005292B7 /* app.json in Resources */ = {isa = PBXBuildFile; fileRef = 9997D58B22F187E0005292B7 /* app.json */; };
-		9997D58F22F190AA005292B7 /* logo.png in Resources */ = {isa = PBXBuildFile; fileRef = 9997D58E22F190AA005292B7 /* logo.png */; };
 		99984659212D1124006FDD60 /* UASScheduleReVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 99984658212D1124006FDD60 /* UASScheduleReVC.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; };
 		99A2B88621571916002C8A97 /* UASClientVisitPlanCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 99A2B88521571916002C8A97 /* UASClientVisitPlanCell.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; };
 		99A6655B21192EA5007A858D /* UASPreView.m in Sources */ = {isa = PBXBuildFile; fileRef = 99A6655A21192EA5007A858D /* UASPreView.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; };
 		99AE8CE321474907006D9FEB /* UASClientMaAccountCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 99AE8CE221474907006D9FEB /* UASClientMaAccountCell.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; };
 		99AE981F2182E11C0028B05A /* Workdata_Add.json in Resources */ = {isa = PBXBuildFile; fileRef = 99AE981E2182E11C0028B05A /* Workdata_Add.json */; };
-		99B02AE322EED6660014A144 /* YRReactVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 99B02AE122EED6650014A144 /* YRReactVC.m */; };
+		99B02AE322EED6660014A144 /* YRReactVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 99B02AE122EED6650014A144 /* YRReactVC.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; };
 		99B34858212A6F2400CE6332 /* UASScheduleCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 99B34857212A6F2400CE6332 /* UASScheduleCell.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; };
 		99B3485B212A8E5A00CE6332 /* UASScheduleModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 99B3485A212A8E5A00CE6332 /* UASScheduleModel.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; };
 		99B3485E212A9A9C00CE6332 /* UASAddCircleView.m in Sources */ = {isa = PBXBuildFile; fileRef = 99B3485D212A9A9C00CE6332 /* UASAddCircleView.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; };
@@ -1473,6 +1472,7 @@
 		99C399C22146660B004D3306 /* UASClientMaSecHeaderView.m in Sources */ = {isa = PBXBuildFile; fileRef = 99C399C12146660B004D3306 /* UASClientMaSecHeaderView.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; };
 		99C399C521466EC9004D3306 /* UASClientMaSecFooterView.m in Sources */ = {isa = PBXBuildFile; fileRef = 99C399C421466EC9004D3306 /* UASClientMaSecFooterView.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; };
 		99C4544A217730DA0013FFC3 /* UASClientNodataCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 99C45449217730D90013FFC3 /* UASClientNodataCell.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; };
+		99C8A818230397940073EF99 /* YRRnBridge.m in Sources */ = {isa = PBXBuildFile; fileRef = 99C8A817230397940073EF99 /* YRRnBridge.m */; };
 		99D0B9FA21378E4D0002DFC4 /* UINavigationController+popGes.m in Sources */ = {isa = PBXBuildFile; fileRef = 99D0B9F821378E4C0002DFC4 /* UINavigationController+popGes.m */; };
 		99D9586721211D0100B44CA7 /* UASCountDownView.m in Sources */ = {isa = PBXBuildFile; fileRef = 99D9586621211D0100B44CA7 /* UASCountDownView.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; };
 		99D9586D2121231B00B44CA7 /* UASAdView.m in Sources */ = {isa = PBXBuildFile; fileRef = 99D9586C2121231B00B44CA7 /* UASAdView.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; };
@@ -4720,7 +4720,7 @@
 		7D2DA53E1DF55FAF00C2C4A8 /* icon_zan_nor222.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = icon_zan_nor222.png; sourceTree = "<group>"; };
 		7D2DA53F1DF55FAF00C2C4A8 /* icon_zan_nor333.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = icon_zan_nor333.png; sourceTree = "<group>"; };
 		7D2EFB871E4C43A400962098 /* icon_dakalandian_nor3.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = icon_dakalandian_nor3.png; sourceTree = "<group>"; };
-		7D2F45471DE8570300462CBD /* $RL2N4PN.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "$RL2N4PN.png"; sourceTree = "<group>"; };
+		7D2F45471DE8570300462CBD /* $RL2N4PN.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = $RL2N4PN.png; sourceTree = "<group>"; };
 		7D2FBD6A1E683D5500A08F1F /* JLHONGDIANDetailVC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JLHONGDIANDetailVC.h; path = myOA/JLHONGDIANDetailVC.h; sourceTree = "<group>"; };
 		7D2FBD6B1E683D5500A08F1F /* JLHONGDIANDetailVC.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = JLHONGDIANDetailVC.m; path = myOA/JLHONGDIANDetailVC.m; sourceTree = "<group>"; };
 		7D2FBD6E1E6841A000A08F1F /* NumButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NumButton.h; path = myOA/NumButton.h; sourceTree = "<group>"; };
@@ -5077,6 +5077,8 @@
 		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>"; };
@@ -5100,9 +5102,6 @@
 		9961DAD22195687D007CA402 /* UASScheModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = UASScheModel.m; sourceTree = "<group>"; };
 		9961DAD4219568D4007CA402 /* UASScheduleMainCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = UASScheduleMainCell.h; sourceTree = "<group>"; };
 		9961DAD5219568D4007CA402 /* UASScheduleMainCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = UASScheduleMainCell.m; sourceTree = "<group>"; };
-		9997D58922F187E0005292B7 /* main.jsbundle */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = main.jsbundle; sourceTree = "<group>"; };
-		9997D58B22F187E0005292B7 /* app.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = app.json; sourceTree = "<group>"; };
-		9997D58E22F190AA005292B7 /* logo.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = logo.png; sourceTree = "<group>"; };
 		99984657212D1124006FDD60 /* UASScheduleReVC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = UASScheduleReVC.h; sourceTree = "<group>"; };
 		99984658212D1124006FDD60 /* UASScheduleReVC.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = UASScheduleReVC.m; sourceTree = "<group>"; };
 		99A2B88421571916002C8A97 /* UASClientVisitPlanCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = UASClientVisitPlanCell.h; sourceTree = "<group>"; };
@@ -5149,6 +5148,8 @@
 		99C399C421466EC9004D3306 /* UASClientMaSecFooterView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = UASClientMaSecFooterView.m; sourceTree = "<group>"; };
 		99C45448217730D90013FFC3 /* UASClientNodataCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UASClientNodataCell.h; sourceTree = "<group>"; };
 		99C45449217730D90013FFC3 /* UASClientNodataCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UASClientNodataCell.m; sourceTree = "<group>"; };
+		99C8A816230397940073EF99 /* YRRnBridge.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = YRRnBridge.h; sourceTree = "<group>"; };
+		99C8A817230397940073EF99 /* YRRnBridge.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = YRRnBridge.m; sourceTree = "<group>"; };
 		99D0B9F821378E4C0002DFC4 /* UINavigationController+popGes.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UINavigationController+popGes.m"; sourceTree = "<group>"; };
 		99D0B9F921378E4C0002DFC4 /* UINavigationController+popGes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UINavigationController+popGes.h"; sourceTree = "<group>"; };
 		99D9586521211D0100B44CA7 /* UASCountDownView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = UASCountDownView.h; sourceTree = "<group>"; };
@@ -12039,20 +12040,20 @@
 			name = Frameworks;
 			sourceTree = "<group>";
 		};
-		9997D58822F187E0005292B7 /* bundle */ = {
+		993E56122302CA5F006AA2B7 /* bundle */ = {
 			isa = PBXGroup;
 			children = (
-				9997D58922F187E0005292B7 /* main.jsbundle */,
-				9997D58A22F187E0005292B7 /* assets */,
+				993E56132302CA5F006AA2B7 /* main.jsbundle */,
+				993E56142302CA5F006AA2B7 /* assets */,
 			);
-			path = bundle;
-			sourceTree = "<group>";
+			name = bundle;
+			path = UU_RN/bundle;
+			sourceTree = SOURCE_ROOT;
 		};
-		9997D58A22F187E0005292B7 /* assets */ = {
+		993E56142302CA5F006AA2B7 /* assets */ = {
 			isa = PBXGroup;
 			children = (
-				9997D58B22F187E0005292B7 /* app.json */,
-				9997D58E22F190AA005292B7 /* logo.png */,
+				993E56152302CA5F006AA2B7 /* app.json */,
 			);
 			path = assets;
 			sourceTree = "<group>";
@@ -12071,7 +12072,7 @@
 		99B02ADD22EED6650014A144 /* Others */ = {
 			isa = PBXGroup;
 			children = (
-				9997D58822F187E0005292B7 /* bundle */,
+				993E56122302CA5F006AA2B7 /* bundle */,
 			);
 			path = Others;
 			sourceTree = "<group>";
@@ -12079,6 +12080,8 @@
 		99B02ADE22EED6650014A144 /* Models */ = {
 			isa = PBXGroup;
 			children = (
+				99C8A816230397940073EF99 /* YRRnBridge.h */,
+				99C8A817230397940073EF99 /* YRRnBridge.m */,
 			);
 			path = Models;
 			sourceTree = "<group>";
@@ -17573,7 +17576,7 @@
 				CC30175C1951BABF0059BADA /* f095.png in Resources */,
 				2732E7EC1D1A248900B2789F /* uu_crm_round.png in Resources */,
 				CC6E182319794BC7006ADA8A /* RegistrationHighlight@2x.png in Resources */,
-				9997D58C22F187E0005292B7 /* main.jsbundle in Resources */,
+				993E56162302CA60006AA2B7 /* main.jsbundle in Resources */,
 				CC6E186F19794BC7006ADA8A /* pub_record_button@2x.png in Resources */,
 				CCE2415018FFB8EB00A3CB5A /* recorder_trash_can2.png in Resources */,
 				20EA4C4220AD34960055577D /* loadingAd46.png in Resources */,
@@ -17878,7 +17881,6 @@
 				20EA4C2E20AD34960055577D /* loadingAd59.png in Resources */,
 				AA3703711E5AF6E0001F3EAA /* uu_voice_search8.png in Resources */,
 				CC6E17D719794BC7006ADA8A /* im_003_more_button_normal@2x.png in Resources */,
-				9997D58F22F190AA005292B7 /* logo.png in Resources */,
 				7D26699B1E5FC5DD00F16C15 /* btn_shensu_nor2.png in Resources */,
 				7D86CEC61DDC27AF003805D1 /* oa_daka_line111.png in Resources */,
 				B8793A061D645930006AAFC9 /* searchbar_textfield_search_icon@2x.png in Resources */,
@@ -18561,7 +18563,7 @@
 				20EA4C3C20AD34960055577D /* loadingAd51.png in Resources */,
 				CC3A1427195851280054127B /* v_cammer@2x.png in Resources */,
 				CCE2415118FFB8EB00A3CB5A /* recorder_trash_can2@2x.png in Resources */,
-				9997D58D22F187E0005292B7 /* app.json in Resources */,
+				993E56172302CA60006AA2B7 /* 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 */,
@@ -19600,6 +19602,7 @@
 				CC4656031A5F83CA006D9D89 /* myMediaVC.m in Sources */,
 				CC3A1414195845A10054127B /* StreamPlayerViewController.m in Sources */,
 				CC30168B1951BABF0059BADA /* HBImageScroller.m in Sources */,
+				99C8A818230397940073EF99 /* YRRnBridge.m in Sources */,
 				CCE2416118FFB8EB00A3CB5A /* AppDelegate.mm in Sources */,
 				7D2507B21EA89C36009367B2 /* CalendarDayModel.m in Sources */,
 				204B21C620634B0800FDBFD5 /* UASInviteRegCell.m in Sources */,
@@ -20132,10 +20135,10 @@
 				CODE_SIGN_STYLE = Automatic;
 				COPY_PHASE_STRIP = NO;
 				DOUBANGO_HOME = "$(SRCROOT)/shiku_im/meeting/ios-ngn-stack/stacks";
-				DOUBANGO_LIBS = "$DOUBANGO_HOME/thirdparties/iphone/lib/i386";
-				"DOUBANGO_LIBS[arch=armv6]" = "$DOUBANGO_HOME/thirdparties/iphone/lib/armv6";
-				"DOUBANGO_LIBS[arch=armv7]" = "$DOUBANGO_HOME/thirdparties/iphone/lib/armv7";
-				"DOUBANGO_LIBS[sdk=iphonesimulator*][arch=*]" = "$DOUBANGO_HOME/thirdparties/iphone/lib/i386";
+				DOUBANGO_LIBS = $DOUBANGO_HOME/thirdparties/iphone/lib/i386;
+				"DOUBANGO_LIBS[arch=armv6]" = $DOUBANGO_HOME/thirdparties/iphone/lib/armv6;
+				"DOUBANGO_LIBS[arch=armv7]" = $DOUBANGO_HOME/thirdparties/iphone/lib/armv7;
+				"DOUBANGO_LIBS[sdk=iphonesimulator*][arch=*]" = $DOUBANGO_HOME/thirdparties/iphone/lib/i386;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_OPTIMIZATION_LEVEL = 0;
@@ -20178,10 +20181,10 @@
 				CODE_SIGN_STYLE = Automatic;
 				COPY_PHASE_STRIP = YES;
 				DOUBANGO_HOME = "$(SRCROOT)/shiku_im/meeting/ios-ngn-stack/stacks";
-				DOUBANGO_LIBS = "$DOUBANGO_HOME/thirdparties/iphone/lib/i386";
-				"DOUBANGO_LIBS[arch=armv6]" = "$DOUBANGO_HOME/thirdparties/iphone/lib/armv6";
-				"DOUBANGO_LIBS[arch=armv7]" = "$DOUBANGO_HOME/thirdparties/iphone/lib/armv7";
-				"DOUBANGO_LIBS[sdk=iphonesimulator*][arch=*]" = "$DOUBANGO_HOME/thirdparties/iphone/lib/i386";
+				DOUBANGO_LIBS = $DOUBANGO_HOME/thirdparties/iphone/lib/i386;
+				"DOUBANGO_LIBS[arch=armv6]" = $DOUBANGO_HOME/thirdparties/iphone/lib/armv6;
+				"DOUBANGO_LIBS[arch=armv7]" = $DOUBANGO_HOME/thirdparties/iphone/lib/armv7;
+				"DOUBANGO_LIBS[sdk=iphonesimulator*][arch=*]" = $DOUBANGO_HOME/thirdparties/iphone/lib/i386;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
@@ -20209,6 +20212,8 @@
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
 				CLANG_ENABLE_OBJC_ARC = NO;
 				CLANG_ENABLE_OBJC_WEAK = YES;
+				CODEPUSH_KEY = if4T49oStVOr08rU6SJaPJQmFK3O4ksvOXqog;
+				CODEPUSH_URL = "https://uu-update.ubtob.com";
 				CODE_SIGN_ENTITLEMENTS = shiku_im/shiku_im.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=*]" = "iPhone Developer: QUANMING LV (83764JWNLL)";
@@ -20216,10 +20221,10 @@
 				CODE_SIGN_STYLE = Manual;
 				DEVELOPMENT_TEAM = D49MF83EK7;
 				DOUBANGO_LIBS = "";
-				"DOUBANGO_LIBS[arch=arm64]" = "$DOUBANGO_HOME/thirdparties/iphone/lib/arm64";
-				"DOUBANGO_LIBS[arch=armv6]" = "$DOUBANGO_HOME/thirdparties/iphone/lib/armv6";
-				"DOUBANGO_LIBS[arch=armv7]" = "$DOUBANGO_HOME/thirdparties/iphone/lib/armv7";
-				"DOUBANGO_LIBS[arch=armv7s]" = "$DOUBANGO_HOME/thirdparties/iphone/lib/armv7s";
+				"DOUBANGO_LIBS[arch=arm64]" = $DOUBANGO_HOME/thirdparties/iphone/lib/arm64;
+				"DOUBANGO_LIBS[arch=armv6]" = $DOUBANGO_HOME/thirdparties/iphone/lib/armv6;
+				"DOUBANGO_LIBS[arch=armv7]" = $DOUBANGO_HOME/thirdparties/iphone/lib/armv7;
+				"DOUBANGO_LIBS[arch=armv7s]" = $DOUBANGO_HOME/thirdparties/iphone/lib/armv7s;
 				"DOUBANGO_LIBS[sdk=iphonesimulator*][arch=*]" = "";
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -20243,18 +20248,18 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "shiku_im/shiku_im-Prefix.pch";
 				HEADER_SEARCH_PATHS = (
-					"$DOUBANGO_HOME/bindings/_common",
-					"$DOUBANGO_HOME/tinySDP/include",
-					"$DOUBANGO_HOME/tinyHTTP/include",
-					"$DOUBANGO_HOME/tinySMS/include",
-					"$DOUBANGO/HOME/tinyMSRP/include",
+					$DOUBANGO_HOME/bindings/_common,
+					$DOUBANGO_HOME/tinySDP/include,
+					$DOUBANGO_HOME/tinyHTTP/include,
+					$DOUBANGO_HOME/tinySMS/include,
+					$DOUBANGO/HOME/tinyMSRP/include,
 					"$(PROJECT_DIR)/shiku_im/RSA/include",
 					/usr/include/libxml2,
-					"$DOUBANGO_HOME/tinyDAV/include",
-					"$DOUBANGO_HOME/tinySAK/src",
-					"$DOUBANGO_HOME/tinyNET/src",
-					"$DOUBANGO_HOME/tinyMEDIA/include",
-					"$DOUBANGO_HOME/tinySIP/include",
+					$DOUBANGO_HOME/tinyDAV/include,
+					$DOUBANGO_HOME/tinySAK/src,
+					$DOUBANGO_HOME/tinyNET/src,
+					$DOUBANGO_HOME/tinyMEDIA/include,
+					$DOUBANGO_HOME/tinySIP/include,
 					"\"${PODS_ROOT}/Headers/Public/AFNetworking\"",
 					"$(inherited)",
 				);
@@ -20285,8 +20290,48 @@
 					"$(PROJECT_DIR)/shiku_im/文件夹1/pay",
 					"$(PROJECT_DIR)/shiku_im/文件夹1/pay(支付宝)",
 				);
-				"LIBRARY_SEARCH_PATHS[arch=*]" = "$(PROJECT_DIR)/shiku_im/LibBPush $(PROJECT_DIR)/shiku_im/amr_wav/VoiceConvert/lib $(PROJECT_DIR)/shiku_im/audioRecorder $(PROJECT_DIR)/shiku_im/RSA/include $(PROJECT_DIR)/shiku_im/Vendor/libidn $(PROJECT_DIR)/shiku_im/RSA $(PROJECT_DIR)/shiku_im/admob5.05 $(PROJECT_DIR)/shiku_im $(PROJECT_DIR) $(PROJECT_DIR)/shiku_im/controller/MapChoseLocation $(PROJECT_DIR)/shiku_im/person/UMSocial/SocialLibraries/QQ $(PROJECT_DIR)/shiku_im/person/UMSocial/SocialLibraries/Sina $(PROJECT_DIR)/shiku_im/person/UMSocial/SocialLibraries/Wechat \"$PODS_CONFIGURATION_BUILD_DIR/MJRefresh\" \"$PODS_CONFIGURATION_BUILD_DIR/AFNetworking\" \"$PODS_CONFIGURATION_BUILD_DIR/SVProgressHUD\" \"$PODS_CONFIGURATION_BUILD_DIR/ReactiveObjC\" \"$PODS_CONFIGURATION_BUILD_DIR/Masonry\" $(inherited) \"$PODS_CONFIGURATION_BUILD_DIR/IQKeyboardManager\"";
-				"LIBRARY_SEARCH_PATHS[sdk=iphonesimulator*]" = "$(inherited) $DOUBANGO_LIBS $(SRCROOT)/shiku_im/Vendor/libidn $(PROJECT_DIR)/shiku_im/RSA $(PROJECT_DIR)/shiku_im/youMeng $(PROJECT_DIR)/shiku_im/audioRecorder $(SRCROOT)/shiku_im/amr_wav/VoiceConvert/lib $(PROJECT_DIR)/shiku_im/admob5.05 $(PROJECT_DIR)/shiku_im/person/UMSocial/SocialLibraries/QQ $(PROJECT_DIR)/shiku_im/person/UMSocial/SocialLibraries/Sina $(PROJECT_DIR)/shiku_im/person/UMSocial/SocialLibraries/Wechat \"$PODS_CONFIGURATION_BUILD_DIR/MJRefresh\" \"$PODS_CONFIGURATION_BUILD_DIR/AFNetworking\" \"$PODS_CONFIGURATION_BUILD_DIR/SVProgressHUD\" \"$PODS_CONFIGURATION_BUILD_DIR/ReactiveObjC\" \"$PODS_CONFIGURATION_BUILD_DIR/Masonry\" $(inherited) \"$PODS_CONFIGURATION_BUILD_DIR/IQKeyboardManager\"";
+				"LIBRARY_SEARCH_PATHS[arch=*]" = (
+					"$(PROJECT_DIR)/shiku_im/LibBPush",
+					"$(PROJECT_DIR)/shiku_im/amr_wav/VoiceConvert/lib",
+					"$(PROJECT_DIR)/shiku_im/audioRecorder",
+					"$(PROJECT_DIR)/shiku_im/RSA/include",
+					"$(PROJECT_DIR)/shiku_im/Vendor/libidn",
+					"$(PROJECT_DIR)/shiku_im/RSA",
+					"$(PROJECT_DIR)/shiku_im/admob5.05",
+					"$(PROJECT_DIR)/shiku_im",
+					"$(PROJECT_DIR)",
+					"$(PROJECT_DIR)/shiku_im/controller/MapChoseLocation",
+					"$(PROJECT_DIR)/shiku_im/person/UMSocial/SocialLibraries/QQ",
+					"$(PROJECT_DIR)/shiku_im/person/UMSocial/SocialLibraries/Sina",
+					"$(PROJECT_DIR)/shiku_im/person/UMSocial/SocialLibraries/Wechat",
+					"\"$PODS_CONFIGURATION_BUILD_DIR/MJRefresh\"",
+					"\"$PODS_CONFIGURATION_BUILD_DIR/AFNetworking\"",
+					"\"$PODS_CONFIGURATION_BUILD_DIR/SVProgressHUD\"",
+					"\"$PODS_CONFIGURATION_BUILD_DIR/ReactiveObjC\"",
+					"\"$PODS_CONFIGURATION_BUILD_DIR/Masonry\"",
+					"$(inherited)",
+					"\"$PODS_CONFIGURATION_BUILD_DIR/IQKeyboardManager\"",
+				);
+				"LIBRARY_SEARCH_PATHS[sdk=iphonesimulator*]" = (
+					"$(inherited)",
+					$DOUBANGO_LIBS,
+					"$(SRCROOT)/shiku_im/Vendor/libidn",
+					"$(PROJECT_DIR)/shiku_im/RSA",
+					"$(PROJECT_DIR)/shiku_im/youMeng",
+					"$(PROJECT_DIR)/shiku_im/audioRecorder",
+					"$(SRCROOT)/shiku_im/amr_wav/VoiceConvert/lib",
+					"$(PROJECT_DIR)/shiku_im/admob5.05",
+					"$(PROJECT_DIR)/shiku_im/person/UMSocial/SocialLibraries/QQ",
+					"$(PROJECT_DIR)/shiku_im/person/UMSocial/SocialLibraries/Sina",
+					"$(PROJECT_DIR)/shiku_im/person/UMSocial/SocialLibraries/Wechat",
+					"\"$PODS_CONFIGURATION_BUILD_DIR/MJRefresh\"",
+					"\"$PODS_CONFIGURATION_BUILD_DIR/AFNetworking\"",
+					"\"$PODS_CONFIGURATION_BUILD_DIR/SVProgressHUD\"",
+					"\"$PODS_CONFIGURATION_BUILD_DIR/ReactiveObjC\"",
+					"\"$PODS_CONFIGURATION_BUILD_DIR/Masonry\"",
+					"$(inherited)",
+					"\"$PODS_CONFIGURATION_BUILD_DIR/IQKeyboardManager\"",
+				);
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = (
 					"-framework",
@@ -20326,6 +20371,8 @@
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
 				CLANG_ENABLE_OBJC_ARC = NO;
 				CLANG_ENABLE_OBJC_WEAK = YES;
+				CODEPUSH_KEY = rKIg25bUKa6egfOwWhBgjvXOJjka4ksvOXqog;
+				CODEPUSH_URL = "https://uu-update.ubtob.com";
 				CODE_SIGN_ENTITLEMENTS = shiku_im/shiku_im.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=*]" = "iPhone Developer: QUANMING LV (83764JWNLL)";
@@ -20333,10 +20380,10 @@
 				CODE_SIGN_STYLE = Manual;
 				DEVELOPMENT_TEAM = D49MF83EK7;
 				DOUBANGO_LIBS = "";
-				"DOUBANGO_LIBS[arch=arm64]" = "$DOUBANGO_HOME/thirdparties/iphone/lib/arm64";
-				"DOUBANGO_LIBS[arch=armv6]" = "$DOUBANGO_HOME/thirdparties/iphone/lib/armv6";
-				"DOUBANGO_LIBS[arch=armv7]" = "$DOUBANGO_HOME/thirdparties/iphone/lib/armv7";
-				"DOUBANGO_LIBS[arch=armv7s]" = "$DOUBANGO_HOME/thirdparties/iphone/lib/armv7s";
+				"DOUBANGO_LIBS[arch=arm64]" = $DOUBANGO_HOME/thirdparties/iphone/lib/arm64;
+				"DOUBANGO_LIBS[arch=armv6]" = $DOUBANGO_HOME/thirdparties/iphone/lib/armv6;
+				"DOUBANGO_LIBS[arch=armv7]" = $DOUBANGO_HOME/thirdparties/iphone/lib/armv7;
+				"DOUBANGO_LIBS[arch=armv7s]" = $DOUBANGO_HOME/thirdparties/iphone/lib/armv7s;
 				"DOUBANGO_LIBS[sdk=iphonesimulator*][arch=*]" = "";
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -20362,16 +20409,16 @@
 				HEADER_SEARCH_PATHS = (
 					"$(PROJECT_DIR)/shiku_im/RSA/include",
 					/usr/include/libxml2,
-					"$DOUBANGO_HOME/tinyDAV/include",
-					"$DOUBANGO_HOME/tinySAK/src",
-					"$DOUBANGO_HOME/tinyNET/src",
-					"$DOUBANGO_HOME/tinyMEDIA/include",
-					"$DOUBANGO/HOME/tinyMSRP/include",
-					"$DOUBANGO_HOME/tinySIP/include",
-					"$DOUBANGO_HOME/tinyHTTP/include",
-					"$DOUBANGO_HOME/tinySMS/include",
-					"$DOUBANGO_HOME/tinySDP/include",
-					"$DOUBANGO_HOME/bindings/_common",
+					$DOUBANGO_HOME/tinyDAV/include,
+					$DOUBANGO_HOME/tinySAK/src,
+					$DOUBANGO_HOME/tinyNET/src,
+					$DOUBANGO_HOME/tinyMEDIA/include,
+					$DOUBANGO/HOME/tinyMSRP/include,
+					$DOUBANGO_HOME/tinySIP/include,
+					$DOUBANGO_HOME/tinyHTTP/include,
+					$DOUBANGO_HOME/tinySMS/include,
+					$DOUBANGO_HOME/tinySDP/include,
+					$DOUBANGO_HOME/bindings/_common,
 					"\"${PODS_ROOT}/Headers/Public/AFNetworking\"",
 					"$(inherited)",
 				);
@@ -20379,7 +20426,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
-					"$DOUBANGO_LIBS",
+					$DOUBANGO_LIBS,
 					"$(SRCROOT)/shiku_im/Vendor/libidn",
 					"$(PROJECT_DIR)/shiku_im/RSA",
 					"$(PROJECT_DIR)/shiku_im/youMeng",

shiku_im/shiku_im/RN/Controllers/YRReactVC.m

@@ -8,12 +8,14 @@
 #import "YRReactVC.h"
 #import <React/RCTRootView.h>
 #import <React/RCTBundleURLProvider.h>
+#import <CodePush/CodePush.h>
 
+//url:https://uu-update.ubtob.com
 
-//url:http://118.31.228.154:3000/
+//Production │ rKIg25bUKa6egfOwWhBgjvXOJjka4ksvOXqog │
+//├────────────┼───────────────────────────────────────┤
+//│ Staging    │ if4T49oStVOr08rU6SJaPJQmFK3O4ksvOXqog │
 
-// Production  gNVbisvWP6wzi4CKPMeFyiAg1bJI4ksvOXqog
-// Staging     vZXYx0je0ztieMJOKneqszC1iEfj4ksvOXqog
 
 @interface YRReactVC ()
 
@@ -21,32 +23,55 @@
 
 @implementation YRReactVC
 
+
 - (void)viewDidLoad {
     [super viewDidLoad];
     // Do any additional setup after loading the view.
     
+}
+
+
+-(void)createUI{
+    
     NSURL *jsCodeLocation = [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@"index" fallbackResource:nil];
     
+    jsCodeLocation = [CodePush bundleURL];
+    
+    
     NSString * strUrl = @"http://10.1.80.96:8081/index.bundle?platform=ios";
     jsCodeLocation = [NSURL URLWithString:strUrl] ;
     
     RCTRootView * rootView = [[RCTRootView alloc] initWithBundleURL:jsCodeLocation moduleName:@"UU_RN"
-                                                          initialProperties:@{@"UU":@"UU_RN"}
-                                                              launchOptions:nil];
-
+                                                  initialProperties:@{@"UU":@"UU_RN"}
+                                                      launchOptions:nil];
+    
     
     self.view = rootView;
     
+    [self addNotification];
     
 }
 
+-(void)addNotification{
+    //返回跳入界面
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(backAction) name:@"YRReactNativeShouldBack" object:nil];
+    
+}
+
+-(void)dealloc{
+    
+    [[NSNotificationCenter defaultCenter] removeObserver:self name:@"YRReactNativeShouldBack" object:nil];
+    
+}
 
 -(void)viewWillAppear:(BOOL)animated{
     
     [super viewWillAppear:animated];
     
     self.navigationController.navigationBar.hidden = YES;
-        
+    
 }
 
+
+
 @end

shiku_im/shiku_im/RN/Models/YRRnBridge.h

@@ -0,0 +1,17 @@
+//
+//  YRRnBridge.h
+//  shiku_im
+//
+//  Created by liujl on 2019/8/14.
+//
+
+#import <Foundation/Foundation.h>
+
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface YRRnBridge : NSObject
+
+@end
+
+NS_ASSUME_NONNULL_END

shiku_im/shiku_im/RN/Models/YRRnBridge.m

@@ -0,0 +1,36 @@
+//
+//  YRRnBridge.m
+//  shiku_im
+//
+//  Created by liujl on 2019/8/14.
+//
+
+#import "YRRnBridge.h"
+#import <React/RCTRootView.h>
+#import <React/RCTBundleURLProvider.h>
+
+@interface YRRnBridge()<RCTBridgeModule>
+
+@end
+
+@implementation YRRnBridge
+
+
+#pragma mark - ReactNative交互
+
+RCT_EXPORT_MODULE();
+
+
+-(dispatch_queue_t)methodQueue{
+    
+    return  dispatch_get_main_queue();
+    
+}
+
+RCT_EXPORT_METHOD(goBack){
+    
+    [[NSNotificationCenter defaultCenter] postNotificationName:@"YRReactNativeShouldBack" object:nil];
+    
+}
+
+@end

shiku_im/shiku_im/文件夹1/WorkMain(工作新页面)/Controllers/UASWorkMainVC.m

@@ -920,7 +920,6 @@
         
     }else if([Localized(model.title) isEqualToString:Localized(@"UU_work_YitoaSong")] || [model.modelId isEqual:@100034] ){//英唐之歌
         
-        
         YitoaSongVC *songVC = [YitoaSongVC new];
         
         [self.navigationController pushViewController:songVC animated:YES];
@@ -2095,6 +2094,15 @@
 - (void)buttonActionStep
 {
     
+    
+    UASBaseVC *rn = [NSClassFromString(@"YRReactVC") new];
+    
+    rn.title = @"REACTNATIVE";
+    
+    [self.navigationController pushViewController:rn animated:YES];
+    
+    return;
+
     //LYHealthKitManage *manage = [LYHealthKitManage shareInstance];
     // __weak typeof(self) weakSelf = self;
     

shiku_im/shiku_im/文件夹3/MainView/NewWoVC.m

@@ -355,16 +355,6 @@ static NSString *cellID = @"cellID";
     [_tableView reloadData];
 }
 
--(void)pushToReactVC{
-    
-    UASBaseVC *rn = [NSClassFromString(@"YRReactVC") new];
-    
-    rn.title = @"REACTNATIVE";
-    
-    [self.navigationController pushViewController:rn animated:YES];
-    
-    
-}
 
 #pragma mark --- UITableView delegate && datasource
 -(NSInteger)numberOfSectionsInTableView:(UITableView *)tableView{
@@ -406,8 +396,6 @@ static NSString *cellID = @"cellID";
     
     
     UIImageView *iconView = [[UIImageView alloc]init];
-    iconView.target = self;
-    iconView.aSelector = @selector(pushToReactVC);
     iconView.layer.cornerRadius = 47;
     iconView.layer.masksToBounds = YES;
     iconView.layer.borderWidth = 3;