1.适配RN 0.59.9版本

shiku_im/Podfile

@@ -25,30 +25,53 @@ 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 'React', :path => './UU_RN/node_modules/react-native', :subspecs => [
+  'Core',
+  'CxxBridge',
+  'DevSupport',
+  'RCTWebSocket',
+  'RCTGeolocation',
+  'RCTLinkingIOS',
+  'RCTSettings',
+  'RCTText',
+  'RCTVibration',
+  'RCTImage',
+  'RCTAnimation',
+  'RCTActionSheet',
+  'RCTCameraRoll',
+  
+  ]
+  
   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'
   
-  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'
+  #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

@@ -25,11 +25,6 @@ PODS:
     - 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
@@ -40,76 +35,62 @@ PODS:
   - 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/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)
   - SDWebImage (4.4.6):
     - SDWebImage/Core (= 4.4.6)
@@ -117,7 +98,7 @@ PODS:
   - SVProgressHUD (2.2.5)
   - TZImagePickerController (3.2.1)
   - WechatOpenSDK (1.8.4)
-  - yoga (0.60.3.React)
+  - yoga (0.59.9.React)
 
 DEPENDENCIES:
   - AFNetworking
@@ -134,24 +115,19 @@ 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
   - SDWebImage (= 4.4.6)
   - SVProgressHUD
@@ -187,41 +163,7 @@ 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"
   yoga:
     :path: "./UU_RN/node_modules/react-native/ReactCommon/yoga"
 
@@ -230,42 +172,25 @@ SPEC CHECKSUMS:
   AliPay: 2bd35a4e486d2a8c035043023cd846e886bb21d1
   boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c
   Bugtags: 3ea74dc1a2a0a24989c2243ab2e075bf60b48d56
-  DoubleConversion: 5805e889d232975c086db112ece9ed034df7a0b2
+  DoubleConversion: bb338842f62ab1d708ceb63ec3d999f0f3d98ecd
   EGOCache: 191fd213da6804d487b49b1a91772ba904f3e324
   FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
-  Folly: 30e7936e1c45c08d884aa59369ed951a8e68cf51
-  glog: 1f3da668190260b06b429bb211bfbee5cd790c28
+  Folly: de497beb10f102453a1afa9edbf8cf8a251890de
+  glog: aefd1eb5dda2ab95ba0938556f34b98e2da3a60d
   HMSegmentedControl: f514c6dad47aa3065e0ed2e8046b73efc71221b9
   IQKeyboardManager: fcef267266379c003181fc3592f6bdb8bf4db839
   Masonry: 678fab65091a9290e40e2832a55e7ab731aad201
   MJExtension: d86aacb740c87519d20e3cca55b6fa4be6cc7548
   MJRefresh: ed450d6eb9d3346a2cb033ab7eb6de090aeef437
   pop: d582054913807fd11fd50bfe6a539d91c7e1a55a
-  React: c438ccc7e14e86d4702bb92d7e262f549ffaa995
-  React-Core: c76495f5c14e73c0f803b89c3fa83f804da61bd6
-  React-cxxreact: f64bc64cf4682d6ea5a064f6017da72482858682
-  React-DevSupport: 30336bca00f72681eac995d21a31b963e7d5cfec
-  React-fishhook: 73dc8058ca42828cc92e8fbba6cd9571100e10ca
-  React-jsi: 40f467ff088c811c6630acccb4aea57ea7ccb1b5
-  React-jsiexecutor: e4b4717060a0cd8d0270323b5655a68c95432efd
-  React-jsinspector: 044105eea064aec81adc5e4d777a8f6589e7d094
-  React-RCTActionSheet: 08864c609d9f959abf3d51fdd93f8bc6e91f21eb
-  React-RCTAnimation: a4547e9fac2627ded3df9d302f5558b475faf819
-  React-RCTBlob: 62d5c263a2adb8f7a2cafd601beba18a2d99cbbb
-  React-RCTImage: 963859de2b05d2037d1b7842cdbddc8d7f3a2f3b
-  React-RCTLinking: 5998a7db9a6156ed112b006d01f76b2d1cc83d98
-  React-RCTNetwork: 0b676e8194f3f893db813007d37e37e9820173a3
-  React-RCTSettings: fdd7606f1b6050eced69fc6046d5db6768aefd57
-  React-RCTText: 36c0532feb5521cb295ba80e7e44b70cf1c36fc7
-  React-RCTVibration: dabb8d59bb47e1d9124b3f77bfdc1b33d42b0a74
-  React-RCTWebSocket: f32b93e0953d7c07fd5dd45305406282cfdc95cf
+  React: 1d605e098d69bdf08960787f3446f0a9dc2e2ccf
   ReactiveObjC: 011caa393aa0383245f2dcf9bf02e86b80b36040
   SDWebImage: 3f3f0c02f09798048c47a5ed0a13f17b063572d8
   SVProgressHUD: 1428aafac632c1f86f62aa4243ec12008d7a51d6
   TZImagePickerController: bf4c57b98d8707fce41ea6be872414a71c7a8c9d
   WechatOpenSDK: 9b721089507c895d05f997408c30bb6e6f5f9b60
-  yoga: 88c514f310aff89b94a14c5fbf44b95735af0cb7
+  yoga: 128daf064cacaede0c3bb27424b6b4c71052e6cd
 
-PODFILE CHECKSUM: 842830fffd26ca4ae347913fe0ee18bbd2e2bbc7
+PODFILE CHECKSUM: 798543e59399751c6e6366cdc72344ac23b1b015
 
 COCOAPODS: 1.5.2

shiku_im/shiku_im.xcodeproj/project.pbxproj

@@ -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>"; };
@@ -20132,10 +20132,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 +20178,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;
@@ -20216,10 +20216,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 +20243,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,48 +20285,8 @@
 					"$(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",
@@ -20373,10 +20333,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 = (
@@ -20402,16 +20362,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)",
 				);
@@ -20419,7 +20379,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

@@ -27,6 +27,9 @@
     
     NSURL *jsCodeLocation = [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@"index" fallbackResource:nil];
     
+    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];
@@ -34,8 +37,16 @@
     
     self.view = rootView;
     
+    
 }
 
 
+-(void)viewWillAppear:(BOOL)animated{
+    
+    [super viewWillAppear:animated];
+    
+    self.navigationController.navigationBar.hidden = YES;
+        
+}
 
 @end

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/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,14 +8,11 @@
 
 #import "UASTabbar.h"
 #import "UASButton.h"
-#define TabbarItemNums 4.0
 
 @interface UASTabbar()
 
 @property(strong,nonatomic)NSMutableArray<UILabel *> *labArr;
 
-@property(assign,atomic)BOOL isExist;
-
 @end
 
 @implementation UASTabbar
@@ -24,15 +21,15 @@
 -(void)layoutSubviews{
     
     [super layoutSubviews];
-    
+
     [self addRemindView];
     
 }
 
 -(void)addRemindView{
     
-    if (self.isExist  || self.labArr.count>0) return;
-    self.isExist = YES;
+    if (self.labArr.count == self.items.count) return;
+    [self.labArr removeAllObjects];
     
     NSInteger index = 0;
     
@@ -98,7 +95,7 @@
 
 - (void)showBadgeOnItemIndex:(int)index{
     
-    if (self.labArr.count == 0 || index >= self.items.count) return;
+    if (index >= self.labArr.count || index >= self.items.count) return;
     
     self.labArr[index].hidden = NO;
     
@@ -106,8 +103,8 @@
 
 - (void)hideBadgeOnItemIndex:(int)index{
     
-    if (self.labArr.count == 0 || index >= self.items.count) return;
-
+    if (index >= self.labArr.count || index >= self.items.count) return;
+    
     self.labArr[index].hidden = YES;
     
 }

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/shiku_im-Info.plist

@@ -2,10 +2,6 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>CodePushServerURL</key>
-	<string>$(CODEPUSH_URL)</string>
-	<key>CodePushDeploymentKey</key>
-	<string>$(CODEPUSH_KEY)</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleDisplayName</key>
@@ -37,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>
@@ -117,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>