调整

shiku_im/Podfile.lock

@@ -39,7 +39,7 @@ PODS:
     - glog
   - glog (0.3.5)
   - HMSegmentedControl (1.5.5)
-  - IQKeyboardManager (6.4.2)
+  - IQKeyboardManager (6.5.0)
   - JWT (3.0.0-beta.11):
     - Base64 (~> 1.1.2)
   - Masonry (1.1.0)
@@ -114,8 +114,8 @@ PODS:
   - SDWebImage/Core (4.4.6)
   - SSZipArchive (2.2.2)
   - SVProgressHUD (2.2.5)
-  - TZImagePickerController (3.2.3)
-  - WechatOpenSDK (1.8.5)
+  - TZImagePickerController (3.2.4)
+  - WechatOpenSDK (1.8.6)
   - yoga (0.59.9.React)
 
 DEPENDENCIES:
@@ -208,30 +208,30 @@ SPEC CHECKSUMS:
   Base64: cecfb41a004124895a7bcee567a89bae5a89d49b
   boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c
   Bugtags: 3ea74dc1a2a0a24989c2243ab2e075bf60b48d56
-  CodePush: f6b348759cdc42c734d9c3a46ceb2997c270b12e
+  CodePush: b56e29c56dba8121898f601ca48a9a48b2ff5efb
   DoubleConversion: bb338842f62ab1d708ceb63ec3d999f0f3d98ecd
   EGOCache: 191fd213da6804d487b49b1a91772ba904f3e324
   FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
   Folly: de497beb10f102453a1afa9edbf8cf8a251890de
   glog: aefd1eb5dda2ab95ba0938556f34b98e2da3a60d
   HMSegmentedControl: f514c6dad47aa3065e0ed2e8046b73efc71221b9
-  IQKeyboardManager: b41e0a4943fbac4c11a239d31a688667675f962e
+  IQKeyboardManager: 700e5155d6a292383b54e8678aec769e14fc78fc
   JWT: 05028b9624591bba9681bb57df2c5f95fa258bad
   Masonry: 678fab65091a9290e40e2832a55e7ab731aad201
   MJExtension: d86aacb740c87519d20e3cca55b6fa4be6cc7548
   MJRefresh: ed450d6eb9d3346a2cb033ab7eb6de090aeef437
   pop: d582054913807fd11fd50bfe6a539d91c7e1a55a
-  React: 1d605e098d69bdf08960787f3446f0a9dc2e2ccf
-  react-native-orientation: 3d9a0a8273d18260f7528414093a6a36491382b6
+  React: a86b92f00edbe1873a63e4a212c29b7a7ad5224f
+  react-native-orientation: d4a97266b06ec8d45d74e626656a730ebbebbb6f
   ReactiveObjC: 011caa393aa0383245f2dcf9bf02e86b80b36040
-  RNGestureHandler: 7ccf2f3f60458e084f9ada01fbaf610f6fef073c
+  RNGestureHandler: 5329a942fce3d41c68b84c2c2276ce06a696d8b0
   SDWebImage: 3f3f0c02f09798048c47a5ed0a13f17b063572d8
   SSZipArchive: fa16b8cc4cdeceb698e5e5d9f67e9558532fbf23
   SVProgressHUD: 1428aafac632c1f86f62aa4243ec12008d7a51d6
-  TZImagePickerController: f321e8db6cd18dc6ac8e23694961c158a9345a87
-  WechatOpenSDK: 9b15110aba1d502456d8e83677357e6437f2e751
-  yoga: 128daf064cacaede0c3bb27424b6b4c71052e6cd
+  TZImagePickerController: d259369c5c2cc96299e53da868ae5be1b24353cd
+  WechatOpenSDK: 368ae03b72ee3ea1328c4f11326fbb5d2721d118
+  yoga: 03ff42a6f223fb88deeaed60249020d80c3091ee
 
 PODFILE CHECKSUM: f00721d7766f2faf58b2705be26d722d08151105
 
-COCOAPODS: 1.5.2
+COCOAPODS: 1.6.0

shiku_im/YRReactNVC.h

@@ -0,0 +1,17 @@
+//
+//  YRReactNVC.h
+//  UU_Ent
+//
+//  Created by huangyp-pc on 2019/9/26.
+//  Copyright © 2019 UAS. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface YRReactNVC : UASBaseVC
+
+@end
+
+NS_ASSUME_NONNULL_END

shiku_im/YRReactNVC.m

@@ -0,0 +1,13 @@
+//
+//  YRReactNVC.m
+//  UU_Ent
+//
+//  Created by huangyp-pc on 2019/9/26.
+//  Copyright © 2019 UAS. All rights reserved.
+//
+
+#import "YRReactNVC.h"
+
+@implementation YRReactNVC
+
+@end

shiku_im/shiku_im.xcodeproj/project.pbxproj

@@ -4758,7 +4758,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>"; };
@@ -18998,7 +18998,7 @@
 			files = (
 			);
 			inputPaths = (
-				"${SRCROOT}/Pods/Target Support Files/Pods-shiku_im/Pods-shiku_im-resources.sh",
+				"${PODS_ROOT}/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",
@@ -19017,7 +19017,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-shiku_im/Pods-shiku_im-resources.sh\"\n";
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-shiku_im/Pods-shiku_im-resources.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
 /* End PBXShellScriptBuildPhase section */
@@ -20378,10 +20378,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;
@@ -20424,10 +20424,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;
@@ -20462,12 +20462,13 @@
 				"CODE_SIGN_IDENTITY[sdk=*]" = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
+				CURRENT_PROJECT_VERSION = 6.0.0;
 				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 = (
@@ -20491,18 +20492,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)",
 				);
@@ -20533,8 +20534,49 @@
 					"$(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\"",
+				);
+				MARKETING_VERSION = 6.4.8;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = (
 					"-framework",
@@ -20581,12 +20623,13 @@
 				"CODE_SIGN_IDENTITY[sdk=*]" = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
+				CURRENT_PROJECT_VERSION = 6.0.0;
 				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 = (
@@ -20612,16 +20655,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)",
 				);
@@ -20629,7 +20672,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",
@@ -20657,6 +20700,7 @@
 					"$(PROJECT_DIR)/shiku_im/文件夹1/pay",
 					"$(PROJECT_DIR)/shiku_im/文件夹1/pay(支付宝)",
 				);
+				MARKETING_VERSION = 6.4.8;
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_LDFLAGS = (
 					"-framework",

shiku_im/shiku_im/JOABFriendsVC.m

@@ -105,6 +105,7 @@ NSString *cellId = @"cellResId";
     self.tableView=[[UITableView alloc]initWithFrame:self.view.frame style:UITableViewStylePlain];
     self.tableView.delegate=self;
     self.tableView.dataSource=self;
+    self.tableView.backgroundColor = BGKJ_COLOR;
     [self.view addSubview:self.tableView];
     
     

shiku_im/shiku_im/control/JXDatePicker.m

@@ -23,6 +23,24 @@
         datePicker.date = [NSDate date];
         [datePicker addTarget:self action:@selector(onDate:) forControlEvents:UIControlEventValueChanged];
         
+        unsigned int outCount;
+
+        int i;
+
+        objc_property_t *pProperty = class_copyPropertyList([UIDatePicker class], &outCount);
+
+        for (i = 0; i < outCount; i++){
+            
+            NSString *getPropertyName = [NSString stringWithCString:property_getName(pProperty[i]) encoding:NSUTF8StringEncoding];
+            
+//            NSString *getPropertyNameString = [NSString stringWithCString:property_getAttributes(pProperty[i]) encoding:NSUTF8StringEncoding];
+            
+            if([getPropertyName isEqualToString:@"textColor"]){
+                [datePicker setValue:[UIColor blackColor] forKey:@"textColor"];
+                
+            }
+        }
+        
         [self addSubview:datePicker];
         [datePicker release];
         

shiku_im/shiku_im/controller/ClientReportVC.m

@@ -487,6 +487,7 @@
         UILabel *title = [[UILabel alloc]initWithFrame:CGRectMake(10, 10+40*i, 120, 30)];
         title.font = FONT_SIZE(14);
         title.numberOfLines = 1;
+        title.textColor = [UIColor blackColor];
         [_scrollV addSubview:title];
         if ([must[i] isEqualToString:@"1"]) {
             title.attributedText = AttributedStr;
@@ -511,6 +512,9 @@
     _startDate.autocapitalizationType = UITextAutocapitalizationTypeNone;
     _startDate.enablesReturnKeyAutomatically = YES;
     _startDate.borderStyle = UITextBorderStyleRoundedRect;
+    _startDate.layer.borderColor = [UIColor lightGrayColor].CGColor;
+    _startDate.layer.borderWidth = 0.5;
+    _startDate.layer.cornerRadius = 5;
     _startDate.returnKeyType = UIReturnKeyDone;
     //    _startDate.clearButtonMode = UITextFieldViewModeAlways;
     _startDate.userInteractionEnabled = YES;
@@ -530,6 +534,9 @@
     _endDate.autocapitalizationType = UITextAutocapitalizationTypeNone;
     _endDate.enablesReturnKeyAutomatically = YES;
     _endDate.borderStyle = UITextBorderStyleRoundedRect;
+    _endDate.layer.borderColor = [UIColor lightGrayColor].CGColor;
+    _endDate.layer.borderWidth = 0.5;
+    _endDate.layer.cornerRadius = 5;
     _endDate.returnKeyType = UIReturnKeyDone;
     //    _endDate.clearButtonMode = UITextFieldViewModeAlways;
     _endDate.userInteractionEnabled = YES;
@@ -1386,6 +1393,9 @@
     tf.tag = 1000+num;
     tf.returnKeyType = UIReturnKeyDone;
     tf.borderStyle = UITextBorderStyleRoundedRect;
+    tf.layer.borderColor = [UIColor lightGrayColor].CGColor;
+    tf.layer.borderWidth = 0.5;
+    tf.layer.cornerRadius = 5;
     tf.backgroundColor = BGKJ_COLOR;
     tf.delegate = self;
     tf.placeholder = title;

shiku_im/shiku_im/controller/DocumentListVC.m

@@ -84,13 +84,16 @@ static NSString *cellID = @"cellID";
     _searchBar = [[UISearchBar alloc] initWithFrame:CGRectMake(0, 0, self.view.frame.size.width, 44)];
     _searchBar.placeholder = Localized(@"UU_custom_search");
     _searchBar.delegate = self;
+    _searchBar.searchTextField.backgroundColor = BGKJ_COLOR;
+    _searchBar.backgroundImage = [UIImageView createImageWithColor:BGB_COLOR];
     //添加 searchBar 到 headerView
     UIView *tableHeaderView = [[UIView alloc] init];
     [tableHeaderView addSubview:_searchBar];
     tableHeaderView.height = 44;
     [_tableView setTableHeaderView:tableHeaderView];
-    UIView * uv = [[UIView alloc]initWithFrame:CGRectMake(SCREEN_WIDTH-48, 7.5, 40, 30)];
+    UIView * uv = [[UIView alloc]initWithFrame:CGRectMake(SCREEN_WIDTH-51, 7.5, 40, 30)];
     uv.userInteractionEnabled = YES;
+    uv.backgroundColor = BGKJ_COLOR;
     self.uv = uv;
     
     UITapGestureRecognizer * tapges =[[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(clickVoiceSearch)];

shiku_im/shiku_im/controller/JODidSubscribleTableViewCell.m

@@ -19,7 +19,7 @@
         self.lable2.numberOfLines = 0;
         self.lable2.verticalAlignment = NSTextVerticalAlignmentTop;
         self.lable2.font = FONT_SIZE(13);
-        
+        self.lable2.textColor = [UIColor blackColor];
         
         self.button2 = [[ZXsubButton alloc]initWithFrame:CGRectMake(SCREEN_WIDTH-100,10, 90, 20)];
         self.button2.titleLabel.font = FONT_SIZE(13);
@@ -29,7 +29,7 @@
         [self.contentView addSubview:self.image2];
         [self.contentView addSubview:self.lable2];
         [self.contentView addSubview:self.button2];
-        
+        self.contentView.backgroundColor = BGKJ_COLOR;
     }
     return self;
 }

shiku_im/shiku_im/controller/JOMsgViewController.m

@@ -4098,9 +4098,9 @@
                 
             }else if ( [p.user.userId isEqualToString:UAS_SEEPLANEL_ID] || [p.user.userNickname isEqualToString:@"实时看板"])
             {
-                LYYSeePlanVC *vc = [[LYYSeePlanVC alloc] init];
-                [self.navigationController pushViewController:vc animated:YES];
-                
+                LYYSeePlanVC *seePlan = [LYYSeePlanVC new];
+                seePlan.title = @"实时看板";
+                [self.navigationController pushViewController:seePlan animated:YES];
             }
             
             

shiku_im/shiku_im/controller/JONewEnterContructVC.m

@@ -68,7 +68,7 @@
  
     [super viewDidLoad];
     
-    self.view.backgroundColor=[UIColor whiteColor];
+    self.view.backgroundColor = BGKJ_COLOR;
     height=0;
     countOfbtn=0;
     wightOfBtn=0;
@@ -223,6 +223,7 @@
     _leftTableView.dataSource=self;
     _leftTableView.showsHorizontalScrollIndicator=NO;
     _leftTableView.showsVerticalScrollIndicator=NO;
+    _leftTableView.backgroundColor = BGKJ_COLOR;
     [self.view addSubview:_leftTableView];
     
     [self setExtraCellLineHidden:_leftTableView];
@@ -969,7 +970,7 @@
         UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:ID];
         if (!cell) {
             cell = [[UITableViewCell alloc] initWithStyle:UITableViewCellStyleSubtitle reuseIdentifier:ID];
-            
+            cell.backgroundColor = BGKJ_COLOR;
         }
         
         cell.textLabel.font=FONT_SIZE(14);
@@ -983,7 +984,7 @@
             cell.textLabel.text=model2.EM_NAME;
             cell.textLabel.lineBreakMode = UILineBreakModeWordWrap;
             cell.textLabel.numberOfLines = 0;
-
+            cell.textLabel.textColor = [UIColor blackColor];
              cell.userInteractionEnabled=YES;
             
 //            UIImageView * playCard=[[UIImageView alloc]initWithFrame:CGRectMake(widthOftable-30,10,20,20)];
@@ -1007,7 +1008,7 @@
             cell.textLabel.lineBreakMode = UILineBreakModeWordWrap;
             cell.textLabel.numberOfLines = 0;
             cell.userInteractionEnabled=YES;
-            
+            cell.textLabel.textColor = [UIColor blackColor];
             [cell.contentView.subviews makeObjectsPerformSelector:@selector(removeFromSuperview)];
            
             if (Joindex==indexPath.row)
@@ -1031,11 +1032,11 @@
         if (!cell) {
             
             cell = [[UITableViewCell alloc] initWithStyle:UITableViewCellStyleSubtitle reuseIdentifier:ID];
-            
+            cell.backgroundColor = BGKJ_COLOR;
         }
         
         cell.textLabel.font=FONT_SIZE(14);
-       
+       cell.textLabel.textColor = [UIColor blackColor];
         
         cell.selectionStyle=UITableViewCellSelectionStyleNone;
         
@@ -1049,6 +1050,7 @@
             cell.textLabel.lineBreakMode = UILineBreakModeWordWrap;
             cell.textLabel.numberOfLines = 0;
             cell.userInteractionEnabled=YES;
+            cell.textLabel.textColor = [UIColor blackColor];
             
             UIImageView * playCard=[[UIImageView alloc]initWithFrame:CGRectMake(widthOftable*2-40,10,20,20)];
             playCard.image=[UIImage imageNamed:@"uu_addBookphone"];
@@ -1073,6 +1075,7 @@
             cell.textLabel.lineBreakMode = UILineBreakModeWordWrap;
             cell.textLabel.numberOfLines = 0;
             cell.userInteractionEnabled=YES;
+            cell.textLabel.textColor = [UIColor blackColor];
             [cell.contentView.subviews makeObjectsPerformSelector:@selector(removeFromSuperview)];
 
         }

shiku_im/shiku_im/controller/JONewPersonDetailVC.m

@@ -38,11 +38,13 @@
     UILabel * title=[[UILabel alloc]initWithFrame:CGRectMake(10,5,60,40)];
     title.text=self.titleString;
     title.font=FONT_SIZE(16);
+    title.textColor = [UIColor blackColor];
     [self.contentView addSubview:title];
     
     
     UILabel * nrong=[[UILabel alloc]initWithFrame:CGRectMake(70,5,200,40)];
     nrong.text=self.neirongString;
+    nrong.textColor = [UIColor blackColor];
     nrong.font=FONT_SIZE(14);
     
     [self.contentView addSubview:nrong];
@@ -219,6 +221,7 @@
     _dataTableView=[[UITableView alloc]initWithFrame:CGRectMake(0,HEIGHT,self_width, HEIGHT) style:UITableViewStylePlain];
     _dataTableView.delegate=self;
     _dataTableView.dataSource=self;
+    _dataTableView.backgroundColor = BGKJ_COLOR;
     [self setExtraCellLineHidden:_dataTableView];
     [self.view addSubview:_dataTableView];
 

shiku_im/shiku_im/controller/JOSpecialAttentionVC.m

@@ -50,6 +50,7 @@
     self.tableView=[[UITableView alloc]initWithFrame:CGRectMake(0,0,self_width,self_height) style:UITableViewStylePlain];
     self.tableView.delegate=self;
     self.tableView.dataSource=self;
+    self.tableView.backgroundColor = BGKJ_COLOR;
     [self.view addSubview:self.tableView];
     
      [self setUpSearchBar];

shiku_im/shiku_im/controller/JOTableViewCell.m

@@ -19,7 +19,7 @@
         self.lable1.verticalAlignment = NSTextVerticalAlignmentTop;
         self.lable1.numberOfLines = 0;
         self.lable1.font = FONT_SIZE(12);
-        
+        self.lable1.textColor = [UIColor blackColor];
         
         self.button1 = [[ZXsubButton alloc]initWithFrame:CGRectMake(SCREEN_WIDTH -100-88,7.8, 90, 20)];
         
@@ -29,7 +29,7 @@
         [self.contentView addSubview:self.image1];
         [self.contentView addSubview:self.lable1];
         [self.contentView addSubview:self.button1];
-        
+        self.contentView.backgroundColor = BGKJ_COLOR;
     }
     return self;
 }

shiku_im/shiku_im/controller/NewSubscribleManageViewController.m

@@ -139,6 +139,7 @@ static  NSString * cellID2 = @"cellID2";
     _LeftTableView.delegate = self;
     _LeftTableView.dataSource = self;
     _LeftTableView.separatorStyle = NO;
+    _LeftTableView.backgroundColor = BGKJ_COLOR;
     [UIView setExtraCellLineHidden:_LeftTableView];
 //    _LeftTableView.backgroundColor = [UIColor lightGrayColor];
     [self.view addSubview:_LeftTableView];
@@ -164,6 +165,7 @@ static  NSString * cellID2 = @"cellID2";
     _RightTableView.dataSource = self;
 //    _RightTableView.separatorStyle = NO;
     [_RightTableView registerClass:[JOTableViewCell class] forCellReuseIdentifier:cellID1];
+    _RightTableView.backgroundColor = BGKJ_COLOR;
     
     [UIView setExtraCellLineHidden:_RightTableView];
     [self.view addSubview:_imageV];
@@ -204,6 +206,7 @@ static  NSString * cellID2 = @"cellID2";
     _DidSubscribleTableView.dataSource = self;
     _DidSubscribleTableView.rowHeight = 50+cellScale;
     _DidSubscribleTableView.hidden = YES;
+    _DidSubscribleTableView.backgroundColor = BGKJ_COLOR;
     [_DidSubscribleTableView registerClass:[JODidSubscribleTableViewCell class] forCellReuseIdentifier:cellID2];
     [UIView setExtraCellLineHidden:_DidSubscribleTableView];
     
@@ -475,15 +478,16 @@ static  NSString * cellID2 = @"cellID2";
     if (cell == nil)
     {
         cell = [[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:cellID];
-//        cell.backgroundColor = [UIColor lightGrayColor];
+        cell.backgroundColor = BGKJ_COLOR;
     }
         if (_bigTitle2.count !=0) {
             
             cell.textLabel.text =[NSString stringWithFormat:@"%@",_bigTitle2[indexPath.row]];
             cell.textLabel.font = FONT_SIZE(12);
+            cell.textLabel.textColor = [UIColor blackColor];
             cell.textLabel.numberOfLines = 0;
             cell.selectedTextColor = [UIColor redColor];
-
+            
         }
         
     return cell;

shiku_im/shiku_im/controller/QiangShangjiVC.m

@@ -87,10 +87,13 @@ static NSString *cellID = @"cellID";
     _searchBar = [[UISearchBar alloc] initWithFrame:CGRectMake(0, 0, self.view.frame.size.width, 44)];
     _searchBar.placeholder = Localized(@"UU_custom_search");
     _searchBar.delegate = self;
+    _searchBar.searchTextField.backgroundColor = BGKJ_COLOR;
+    _searchBar.backgroundImage = [UIImageView createImageWithColor:BGB_COLOR];
     //    _searchBar.showsCancelButton = YES;
     //添加 searchBar 到 headerView
-    UIView * uv = [[UIView alloc]initWithFrame:CGRectMake(SCREEN_WIDTH-48, 7.5, 40, 30)];
+    UIView * uv = [[UIView alloc]initWithFrame:CGRectMake(SCREEN_WIDTH-51, 7.5, 40, 30)];
     uv.userInteractionEnabled = YES;
+    uv.backgroundColor = BGKJ_COLOR;
     self.uv = uv;
     //    uv.backgroundColor = [UIColor redColor];
     UITapGestureRecognizer * tapges =[[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(clickVoiceSearch)];

shiku_im/shiku_im/controller/YPCalendarVC.m

@@ -361,6 +361,7 @@ static NSString *cellID = @"cellID";
     _startDayTime.textAlignment = NSTextAlignmentCenter;
     _startDayTime.numberOfLines = 0;
     [_sigmenView addSubview:_startDayTime];
+    _startDayTime.textColor = [UIColor blackColor];
     
     NSString *sTime = [_kaishiTime substringWithRange:NSMakeRange(0, _kaishiTime.length-3)];;
     sTime = [sTime stringByReplacingOccurrencesOfString: @"-" withString: @"."];
@@ -372,6 +373,7 @@ static NSString *cellID = @"cellID";
     _endDayTime.textAlignment = NSTextAlignmentCenter;
     _endDayTime.numberOfLines = 0;
     [_sigmenView addSubview:_endDayTime];
+    _endDayTime.textColor = [UIColor blackColor];
     
     NSString *dTime = [_jieshuTime substringWithRange:NSMakeRange(0, _jieshuTime.length-3)];;
     dTime = [dTime stringByReplacingOccurrencesOfString: @"-" withString: @"."];

shiku_im/shiku_im/controller/myOA/ERPNewTaskViewController.m

@@ -330,7 +330,7 @@ static NSString *ID = @"status11";
     [_scrollView addSubview:FirstView];
     
     UILabel * FirstLable = [[UILabel alloc]initWithFrame:CGRectMake(10, 5, 100, 30)];
-    
+    FirstLable.textColor = [UIColor blackColor];
     NSString *titleName =  Localized(@"UU_message_doJob_newTask_taskName");
     NSMutableAttributedString *AttributedStr = [[NSMutableAttributedString alloc]initWithString:FORMAT(@"%@*",titleName)];
     [AttributedStr addAttribute:NSForegroundColorAttributeName
@@ -360,6 +360,7 @@ static NSString *ID = @"status11";
     [_scrollView addSubview:SecondView];
     
     UILabel * SecondLable = [[UILabel alloc]initWithFrame:CGRectMake(10, 5, 100, 20)];
+    SecondLable.textColor = [UIColor blackColor];
     NSString *titleName1 =  Localized(@"UU_message_doJob_newTask_taskDetail");
     NSMutableAttributedString *AttributedStr1 = [[NSMutableAttributedString alloc]initWithString:FORMAT(@"%@*",titleName1)];
     [AttributedStr1 addAttribute:NSForegroundColorAttributeName
@@ -454,6 +455,7 @@ static NSString *ID = @"status11";
             cell.detailTextLabel.text = self.selModel.emname;
         
     }
+    cell.backgroundColor = BGKJ_COLOR;
     return cell;
     
     

shiku_im/shiku_im/controller/myOA/JOHYTableViewController.m

@@ -87,6 +87,7 @@
     self.tableView = [[UITableView alloc]initWithFrame:CGRectMake(0, 0, self_width, self_height)];;
     self.tableView.delegate=self;
     self.tableView.dataSource=self;
+    self.tableView.backgroundColor = BGKJ_COLOR;
     self.tableView.tableFooterView = [UIView new];
     [self.view addSubview:self.tableView];
 //    [self.tableView addEmptyViewWithImageName:@"crm_all_noData" title:nil];
@@ -96,7 +97,7 @@
     _searchBar.delegate = self;
     _searchBar.tintColor=[UIColor orangeColor];
     _searchBar.backgroundImage = [UIImageView createImageWithColor:BGB_COLOR];
-    _searchBar.backgroundColor=[UIColor whiteColor];
+    _searchBar.searchTextField.backgroundColor = [UIColor whiteColor];
    
     UIView * uv = [[UIView alloc]initWithFrame:CGRectMake(SCREEN_WIDTH-48, 7.5, 40, 30)];
     uv.userInteractionEnabled = YES;

shiku_im/shiku_im/controller/myOA/JOOASetUpViewController.m

@@ -140,6 +140,9 @@
     //设置返回按钮功能
     _TitleField.returnKeyType=UIReturnKeyDone;
     _TitleField.borderStyle=UITextBorderStyleRoundedRect;
+    _TitleField.layer.borderColor = [UIColor lightGrayColor].CGColor;
+    _TitleField.layer.borderWidth = 0.5;
+    _TitleField.layer.cornerRadius = 5;
     _TitleField.font = FONT_SIZE(13);
     _TitleField.backgroundColor = BGKJ_COLOR;
     _TitleField.placeholder=@"请输入";
@@ -153,6 +156,9 @@
     //设置返回按钮功能
     _carryPeople.returnKeyType=UIReturnKeyDone;
     _carryPeople.borderStyle=UITextBorderStyleRoundedRect;
+    _carryPeople.layer.borderColor = [UIColor lightGrayColor].CGColor;
+    _carryPeople.layer.borderWidth = 0.5;
+    _carryPeople.layer.cornerRadius = 5;
     _carryPeople.font = FONT_SIZE(13);
     _carryPeople.backgroundColor = BGKJ_COLOR;
     _carryPeople.placeholder=@"请选择";
@@ -174,6 +180,9 @@
     //设置返回按钮功能
     _BeginDate.returnKeyType=UIReturnKeyDone;
     _BeginDate.borderStyle=UITextBorderStyleRoundedRect;
+    _BeginDate.layer.borderColor = [UIColor lightGrayColor].CGColor;
+    _BeginDate.layer.borderWidth = 0.5;
+    _BeginDate.layer.cornerRadius = 5;
     _BeginDate.font = FONT_SIZE(13);
     _BeginDate.backgroundColor = BGKJ_COLOR;
     _BeginDate.userInteractionEnabled=NO;
@@ -193,6 +202,9 @@
     //设置返回按钮功能
     _endDate.returnKeyType=UIReturnKeyDone;
     _endDate.borderStyle=UITextBorderStyleRoundedRect;
+    _endDate.layer.borderColor = [UIColor lightGrayColor].CGColor;
+    _endDate.layer.borderWidth = 0.5;
+    _endDate.layer.cornerRadius = 5;
     _endDate.font = FONT_SIZE(13);
     _endDate.backgroundColor = BGKJ_COLOR;
     _endDate.userInteractionEnabled=NO;
@@ -213,6 +225,9 @@
     //设置返回按钮功能
     _emergency_degree.returnKeyType=UIReturnKeyDone;
     _emergency_degree.borderStyle=UITextBorderStyleRoundedRect;
+    _emergency_degree.layer.borderColor = [UIColor lightGrayColor].CGColor;
+    _emergency_degree.layer.borderWidth = 0.5;
+    _emergency_degree.layer.cornerRadius = 5;
     _emergency_degree.font = FONT_SIZE(13);
     _emergency_degree.backgroundColor = BGKJ_COLOR;
     _emergency_degree.text=@"请选择";
@@ -232,6 +247,9 @@
     //设置返回按钮功能
     _typeOfRW.returnKeyType=UIReturnKeyDone;
     _typeOfRW.borderStyle=UITextBorderStyleRoundedRect;
+    _typeOfRW.layer.borderColor = [UIColor lightGrayColor].CGColor;
+    _typeOfRW.layer.borderWidth = 0.5;
+    _typeOfRW.layer.cornerRadius = 5;
     _typeOfRW.userInteractionEnabled = NO;
     _typeOfRW.font = FONT_SIZE(13);
     _typeOfRW.backgroundColor = BGKJ_COLOR;

shiku_im/shiku_im/controller/myOA/工作汇报/LYYWorkreportMainVC.m

@@ -44,6 +44,7 @@
         LYYButtonView *btn  = [[LYYButtonView alloc] initWithFrame:CGRectMake(((self_width)/3)*i, 0, (self_width-4)/3, (self_width-4)/3-30)];
         btn.backgroundColor = BGKJ_COLOR;
         btn.lab.text = arr[i];
+        btn.lab.textColor = [UIColor blackColor];
         [btn.btn addTarget:self action:@selector(btnAction:) forControlEvents:UIControlEventTouchUpInside];
         btn.imgView.image = [UIImage imageNamed:imageArr[i]];
         btn.btn.tag = i;

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

@@ -2677,7 +2677,7 @@
         [parmArr addObject:parmStr];
     }
     if (_FD_model.fpd_mainID.length != 0 && _FD_model.fpd_mainID.length>0 ) {
-        [formStore setObject:_FD_model.nameFpd_mainID forKey:_FD_model.fpd_mainID];
+        [formStore setObject:FORMAT(@"%@",_FD_model.nameFpd_mainID) forKey:_FD_model.fpd_mainID];
     }
     
     

shiku_im/shiku_im/controller/新的详情/UASNewapprovalprocessVC.m

@@ -601,12 +601,13 @@
 }
 -(void)createSearchBar{
     UIView *titleView = [[UIView alloc] initWithFrame:CGRectMake(0, 7,SCREEN_WIDTH-90, 30)];
+    titleView.backgroundColor = BGKJ_COLOR;
     UISearchBar *searchBar = [[UISearchBar alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH-90, 30)];
     searchBar.backgroundImage = [UIImage imageNamed:@"clearImage"];
     searchBar.delegate = self;
     searchBar.returnKeyType = UIReturnKeySearch;
     searchBar.tintColor = Color(69, 92, 255, 1);
-    searchBar.backgroundColor = [UIColor whiteColor];
+    searchBar.backgroundColor = BGKJ_COLOR;
     searchBar.layer.cornerRadius = 4;
     searchBar.layer.masksToBounds = YES;
     if (self.style == NOfineshTask) {
@@ -629,11 +630,13 @@
     
     
     UITextField *searchField = iOS13 ? searchBar.searchTextField : [searchBar valueForKey:@"_searchField"];
+    searchField.backgroundColor = BGKJ_COLOR;
     [searchField setLeftViewMode:UITextFieldViewModeNever];
     
     UIView * view = [[UIView alloc]initWithFrame:CGRectMake(CGRectGetMaxX(searchBar.frame)-30, 0, 30, 30)];
     
     view.userInteractionEnabled = YES;
+    view.backgroundColor = BGKJ_COLOR;
     UITapGestureRecognizer * tapges =[[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(clickVoiceSearch)];
     UIButton * btn  = [[UIButton alloc]initWithFrame:CGRectMake(9,7 , 16,16 )];
     [btn setBackgroundImage:[UIImage imageNamed:@"icon-searcher-custom"] forState:UIControlStateNormal];

shiku_im/shiku_im/controller/预约小秘书/共享预约/ShareListVC.m

@@ -356,10 +356,13 @@ static NSString *cellID = @"cellID";
     _searchBar = [[UISearchBar alloc] initWithFrame:CGRectMake(0, 0, self.view.frame.size.width, 44)];
     _searchBar.placeholder = Localized(@"UU_custom_search");
     _searchBar.delegate = self;
+    _searchBar.backgroundColor = BGKJ_COLOR;
+    _searchBar.searchTextField.backgroundColor = BGKJ_COLOR;
     //    _searchBar.showsCancelButton = YES;
     //添加 searchBar 到 headerView
     UIView * uv = [[UIView alloc]initWithFrame:CGRectMake(SCREEN_WIDTH-48, 7.5, 40, 30)];
     uv.userInteractionEnabled = YES;
+    uv.backgroundColor = BGKJ_COLOR;
     self.uv = uv;
     //    uv.backgroundColor = [UIColor redColor];
     UITapGestureRecognizer * tapges =[[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(clickVoiceSearch)];
@@ -374,6 +377,7 @@ static NSString *cellID = @"cellID";
     UIView *tableHeaderView = [[UIView alloc] init];
     [tableHeaderView addSubview:_searchBar];
     tableHeaderView.height = 44;
+    tableHeaderView.backgroundColor = BGKJ_COLOR;
     [_tableView setTableHeaderView:tableHeaderView];
     [self initRecognizer1];
     

shiku_im/shiku_im/shiku_im-Info.plist

@@ -33,7 +33,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>6.4.7</string>
+	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -112,7 +112,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>6.0.1</string>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>CodePushDeploymentKey</key>
 	<string>$(CODEPUSH_KEY)</string>
 	<key>CodePushServerURL</key>

shiku_im/shiku_im/shiku_im-Prefix.pch

@@ -360,6 +360,6 @@ else{\
 #import "UASBaseVC.h"
 #import "UITableView+WFEmpty.h"
 #import <HMSegmentedControl/HMSegmentedControl.h>
-
+#import "UITextField+extension.h"
 
 #endif

shiku_im/shiku_im/一元捐/项目列表/选择支付界面/ZXPayView.m

@@ -384,7 +384,10 @@
                         req.timeStamp           = stamp.intValue;
                         req.package             = [dict objectForKey:@"package"];
                         req.sign                = [dict objectForKey:@"sign"];
-                        [WXApi sendReq:req];
+//                        [WXApi sendReq:req];
+                        [WXApi sendReq:req completion:^(BOOL success) {
+                            
+                        }];
                 
                     }
                 }else{

shiku_im/shiku_im/文件夹1/CRM3.0/商机管理/Controllers/MyNicheViewController.m

@@ -190,6 +190,7 @@ static NSString *cellID = @"cellID";
         _tableView.dataSource = self;
         _tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
         _tableView.showsVerticalScrollIndicator = NO;
+        _tableView.backgroundColor = BGKJ_COLOR;
     }
     return _tableView;
 }

shiku_im/shiku_im/文件夹1/CRM3.0/商机管理/Controllers/NicheManageVC.m

@@ -265,6 +265,7 @@ static NSString *cellID = @"cellID";
     UILabel *title = [UILabel new];
     title.text = _headerTitle[section];
     title.font = FONT_SIZE(12);
+    title.textColor = [UIColor blackColor];
     
     UIButton *Hbtn = [UIButton new];
     Hbtn.tag = section;
@@ -311,6 +312,7 @@ static NSString *cellID = @"cellID";
             lbl.text = _mainButton[i];
             lbl.font = FONT_SIZE(12);
             lbl.textAlignment = NSTextAlignmentCenter;
+            lbl.textColor = [UIColor blackColor];
             [btn addSubview:lbl];
             [lbl mas_makeConstraints:^(MASConstraintMaker *make) {
                 make.left.right.equalTo(btn);
@@ -841,6 +843,7 @@ static NSString *cellID = @"cellID";
         _tableView.dataSource = self;
         _tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
         _tableView.showsVerticalScrollIndicator = NO;
+        _tableView.backgroundColor = BGKJ_COLOR;
     }
     return _tableView;
 }

shiku_im/shiku_im/文件夹1/CRM3.0/商机管理/Controllers/NicheSearchVC.m

@@ -192,6 +192,8 @@
     _searchBar = [[UISearchBar alloc] initWithFrame:CGRectMake(0, 0, self.view.frame.size.width, 44)];
     _searchBar.placeholder = Localized(@"UU_custom_search");
     _searchBar.delegate = self;
+    _searchBar.searchTextField.backgroundColor = BGKJ_COLOR;
+    _searchBar.backgroundImage = [UIImageView createImageWithColor:BGB_COLOR];
     //添加 searchBar 到 headerView
     UIView *tableHeaderView = [[UIView alloc] init];
     [tableHeaderView addSubview:_searchBar];
@@ -218,6 +220,7 @@
         _tableView.dataSource = self;
         _tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
         _tableView.showsVerticalScrollIndicator = NO;
+        _tableView.backgroundColor = BGKJ_COLOR;
     }
     return _tableView;
 }

shiku_im/shiku_im/文件夹1/CRM3.0/商机管理/Views/NicheMainCell.m

@@ -163,6 +163,7 @@
         make.width.mas_equalTo(SCREEN_WIDTH/2);
     }];
     
+    self.contentView.backgroundColor = BGKJ_COLOR;
 }
 
 -(void)setModel:(NichePanelModel *)model
@@ -352,6 +353,8 @@
         make.right.bottom.equalTo(self);
         make.height.mas_equalTo(1);
     }];
+    
+    self.contentView.backgroundColor = BGKJ_COLOR;
 }
 
 -(void)setBaseStr:(NSString *)baseStr

shiku_im/shiku_im/文件夹1/CRM3.0/客户管理/Controllers/UASClientDocuSearchVC.m

@@ -702,6 +702,7 @@ UIImageView *_noDataImage;//没数据图片
         
         _searchBar.backgroundImage = image;
         _searchBar.placeholder = @"搜索";
+        _searchBar.searchTextField.backgroundColor = BGKJ_COLOR;
     }
     
     return _searchBar;

shiku_im/shiku_im/文件夹1/CRM3.0/客户管理/Views/UASClientMaAccountCell.m

@@ -64,6 +64,7 @@
     [self.contentView addSubview:self.visitPlanCountL];
     [self.contentView addSubview:self.visitReportL];
     [self.contentView addSubview:self.visitReportCountL];
+    self.contentView.backgroundColor = BGKJ_COLOR;
     
     [self.nameL mas_makeConstraints:^(MASConstraintMaker *make) {
         
@@ -161,7 +162,7 @@
         _nameL.textAlignment = NSTextAlignmentCenter;
         _nameL.font = FONT_SIZE(15);
         _nameL.text = @"黄岩";
-        
+        _nameL.textColor = HexColor(@"#666666");
     }
     
     return _nameL;

shiku_im/shiku_im/文件夹1/CRM3.0/客户管理/Views/UASClientMaCell.m

@@ -81,6 +81,7 @@
     //    _titleLabel.lineBreakMode = NSLineBreakByCharWrapping;
     //    _titleLabel.numberOfLines = 2;
     _titleLabel.font = FONT_SIZE(13);
+    _titleLabel.textColor = [UIColor blackColor];
     return _titleLabel;
 }
 

shiku_im/shiku_im/文件夹1/CRM3.0/联系人管理/view/UASCRMALTableViewcell2.m

@@ -32,6 +32,7 @@
         //cell点击没效果
         self.selectionStyle=UITableViewCellSelectionStyleNone;
         // 裁剪看不到的
+        self.backgroundColor = BGKJ_COLOR;
         
         [self setView];
         
@@ -103,7 +104,7 @@
     if (!_nameLabel) {
         _nameLabel = [UILabel new];
         _nameLabel.font = FONT_SIZE(15);
-        
+        _nameLabel.textColor = [UIColor blackColor];
     }
     return _nameLabel;
     

shiku_im/shiku_im/文件夹1/CRM3.0/联系人管理/viewcontrller/UASCRMAddressListVC.m

@@ -201,7 +201,8 @@ static CNContactPickerViewController * peoplePickVC;
     self.searchBar = searchBar;
     [titleView addSubview:self.searchBar];
     [titleView addSubview:btn];
-    
+    _searchBar.searchTextField.backgroundColor = BGKJ_COLOR;
+    _searchBar.backgroundImage = [UIImageView createImageWithColor:BGB_COLOR];
     
     UIView *VocieView = [[UIView alloc] initWithFrame:CGRectMake(CGRectGetMaxX(searchBar.frame)-30, 0, 30, 30)];
     VocieView.userInteractionEnabled  = YES;
@@ -219,10 +220,10 @@ static CNContactPickerViewController * peoplePickVC;
     
     UIButton *navRightbtn2 = [UIButton buttonWithType:UIButtonTypeCustom];
     navRightbtn2.frame = CGRectMake(0, 5, 30, 30);
-    UIImage *AddImage  = [UIImage imageNamed:@"crm_main_add"];
-  
-    navRightbtn2.imageRect = CGRectMake(20, 8, 20, 20);
-    [navRightbtn2 setImage:AddImage forState:UIControlStateNormal];
+    UIImageView *imageV = [[UIImageView alloc]initWithFrame:CGRectMake(10, 10, 15, 15)];
+    imageV.image = [UIImage imageNamed:@"crm_main_add"];
+    imageV.userInteractionEnabled = YES;
+    [navRightbtn2 addSubview:imageV];
     
     [navRightbtn2 addTarget:self action:@selector(clickRightButton) forControlEvents:UIControlEventTouchUpInside];
     UIBarButtonItem *bbi2 = [[UIBarButtonItem alloc]initWithCustomView:navRightbtn2];

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

@@ -2100,11 +2100,11 @@
 {
     
     
-    UASBaseVC *rn = [NSClassFromString(@"YRReactVC") new];
-
-    rn.title = @"REACTNATIVE";
-
-    [self.navigationController pushViewController:rn animated:YES];
+//    UASBaseVC *rn = [NSClassFromString(@"YRReactVC") new];
+//
+//    rn.title = @"REACTNATIVE";
+//
+//    [self.navigationController pushViewController:rn animated:YES];
 //
 //    return;
 

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

@@ -39,7 +39,8 @@
     [self.contentView addSubview:self.leftImageV];
     [self.contentView addSubview:self.titleLabel];
     [self.contentView addSubview:self.rightImageV];
-   
+    self.contentView.backgroundColor = BGKJ_COLOR;
+    
     [self.leftImageV mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.equalTo(self.contentView).offset(15);
         make.width.height.mas_equalTo(20);
@@ -132,7 +133,7 @@
     if (!_titleLabel) {
         
         _titleLabel = [UILabel new];
-        
+        _titleLabel.textColor = [UIColor blackColor];
     }
     
     return _titleLabel;

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

@@ -44,6 +44,9 @@
     
     [self.contentView addSubview:self.header];
     
+//    self.contentView.backgroundColor = BGKJ_COLOR;
+    self.backgroundColor = BGKJ_COLOR;
+    
     [self.header mas_makeConstraints:^(MASConstraintMaker *make) {
         
         make.top.equalTo(self.contentView).offset(8);
@@ -284,7 +287,7 @@
         _titleLabel = [UILabel new];
         _titleLabel.backgroundColor = [UIColor whiteColor];
         _titleLabel.textAlignment = NSTextAlignmentLeft;
-        
+        _titleLabel.textColor = [UIColor blackColor];
     }
     
     return _titleLabel;

shiku_im/shiku_im/文件夹1/工资条/工资查询/View/EnterPriseWageCell.m

@@ -19,6 +19,7 @@
 //        self.textField.backgroundColor = [UIColor redColor];
         [self.contentView addSubview:self.textField];
         
+        self.contentView.backgroundColor = BGKJ_COLOR;
     }
     return self;
     

shiku_im/shiku_im/文件夹1/日程管理/Controllers/ScheduleManageVC.m

@@ -761,6 +761,7 @@ static NSString *cellID = @"cellID";
         _tableView.rowHeight = 60;
         _tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
         _tableView.showsVerticalScrollIndicator = NO;
+        _tableView.backgroundColor = BGKJ_COLOR;
     }
     return _tableView;
 }

shiku_im/shiku_im/文件夹1/日程管理/Controllers/ScheduleSearchVC.m

@@ -176,6 +176,7 @@ static NSString *cellID = @"cellID";
         _tableView.dataSource = self;
         _tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
         _tableView.showsVerticalScrollIndicator = NO;
+        _tableView.backgroundColor = BGKJ_COLOR;
     }
     return _tableView;
 }

shiku_im/shiku_im/文件夹1/日程管理/Controllers/UASScheduleSetVC.m

@@ -144,7 +144,9 @@
     
     cell.textLabel.text = self.dataArr[indexPath.section][indexPath.row].title;
     cell.detailTextLabel.text = self.dataArr[indexPath.section][indexPath.row].subTitle;
-    
+    cell.textLabel.textColor = [UIColor blackColor];
+    cell.detailTextLabel.textColor = [UIColor blackColor];
+    cell.backgroundColor = BGKJ_COLOR;
     return cell;
     
 }

shiku_im/shiku_im/文件夹1/日程管理/Views/CreatScheduleCell.m

@@ -62,6 +62,8 @@
         make.top.bottom.equalTo(self);
         make.right.equalTo(_rowImageV.mas_left).offset(-5);
     }];
+    
+    self.contentView.backgroundColor = BGKJ_COLOR;
 }
 
 - (void)awakeFromNib {

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

@@ -126,7 +126,8 @@ static NSString * cellID = @"cellID";
     searchBar.delegate = self;
     searchBar.returnKeyType = UIReturnKeySearch;
     searchBar.tintColor = Color(69, 92, 255, 1);
-    searchBar.backgroundColor = [UIColor whiteColor];
+    searchBar.searchTextField.backgroundColor = BGKJ_COLOR;
+    searchBar.backgroundImage = [UIImageView createImageWithColor:BGKJ_COLOR];
     searchBar.layer.cornerRadius = 5;
     searchBar.layer.masksToBounds = YES;
     if (![self.caller isEqualToString:@"Device"]) {
@@ -149,6 +150,7 @@ static NSString * cellID = @"cellID";
     UIView * uv = [[UIView alloc]initWithFrame:CGRectMake(CGRectGetMaxX(titleView.frame)-30, 0, 30, 30)];
     uv.userInteractionEnabled = YES;
     self.uv = uv;
+    uv.backgroundColor = BGKJ_COLOR;
     UITapGestureRecognizer * tapges =[[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(clickVoiceSearch)];
     UIButton * btn  = [[UIButton alloc]initWithFrame:CGRectMake(9,7 , 16,16 )];
     [btn setBackgroundImage:[UIImage imageNamed:@"icon-searcher-custom"] forState:UIControlStateNormal];

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

@@ -118,7 +118,8 @@
     searchBar.delegate = self;
     searchBar.returnKeyType = UIReturnKeySearch;
     searchBar.tintColor = Color(69, 92, 255, 1);
-    searchBar.backgroundColor = [UIColor whiteColor];
+    searchBar.searchTextField.backgroundColor = BGKJ_COLOR;
+    searchBar.backgroundImage = [UIImageView createImageWithColor:BGB_COLOR];
     searchBar.layer.cornerRadius = 4;
     searchBar.layer.masksToBounds = YES;
     if ([self.caller isEqualToString:@"DeviceBatch!Use"]) {
@@ -140,6 +141,7 @@
     self.searchBar = searchBar;
     UIView * uv = [[UIView alloc]initWithFrame:CGRectMake(CGRectGetMaxX(titleView.frame)-30, 0, 30, 30)];
     uv.userInteractionEnabled = YES;
+    uv.backgroundColor = BGKJ_COLOR;
     self.uv = uv;
     UITapGestureRecognizer * tapges =[[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(clickVoiceSearch)];
     UIButton * btn  = [[UIButton alloc]initWithFrame:CGRectMake(9,7 , 16,16 )];

shiku_im/shiku_im/文件夹1/设备管理2.0/Controllers/StockSearchVC.m

@@ -285,6 +285,7 @@ static NSString *cellID = @"cellID";
     UITextField  *textFiled = [[UITextField alloc]initWithFrame:CGRectMake(100, 10+tag*40,self_width-110, 30)];
     textFiled.returnKeyType = UIReturnKeyDone;
     textFiled.borderStyle = UITextBorderStyleRoundedRect;
+    textFiled.layer.borderColor = [[UIColor lightGrayColor] colorWithAlphaComponent:0.4].CGColor;
     textFiled.autocorrectionType = UITextAutocorrectionTypeNo;
     textFiled.autocapitalizationType = UITextAutocapitalizationTypeNone;
     textFiled.layer.cornerRadius = 5.0;
@@ -293,6 +294,8 @@ static NSString *cellID = @"cellID";
     textFiled.delegate = self;
     textFiled.placeholder = str;
     textFiled.font = FONT_SIZE(13);
+    textFiled.backgroundColor = BGKJ_COLOR;
+    [textFiled setPlaceHolderColor:[UIColor lightGrayColor]];
     return textFiled;
 }
 
@@ -301,6 +304,7 @@ static NSString *cellID = @"cellID";
     UILabel *lbl = [[UILabel alloc]initWithFrame:CGRectMake(10, 10+hang*40 ,90 , 30)];
     lbl.text = FORMAT(@"%@",text);
     lbl.font = FONT_SIZE(15);
+    lbl.textColor = [UIColor blackColor];
     return lbl;
 }
 

shiku_im/shiku_im/文件夹3/ChildView/PersonalDataVC.m

@@ -112,6 +112,8 @@ static NSString *cellID = @"cellID";
     
     cell.textLabel.text = _titleArr[indexPath.section][indexPath.row];
     cell.detailTextLabel.text = _detailArr[indexPath.section][indexPath.row];
+    cell.textLabel.textColor = [UIColor blackColor];
+    cell.detailTextLabel.textColor = [UIColor blackColor];
     
     if (indexPath.section == 0) {
         cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator;
@@ -134,6 +136,7 @@ static NSString *cellID = @"cellID";
         }
     }
     
+    cell.backgroundColor = BGKJ_COLOR;
     return cell;
 }
 

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

@@ -703,29 +703,30 @@ static NSString *cellID = @"cellID";
 
 -(UIView *)pickerView:(UIPickerView *)pickerView viewForRow:(NSInteger)row forComponent:(NSInteger)component reusingView:(UIView *)view{
     UILabel *lbl = (UILabel *)view;
-
+    
     if (lbl == nil) {
-
-    lbl = [[UILabel alloc]init];
-
-    //在这里设置字体相关属性
-
-    lbl.font = [UIFont systemFontOfSize:20];
-
-    lbl.textColor = [UIColor blackColor];
-
-    [lbl setTextAlignment:1];
-
-    [lbl setBackgroundColor:BGKJ_COLOR];
-
+        
+        lbl = [[UILabel alloc]init];
+        
+        //在这里设置字体相关属性
+        
+        lbl.font = [UIFont systemFontOfSize:20];
+        
+        lbl.textColor = [UIColor blackColor];
+        
+        [lbl setTextAlignment:1];
+        
+        [lbl setBackgroundColor:BGKJ_COLOR];
+        
     }
-
+    
     //重新加载lbl的文字内容
-
+    
     lbl.text = [self pickerView:pickerView titleForRow:row forComponent:component];
-
+    
     return lbl;
 }
+
 #pragma mark --- 切换账套
 -(void)changeMaster
 {