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

# Conflicts:
#	shiku_im/Podfile.lock
#	shiku_im/shiku_im/AppDelegate.mm

shiku_im/Podfile

@@ -25,30 +25,54 @@ target 'shiku_im' do
   pod 'HMSegmentedControl'
 
   #ReactNative
-  pod 'React', :path => './UU_RN/node_modules/react-native/'
-  pod 'React-Core', :path => './UU_RN/node_modules/react-native/React'
-  pod 'React-DevSupport', :path => './UU_RN/node_modules/react-native/React'
-  pod 'React-fishhook', :path => './UU_RN/node_modules/react-native/Libraries/fishhook'
-  pod 'React-RCTActionSheet', :path => './UU_RN/node_modules/react-native/Libraries/ActionSheetIOS'
-  pod 'React-RCTAnimation', :path => './UU_RN/node_modules/react-native/Libraries/NativeAnimation'
-  pod 'React-RCTBlob', :path => './UU_RN/node_modules/react-native/Libraries/Blob'
-  pod 'React-RCTImage', :path => './UU_RN/node_modules/react-native/Libraries/Image'
-  pod 'React-RCTLinking', :path => './UU_RN/node_modules/react-native/Libraries/LinkingIOS'
-  pod 'React-RCTNetwork', :path => './UU_RN/node_modules/react-native/Libraries/Network'
-  pod 'React-RCTSettings', :path => './UU_RN/node_modules/react-native/Libraries/Settings'
-  pod 'React-RCTText', :path => './UU_RN/node_modules/react-native/Libraries/Text'
-  pod 'React-RCTVibration', :path => './UU_RN/node_modules/react-native/Libraries/Vibration'
-  pod 'React-RCTWebSocket', :path => './UU_RN/node_modules/react-native/Libraries/WebSocket'
   
-  pod 'React-cxxreact', :path => './UU_RN/node_modules/react-native/ReactCommon/cxxreact'
-  pod 'React-jsi', :path => './UU_RN/node_modules/react-native/ReactCommon/jsi'
-  pod 'React-jsiexecutor', :path => './UU_RN/node_modules/react-native/ReactCommon/jsiexecutor'
-  pod 'React-jsinspector', :path => './UU_RN/node_modules/react-native/ReactCommon/jsinspector'
-  pod 'yoga', :path => './UU_RN/node_modules/react-native/ReactCommon/yoga'
+  pod 'React', :path => './UU_RN/node_modules/react-native', :subspecs => [
+  'Core',
+  'CxxBridge',
+  'DevSupport',
+  'RCTWebSocket',
+  'RCTGeolocation',
+  'RCTLinkingIOS',
+  'RCTSettings',
+  'RCTText',
+  'RCTVibration',
+  'RCTImage',
+  'RCTAnimation',
+  'RCTActionSheet',
+  'RCTCameraRoll',
+  
+  ]
   
-  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 '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'
+#  pod 'React-DevSupport', :path => './UU_RN/node_modules/react-native/React'
+#  pod 'React-fishhook', :path => './UU_RN/node_modules/react-native/Libraries/fishhook'
+#  pod 'React-RCTActionSheet', :path => './UU_RN/node_modules/react-native/Libraries/ActionSheetIOS'
+#  pod 'React-RCTAnimation', :path => './UU_RN/node_modules/react-native/Libraries/NativeAnimation'
+#  pod 'React-RCTBlob', :path => './UU_RN/node_modules/react-native/Libraries/Blob'
+#  pod 'React-RCTImage', :path => './UU_RN/node_modules/react-native/Libraries/Image'
+#  pod 'React-RCTLinking', :path => './UU_RN/node_modules/react-native/Libraries/LinkingIOS'
+#  pod 'React-RCTNetwork', :path => './UU_RN/node_modules/react-native/Libraries/Network'
+#  pod 'React-RCTSettings', :path => './UU_RN/node_modules/react-native/Libraries/Settings'
+#  pod 'React-RCTText', :path => './UU_RN/node_modules/react-native/Libraries/Text'
+#  pod 'React-RCTVibration', :path => './UU_RN/node_modules/react-native/Libraries/Vibration'
+#  pod 'React-RCTWebSocket', :path => './UU_RN/node_modules/react-native/Libraries/WebSocket'
+#
+#  pod 'React-cxxreact', :path => './UU_RN/node_modules/react-native/ReactCommon/cxxreact'
+#  pod 'React-jsi', :path => './UU_RN/node_modules/react-native/ReactCommon/jsi'
+#  pod 'React-jsiexecutor', :path => './UU_RN/node_modules/react-native/ReactCommon/jsiexecutor'
+#  pod 'yoga', :path => './UU_RN/node_modules/react-native/ReactCommon/yoga'
+#
+#  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'
 
 
 end

shiku_im/Podfile.lock

@@ -15,114 +15,109 @@ 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):
     - FMDB/standard (= 2.7.5)
   - FMDB/standard (2.7.5)
   - Folly (2018.10.22.00):
-    - boost-for-react-native
-    - DoubleConversion
-    - Folly/Default (= 2018.10.22.00)
-    - glog
-  - Folly/Default (2018.10.22.00):
     - boost-for-react-native
     - DoubleConversion
     - glog
   - 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.60.3):
-    - React-Core (= 0.60.3)
-    - React-DevSupport (= 0.60.3)
-    - React-RCTActionSheet (= 0.60.3)
-    - React-RCTAnimation (= 0.60.3)
-    - React-RCTBlob (= 0.60.3)
-    - React-RCTImage (= 0.60.3)
-    - React-RCTLinking (= 0.60.3)
-    - React-RCTNetwork (= 0.60.3)
-    - React-RCTSettings (= 0.60.3)
-    - React-RCTText (= 0.60.3)
-    - React-RCTVibration (= 0.60.3)
-    - React-RCTWebSocket (= 0.60.3)
-  - React-Core (0.60.3):
-    - Folly (= 2018.10.22.00)
-    - React-cxxreact (= 0.60.3)
-    - React-jsiexecutor (= 0.60.3)
-    - yoga (= 0.60.3.React)
-  - React-cxxreact (0.60.3):
-    - boost-for-react-native (= 1.63.0)
-    - DoubleConversion
+  - React (0.59.9):
+    - React/Core (= 0.59.9)
+  - React/Core (0.59.9):
+    - yoga (= 0.59.9.React)
+  - React/CxxBridge (0.59.9):
     - Folly (= 2018.10.22.00)
-    - glog
-    - React-jsinspector (= 0.60.3)
-  - React-DevSupport (0.60.3):
-    - React-Core (= 0.60.3)
-    - React-RCTWebSocket (= 0.60.3)
-  - React-fishhook (0.60.3)
-  - React-jsi (0.60.3):
+    - React/Core
+    - React/cxxreact
+    - React/jsiexecutor
+  - React/cxxreact (0.59.9):
     - boost-for-react-native (= 1.63.0)
     - DoubleConversion
     - Folly (= 2018.10.22.00)
     - glog
-    - React-jsi/Default (= 0.60.3)
-  - React-jsi/Default (0.60.3):
-    - boost-for-react-native (= 1.63.0)
+    - React/jsinspector
+  - React/DevSupport (0.59.9):
+    - React/Core
+    - React/RCTWebSocket
+  - React/fishhook (0.59.9)
+  - React/jsi (0.59.9):
     - DoubleConversion
     - Folly (= 2018.10.22.00)
     - glog
-  - React-jsiexecutor (0.60.3):
+  - React/jsiexecutor (0.59.9):
     - DoubleConversion
     - Folly (= 2018.10.22.00)
     - glog
-    - React-cxxreact (= 0.60.3)
-    - React-jsi (= 0.60.3)
-  - React-jsinspector (0.60.3)
-  - React-RCTActionSheet (0.60.3):
-    - React-Core (= 0.60.3)
-  - React-RCTAnimation (0.60.3):
-    - React-Core (= 0.60.3)
-  - React-RCTBlob (0.60.3):
-    - React-Core (= 0.60.3)
-    - React-RCTNetwork (= 0.60.3)
-    - React-RCTWebSocket (= 0.60.3)
-  - React-RCTImage (0.60.3):
-    - React-Core (= 0.60.3)
-    - React-RCTNetwork (= 0.60.3)
-  - React-RCTLinking (0.60.3):
-    - React-Core (= 0.60.3)
-  - React-RCTNetwork (0.60.3):
-    - React-Core (= 0.60.3)
-  - React-RCTSettings (0.60.3):
-    - React-Core (= 0.60.3)
-  - React-RCTText (0.60.3):
-    - React-Core (= 0.60.3)
-  - React-RCTVibration (0.60.3):
-    - React-Core (= 0.60.3)
-  - React-RCTWebSocket (0.60.3):
-    - React-Core (= 0.60.3)
-    - React-fishhook (= 0.60.3)
+    - React/cxxreact
+    - React/jsi
+  - React/jsinspector (0.59.9)
+  - React/RCTActionSheet (0.59.9):
+    - React/Core
+  - React/RCTAnimation (0.59.9):
+    - React/Core
+  - React/RCTBlob (0.59.9):
+    - React/Core
+  - React/RCTCameraRoll (0.59.9):
+    - React/Core
+    - React/RCTImage
+  - React/RCTGeolocation (0.59.9):
+    - React/Core
+  - React/RCTImage (0.59.9):
+    - React/Core
+    - React/RCTNetwork
+  - React/RCTLinkingIOS (0.59.9):
+    - React/Core
+  - React/RCTNetwork (0.59.9):
+    - React/Core
+  - React/RCTSettings (0.59.9):
+    - React/Core
+  - React/RCTText (0.59.9):
+    - React/Core
+  - React/RCTVibration (0.59.9):
+    - React/Core
+  - React/RCTWebSocket (0.59.9):
+    - React/Core
+    - 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)
-  - yoga (0.60.3.React)
+  - yoga (0.59.9.React)
 
 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
@@ -134,25 +129,21 @@ DEPENDENCIES:
   - MJExtension (= 3.0.10)
   - MJRefresh
   - pop
-  - React (from `./UU_RN/node_modules/react-native/`)
-  - React-Core (from `./UU_RN/node_modules/react-native/React`)
-  - React-cxxreact (from `./UU_RN/node_modules/react-native/ReactCommon/cxxreact`)
-  - React-DevSupport (from `./UU_RN/node_modules/react-native/React`)
-  - React-fishhook (from `./UU_RN/node_modules/react-native/Libraries/fishhook`)
-  - React-jsi (from `./UU_RN/node_modules/react-native/ReactCommon/jsi`)
-  - React-jsiexecutor (from `./UU_RN/node_modules/react-native/ReactCommon/jsiexecutor`)
-  - React-jsinspector (from `./UU_RN/node_modules/react-native/ReactCommon/jsinspector`)
-  - React-RCTActionSheet (from `./UU_RN/node_modules/react-native/Libraries/ActionSheetIOS`)
-  - React-RCTAnimation (from `./UU_RN/node_modules/react-native/Libraries/NativeAnimation`)
-  - React-RCTBlob (from `./UU_RN/node_modules/react-native/Libraries/Blob`)
-  - React-RCTImage (from `./UU_RN/node_modules/react-native/Libraries/Image`)
-  - React-RCTLinking (from `./UU_RN/node_modules/react-native/Libraries/LinkingIOS`)
-  - React-RCTNetwork (from `./UU_RN/node_modules/react-native/Libraries/Network`)
-  - React-RCTSettings (from `./UU_RN/node_modules/react-native/Libraries/Settings`)
-  - React-RCTText (from `./UU_RN/node_modules/react-native/Libraries/Text`)
-  - React-RCTVibration (from `./UU_RN/node_modules/react-native/Libraries/Vibration`)
-  - React-RCTWebSocket (from `./UU_RN/node_modules/react-native/Libraries/WebSocket`)
+  - React/Core (from `./UU_RN/node_modules/react-native`)
+  - React/CxxBridge (from `./UU_RN/node_modules/react-native`)
+  - React/DevSupport (from `./UU_RN/node_modules/react-native`)
+  - React/RCTActionSheet (from `./UU_RN/node_modules/react-native`)
+  - React/RCTAnimation (from `./UU_RN/node_modules/react-native`)
+  - React/RCTCameraRoll (from `./UU_RN/node_modules/react-native`)
+  - React/RCTGeolocation (from `./UU_RN/node_modules/react-native`)
+  - React/RCTImage (from `./UU_RN/node_modules/react-native`)
+  - React/RCTLinkingIOS (from `./UU_RN/node_modules/react-native`)
+  - React/RCTSettings (from `./UU_RN/node_modules/react-native`)
+  - React/RCTText (from `./UU_RN/node_modules/react-native`)
+  - 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
@@ -163,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:
@@ -187,60 +183,32 @@ EXTERNAL SOURCES:
   glog:
     :podspec: "./UU_RN/node_modules/react-native/third-party-podspecs/glog.podspec"
   React:
-    :path: "./UU_RN/node_modules/react-native/"
-  React-Core:
-    :path: "./UU_RN/node_modules/react-native/React"
-  React-cxxreact:
-    :path: "./UU_RN/node_modules/react-native/ReactCommon/cxxreact"
-  React-DevSupport:
-    :path: "./UU_RN/node_modules/react-native/React"
-  React-fishhook:
-    :path: "./UU_RN/node_modules/react-native/Libraries/fishhook"
-  React-jsi:
-    :path: "./UU_RN/node_modules/react-native/ReactCommon/jsi"
-  React-jsiexecutor:
-    :path: "./UU_RN/node_modules/react-native/ReactCommon/jsiexecutor"
-  React-jsinspector:
-    :path: "./UU_RN/node_modules/react-native/ReactCommon/jsinspector"
-  React-RCTActionSheet:
-    :path: "./UU_RN/node_modules/react-native/Libraries/ActionSheetIOS"
-  React-RCTAnimation:
-    :path: "./UU_RN/node_modules/react-native/Libraries/NativeAnimation"
-  React-RCTBlob:
-    :path: "./UU_RN/node_modules/react-native/Libraries/Blob"
-  React-RCTImage:
-    :path: "./UU_RN/node_modules/react-native/Libraries/Image"
-  React-RCTLinking:
-    :path: "./UU_RN/node_modules/react-native/Libraries/LinkingIOS"
-  React-RCTNetwork:
-    :path: "./UU_RN/node_modules/react-native/Libraries/Network"
-  React-RCTSettings:
-    :path: "./UU_RN/node_modules/react-native/Libraries/Settings"
-  React-RCTText:
-    :path: "./UU_RN/node_modules/react-native/Libraries/Text"
-  React-RCTVibration:
-    :path: "./UU_RN/node_modules/react-native/Libraries/Vibration"
-  React-RCTWebSocket:
-    :path: "./UU_RN/node_modules/react-native/Libraries/WebSocket"
+    :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
-  DoubleConversion: 5805e889d232975c086db112ece9ed034df7a0b2
+  CodePush: f6b348759cdc42c734d9c3a46ceb2997c270b12e
+  DoubleConversion: bb338842f62ab1d708ceb63ec3d999f0f3d98ecd
   EGOCache: 191fd213da6804d487b49b1a91772ba904f3e324
   FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
-  Folly: 30e7936e1c45c08d884aa59369ed951a8e68cf51
-  glog: 1f3da668190260b06b429bb211bfbee5cd790c28
+  Folly: de497beb10f102453a1afa9edbf8cf8a251890de
+  glog: aefd1eb5dda2ab95ba0938556f34b98e2da3a60d
   HMSegmentedControl: f514c6dad47aa3065e0ed2e8046b73efc71221b9
   IQKeyboardManager: fcef267266379c003181fc3592f6bdb8bf4db839
+  JWT: 05028b9624591bba9681bb57df2c5f95fa258bad
   Masonry: 678fab65091a9290e40e2832a55e7ab731aad201
   MJExtension: d86aacb740c87519d20e3cca55b6fa4be6cc7548
   MJRefresh: ed450d6eb9d3346a2cb033ab7eb6de090aeef437
   pop: d582054913807fd11fd50bfe6a539d91c7e1a55a
+
   React: ac23e9cc8d2d4cfe9b536b5cc0c32d19b9937bcf
   React-Core: 84de3cf80e31f0267c5ce0b5b482d59ce30a8a57
   React-cxxreact: a802a1c6b14f3de66ba032460b424c17ececd1e2
@@ -259,13 +227,18 @@ SPEC CHECKSUMS:
   React-RCTText: b026f8350c2cbe0daeb9880dd9c6e018fce0daf7
   React-RCTVibration: 5d9ed4a968e9d42880ddcc7c29bee3417c745408
   React-RCTWebSocket: 69d8565d66043f244b4129f3d7154c5689fb7d3e
+
   ReactiveObjC: 011caa393aa0383245f2dcf9bf02e86b80b36040
+  RNGestureHandler: 7ccf2f3f60458e084f9ada01fbaf610f6fef073c
   SDWebImage: 3f3f0c02f09798048c47a5ed0a13f17b063572d8
+  SSZipArchive: fa16b8cc4cdeceb698e5e5d9f67e9558532fbf23
   SVProgressHUD: 1428aafac632c1f86f62aa4243ec12008d7a51d6
   TZImagePickerController: bf4c57b98d8707fce41ea6be872414a71c7a8c9d
   WechatOpenSDK: 9b721089507c895d05f997408c30bb6e6f5f9b60
-  yoga: 843fe25849b56131275bf3e5da2c468e96f68aff
 
-PODFILE CHECKSUM: 842830fffd26ca4ae347913fe0ee18bbd2e2bbc7
+  yoga: 128daf064cacaede0c3bb27424b6b4c71052e6cd
+
+
+PODFILE CHECKSUM: a7427ed79027131c798a61cdaacdfea73b1b9f9c
 
 COCOAPODS: 1.6.0

shiku_im/shiku_im.xcodeproj/project.pbxproj

@@ -1441,6 +1441,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"; }; };
@@ -1458,7 +1460,7 @@
 		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"; }; };
@@ -1477,6 +1479,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"; }; };
@@ -5095,6 +5098,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>"; };
@@ -5164,6 +5169,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>"; };
@@ -12068,6 +12075,24 @@
 			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 = (
@@ -12082,6 +12107,7 @@
 		99B02ADD22EED6650014A144 /* Others */ = {
 			isa = PBXGroup;
 			children = (
+				993E56122302CA5F006AA2B7 /* bundle */,
 			);
 			path = Others;
 			sourceTree = "<group>";
@@ -12089,6 +12115,8 @@
 		99B02ADE22EED6650014A144 /* Models */ = {
 			isa = PBXGroup;
 			children = (
+				99C8A816230397940073EF99 /* YRRnBridge.h */,
+				99C8A817230397940073EF99 /* YRRnBridge.m */,
 			);
 			path = Models;
 			sourceTree = "<group>";
@@ -17583,6 +17611,7 @@
 				CC30175C1951BABF0059BADA /* f095.png in Resources */,
 				2732E7EC1D1A248900B2789F /* uu_crm_round.png in Resources */,
 				CC6E182319794BC7006ADA8A /* RegistrationHighlight@2x.png 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 */,
@@ -18569,6 +18598,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 */,
 				CC6E186119794BC7006ADA8A /* feeds_play_btn@2x.png in Resources */,
 				7D736AE81E0BE3DE0035B25B /* icon_banci_nor3.png in Resources */,
 				272F120A1CC4D95100452A0D /* uu_work_chaxun_press.png in Resources */,
@@ -19612,6 +19642,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 */,
@@ -20139,6 +20170,8 @@
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				CODEPUSH_KEY = vZXYx0je0ztieMJOKneqszC1iEfj4ksvOXqog;
+				CODEPUSH_URL = "http://118.31.228.154:3000/";
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
@@ -20183,6 +20216,8 @@
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				CODEPUSH_KEY = gNVbisvWP6wzi4CKPMeFyiAg1bJI4ksvOXqog;
+				CODEPUSH_URL = "http://118.31.228.154:3000/";
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
@@ -20219,6 +20254,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)";
@@ -20376,6 +20413,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)";

shiku_im/shiku_im/AppDelegate.mm

@@ -58,6 +58,7 @@
 #import "UASWorkManager.h"
 #import "NSString+secri.h"
 #import <MapKit/MapKit.h>
+#import <React/RCTDevLoadingView.h>
 //#import "UICKeyChainStore.h"
 #undef TAG
 #define kTAG @"AppDelegate///: "
@@ -324,8 +325,11 @@
     
     if([[NSUserDefaults standardUserDefaults] boolForKey:isAutoLoginOrNot]){
         
-        self.tabMain = [[UASMainVC alloc]init];
-        
+        if (self.tabMain == nil) {
+            
+         self.tabMain = [[UASMainVC alloc]init];
+            
+        }
         
     }
     
@@ -491,10 +495,17 @@
         
     });
     
+    [self reactNativeConfig];
+    
+}
+
+-(void)reactNativeConfig{
     
+    [RCTDevLoadingView setEnabled:NO];
     
 }
 
+
 /**
  启动日志
  */
@@ -5675,22 +5686,19 @@
     NSString *currentVersion = [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleVersion"];
     if ([lastVersion isEqualToString:currentVersion]) {//版本号相同
         if ([[NSUserDefaults standardUserDefaults] boolForKey:isAutoLoginOrNot]) {//自动登录
-            
+        
             [self showMainUI];
-            
-//            [jxServer getSetting:self];
-            
-           
+
         }else{//手动登录
-            
+
             [self showLoginUI];
-            
-                        
+
+
         }
     }else{//版本号不同
         
        UASGuideController *guideVc = [[[UASGuideController alloc]init] autorelease];
-       
+        
         @weakify(self)
         guideVc.chooseNextVC = ^{
             @strongify(self)
@@ -5816,13 +5824,12 @@
     [g_server newlogout:[[NSUserDefaults standardUserDefaults] objectForKey:kMY_USER_ID] offlineTime:str1 toView:nil];
     
     NSString * times=[NSString getLongCurrenTime];
-    NSDictionary *dic =    [NSDictionary dictionaryWithObjectsAndKeys:
+    NSDictionary *dic  =    [NSDictionary dictionaryWithObjectsAndKeys:
                             times,@"aa_date",
                             @"iOSAPP在线",@"aa_type",
                             @"APP杀死",@"aa_remark",
                             [[NSUserDefaults standardUserDefaults] objectForKey:@"UUCurrentAddress"],@"aa_location",
                             [[NSUserDefaults standardUserDefaults] objectForKey:kMY_USER_LoginName],@"aa_telephone",
-                            
                             nil];
      [[NSNotificationCenter defaultCenter] postNotificationName:@"saveMonitorLogALLL" object:@"monitorLog" userInfo:dic];
     

shiku_im/shiku_im/RN/Controllers/YRReactVC.m

@@ -8,6 +8,14 @@
 #import "YRReactVC.h"
 #import <React/RCTRootView.h>
 #import <React/RCTBundleURLProvider.h>
+#import <CodePush/CodePush.h>
+
+//url:https://uu-update.ubtob.com
+
+//Production │ rKIg25bUKa6egfOwWhBgjvXOJjka4ksvOXqog │
+//├────────────┼───────────────────────────────────────┤
+//│ Staging    │ if4T49oStVOr08rU6SJaPJQmFK3O4ksvOXqog │
+
 
 @interface YRReactVC ()
 
@@ -15,20 +23,53 @@
 
 @implementation YRReactVC
 
+
 - (void)viewDidLoad {
     [super viewDidLoad];
     // Do any additional setup after loading the view.
-
     
+}
 
-    NSURL *jsCodeLocation = [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@"index" fallbackResource:nil];
 
+-(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;
+    
 }
 
 

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/RN/Others/bundle/assets/app.json

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

shiku_im/shiku_im/Register&Login/loginVC.m

@@ -845,7 +845,34 @@
         } failure:^(NSURLSessionDataTask *task, NSError *error) {
             //请求失败
             [UASUserInfo shareManager].b2bDic = @{};
+            [_wait stop];
             [[NSUserDefaults standardUserDefaults] setObject:@{} forKey:@"B2BplatformData"];
+            NSData *returnData = [[error userInfo]                     objectForKey:@"com.alamofire.serialization.response.error.data"];
+        
+            NSString *errorStr  = @"网络异常";
+            
+            if (returnData) {
+                
+                NSString *errorStr1  = @"";
+                
+                id content = [NSJSONSerialization JSONObjectWithData:returnData options:NSJSONReadingMutableContainers error:nil];
+                
+                errorStr = [NSString stringWithFormat:@"%@",[content objectForKey:@"exceptionInfo"]];
+                errorStr1 = [NSString stringWithFormat:@"%@",[content objectForKey:@"message"]];
+                if ([errorStr isEqualToString:@"(null)"] || errorStr.length==0) {
+                    
+                    if ([errorStr1 isEqualToString:@"(null)"] || errorStr1.length==0) {
+                        errorStr = [[ NSString alloc] initWithData:returnData encoding:NSUTF8StringEncoding];
+                        
+                        
+                    }
+        
+                }
+                
+                
+            }
+            
+            [KPromptBox showKPromptBoxWithMassage:errorStr];
     
         }];
     }

shiku_im/shiku_im/bundle/assets/app.json

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

shiku_im/shiku_im/controller/DocumentVC.m

@@ -2720,6 +2720,8 @@ static NSString *cellID = @"cellID";
         
         dataVC.type = typeStr;
         
+        dataVC.selectedStr = textView.text;
+        
         dataVC.block = ^(NSArray *backData,NSString *showKey,NSMutableArray *dgField){
             for (int a = 0; a < dgField.count; a++) {
                 int c , d ;
@@ -2741,33 +2743,34 @@ static NSString *cellID = @"cellID";
                                     valueStr = [valueStr stringByAppendingString:@"#"];
                                 }
                             }
+                            //改变保存的数组
+                            NSMutableArray *backTitleArray = [[NSMutableArray alloc]init];
+                            NSMutableArray *sArray = [[NSMutableArray alloc]init];
+                            NSArray *abc;
+                            abc = [_detailDataArr mutableCopy];
+                            for (int i = 0; i < abc.count; i++) {
+                                
+                                sArray = abc[i];
+                                if (i == c) {
+                                    [sArray replaceObjectAtIndex:d withObject:[NSString stringWithFormat:@"%@",valueStr]];
+                                }
+                                
+                                [backTitleArray addObject:sArray];
+                                
+                            }
+                            _detailDataArr = backTitleArray;
+                            
+                            //改变对应textView不能编辑
+                            int index = c*1000 + d;
+                            for (DocumentCell *cell in _tableView.visibleCells) {
+                                if (cell.MyTextView.tag == index) {
+                                    cell.MyTextView.text = [NSString stringWithFormat:@"%@",valueStr];
+                                }
+                            }
                         }
                     }
                 }
-                //改变保存的数组
-                NSMutableArray *backTitleArray = [[NSMutableArray alloc]init];
-                NSMutableArray *sArray = [[NSMutableArray alloc]init];
-                NSArray *abc;
-                abc = [_detailDataArr mutableCopy];
-                for (int i = 0; i < abc.count; i++) {
-                    
-                    sArray = abc[i];
-                    if (i == c) {
-                        [sArray replaceObjectAtIndex:d withObject:[NSString stringWithFormat:@"%@",valueStr]];
-                    }
-                    
-                    [backTitleArray addObject:sArray];
-                    
-                }
-                _detailDataArr = backTitleArray;
                 
-                //改变对应textView不能编辑
-                int index = c*1000 + d;
-                for (DocumentCell *cell in _tableView.visibleCells) {
-                    if (cell.MyTextView.tag == index) {
-                        cell.MyTextView.text = [NSString stringWithFormat:@"%@",valueStr];
-                    }
-                }
                 
             }
             

shiku_im/shiku_im/controller/FMDB/TIFmdbManager.m

@@ -327,6 +327,7 @@ static TIFmdbManager *manager = nil;
     }];
     
     [self.operationQueue addOperation:operation];
+        
     }
         
 }

shiku_im/shiku_im/controller/JOMsgViewController.m

@@ -325,8 +325,7 @@
                 [self B2BGetMsgCounts];
                 
                 //4.预约小秘书
-//                [self getBookingAppointmentCount];
-                
+//              [self getBookingAppointmentCount];
                 
             }
             else if (g_PersonalUser)

shiku_im/shiku_im/controller/MFselectVC.m

@@ -143,10 +143,22 @@ static NSString *cellID = @"cellID";
         
         NSString *dataStr = responseObject[@"data"];
         NSDictionary *dataDic = [self dictionaryWithJsonString:dataStr];
+        NSArray *selectArr = [self.selectedStr componentsSeparatedByString:@"#"];
         for (id obj in dataDic) {
             [_dataArr addObject:obj];
             [_allDataArr addObject:obj];
             [_searchArr addObject:[obj objectForKey:_showKey]];
+            
+            for (NSString *seleStr in selectArr) {
+                
+                if ([[NSString stringWithFormat:@"%@",obj[_showKey]] isEqualToString:seleStr]) {
+                    
+                    [self.SelectedArr addObject:obj];
+                    
+                }
+                
+            }
+            
         }
         
         [_tableView reloadData];

shiku_im/shiku_im/controller/UASMainVC.m

@@ -23,6 +23,7 @@
 #import "UASScheDisMissAni.h"
 #import "ScheduleListModel.h"
 #import "ScheduleRemindVC.h"
+
 @interface UASMainVC ()<UIAlertViewDelegate,UITabBarDelegate,UITabBarControllerDelegate,UIViewControllerTransitioningDelegate>
 
 @property(strong,nonatomic)NSMutableArray<UIView *> *tarArr;
@@ -73,10 +74,8 @@
     [self subVCWith:addVc title:Localized(@"UU_TabBarLabel1") normalImgTitle:@"UU_TabContact_nor" selImgTitle:@"UU_TabContact_select"];
     [self subVCWith:workVc title:Localized(@"UU_TabBarLabel2") normalImgTitle:@"UU_TabWork_nor" selImgTitle:@"UU_TabWork_select"];
     [self subVCWith:woVc title:Localized(@"UU_TabBarLabel3") normalImgTitle:@"UU_TabMe_nor" selImgTitle:@"UU_TabMe_select"];
-    [tarBar showBadgeOnItemIndex:0];
     [self checkVersion];
     [self postBPushDataToServer:[BPush getChannelId]];
-    [self createUI];
     [self scheduleRemindView];
     self.tabBar.tintColor = HexColor(@"#1084D1");
     SLog(@"百度推送ID:%@",[BPush getChannelId]);
@@ -150,7 +149,10 @@
 }
 
 
--(void)createUI{
+
+-(void)viewDidAppear:(BOOL)animated{
+    
+    [super viewDidAppear:animated];
     
     UASTabbar *tarbar = (UASTabbar *)self.tabBar;
     
@@ -164,9 +166,9 @@
         }
         
     }
-
-
+    
 }
+
 -(void)addNotification{
     
     //注册设置界面是否需要引导的通知

shiku_im/shiku_im/controller/UASPreView.m

@@ -27,7 +27,7 @@ static UASPreView *preview = nil;
         preview.webView.UIDelegate = preview;
         
         preview.webView.navigationDelegate = preview;
-
+        
         
     });
     

shiku_im/shiku_im/controller/UASTabbar.m

@@ -8,122 +8,144 @@
 
 #import "UASTabbar.h"
 #import "UASButton.h"
-#define TabbarItemNums 4.0
 
 @interface UASTabbar()
 
-@property(strong,nonatomic)UASButton *badgeBtn;
-    
+@property(strong,nonatomic)NSMutableArray<UILabel *> *labArr;
 
 @end
 
 @implementation UASTabbar
 
--(void)setRemindCount:(NSInteger)remindCount{
-    
+
+-(void)layoutSubviews{
     
-    if (remindCount>0) {
+    [super layoutSubviews];
 
-        self.badgeBtn.hidden = NO;
-        if (remindCount > 99) {
+    [self addRemindView];
     
-            self.badgeBtn.titleLabel.font = [UIFont systemFontOfSize:8]; //消息大小不变
-            
-            [self.badgeBtn setTitle:@"99+" forState:UIControlStateNormal];
-            
+}
 
-        }else{
-        
-             self.badgeBtn.titleLabel.font = [UIFont systemFontOfSize:8]; //消息大小不变
+-(void)addRemindView{
+    
+    if (self.labArr.count == self.items.count) return;
+    [self.labArr removeAllObjects];
+    
+    NSInteger index = 0;
+    
+    for (UIView *view in self.subviews) {
+        if ([view isKindOfClass:NSClassFromString(@"UITabBarButton")]) {
             
-             [self.badgeBtn setTitle:[NSString stringWithFormat:@"%ld",(long)remindCount] forState:UIControlStateNormal];
+            for (UIView *viewOne in view.subviews) {
+                
+                if ([viewOne isKindOfClass:NSClassFromString(@"UITabBarSwappableImageView")]) {
+                    
+                    UILabel *label = [UILabel new];
+                    label.backgroundColor = [UIColor redColor];
+                    if (index == 0) {
+                        
+                        label.layer.cornerRadius = 8;
+                        label.layer.masksToBounds = YES;
+                        
+                        label.textColor = [UIColor whiteColor];
+                        
+                        label.font = [UIFont systemFontOfSize:8];
+                        
+                        label.textAlignment = NSTextAlignmentCenter;
+                        
+                        [viewOne addSubview:label];
+                        
+                        [label mas_makeConstraints:^(MASConstraintMaker *make) {
+                            
+                            make.top.equalTo(viewOne).offset(-6);
+                            make.right.equalTo(viewOne).offset(10);
+                            make.width.height.mas_equalTo(16);
+                            
+                        }];
+                        
+                    }else{
+                        
+                        label.layer.cornerRadius = 5;
+                        label.layer.masksToBounds = YES;
+                        
+                        [viewOne addSubview:label];
+                        
+                        [label mas_makeConstraints:^(MASConstraintMaker *make) {
+                            
+                            make.top.equalTo(viewOne).offset(-5);
+                            make.right.equalTo(viewOne).offset(5);
+                            make.width.height.mas_equalTo(10);
+                            
+                        }];
+                        
+                    }
+                    index++;
+                    label.hidden = YES;
+                    [self.labArr addObject:label];
+                }
+                
+            }
             
         }
         
         
-        
-    }else{
-       
-        self.badgeBtn.hidden = YES;
-    
     }
-
+    
 }
 
+- (void)showBadgeOnItemIndex:(int)index{
+    
+    if (index >= self.labArr.count || index >= self.items.count) return;
+    
+    self.labArr[index].hidden = NO;
+    
+}
 
+- (void)hideBadgeOnItemIndex:(int)index{
+    
+    if (index >= self.labArr.count || index >= self.items.count) return;
+    
+    self.labArr[index].hidden = YES;
+    
+}
 
-- (void)showBadgeOnItemIndex:(int)index{
 
+-(void)setRemindCount:(NSInteger)remindCount{
     
-    if (index > 0) {
-        [self removeBadgeOnItemIndex:index];
-        
-        UIView *badgeView = [[UIView alloc]init];
-        badgeView.tag = 9999 + index;
-        badgeView.layer.cornerRadius = 5;
-        badgeView.backgroundColor = [UIColor redColor];
-        CGRect tabFrame = self.frame;
-        
-        float percentX = (index +0.6) / TabbarItemNums;
-        CGFloat x = ceilf(percentX * tabFrame.size.width);
-        CGFloat y = ceilf(0.1 * tabFrame.size.height);
-        badgeView.frame = CGRectMake(x, y, 10, 10);
-        [self addSubview:badgeView];
-        
-    }else{
-        
-        CGFloat bageWidth = 16;
-        UASButton *badgeBtn = [UASButton new];
-        badgeBtn.layer.cornerRadius = bageWidth/2;
-        badgeBtn.backgroundColor = [UIColor redColor];
-        CGRect tabFrame = self.frame;
+    _remindCount = remindCount;
+    
+    if (remindCount > 0) {
         
-        float percent = 0;
+        self.labArr[0].hidden = NO;
         
-        if (SCREEN_WIDTH > 320) {
+        if (remindCount > 99) {
             
-            percent = 0.595;
+            self.labArr[0].font = [UIFont systemFontOfSize:7];
+            self.labArr[0].text = @"99+";
             
         }else{
             
-            percent = 0.625;
-            
+            self.labArr[0].font = [UIFont systemFontOfSize:8];
+            self.labArr[0].text = [NSString stringWithFormat:@"%ld",(long)remindCount];
         }
         
-        float percentX = (index + percent) / TabbarItemNums;
-        CGFloat x = ceilf(percentX * tabFrame.size.width);
-        CGFloat y = ceilf(0.08 * tabFrame.size.height);
-        badgeBtn.frame = CGRectMake(x, y,bageWidth, bageWidth);
-        [self bringSubviewToFront:badgeBtn];
-        self.badgeBtn.titleLabel.numberOfLines = 1;
-        self.badgeBtn = badgeBtn;
-        self.badgeBtn.titleLabel.font = FONT_SIZE(8);
-        self.badgeBtn.contentHorizontalAlignment = UIControlContentHorizontalAlignmentCenter;
-        self.badgeBtn.hidden = YES;
-        [self addSubview:self.badgeBtn];
-
+    }else{
+        
+        self.labArr[0].hidden = YES;
+        
     }
-}
-
-- (void)hideBadgeOnItemIndex:(int)index{
     
-    [self removeBadgeOnItemIndex:index];
-}
-
-- (void)removeBadgeOnItemIndex:(int)index{
     
-    for (UIView *subView in self.subviews) {
-        if (subView.tag == 9999+index) {
-            [subView removeFromSuperview];
-        }
-    }
 }
 
--(void)layoutSubviews{
-    
-    [super layoutSubviews];
+-(NSMutableArray *)labArr{
     
+    if (!_labArr) {
+        
+        _labArr = [NSMutableArray new];
+        
+    }
     
+    return _labArr;
 }
-
 @end

shiku_im/shiku_im/controller/UpdateDocumentVC.m

@@ -2942,33 +2942,34 @@ static NSString *cellID = @"cellID";
                                     valueStr = [valueStr stringByAppendingString:@"#"];
                                 }
                             }
+                            //改变保存的数组
+                            NSMutableArray *backTitleArray = [[NSMutableArray alloc]init];
+                            NSMutableArray *sArray = [[NSMutableArray alloc]init];
+                            NSArray *abc;
+                            abc = [_detailDataArr mutableCopy];
+                            for (int i = 0; i < abc.count; i++) {
+                                
+                                sArray = abc[i];
+                                if (i == c) {
+                                    [sArray replaceObjectAtIndex:d withObject:[NSString stringWithFormat:@"%@",valueStr]];
+                                }
+                                
+                                [backTitleArray addObject:sArray];
+                                
+                            }
+                            _detailDataArr = backTitleArray;
+                            
+                            //改变对应textView不能编辑
+                            int index = c*1000 + d;
+                            for (DocumentCell *cell in _tableView.visibleCells) {
+                                if (cell.MyTextView.tag == index) {
+                                    cell.MyTextView.text = [NSString stringWithFormat:@"%@",valueStr];
+                                }
+                            }
                         }
                     }
                 }
-                //改变保存的数组
-                NSMutableArray *backTitleArray = [[NSMutableArray alloc]init];
-                NSMutableArray *sArray = [[NSMutableArray alloc]init];
-                NSArray *abc;
-                abc = [_detailDataArr mutableCopy];
-                for (int i = 0; i < abc.count; i++) {
-                    
-                    sArray = abc[i];
-                    if (i == c) {
-                        [sArray replaceObjectAtIndex:d withObject:[NSString stringWithFormat:@"%@",valueStr]];
-                    }
-                    
-                    [backTitleArray addObject:sArray];
-                    
-                }
-                _detailDataArr = backTitleArray;
                 
-                //改变对应textView不能编辑
-                int index = c*1000 + d;
-                for (DocumentCell *cell in _tableView.visibleCells) {
-                    if (cell.MyTextView.tag == index) {
-                        cell.MyTextView.text = [NSString stringWithFormat:@"%@",valueStr];
-                    }
-                }
                 
             }
             

shiku_im/shiku_im/controller/myOA/B2BSchedulingSettingVC.m

@@ -50,6 +50,7 @@
     if (_dataArr.count != 0) {
         [_dataArr removeAllObjects];
     }
+    
     [SVProgressHUD showWithStatus:@"正在加载中"];
     self.tableView.userInteractionEnabled = NO;
     [self loadData];

shiku_im/shiku_im/controller/myOA/JLPunchCardViewController.m

@@ -865,8 +865,7 @@
                     [_kaoqingArr addObject:model];
                 }
                 
-                
-                
+
             }
         }
         

shiku_im/shiku_im/controller/myOA/JOPunchCardViewController.m

@@ -1937,14 +1937,12 @@ updatingLocation:(BOOL)updatingLocation
     
     if (error == nil) {
         DLog(@"heiehi%@",ObjectData);
-   JLHeightSettingModel  * _model = [JLHeightSettingModel mj_objectWithKeyValues:ObjectData];
+        JLHeightSettingModel  * _model = [JLHeightSettingModel mj_objectWithKeyValues:ObjectData];
         
         JLAdvancedSettingVC *vc = [[JLAdvancedSettingVC alloc] init];
         vc.model = _model;
         [self.navigationController pushViewController:vc animated:YES];
         
-              
-        
     }else{
         if (error.code==-1009)
         {

shiku_im/shiku_im/controller/myOA/LYHTTPRequest.h

@@ -192,5 +192,4 @@ typedef NS_ENUM(NSInteger,RequestType)
 
 
 
-
 @end

shiku_im/shiku_im/shiku_im-Info.plist

@@ -33,7 +33,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>6.4.5</string>
+	<string>6.4.6</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -113,6 +113,10 @@
 	</array>
 	<key>CFBundleVersion</key>
 	<string>6.0.0</string>
+	<key>CodePushDeploymentKey</key>
+	<string>$(CODEPUSH_KEY)</string>
+	<key>CodePushServerURL</key>
+	<string>$(CODEPUSH_URL)</string>
 	<key>LSApplicationQueriesSchemes</key>
 	<array>
 		<string>baidumap</string>

shiku_im/shiku_im/文件夹1/B2B商务（新）/Controllers/UASB2BMainVC.m

@@ -98,7 +98,6 @@
     
     label.userInteractionEnabled = YES;
     
-    
     label.target = self;
     
     label.aSelector = @selector(barViewDidclicked);
@@ -122,10 +121,8 @@
     
     label.height = 22;
     
-    
     label.attributedText = attrStr;
     
-    
     self.navigationItem.titleView = barView;
     
     barView.target = self;
@@ -138,7 +135,6 @@
     
     @weakify(self)
     LOGLoopView *header = [[LOGLoopView alloc]initWithUrls:loopArr titles:@[] didSelected:^(NSInteger index) {
-       
         @strongify(self)
         [self pushToAllControllerWithIndex:index];
         
@@ -157,7 +153,6 @@
     _tabelView.mj_header = [MJRefreshNormalHeader headerWithRefreshingBlock:^{
         
         @strongify(self)
-        
         [self getAllDataFromServer];
         
         

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

@@ -458,12 +458,14 @@
     
     [self.navigationController pushViewController:setVC animated:YES];
     
-    
 }
 
 
 
 
+/**
+ 跳转日程界面
+ */
 -(void)moveToScheduleVC{
     
     UASMainVC *main = (UASMainVC *)self.tabBarController;
@@ -918,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];
@@ -2093,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,6 +355,7 @@ static NSString *cellID = @"cellID";
     [_tableView reloadData];
 }
 
+
 #pragma mark --- UITableView delegate && datasource
 -(NSInteger)numberOfSectionsInTableView:(UITableView *)tableView{
     return 1;

shiku_im/shiku_im/文件夹5/UASGuideController.m

@@ -63,21 +63,33 @@
     btn.backgroundColor = [UIColor clearColor];
     btn.frame = CGRectMake(sv.bounds.size.width*3+(SCREEN_WIDTH-120)/2, sv.bounds.size.height-80, 120, 40);
     [sv addSubview:btn];
-    [btn addTarget:self action:@selector(enterHomeViewController) forControlEvents:UIControlEventTouchUpInside];
+    [btn addTarget:self action:@selector(enterHomeViewControllerScroll:) forControlEvents:UIControlEventTouchUpInside];
     
 }
 
 
-- (void)enterHomeViewController
+- (void)enterHomeViewControllerScroll:(BOOL)isScroll
 {
     UIScrollView *view = [self.view viewWithTag:2000];
+    
     [UIView animateWithDuration:0.2 animations:^{
         
         //平移
-        view.transform = CGAffineTransformMakeTranslation(-SCREEN_WIDTH, 0);
+        if (isScroll) {
+            
+            view.transform = CGAffineTransformMakeTranslation(-SCREEN_WIDTH, 0);
+            
+        }else{
+         
+            view.transform = CGAffineTransformMakeTranslation(0, -SCREEN_HEIGHT);
+            
+        }
+        
+    } completion:^(BOOL finished) {
+        
         [view removeFromSuperview];
         if ([[NSUserDefaults standardUserDefaults] boolForKey:isAutoLoginOrNot]) {//自动登录
-           
+            
             if (self.chooseNextVC) {
                 
                 self.chooseNextVC();
@@ -86,14 +98,12 @@
             
         }else{
             
-        loginVC *loginVc =  [[loginVC alloc]init];
+            loginVC *loginVc =  [[loginVC alloc]init];
             
-        [UIApplication sharedApplication].keyWindow.rootViewController = loginVc;
+            [UIApplication sharedApplication].keyWindow.rootViewController = loginVc;
             
         }
         
-    } completion:^(BOOL finished) {
-        
     }];
 }
 
@@ -104,7 +114,7 @@
         _pg.currentPage = curPageIndex;
         
         if (scrollView.contentOffset.x > scrollView.bounds.size.width * 3) {
-            [self enterHomeViewController];
+            [self enterHomeViewControllerScroll:YES];
         }
     }
 }