设备管理冲突解决

.gitignore

@@ -32,6 +32,7 @@ xcuserdata/
 # https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
 #
 Pods/
+UU_RN/
 
 Podfile.lock
 # Carthage

shiku_im/Podfile

@@ -1,12 +1,12 @@
 # Uncomment the next line to define a global platform for your project
-# platform :ios, '9.0'
+ platform :ios, '9.0'
 
 target 'shiku_im' do
   # Uncomment the next line if you're using Swift or would like to use dynamic frameworks
   # use_frameworks!
 
   pod 'MJRefresh'
-  pod 'MJExtension'
+  pod 'MJExtension'=>'3.0.10'
 
 #  pod 'MBProgressHUD'
   pod 'AFNetworking'
@@ -24,4 +24,31 @@ target 'shiku_im' do
   pod 'SDWebImage'=>'4.4.6'
   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 '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,49 +15,155 @@ PODS:
   - AFNetworking/UIKit (3.2.1):
     - AFNetworking/NSURLSession
   - AliPay (2.1.2)
-  - Bugtags (3.1.2):
-    - Bugtags/Core (= 3.1.2)
-  - Bugtags/Core (3.1.2)
+  - boost-for-react-native (1.63.0)
+  - Bugtags (3.1.3):
+    - Bugtags/Core (= 3.1.3)
+  - Bugtags/Core (3.1.3)
+  - 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.3.0)
+  - IQKeyboardManager (6.4.0)
   - Masonry (1.1.0)
-  - MJExtension (3.0.17)
+  - 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
+    - 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):
+    - 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)
+    - DoubleConversion
+    - Folly (= 2018.10.22.00)
+    - glog
+  - React-jsiexecutor (0.60.3):
+    - 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)
   - ReactiveObjC (3.1.1)
   - SDWebImage (4.4.6):
     - SDWebImage/Core (= 4.4.6)
   - SDWebImage/Core (4.4.6)
   - SVProgressHUD (2.2.5)
-  - TZImagePickerController (3.2.0)
+  - TZImagePickerController (3.2.1)
   - WechatOpenSDK (1.8.4)
+  - yoga (0.60.3.React)
 
 DEPENDENCIES:
   - AFNetworking
   - AliPay
   - Bugtags
+  - DoubleConversion (from `./UU_RN/node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`)
   - EGOCache
   - FMDB
+  - Folly (from `./UU_RN/node_modules/react-native/third-party-podspecs/Folly.podspec`)
+  - glog (from `./UU_RN/node_modules/react-native/third-party-podspecs/glog.podspec`)
   - HMSegmentedControl
   - IQKeyboardManager
   - Masonry
-  - MJExtension
+  - 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`)
   - ReactiveObjC
   - SDWebImage (= 4.4.6)
   - SVProgressHUD
   - TZImagePickerController
   - WechatOpenSDK
+  - yoga (from `./UU_RN/node_modules/react-native/ReactCommon/yoga`)
 
 SPEC REPOS:
   https://github.com/cocoapods/specs.git:
     - AFNetworking
     - AliPay
+    - boost-for-react-native
     - Bugtags
     - EGOCache
     - FMDB
@@ -73,24 +179,93 @@ SPEC REPOS:
     - TZImagePickerController
     - WechatOpenSDK
 
+EXTERNAL SOURCES:
+  DoubleConversion:
+    :podspec: "./UU_RN/node_modules/react-native/third-party-podspecs/DoubleConversion.podspec"
+  Folly:
+    :podspec: "./UU_RN/node_modules/react-native/third-party-podspecs/Folly.podspec"
+  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"
+  yoga:
+    :path: "./UU_RN/node_modules/react-native/ReactCommon/yoga"
+
 SPEC CHECKSUMS:
   AFNetworking: b6f891fdfaed196b46c7a83cf209e09697b94057
   AliPay: 2bd35a4e486d2a8c035043023cd846e886bb21d1
-  Bugtags: 3a70c73c3415938f842556d8d9f9dcf592ccfd86
+  boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c
+  Bugtags: 3ea74dc1a2a0a24989c2243ab2e075bf60b48d56
+  DoubleConversion: 5805e889d232975c086db112ece9ed034df7a0b2
   EGOCache: 191fd213da6804d487b49b1a91772ba904f3e324
   FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
+  Folly: 30e7936e1c45c08d884aa59369ed951a8e68cf51
+  glog: 1f3da668190260b06b429bb211bfbee5cd790c28
   HMSegmentedControl: f514c6dad47aa3065e0ed2e8046b73efc71221b9
-  IQKeyboardManager: 2ca9d64893247556f53523dcd8d78641f0ba7c23
+  IQKeyboardManager: fcef267266379c003181fc3592f6bdb8bf4db839
   Masonry: 678fab65091a9290e40e2832a55e7ab731aad201
-  MJExtension: 74ec83124a68891619fb7ba9c5c811bbf1691076
+  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
   ReactiveObjC: 011caa393aa0383245f2dcf9bf02e86b80b36040
   SDWebImage: 3f3f0c02f09798048c47a5ed0a13f17b063572d8
   SVProgressHUD: 1428aafac632c1f86f62aa4243ec12008d7a51d6
-  TZImagePickerController: 7850b158d025065b162a1a963d445040b828abc9
+  TZImagePickerController: bf4c57b98d8707fce41ea6be872414a71c7a8c9d
   WechatOpenSDK: 9b721089507c895d05f997408c30bb6e6f5f9b60
+  yoga: 88c514f310aff89b94a14c5fbf44b95735af0cb7
 
-PODFILE CHECKSUM: b24727c5036e6873182234452070d8185a3752ed
+PODFILE CHECKSUM: 842830fffd26ca4ae347913fe0ee18bbd2e2bbc7
 
-COCOAPODS: 1.6.0
+COCOAPODS: 1.5.2

shiku_im/shiku_im.xcodeproj/project.pbxproj

@@ -1458,6 +1458,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 */; };
 		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"; }; };
@@ -5126,6 +5127,8 @@
 		99AE8CE121474907006D9FEB /* UASClientMaAccountCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = UASClientMaAccountCell.h; sourceTree = "<group>"; };
 		99AE8CE221474907006D9FEB /* UASClientMaAccountCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = UASClientMaAccountCell.m; sourceTree = "<group>"; };
 		99AE981E2182E11C0028B05A /* Workdata_Add.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = Workdata_Add.json; sourceTree = "<group>"; };
+		99B02AE022EED6650014A144 /* YRReactVC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = YRReactVC.h; sourceTree = "<group>"; };
+		99B02AE122EED6650014A144 /* YRReactVC.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = YRReactVC.m; sourceTree = "<group>"; };
 		99B34856212A6F2400CE6332 /* UASScheduleCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = UASScheduleCell.h; sourceTree = "<group>"; };
 		99B34857212A6F2400CE6332 /* UASScheduleCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = UASScheduleCell.m; sourceTree = "<group>"; };
 		99B34859212A8E5A00CE6332 /* UASScheduleModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = UASScheduleModel.h; sourceTree = "<group>"; };
@@ -12065,6 +12068,47 @@
 			name = Frameworks;
 			sourceTree = "<group>";
 		};
+		99B02ADC22EED6650014A144 /* RN */ = {
+			isa = PBXGroup;
+			children = (
+				99B02ADD22EED6650014A144 /* Others */,
+				99B02ADE22EED6650014A144 /* Models */,
+				99B02ADF22EED6650014A144 /* Controllers */,
+				99B02AE222EED6650014A144 /* Views */,
+			);
+			path = RN;
+			sourceTree = "<group>";
+		};
+		99B02ADD22EED6650014A144 /* Others */ = {
+			isa = PBXGroup;
+			children = (
+			);
+			path = Others;
+			sourceTree = "<group>";
+		};
+		99B02ADE22EED6650014A144 /* Models */ = {
+			isa = PBXGroup;
+			children = (
+			);
+			path = Models;
+			sourceTree = "<group>";
+		};
+		99B02ADF22EED6650014A144 /* Controllers */ = {
+			isa = PBXGroup;
+			children = (
+				99B02AE022EED6650014A144 /* YRReactVC.h */,
+				99B02AE122EED6650014A144 /* YRReactVC.m */,
+			);
+			path = Controllers;
+			sourceTree = "<group>";
+		};
+		99B02AE222EED6650014A144 /* Views */ = {
+			isa = PBXGroup;
+			children = (
+			);
+			path = Views;
+			sourceTree = "<group>";
+		};
 		99C399A62146450D004D3306 /* Others */ = {
 			isa = PBXGroup;
 			children = (
@@ -16256,6 +16300,7 @@
 		CCE23E8C18FFB8EA00A3CB5A /* shiku_im */ = {
 			isa = PBXGroup;
 			children = (
+				99B02ADC22EED6650014A144 /* RN */,
 				4DE8427D1E94C6DE00D20EA2 /* Main(主文件) */,
 				A75FA3761C72F55F004B2D32 /* LoginUAS(登陆) */,
 				A7D56A241C76E66D00DAACEE /* MessageList(消息) */,
@@ -18728,7 +18773,7 @@
 			files = (
 			);
 			inputPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-shiku_im/Pods-shiku_im-resources.sh",
+				"${SRCROOT}/Pods/Target Support Files/Pods-shiku_im/Pods-shiku_im-resources.sh",
 				"${PODS_ROOT}/AliPay/AlipaySDK.bundle",
 				"${PODS_ROOT}/Bugtags/Bugtags.bundle",
 				"${PODS_ROOT}/IQKeyboardManager/IQKeyboardManager/Resources/IQKeyboardManager.bundle",
@@ -18747,7 +18792,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-shiku_im/Pods-shiku_im-resources.sh\"\n";
+			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-shiku_im/Pods-shiku_im-resources.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
 /* End PBXShellScriptBuildPhase section */
@@ -19459,6 +19504,7 @@
 				CC1D1924195455710029F7FD /* JXTextView.m in Sources */,
 				CCE2415B18FFB8EB00A3CB5A /* VoiceConverter.mm in Sources */,
 				7D305E7D1E320E530045D753 /* JLHeightSettingModel.m in Sources */,
+				99B02AE322EED6660014A144 /* YRReactVC.m in Sources */,
 				7DE27D2C20134F0700BE1E3B /* LYYPubicWaitquoteVC.m in Sources */,
 				273F3F261D373A2A00160ECE /* DataAnalysisVC.m in Sources */,
 				276BDE9A20A1770E00C1DB57 /* ForgetPwToEmailVC.m in Sources */,

shiku_im/shiku_im/AppDelegate.mm

@@ -366,6 +366,12 @@
     @weakify(self)
     self.adView.loadCompleted = ^{
 
+        UIViewController *RN = [NSClassFromString(@"YRReactVC") new];
+        
+        self.window.rootViewController = RN;
+        
+        return;
+        
         @strongify(self)
         
         NSString *lastVersion = [[NSUserDefaults standardUserDefaults] objectForKey:@"theLastVersion"];

shiku_im/shiku_im/RN/Controllers/YRReactVC.h

@@ -0,0 +1,16 @@
+//
+//  YRReactVC.h
+//  shiku_im
+//
+//  Created by liujl on 2019/7/29.
+//
+
+#import "UASBaseVC.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface YRReactVC : UASBaseVC
+
+@end
+
+NS_ASSUME_NONNULL_END

shiku_im/shiku_im/RN/Controllers/YRReactVC.m

@@ -0,0 +1,36 @@
+//
+//  YRReactVC.m
+//  shiku_im
+//
+//  Created by liujl on 2019/7/29.
+//
+
+#import "YRReactVC.h"
+#import <React/RCTRootView.h>
+#import <React/RCTBundleURLProvider.h>
+
+@interface YRReactVC ()
+
+@end
+
+@implementation YRReactVC
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    // Do any additional setup after loading the view.
+
+    
+
+    NSURL *jsCodeLocation = [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@"index" fallbackResource:nil];
+
+    RCTRootView * rootView = [[RCTRootView alloc] initWithBundleURL:jsCodeLocation moduleName:@"UU_RN"
+                                                          initialProperties:@{@"UU":@"UU_RN"}
+                                                              launchOptions:nil];
+    
+    self.view = rootView;
+    
+}
+
+
+
+@end

shiku_im/shiku_im/Register&Login/loginVC.m

@@ -64,7 +64,6 @@
         
         [self setUpUI];
         
-        
     }
     return self;
 }
@@ -452,7 +451,7 @@
         
         [[NSNotificationCenter defaultCenter] postNotificationName:@"changeSelectTabbar" object:nil];
     }
-    [[NSNotificationCenter defaultCenter] postNotificationName:@"plusCHangeMainHeight" object:nil];
+    
     _btn.userInteractionEnabled = YES;
 }
 
@@ -525,16 +524,16 @@
 -(int) didServerResultFailed:(JXConnection*)aDownload dict:(NSDictionary*)dict{
     _btn.userInteractionEnabled = YES;
     [_wait hide];
-//    [KPromptBox showKPromptBoxWithMassage:@"IM登录失败，请重新登录"];
-    //    [((AppDelegate*)[[UIApplication sharedApplication] delegate]) showMainUI];
+    [KPromptBox showKPromptBoxWithMassage:@"IM登录失败，请重新登录"];
+    
     return show_error;
 }
 
 -(int) didServerConnectError:(JXConnection*)aDownload error:(NSError *)error{//error为空时，代表超时
     _btn.userInteractionEnabled = YES;
     [_wait hide];
-    [KPromptBox showKPromptBoxWithMassage:@"IM登录失败，请重新登录"];
-    //    [((AppDelegate*)[[UIApplication sharedApplication] delegate]) showMainUI];
+    
+    
     return show_error;
 }
 
@@ -1094,7 +1093,7 @@
     url = [url stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
     
     //执行网络请求
-    DLog(@"开始登录请求！！！！");
+    DLog(@"%@",g_master);
     
     UASNetworkManager *loginSeverManager = [UASNetworkManager manager];
     
@@ -1153,7 +1152,17 @@
             
             [userDefaults setBool:NO forKey:@"erpOpen"];
             
-            [UASAlertView showWithTitle:nil content:@"账号或密码错误,UAS登录失败" sureTitle:Localized(@"UU_custom_sure") cancelTitle:nil click:^(NSInteger index) {
+            NSString *msgStr = @"";
+            if ([dic[@"data"] isKindOfClass:NSString.class]) {
+                
+                msgStr = [NSString stringWithFormat:@"%@",dic[@"data"]];
+                
+            }else{
+                
+                msgStr = @"账号或密码错误,UAS登录失败";
+            }
+            
+            [UASAlertView showWithTitle:nil content:msgStr sureTitle:Localized(@"UU_custom_sure") cancelTitle:nil click:^(NSInteger index) {
                 
             }];
         }

shiku_im/shiku_im/controller/DocumentDetailVC.m

@@ -433,7 +433,7 @@
     NSString *ip = [[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
     NSString *sessionId = [[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
     
-    NSString *url = [NSString stringWithFormat:@"%@mobile/common/getformandgriddata.action?caller=%@&id=%@&sessionId=%@",ip,_caller,_dan_id,sessionId];
+    NSString *url = [NSString stringWithFormat:@"%@mobile/common/getformandgriddata.action?caller=%@&id=%@&sessionId=%@&isprocess=1",ip,_caller,_dan_id,sessionId];
     //21655,Ask4Leave
     UASNetworkManager *manager = [UASNetworkManager shareManager];
     manager.requestSerializer = [AFHTTPRequestSerializer serializer];
@@ -534,8 +534,7 @@
             
             DLog(@"错误的原因:%@",errorStr);
             [JOShowMessageFromNavi showDropViewWithMessage:errorStr ToNavi:self.navigationController withColor:nil];
-        }
-        else{
+        }else{
             [JOShowMessageFromNavi showDropViewWithMessage:@"请检查网络情况" ToNavi:self.navigationController withColor:nil];
         }
 
@@ -594,6 +593,7 @@
         
         
     }else{
+        
     LYYReadingVC *vc1 = [[LYYReadingVC alloc] init];
     
     LYYFuJianModel *model =    _fd_dataArr[sender.tag -89];

shiku_im/shiku_im/controller/DocumentListVC.m

@@ -482,7 +482,7 @@ static NSString *cellID = @"cellID";
     
     status = [_listData[indexPath.row] objectForKey:_cModel.fo_statusfield];
     
-    if ([status isEqualToString:@"在录入"]) {
+    if ([status isEqualToString:@"在录入"] || [status isEqualToString:@"未审核"] ) {
         
         if ([_caller isEqualToString:URL_REIMBURSEMENT_CALLER]) {
             LYYReimbursementVC *vc = (LYYReimbursementVC *)[self.navigationController.viewControllers objectAtIndex:2];

shiku_im/shiku_im/controller/DocumentVC.m

@@ -260,15 +260,15 @@ static NSString *cellID = @"cellID";
                 [_listKeyArr addObject:obj[@"fd_field"]];
                 NSString *fdtype = [NSString stringWithFormat:@"%@",obj[@"fd_type"]];
                 NSString *fddefaultValue = [NSString stringWithFormat:@"%@",obj[@"fd_defaultvalue"]];
-                if ([fdtype isEqualToString:@"D"]) {
-                    [_detailDataArr addObject:dateString];
-                }else{
+//                if ([fdtype isEqualToString:@"D"]) {
+//                    [_detailDataArr addObject:dateString];
+//                }else{
                     if (fddefaultValue.length != 0) {
                         [_detailDataArr addObject:fddefaultValue];
                     }else{
                         [_detailDataArr addObject:@""];
                     }
-                }
+//                }
             }else if([isDefault isEqualToString:@"0"]){
                 [edit1 addObject:obj];
             }
@@ -285,11 +285,11 @@ static NSString *cellID = @"cellID";
                 [_gridData addObject:obj];
                 [_gridKeyArr addObject:obj[@"dg_field"]];
                 NSString *fdtype = [NSString stringWithFormat:@"%@",obj[@"dg_type"]];
-                if ([fdtype isEqualToString:@"D"]) {
-                    [_gridDetail addObject:dateString];
-                }else{
+//                if ([fdtype isEqualToString:@"D"]) {
+//                    [_gridDetail addObject:dateString];
+//                }else{
                     [_gridDetail addObject:@""];
-                }
+//                }
                 
             }else if([isDefault isEqualToString:@"0"]){
                 [_edit2Arr addObject:obj];

shiku_im/shiku_im/controller/JOMsgViewController.m

@@ -741,7 +741,6 @@
             [self settting:2];
             self.headerView.hidden = NO;
             
-            
             [UIView animateWithDuration:1 animations:^{
                 
                 [self.tableView setContentOffset:CGPointMake(0, -121)];

shiku_im/shiku_im/controller/UASAdView.m

@@ -28,7 +28,6 @@ static UASAdView *adView = nil;
     
     [adView makeKeyAndVisible];
     
-    
     return adView;
     
 }

shiku_im/shiku_im/controller/UASMainVC.m

@@ -118,7 +118,6 @@
             
             if ([view isKindOfClass:class]) {
                 
-                
                 [self.tarArr addObject:view];
                 
             }
@@ -242,7 +241,6 @@
     
     NSDictionary *urlDic = [self getParametersWithUrl:url];
     
-
     NSString *str = urlDic[@"pagekind"];
     
     if (self.waitVC) {

shiku_im/shiku_im/controller/UpdateDocumentVC.m

@@ -65,6 +65,8 @@ static NSString *cellID = @"cellID";
     
     BOOL turnFrame; //用来判断是否点击了textView
     BOOL turnFrameSpecial; //返回选择提示框 特殊处理
+    
+    NSString *_vecode;//高登特殊要求字段
 }
 
 - (NSMutableArray *)cellHeightArray
@@ -136,6 +138,7 @@ static NSString *cellID = @"cellID";
     _gridId = [[NSMutableArray alloc]init];
     _formCount = 0;
     _guanlianId = @"";
+    _vecode = @"";
     turnFrame = NO;
     turnFrameSpecial = NO;
     [self getDataFromSeverWithCaller:_caller];
@@ -292,6 +295,13 @@ static NSString *cellID = @"cellID";
                 [_idArr addObject:idArr];
             }
             
+            //特殊取值-高登要求
+            if ([_caller isEqualToString:@"VerifyApplyDetail!FQC"]) {
+                NSString *field = [NSString stringWithFormat:@"%@",obj[@"fd_field"]];
+                if ([field isEqualToString:@"ve_code"]) {
+                    _vecode = FORMAT(@"%@",obj[@"fd_value"]);
+                }
+            }
             
         }
         _listArr = [NSDictionary changeType:_listArr];
@@ -881,14 +891,20 @@ static NSString *cellID = @"cellID";
     
     if (_gridData.count != 0) {
         if (section == (_listArr.count-1)) {
-            return 100;
+            if ([_caller isEqualToString:@"VerifyApplyDetail!FQC"]) {
+                return 150;
+            }else
+                return 100;
         }
         else{
             return 4;
         }
     }else{
         if (section == (_listArr.count-1)) {
-            return 60;
+            if ([_caller isEqualToString:@"VerifyApplyDetail!FQC"]) {
+                return 110;
+            }else
+                return 60;
         }
         else{
             return 4;
@@ -984,7 +1000,35 @@ static NSString *cellID = @"cellID";
                     make.top.equalTo(footerView.mas_bottom).offset(10);
                     make.height.mas_equalTo(40);
                 }];
-            }else{
+            }
+            else if ([_caller isEqualToString:@"VerifyApplyDetail!FQC"]) {
+                [footerView addSubview:addBtn];
+                
+                UIButton *zhuandanBtn = [UIButton new];
+                zhuandanBtn.layer.cornerRadius = 5;
+                zhuandanBtn.layer.masksToBounds = YES;
+                [zhuandanBtn setBackgroundColor:HexColor(@"#33A2EE") forState:UIControlStateNormal];
+                [zhuandanBtn setBackgroundColor:HexColor(@"#2D84C0") forState:UIControlStateHighlighted];
+                [zhuandanBtn setTitleColor:HexColor(@"#FFFFFF") forState:UIControlStateNormal];
+                zhuandanBtn.titleLabel.font = FONT_SIZE(18);
+                [zhuandanBtn setTitle:@"转单" forState:UIControlStateNormal];
+                [zhuandanBtn addTarget:self action:@selector(zhandanAction) forControlEvents:UIControlEventTouchUpInside];
+                [footerView addSubview:zhuandanBtn];
+                [zhuandanBtn mas_makeConstraints:^(MASConstraintMaker *make) {
+                    make.left.equalTo(footerView).offset(20);
+                    make.right.equalTo(footerView).offset(-20);
+                    make.top.equalTo(addBtn.mas_bottom).offset(5);
+                    make.height.mas_equalTo(40);
+                }];
+                
+                [_refreshBtn mas_makeConstraints:^(MASConstraintMaker *make) {
+                    make.left.equalTo(footerView).offset(20);
+                    make.right.equalTo(footerView).offset(-20);
+                    make.top.equalTo(zhuandanBtn.mas_bottom).offset(5);
+                    make.height.mas_equalTo(40);
+                }];
+            }
+            else{
                 [footerView addSubview:addBtn];
                 [_refreshBtn mas_makeConstraints:^(MASConstraintMaker *make) {
                     make.left.equalTo(footerView).offset(20);
@@ -1022,12 +1066,38 @@ static NSString *cellID = @"cellID";
             [_refreshBtn addTarget:self action:@selector(uploadAction) forControlEvents:UIControlEventTouchUpInside];
             [footerView addSubview:_refreshBtn];
             
-            [_refreshBtn mas_makeConstraints:^(MASConstraintMaker *make) {
-                make.left.equalTo(footerView).offset(20);
-                make.right.equalTo(footerView).offset(-20);
-                make.top.equalTo(footerView).offset(10);
-                make.height.mas_equalTo(40);
-            }];
+            if ([_caller isEqualToString:@"VerifyApplyDetail!FQC"]) {
+                UIButton *zhuandanBtn = [UIButton new];
+                zhuandanBtn.layer.cornerRadius = 5;
+                zhuandanBtn.layer.masksToBounds = YES;
+                [zhuandanBtn setBackgroundColor:HexColor(@"#33A2EE") forState:UIControlStateNormal];
+                [zhuandanBtn setBackgroundColor:HexColor(@"#2D84C0") forState:UIControlStateHighlighted];
+                [zhuandanBtn setTitleColor:HexColor(@"#FFFFFF") forState:UIControlStateNormal];
+                zhuandanBtn.titleLabel.font = FONT_SIZE(18);
+                [zhuandanBtn setTitle:@"转单" forState:UIControlStateNormal];
+                [zhuandanBtn addTarget:self action:@selector(zhandanAction) forControlEvents:UIControlEventTouchUpInside];
+                [footerView addSubview:zhuandanBtn];
+                [zhuandanBtn mas_makeConstraints:^(MASConstraintMaker *make) {
+                    make.left.equalTo(footerView).offset(20);
+                    make.right.equalTo(footerView).offset(-20);
+                    make.top.equalTo(footerView).offset(5);
+                    make.height.mas_equalTo(40);
+                }];
+                
+                [_refreshBtn mas_makeConstraints:^(MASConstraintMaker *make) {
+                    make.left.equalTo(footerView).offset(20);
+                    make.right.equalTo(footerView).offset(-20);
+                    make.top.equalTo(zhuandanBtn.mas_bottom).offset(5);
+                    make.height.mas_equalTo(40);
+                }];
+            }else{
+                [_refreshBtn mas_makeConstraints:^(MASConstraintMaker *make) {
+                    make.left.equalTo(footerView).offset(20);
+                    make.right.equalTo(footerView).offset(-20);
+                    make.top.equalTo(footerView).offset(10);
+                    make.height.mas_equalTo(40);
+                }];
+            }
             
             return footerView;
         }
@@ -1123,6 +1193,29 @@ static NSString *cellID = @"cellID";
     [self.tableView reloadData];
 }
 
+#pragma mark --- 转单
+-(void)zhandanAction
+{
+    [MBProgressHUD showMessage:@"" toView:self.view];
+    
+    NSString *url = [NSString stringWithFormat:@"%@scm/qc/turnQualityYC.action",g_id];
+    NSDictionary *dic = @{
+                          @"id":_listid,
+                          @"code":_vecode,
+                          };
+    UASNetworkManager *manager = [UASNetworkManager shareManager];
+    
+    [manager request:url method:POST parameters:dic progress:nil success:^(NSURLSessionDataTask *task, id responseObject) {
+        [MBProgressHUD hideHUDForView:self.view];
+        
+        [JOShowMessageFromNavi showDropViewWithMessage:@"转单成功" ToNavi:self.navigationController withColor:nil];
+        
+    } failure:^(NSURLSessionDataTask *task, NSError *error) {
+        [MBProgressHUD hideHUDForView:self.view];
+        ErrorInfomation
+    }];
+}
+
 #pragma mark --- 提交单据
 -(void)uploadAction
 {

shiku_im/shiku_im/controller/myOA/JLPunchCardViewController.m

@@ -1995,7 +1995,7 @@
             if ([istoday isEqualToString:@"yes"] ) {
                 if (indexPath.row %2 == 0) {
                     if (model.startcl_time.length > 0) {
-                        
+                        //上班打卡时间大于迟到时间
                         if ([self IsTime:model.latetime withTime:model.startcl_time] == 1) {
                             
                             if ([self IsTime:model.seriousLateTime withTime:model.startcl_time] ==1) {

shiku_im/shiku_im/controller/myOA/NSString+regular.h

@@ -61,5 +61,19 @@
 
 +(BOOL)isMoreThanSixtyWith:(NSString *)date;
 
+/**
+ 转换小数点
+
+ */
++(NSString *)reviseString: (NSString *)str;
+
+/**
+ 计算小数点后位数
+ 
+ */
++(int)calculPointLength:(NSString *)str;
+
+//判断字符串是不是浮点型数据
++(BOOL)isPureFloat:(NSString*)string;
 
 @end

shiku_im/shiku_im/controller/myOA/NSString+regular.m

@@ -314,5 +314,52 @@
     
 }
 
++(NSString *)reviseString: (NSString *)str{
+    //直接传入精度丢失有问题的Double类型
+    double conversionValue = [str doubleValue];
+    NSString *doubleString = [NSString stringWithFormat:@"%lf", conversionValue];
+    NSDecimalNumber *decNumber = [NSDecimalNumber decimalNumberWithString:doubleString];
+    return [decNumber stringValue];
+    
+}
+
+
++(int)calculPointLength:(NSString *)str{
+    
+    int length = 0;
+    
+    if ([str containsString:@"."]) {
+        
+        NSArray<NSString *> *strArr = [str componentsSeparatedByString:@"."];
+        
+        if (strArr.count == 2) {
+            
+            length = strArr[1].length;
+            
+        }else{
+            
+            length = 0;
+            
+        }
+        
+        
+    }else{
+        
+        length = 0;
+        
+    }
+    
+    
+    return length;
+}
+
+
+//判断字符串是不是浮点型数据
++(BOOL)isPureFloat:(NSString*)string{
+
+    NSScanner* scan = [NSScanner scannerWithString:string];
+    float val;
+    return [scan scanFloat:&val] && [scan isAtEnd];
+}
 
 @end

shiku_im/shiku_im/controller/myOA/UASButton.h

@@ -9,8 +9,11 @@
 #import <UIKit/UIKit.h>
 
 typedef NS_ENUM(NSInteger,NSTextVerticalAlignment){
+    //位于Label上方
     NSTextVerticalAlignmentTop = 101,
+    //位于Label中间
     NSTextVerticalAlignmentMiddle,
+    //位于Label下方
     NSTextVerticalAlignmentBottom
 };
 

shiku_im/shiku_im/controller/myOA/UASNetworkManager.m

@@ -9,7 +9,6 @@
 #import "UASNetworkManager.h"
 #import <objc/runtime.h>
 #import "NSJSONSerialization+ZXJSON.h"
-
 static UASNetworkManager *b2bManager = nil;
 
 @implementation UASNetworkManager
@@ -141,7 +140,7 @@ static UASNetworkManager *b2bManager = nil;
 -(NSURLSessionDataTask *)request:(NSString *)url method:(requestType)type parameters:(id)parameters constructingBodyWithBlock:(void (^)(id<AFMultipartFormData>))conBlock progress:(void (^)(NSProgress *))uploadProgress success:(void (^)(NSURLSessionDataTask *, id))success failure:(void (^)(NSURLSessionDataTask *, NSError *))failure{
     
     if (type == POST) {
-
+     
       return [self POST:url parameters:parameters constructingBodyWithBlock:conBlock progress:uploadProgress success:success failure:failure];
         
     }else{

shiku_im/shiku_im/controller/myOA/WorkTools/UASWorkManager.m

@@ -5111,6 +5111,9 @@
     
 }
 
+/**
+ 标识头部信息，适应不改url修改图片的情况
+ */
 -(void)configSdWebImage{
     
     

shiku_im/shiku_im/controller/审批流详情/LYYApprovalDetailVC.m

@@ -741,7 +741,12 @@
     [manager.requestSerializer setValue:paramSessionId forHTTPHeaderField:@"Cookie"];
     [manager.requestSerializer setValue:[NSString stringWithFormat:@"%@",g_sessionUser] forHTTPHeaderField:@"sessionUser"];
     [manager request:url method:POST parameters:nil progress:nil success:^(NSURLSessionDataTask *task, id responseObject) {
-        
+  
+        if ([responseObject isKindOfClass:NSData.class]) {
+            
+            responseObject = (NSDictionary *)[NSJSONSerialization JSONObjectWithData:responseObject options:NSJSONReadingMutableLeaves error:nil];
+            
+        }
   
         //主表的属性数组
         NSMutableArray *formconfigsArr = [[NSMutableArray alloc]init];
@@ -1857,8 +1862,18 @@
 -(UILabel *)creatRightLabelWithHeight:(int)hang text:(NSString *)text withinter:(NSInteger)aa withtype:(NSString *)type
 {
     if ([self isPureFloat:text] && [text containsString:@"."]) {
+        
+        //还原小数位
+        text = [NSString reviseString:text];
+        
         if ([type containsString:@"floatcolumn"] && type.length>11) {
-                NSInteger aa = [[type substringWithRange:NSMakeRange(type.length-2, 1)] integerValue];
+            
+               NSString *typeStr = [type stringByReplacingOccurrencesOfString:@"floatcolumn" withString:@""];
+                //处理特殊情况下的0
+               typeStr = [typeStr stringByReplacingOccurrencesOfString:@"0" withString:@""];
+            
+                NSInteger aa = [typeStr integerValue];
+            
                 if (aa <= 8) {
                     switch (aa) {
                         case 1:
@@ -1891,11 +1906,29 @@
                             break;
                     }
                 }else{
+                    
                     text = FORMAT(@"%.8lf",[text floatValue]);
+                    
                 }
             
         }else{
+            
+            
+            if ([text containsString:@"."]){
+                
+                text = [NSString reviseString:text];
+                
+            }
+            
+            int length = [NSString calculPointLength:text];
+            
+            if (length > 2) {
+                
             text = FORMAT(@"%.2lf",[text floatValue]);
+                
+            }
+            
+            
         }
     }
     CGSize size = [self getSizeWithText:text];
@@ -1936,8 +1969,17 @@
 {
     text = [NSDictionary changeType:text];
     if ([self isPureFloat:text] && [text containsString:@"."] ) {
+        //还原小数位
+        text = [NSString reviseString:text];
+        
        if ([type containsString:@"floatcolumn"] && type.length>11) {
-                NSInteger aa = [[type substringWithRange:NSMakeRange(type.length-2, 1)] integerValue];
+           
+           NSString *typeStr = [type stringByReplacingOccurrencesOfString:@"floatcolumn" withString:@""];
+           
+           typeStr = [typeStr stringByReplacingOccurrencesOfString:@"0" withString:@""];
+           
+           NSInteger aa = [typeStr integerValue];
+           
                 if (aa <= 8) {
                     switch (aa) {
                         case 1:
@@ -1969,11 +2011,28 @@
                         default:
                             break;
                     }
-                }else{
+                }else{//最高取8位
+                    
                     text = FORMAT(@"%.8lf",[text floatValue]);
+                    
                 }
-        }else{
-            text = FORMAT(@"%.2lf",[text floatValue]);
+           
+        }else{//最高取6位
+        
+            if ([text containsString:@"."]){
+                
+                text = [NSString reviseString:text];
+                
+            }
+            
+            int length = [NSString calculPointLength:text];
+            
+            if (length > 2) {
+             
+                text = FORMAT(@"%.2lf",[text floatValue]);
+                
+            }
+            
         }
         
     }
@@ -2283,7 +2342,6 @@
                          @"true",@"result",
                          str,@"customDes", //审批要点
                          @"RECORDER",@"backTaskName",
-                         
                          @"1",@"_noc",
                          @"4311",@"holdtime",
                          @"0",@"_center",
@@ -2602,8 +2660,8 @@
                 
             }
             }
-            str = FORMAT(@"%@",model.fpd_id);
-            str1 = FORMAT(@"%@",model.IDString);
+            str = FORMAT(@"%@",model.fpd_id == nil?@"":model.fpd_id);
+            str1 = FORMAT(@"%@",model.IDString == nil?@"":model.IDString);
             
             if(model.inputStr.length > 0 && model.FB_field.length>0){
                 [parm setObject:model.inputStr forKey:model.FB_field];
@@ -2627,8 +2685,12 @@
           [self PostAgree:sender];
     }else{
     NSString *formS1 = [NSString dictionaryToJson:formStore];
+        
     NSString *parm1 = FORMAT(@"[%@]",[parmArr componentsJoinedByString:@","]);
     
+        
+    parm1 = [parm1 stringByReplacingOccurrencesOfString:@"(null)" withString:@""];
+        
     NSDictionary *dic = [NSDictionary dictionaryWithObjectsAndKeys:_FD_model.jp_caller,@"caller",
                          formS1,@"formStore",
                          parm1,@"param",
@@ -2644,9 +2706,6 @@
             
             [self PostAgree:sender];
             
-            
-            
-            
         }else{
             [HUD hide:YES];
             sender.selected = NO;
@@ -3782,7 +3841,7 @@
     
     bbi3 = [[UIBarButtonItem alloc]initWithCustomView:btn3];
     
-    self.navigationItem.rightBarButtonItems = @[bbi1];
+//    self.navigationItem.rightBarButtonItems = @[bbi1];
     
     [self isAdmin]; //判断是否为管理员
 }
@@ -5657,9 +5716,10 @@
 }
 //判断字符串是不是浮点型数据
 - (BOOL)isPureFloat:(NSString*)string{
+
     NSScanner* scan = [NSScanner scannerWithString:string];
     float val;
-    return[scan scanFloat:&val] && [scan isAtEnd];
+    return [scan scanFloat:&val] && [scan isAtEnd];
 }
 
 @end

shiku_im/shiku_im/person/ScanWebView.m

@@ -29,7 +29,7 @@
     UIBarButtonItem *bbi2 = [[UIBarButtonItem alloc]initWithCustomView:btn2];
     self.navigationItem.leftBarButtonItems = @[bbi2];
     
-    UIWebView *webView = [[UIWebView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT)];
+    UIWebView *webView = [[UIWebView alloc] initWithFrame:CGRectZero];
     webView.backgroundColor = [UIColor clearColor];
     [webView setOpaque:NO];
     webView.delegate = self;
@@ -48,23 +48,12 @@
     [webView loadRequest:request];
     self.webView = webView;
     [self.view addSubview:webView];
-    //获取网页的上下文
-   /* JSContext *context = [webView valueForKeyPath:@"documentView.webView.mainFrame.javaScriptContext"];
-    DLog(@"获取的是什么呢:%@",context);
-    context[@"CloseWindow"] = ^() {
-        
-        DLog(@"+++++++Begin Log+++++++");
-        NSArray *args = [JSContext currentArguments];
-        
-        for (JSValue *jsVal in args) {
-            DLog(@"%@", jsVal);
-        }
-        
-        JSValue *this = [JSContext currentThis];
-        DLog(@"this: %@",this);
-        DLog(@"-------End Log-------");
+    
+    [webView mas_makeConstraints:^(MASConstraintMaker *make) {
+       
+        make.edges.equalTo(self.view);
         
-    };*/
+    }];
     
     
 }
@@ -93,11 +82,9 @@
 }
 
 -(void)webViewDidStartLoad:(UIWebView *)webView{
-    DLog(@"开始加载");
-    //
-//       [((AppDelegate*)[[UIApplication sharedApplication] delegate]) newLoginCheckWithName:[[NSUserDefaults standardUserDefaults] objectForKey:kMY_USER_LoginName] withPass:[[NSUserDefaults standardUserDefaults] objectForKey:kMY_USER_PASSWORD]];
-    DLog(@"开始登陆了走这个方法么");
-//    [(AppDelegate*)[UIApplication sharedApplication].delegate newLoginExtend];
+  
+    
+    
 }
 -(void)webViewDidFinishLoad:(UIWebView *)webView{
     
@@ -110,41 +97,6 @@
         
     };
     
-    DLog(@"加载完成");
-//    [self loadJSToOCMethod];
-//    JSContext *context=[webView valueForKeyPath:@"documentView.webView.mainFrame.javaScriptContext"];  //通过webView键创建JSContext对象
-//   NSString * astr =  [context name];
-//   
-//    DLog(@"giuhouho:%@",context[@"closeWebWindow"]);
-//    context[@"closeWebWindow"] = ^(){
-//        
-//        [self.navigationController popViewControllerAnimated:YES];
-//        
-//    };
-//    JSContext * context = [webView valueForKeyPath:@"documentView.webView.mainFrame.javaScriptContext"];
-    
-    
-//    [ljObject setJumpToVoidPageBlock:^{
-//
-//        id vc = [[NSClassFromString(@"ljDriverFollowCarInsuranceWritePolicyVC") alloc]init];
-//        [self.navigationController pushViewController:vc animated:YES];
-//    }];
-//
-//    [ljObject setJumpToPageBlock:^(NSString *linkUrl)
-//     {
-//         //JS的链接中有fuck这个字符串的话，就跳转
-//         if ([linkUrl rangeOfString:@"fuck"].location != NSNotFound)
-//         {
-//             id vc = [[NSClassFromString(@"ljVC") alloc]init];
-//             [self.navigationController pushViewController:vc animated:YES];
-//         }
-//     }];
-    
-//    NSString *alertJS=@"alert('Hello JS')";//这是利用OC调用JS所执行的命令
-//
-//    [context evaluateScript:alertJS];//通过oc方法调用js的alert
-//    [webView stringByEvaluatingJavaScriptFromString:@"document.getElementsByTagName('body')[0].style.webkitTextSizeAdjust= '78%'"];
-//    [webView stringByEvaluatingJavaScriptFromString:@"document.getElementsByTagName('body')[0].style.webkitTextFillColor= '#575757'"];
 }
 
 - (void)webView:(UIWebView *)webView didFailLoadWithError:(NSError *)error

shiku_im/shiku_im/shiku_im-Info.plist

@@ -33,7 +33,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>6.4.3</string>
+	<string>6.4.5</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>

shiku_im/shiku_im/zh-Hans.lproj/InfoPlist.strings

@@ -1056,7 +1056,7 @@
 "UU_DeviceInquiry" = "设备查询";
 "UU_UsingApplication" = "使用申请";
 "UU_ScrapApplication" = "报废申请";
-"UU_Maintenance" = "养护管理";
+"UU_Maintenance" = "保养维护";
 "UU_FaultSubmission" = "故障送检";
 "UU_Repair" = "设备维修";
 "UU_CycleInventory" = "周期盘点";

shiku_im/shiku_im/文件夹1/ProduceCity(产城服务)/Controllers/UASDocumentVC.m

@@ -1607,8 +1607,6 @@ static NSString *cellID = @"cellID";
         
     }];
     
-    
-    
 }
 
 
@@ -1638,7 +1636,7 @@ static NSString *cellID = @"cellID";
     
     manager1.requestSerializer = [AFHTTPRequestSerializer serializer];
     manager1.responseSerializer = [AFHTTPResponseSerializer serializer];
-   
+    
     NSString * urlAddress1=@"api/serve/getMultiNodeAssigns.action";
     
     NSString *str = [[NSUserDefaults standardUserDefaults] objectForKey:b2bSession];
@@ -1662,7 +1660,6 @@ static NSString *cellID = @"cellID";
         NSString *idString = @"";
         
         
-        
         for (id obj in rootDic[@"assigns"])
         {
             for (id obk in obj[@"JP_CANDIDATES"]) {

shiku_im/shiku_im/文件夹1/设备管理/viewcontellers/LYYDeviceMainVC.m

@@ -52,12 +52,13 @@ static NSString *cellID = @"stutus";
 }
 
 - (void)getData{
-    self.nameArr = @[Localized(@"UU_Scan"),Localized(@"UU_DeviceInquiry"),Localized(@"UU_UsingApplication"),Localized(@"UU_ScrapApplication"),Localized(@"UU_Maintenance"),Localized(@"UU_FaultSubmission"),Localized(@"UU_Repair"),Localized(@"UU_CycleInventory"),Localized(@"UU_Requirement"),Localized(@"UU_Stock"),Localized(@"UU_Batchtransfer"),Localized(@"UU_Statistics")];
+//    self.nameArr = @[Localized(@"UU_Scan"),Localized(@"UU_DeviceInquiry"),Localized(@"UU_UsingApplication"),Localized(@"UU_ScrapApplication"),Localized(@"UU_Maintenance"),Localized(@"UU_FaultSubmission"),Localized(@"UU_Repair"),Localized(@"UU_CycleInventory"),Localized(@"UU_Requirement"),Localized(@"UU_Stock"),Localized(@"UU_Batchtransfer"),Localized(@"UU_Statistics")];
+    self.nameArr = @[Localized(@"UU_Scan"),Localized(@"UU_DeviceInquiry"),Localized(@"UU_UsingApplication"),Localized(@"UU_ScrapApplication"),Localized(@"UU_Maintenance"),Localized(@"UU_FaultSubmission"),Localized(@"UU_CycleInventory"),Localized(@"UU_Requirement")];
     
     for (NSInteger i = 0; i < self.nameArr.count; i ++) {
         LYYDevieceMainModel *model = [LYYDevieceMainModel new];
         model.nameSting = self.nameArr[i];
-        model.imageString = FORMAT(@"UU_device_icon%ld",i);
+        model.imageString = FORMAT(@"icon_devicemanagement_nor%ld",i+1);
         [self.dataArr addObject:model];
     }
 
@@ -142,6 +143,7 @@ static NSString *cellID = @"stutus";
             dListVC.caller = @"DeviceChange!Repair";
             dListVC.mustStr = @"";
             [self.navigationController pushViewController:dListVC animated:YES];
+
         }
             break;
         case 7://周期盘点

shiku_im/shiku_im/文件夹1/设备管理/viewcontellers/搜索/LYYDMDataSearchVC.m

@@ -506,11 +506,14 @@ static NSString * cellID = @"cellID";
         }
 
     }else{
-        
         DeviceFormVC *vc = [DeviceFormVC new];
         vc.deviceCode = FORMAT(@"%@",model.listDic[@"de_code"]);
         vc.title = @"设备信息";
         [self.navigationController pushViewController:vc animated:YES];
+        
+//        DeviceFormVC *vc = [DeviceFormVC new];
+//        vc.deviceCode = FORMAT(@"%@",model.listDic[@"de_code"]);
+//        [self.navigationController pushViewController:vc animated:YES];
     }
 }
 

shiku_im/shiku_im/文件夹1/设备管理/viewcontellers/设备的盘点/LYYDMCheckDetailVC.m

@@ -34,9 +34,29 @@
 {
     self.title = @"设备盘点";
     [self.view addSubview:self.tableView];
+    [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.right.top.bottom.equalTo(self.view);
+    }];
+    
+    
     [self loadData];
-    BackView
+    
+    UIView *footer = [[UIView alloc]initWithFrame:CGRectMake(0, 0, self.view.width, self.view.height - (8 * 40) + 50)];
+    
+    [footer addSubview:self.tableView11];
+    
+    [self.tableView11 mas_makeConstraints:^(MASConstraintMaker *make) {
+       
+        make.edges.equalTo(footer);
+        
+    }];
+    
+    self.tableView.tableFooterView = footer;
+    
+    
     self.view.backgroundColor = BGKJ_COLOR;
+    
+    BackView
  
     _index = 1;
     
@@ -108,20 +128,25 @@
         _upLoadAgain2.backgroundColor = HexColor(@"#0092E0");
         _upLoadAgain2.layer.cornerRadius = 5;
         _upLoadAgain2.layer.masksToBounds = YES;
-        [_upLoadAgain2 addTarget:self action:@selector(upLoadAgainBackToView2) forControlEvents:UIControlEventTouchUpInside];
         [self.view addSubview:_upLoadAgain2];
         
         UILabel *lbl1 = [[UILabel alloc]init];
-        lbl1.text = @"获取明细";
         lbl1.textColor = [UIColor whiteColor];
         lbl1.font = FONT_SIZE(15);
         lbl1.textAlignment = NSTextAlignmentCenter;
         lbl1.backgroundColor = [UIColor clearColor];
         [_upLoadAgain2 addSubview:lbl1];
         [lbl1 mas_makeConstraints:^(MASConstraintMaker *make) {
-            
             make.left.right.top.bottom.equalTo(_upLoadAgain2);
         }];
+        
+        if ([g_master isEqualToString:@"N_MALATA_ZZ"] || [g_master isEqualToString:@"N_MALATA_ZZ_ZS"] ) {
+            lbl1.text = @"刷新";
+            [_upLoadAgain2 addTarget:self action:@selector(reloadDataFromSever) forControlEvents:UIControlEventTouchUpInside];
+        }else{
+            lbl1.text = @"获取明细";
+            [_upLoadAgain2 addTarget:self action:@selector(upLoadAgainBackToView2) forControlEvents:UIControlEventTouchUpInside];
+        }
     }
     return _upLoadAgain2;
     
@@ -176,6 +201,13 @@
     [self loadDataDetail];
     
 }
+
+#pragma mark ------刷新当前页面
+-(void)reloadDataFromSever
+{
+    [self loadData];
+}
+
 #pragma mark ----------------  获取设备盘点数据
 
 
@@ -387,13 +419,21 @@
 -(UITableView *)tableView11
 {
     if (_tableView11 == nil) {
-        _tableView11 = [[UITableView alloc] initWithFrame:CGRectMake(0,0, SCREEN_WIDTH,SCREEN_HEIGHT) style:UITableViewStylePlain];
+        _tableView11 = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStylePlain];
         
         _tableView11.delegate=self;
         _tableView11.dataSource=self;
         _tableView11.backgroundColor = Color(235, 233, 233, 1.0);
         _tableView11.tableFooterView = [[UIView alloc] initWithFrame:CGRectZero];
         _tableView11.separatorStyle = UITableViewCellSeparatorStyleNone;
+        @weakify(self)
+        _tableView11.mj_footer = [MJRefreshBackNormalFooter footerWithRefreshingBlock:^{
+            @strongify(self)
+            self.index++;
+            [self loadDataDetail];
+        }];
+        
+        
     }
     return _tableView11;
     
@@ -421,7 +461,7 @@
         if (self.dataArr.count == 0) {
             return 0;
         }
-        return self.dataArr.count+3;
+        return self.dataArr.count+2;
     }else{
         
         return self.detaiArr[section].count;
@@ -460,6 +500,7 @@
             [cell.contentView addSubview:self.upLoadAgain];
             [cell.contentView addSubview:self.upLoadAgain1];
             [cell.contentView addSubview:self.upLoadAgain2];
+            cell.selectionStyle = UITableViewCellSelectionStyleNone;
             [self.upLoadAgain1 mas_makeConstraints:^(MASConstraintMaker *make) {
                 make.left.equalTo(cell.contentView).offset(30);
                 make.bottom.equalTo(cell.contentView).offset(-5);
@@ -484,31 +525,44 @@
             self.tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
             return cell;
         }else{
-            static NSString *idstr = @"stutuseqa11";
-            UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:idstr ];
-            if (!cell) {
-                cell = [[UITableViewCell alloc] initWithStyle:UITableViewCellStyleSubtitle reuseIdentifier:idstr];
+            static NSString *idstr = @"UITableView11Reid";
+            UITableViewCell *cellOne = [tableView dequeueReusableCellWithIdentifier:idstr ];
+            if (!cellOne) {
+                cellOne = [[UITableViewCell alloc] initWithStyle:UITableViewCellStyleSubtitle reuseIdentifier:idstr];
                 
             }
-            [cell.contentView addSubview:self.tableView11];
-            self.tableView11.backgroundColor = [UIColor redColor];
-            [self.tableView11 mas_makeConstraints:^(MASConstraintMaker *make) {
-                make.top.equalTo(cell.contentView).offset(10);
-                make.right.left.bottom.equalTo(cell.contentView).offset(0);
+            UIView *footer = [UIView new];
+            
+            footer.backgroundColor = [UIColor redColor];
+            
+            
+            
+            [cellOne.contentView addSubview:footer];
+            
+            [footer mas_makeConstraints:^(MASConstraintMaker *make) {
+                
+                make.edges.equalTo(cellOne.contentView);
                 
             }];
-            @weakify(self)
-            self.tableView11.mj_footer = [MJRefreshBackNormalFooter footerWithRefreshingBlock:^{
-             @strongify(self)
-                _index++;
-                [self loadDataDetail];
+            
+            
+            [footer addSubview:self.tableView11];
+            
+            [self.tableView11 mas_makeConstraints:^(MASConstraintMaker *make) {
+                
+                make.edges.equalTo(footer);
+                
             }];
             
-            self.tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
-            return cell;
+            cellOne.selectionStyle = UITableViewCellSelectionStyleBlue;
+            
+            self.tableView11.separatorStyle = UITableViewCellSeparatorStyleNone;
+            
+            return cellOne;
             
         }
     }else{
+        
         LYYDMScanCell *cell = [LYYDMScanCell cellWithTableView:tableView];
         cell.model = self.detaiArr[indexPath.section][indexPath.row];
         return cell;
@@ -519,14 +573,14 @@
 }
 -(CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath
 {
-    if (self.tableView ==tableView) {
+    if (self.tableView == tableView) {
         if (indexPath.row == 8) {
             return 50;
-        }else if (indexPath.row ==9)
+        }else if (indexPath.row == 9)
         {
-            return SCREEN_HEIGHT-260;
-        }
-        return 40;
+            return (self.view.height - ((self.dataArr.count * 40) + 50));
+        }else
+            return 40;
         
     }else{
         return 40;

shiku_im/shiku_im/文件夹1/设备管理/views/LYYDMScanCell.m

@@ -118,6 +118,7 @@
         _namelLabel.font = FONT_SIZE(14);
         _namelLabel.textColor = Color(153, 153, 153, 1.0);
         _namelLabel.numberOfLines = 0;
+        
     }
     return _namelLabel;
 }
@@ -127,7 +128,8 @@
         _detailLabel = [UILabel new];
         _detailLabel.font = FONT_SIZE(14);
         _detailLabel.textAlignment = NSTextAlignmentRight;
-        _namelLabel.numberOfLines = 0;
+        _detailLabel.numberOfLines = 0;
+        
     }
     return _detailLabel;
 }
@@ -148,7 +150,12 @@
 }
 -(void)butAction:(UIButton *)sender{
     
-    self.block();
+    if (self.block) {
+        
+         self.block();
+        
+    }
+    
     
 }
 

shiku_im/shiku_im/文件夹3/MainView/UserInfo/UASUserInfo.m

@@ -17,6 +17,7 @@
     dispatch_once(&onceToken, ^{
         
         instance = [UASUserInfo new];
+        //默认是切换账套的状态，数据需要更新
         instance.masChanged = YES;
         //默认在大陆以及港澳地区
         instance.inRegion = YES;

shiku_im/shiku_im/文件夹3/工牌/ElectronicCardVC.m

@@ -260,7 +260,6 @@
             }
             [SVProgressHUD dismiss];
             
-            
         }else{
             ErrorInfomation
             [SVProgressHUD dismiss];