1.提示框完善

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>"; };
@@ -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,8 +20163,48 @@
 					"$(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",
@@ -20211,10 +20251,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 = (
@@ -20240,16 +20280,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)",
 				);
@@ -20257,7 +20297,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/Register&Login/loginVC.m

@@ -64,7 +64,6 @@
         
         [self setUpUI];
         
-        
     }
     return self;
 }
@@ -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/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/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/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

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

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/文件夹3/MainView/UserInfo/UASUserInfo.m

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