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

shiku_im/Podfile.lock

@@ -93,4 +93,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: 2e58a501fbc028fd37151a6316b97f5594e0e1d5
 
-COCOAPODS: 1.6.0
+COCOAPODS: 1.5.2

shiku_im/shiku_im.xcodeproj/project.pbxproj

@@ -4710,7 +4710,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>"; };
@@ -18651,7 +18651,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",
@@ -18670,7 +18670,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 */
@@ -20012,10 +20012,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;
@@ -20056,10 +20056,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;
@@ -20094,10 +20094,10 @@
 				CODE_SIGN_STYLE = Manual;
 				DEVELOPMENT_TEAM = D49MF83EK7;
 				DOUBANGO_LIBS = "";
-				"DOUBANGO_LIBS[arch=arm64]" = $DOUBANGO_HOME/thirdparties/iphone/lib/arm64;
-				"DOUBANGO_LIBS[arch=armv6]" = $DOUBANGO_HOME/thirdparties/iphone/lib/armv6;
-				"DOUBANGO_LIBS[arch=armv7]" = $DOUBANGO_HOME/thirdparties/iphone/lib/armv7;
-				"DOUBANGO_LIBS[arch=armv7s]" = $DOUBANGO_HOME/thirdparties/iphone/lib/armv7s;
+				"DOUBANGO_LIBS[arch=arm64]" = "$DOUBANGO_HOME/thirdparties/iphone/lib/arm64";
+				"DOUBANGO_LIBS[arch=armv6]" = "$DOUBANGO_HOME/thirdparties/iphone/lib/armv6";
+				"DOUBANGO_LIBS[arch=armv7]" = "$DOUBANGO_HOME/thirdparties/iphone/lib/armv7";
+				"DOUBANGO_LIBS[arch=armv7s]" = "$DOUBANGO_HOME/thirdparties/iphone/lib/armv7s";
 				"DOUBANGO_LIBS[sdk=iphonesimulator*][arch=*]" = "";
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -20121,18 +20121,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)",
 				);
@@ -20163,48 +20163,8 @@
 					"$(PROJECT_DIR)/shiku_im/文件夹1/pay",
 					"$(PROJECT_DIR)/shiku_im/文件夹1/pay(支付宝)",
 				);
-				"LIBRARY_SEARCH_PATHS[arch=*]" = (
-					"$(PROJECT_DIR)/shiku_im/LibBPush",
-					"$(PROJECT_DIR)/shiku_im/amr_wav/VoiceConvert/lib",
-					"$(PROJECT_DIR)/shiku_im/audioRecorder",
-					"$(PROJECT_DIR)/shiku_im/RSA/include",
-					"$(PROJECT_DIR)/shiku_im/Vendor/libidn",
-					"$(PROJECT_DIR)/shiku_im/RSA",
-					"$(PROJECT_DIR)/shiku_im/admob5.05",
-					"$(PROJECT_DIR)/shiku_im",
-					"$(PROJECT_DIR)",
-					"$(PROJECT_DIR)/shiku_im/controller/MapChoseLocation",
-					"$(PROJECT_DIR)/shiku_im/person/UMSocial/SocialLibraries/QQ",
-					"$(PROJECT_DIR)/shiku_im/person/UMSocial/SocialLibraries/Sina",
-					"$(PROJECT_DIR)/shiku_im/person/UMSocial/SocialLibraries/Wechat",
-					"\"$PODS_CONFIGURATION_BUILD_DIR/MJRefresh\"",
-					"\"$PODS_CONFIGURATION_BUILD_DIR/AFNetworking\"",
-					"\"$PODS_CONFIGURATION_BUILD_DIR/SVProgressHUD\"",
-					"\"$PODS_CONFIGURATION_BUILD_DIR/ReactiveObjC\"",
-					"\"$PODS_CONFIGURATION_BUILD_DIR/Masonry\"",
-					"$(inherited)",
-					"\"$PODS_CONFIGURATION_BUILD_DIR/IQKeyboardManager\"",
-				);
-				"LIBRARY_SEARCH_PATHS[sdk=iphonesimulator*]" = (
-					"$(inherited)",
-					$DOUBANGO_LIBS,
-					"$(SRCROOT)/shiku_im/Vendor/libidn",
-					"$(PROJECT_DIR)/shiku_im/RSA",
-					"$(PROJECT_DIR)/shiku_im/youMeng",
-					"$(PROJECT_DIR)/shiku_im/audioRecorder",
-					"$(SRCROOT)/shiku_im/amr_wav/VoiceConvert/lib",
-					"$(PROJECT_DIR)/shiku_im/admob5.05",
-					"$(PROJECT_DIR)/shiku_im/person/UMSocial/SocialLibraries/QQ",
-					"$(PROJECT_DIR)/shiku_im/person/UMSocial/SocialLibraries/Sina",
-					"$(PROJECT_DIR)/shiku_im/person/UMSocial/SocialLibraries/Wechat",
-					"\"$PODS_CONFIGURATION_BUILD_DIR/MJRefresh\"",
-					"\"$PODS_CONFIGURATION_BUILD_DIR/AFNetworking\"",
-					"\"$PODS_CONFIGURATION_BUILD_DIR/SVProgressHUD\"",
-					"\"$PODS_CONFIGURATION_BUILD_DIR/ReactiveObjC\"",
-					"\"$PODS_CONFIGURATION_BUILD_DIR/Masonry\"",
-					"$(inherited)",
-					"\"$PODS_CONFIGURATION_BUILD_DIR/IQKeyboardManager\"",
-				);
+				"LIBRARY_SEARCH_PATHS[arch=*]" = "$(PROJECT_DIR)/shiku_im/LibBPush $(PROJECT_DIR)/shiku_im/amr_wav/VoiceConvert/lib $(PROJECT_DIR)/shiku_im/audioRecorder $(PROJECT_DIR)/shiku_im/RSA/include $(PROJECT_DIR)/shiku_im/Vendor/libidn $(PROJECT_DIR)/shiku_im/RSA $(PROJECT_DIR)/shiku_im/admob5.05 $(PROJECT_DIR)/shiku_im $(PROJECT_DIR) $(PROJECT_DIR)/shiku_im/controller/MapChoseLocation $(PROJECT_DIR)/shiku_im/person/UMSocial/SocialLibraries/QQ $(PROJECT_DIR)/shiku_im/person/UMSocial/SocialLibraries/Sina $(PROJECT_DIR)/shiku_im/person/UMSocial/SocialLibraries/Wechat \"$PODS_CONFIGURATION_BUILD_DIR/MJRefresh\" \"$PODS_CONFIGURATION_BUILD_DIR/AFNetworking\" \"$PODS_CONFIGURATION_BUILD_DIR/SVProgressHUD\" \"$PODS_CONFIGURATION_BUILD_DIR/ReactiveObjC\" \"$PODS_CONFIGURATION_BUILD_DIR/Masonry\" $(inherited) \"$PODS_CONFIGURATION_BUILD_DIR/IQKeyboardManager\"";
+				"LIBRARY_SEARCH_PATHS[sdk=iphonesimulator*]" = "$(inherited) $DOUBANGO_LIBS $(SRCROOT)/shiku_im/Vendor/libidn $(PROJECT_DIR)/shiku_im/RSA $(PROJECT_DIR)/shiku_im/youMeng $(PROJECT_DIR)/shiku_im/audioRecorder $(SRCROOT)/shiku_im/amr_wav/VoiceConvert/lib $(PROJECT_DIR)/shiku_im/admob5.05 $(PROJECT_DIR)/shiku_im/person/UMSocial/SocialLibraries/QQ $(PROJECT_DIR)/shiku_im/person/UMSocial/SocialLibraries/Sina $(PROJECT_DIR)/shiku_im/person/UMSocial/SocialLibraries/Wechat \"$PODS_CONFIGURATION_BUILD_DIR/MJRefresh\" \"$PODS_CONFIGURATION_BUILD_DIR/AFNetworking\" \"$PODS_CONFIGURATION_BUILD_DIR/SVProgressHUD\" \"$PODS_CONFIGURATION_BUILD_DIR/ReactiveObjC\" \"$PODS_CONFIGURATION_BUILD_DIR/Masonry\" $(inherited) \"$PODS_CONFIGURATION_BUILD_DIR/IQKeyboardManager\"";
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = (
 					"-framework",
@@ -20251,10 +20211,10 @@
 				CODE_SIGN_STYLE = Manual;
 				DEVELOPMENT_TEAM = D49MF83EK7;
 				DOUBANGO_LIBS = "";
-				"DOUBANGO_LIBS[arch=arm64]" = $DOUBANGO_HOME/thirdparties/iphone/lib/arm64;
-				"DOUBANGO_LIBS[arch=armv6]" = $DOUBANGO_HOME/thirdparties/iphone/lib/armv6;
-				"DOUBANGO_LIBS[arch=armv7]" = $DOUBANGO_HOME/thirdparties/iphone/lib/armv7;
-				"DOUBANGO_LIBS[arch=armv7s]" = $DOUBANGO_HOME/thirdparties/iphone/lib/armv7s;
+				"DOUBANGO_LIBS[arch=arm64]" = "$DOUBANGO_HOME/thirdparties/iphone/lib/arm64";
+				"DOUBANGO_LIBS[arch=armv6]" = "$DOUBANGO_HOME/thirdparties/iphone/lib/armv6";
+				"DOUBANGO_LIBS[arch=armv7]" = "$DOUBANGO_HOME/thirdparties/iphone/lib/armv7";
+				"DOUBANGO_LIBS[arch=armv7s]" = "$DOUBANGO_HOME/thirdparties/iphone/lib/armv7s";
 				"DOUBANGO_LIBS[sdk=iphonesimulator*][arch=*]" = "";
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -20280,16 +20240,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)",
 				);
@@ -20297,7 +20257,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
-					$DOUBANGO_LIBS,
+					"$DOUBANGO_LIBS",
 					"$(SRCROOT)/shiku_im/Vendor/libidn",
 					"$(PROJECT_DIR)/shiku_im/RSA",
 					"$(PROJECT_DIR)/shiku_im/youMeng",

shiku_im/shiku_im/AppDelegate.mm

@@ -58,7 +58,6 @@
 #import "UASWorkManager.h"
 #import "NSString+secri.h"
 #import <MapKit/MapKit.h>
-#import <MapKit/MapKit.h>
 //#import "UICKeyChainStore.h"
 #undef TAG
 #define kTAG @"AppDelegate///: "

shiku_im/shiku_im/controller/AlertView/UASAlertView.m

@@ -25,9 +25,13 @@ static UASAlertView *alert = nil;
         
         alert = [[UASAlertView alloc]initWithFrame:[UIScreen mainScreen].bounds];
         
+        alert.windowLevel = UIWindowLevelAlert;
         
         alert.backgroundColor = [[UIColor blackColor] colorWithAlphaComponent:0.2f];
         
+        UIViewController *viewC = [UIViewController new];
+        
+        alert.rootViewController = viewC;
         
         [alert makeKeyAndVisible];
         

shiku_im/shiku_im/controller/UASMainVC.m

@@ -415,13 +415,13 @@
 
 -(NSDictionary *)getParametersWithUrl:(NSString *)url{
     
-    
+    //先转换成字符串
     if (![url isKindOfClass:[NSString class]]) {
         
         url = [NSString stringWithFormat:@"%@",url];
         
     }
-    
+    //提取问号后面的参数字符
     NSRange range = [url rangeOfString:@"?"];
     
     if (range.location == NSNotFound) {
@@ -429,7 +429,7 @@
         return [NSDictionary new];
         
     }
-    
+    //如果未提取到直接返回空
     if ([url containsString:@"?undefined"]) {
         
         return [NSDictionary new];

shiku_im/shiku_im/controller/myOA/JOHYXQTableViewController.m

@@ -90,7 +90,7 @@
     [self setNavi];
     [self setTwoBtn];
     //暂时不要
-    //[self getXQfromServerWithID:self.hyModel.ma_code];
+//    [self getXQfromServerWithID:self.hyModel.ma_code];
     [self getcanhuiranyuan];
     [self setMainUI];
     

shiku_im/shiku_im/controller/myOA/JOOutWorkPlanVC.m

@@ -751,9 +751,6 @@
     {
         [JOShowMessageFromNavi showDropViewWithMessage:@"当前网络环境不佳,建议切换到4G网络" ToNavi:self.navigationController withColor:nil];
     }
-
-    
-    
     
 
 }

shiku_im/shiku_im/controller/myOA/JOWQSCDKViewController.m

@@ -1011,7 +1011,7 @@
     //接口
     NSString * urlAddress=@"mobile/oa/saveOutSign.action";
     //Caller
-    NSString * caller=@"Mobile_outsign";
+    NSString * caller=@"c";
     
     /**
      1,打卡地址

shiku_im/shiku_im/controller/myOA/UASButton.m

@@ -138,7 +138,7 @@
         UIGraphicsEndImageContext();
         
         return image;
-
+    
     
 }
 

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

@@ -67,7 +67,6 @@
  */
 @property(strong,nonatomic)NSTimer *punchTime;
 
-
 /**
  是否自动内勤
  */
@@ -2909,7 +2908,7 @@
     NSString *str1=[NSString dictionaryToJson:formStore1];
     NSString * userName = [[NSUserDefaults standardUserDefaults] stringForKey:@"personName"];
     
-    userName = userName != nil ? userName : @"";
+    userName = (userName != nil ? userName : @"");
     
     NSDictionary *dic11 = [NSDictionary dictionaryWithObjectsAndKeys:@"",@"param",
                            str1,@"formStore",

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

@@ -432,10 +432,6 @@
 - (void)cancel
 {
    
-    
-    
-    
-  
             if (_UPDate_model) {
                 if ([_textField01.text isEqualToString:_UPDate_model.WD_COMMENT]&& [_textField02.text isEqualToString:_UPDate_model.WD_PLAN] && [_textField03.text isEqualToString:_UPDate_model.WD_EXPERIENCE]) {
                   [self tiaozhuanliebiao];

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

@@ -127,7 +127,6 @@
         
     } failure:^(NSURLSessionDataTask *task, NSError *error) {
         [MBProgressHUD hideHUDForView:self.view];
-        DLog(@"请求失败：%@",error);
         ErrorInfomation
         
     }];

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

@@ -1002,9 +1002,9 @@
             CNContactStore *store = [[CNContactStore alloc] init];
             [store requestAccessForEntityType:CNEntityTypeContacts completionHandler:^(BOOL granted, NSError*  _Nullable error) {
                 if (error) {
-                    NSLog(@"授权失败");
+                    DLog(@"授权失败");
                 }else {
-                    NSLog(@"成功授权");
+                    DLog(@"成功授权");
                 }
             }];
             

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

@@ -104,8 +104,6 @@
 - (void)viewDidLoad {
     [super viewDidLoad];
     
-    
-    
 }
 
 - (void)didReceiveMemoryWarning {
@@ -146,6 +144,7 @@
         [UASUserInfo shareManager].masChanged = NO;
         //获取缓存数据
         [self getAllData];
+        
         //获取网络更新数据
         [self configUUApplicationFromServer];
         //预加载商城网页
@@ -407,9 +406,6 @@
     
     [self.tableView reloadData];
     
-   
-    
-    
 }
 
 
@@ -941,13 +937,14 @@
 //        [self.navigationController pushViewController:sVC animated:YES];
         [self moveToScheduleVC];
         
-    }else if ([Localized(model.title) isEqualToString:Localized(@"UU_work_CRM_Contact")] || [model.modelId isEqual:@"100037"]){
+    }else if ([Localized(model.title) isEqualToString:Localized(@"UU_work_CRM_Contact")] || [model.modelId isEqual:@"100037"]){//联系人
         UASCRMAddressListVC *vc = [UASCRMAddressListVC new];
         vc.type = 1;
         [self.navigationController pushViewController:vc animated:YES];
     }
     else{//从服务器拿的数据
         
+
         if ([model.caller isEqualToString:@"ProdInOut!Sale"]) {
             //泽天-出货单特殊处理：跳转列表界面
             
@@ -962,6 +959,7 @@
             return;
             
         }
+
         
         if (model.caller.length > 0) {
            
@@ -1025,6 +1023,7 @@
 }
 
 #pragma mark - 网络服务
+//通过该接口利用网络数据对UU应用的数据显示与否进行控制
 -(void)configUUApplicationFromServer{
     
    //http://113.105.74.140:8092/user/appMenu
@@ -1095,7 +1094,7 @@
     
     
 }
-
+//获取服务器新的配置通用表单数据
 -(void)getAllDataFromServerWithData:(NSMutableArray *)arr{
 
     

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

@@ -151,8 +151,6 @@
             }
         }];
         
-       
-        
         return;
         
     }