修改IOS客户端灰度发布需求

IpuLib/IpuLib.xcodeproj/xcuserdata/mac.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -12,7 +12,7 @@
		<key>IpuLib.xcscheme_^#shared#^_</key>
		<dict>
			<key>orderHint</key>
			<integer>7</integer>
			<integer>4</integer>
		</dict>
		<key>IpuLib4Appstore.xcscheme</key>
		<dict>
@@ -22,7 +22,7 @@
		<key>IpuLib4Appstore.xcscheme_^#shared#^_</key>
		<dict>
			<key>orderHint</key>
			<integer>14</integer>
			<integer>3</integer>
		</dict>
		<key>IpuLib4Develop.xcscheme</key>
		<dict>
@@ -32,7 +32,7 @@
		<key>IpuLib4Develop.xcscheme_^#shared#^_</key>
		<dict>
			<key>orderHint</key>
			<integer>15</integer>
			<integer>5</integer>
		</dict>
	</dict>
</dict>

SuperMenu/SuperMenu.xcodeproj/xcuserdata/mac.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -12,7 +12,7 @@
		<key>SuperMenu.xcscheme_^#shared#^_</key>
		<dict>
			<key>orderHint</key>
			<integer>3</integer>
			<integer>2</integer>
		</dict>
	</dict>
</dict>

WadeMobileFunc/WadeMobileFunc.xcodeproj/project.pbxproj

@@ -38,13 +38,13 @@
		01FC20812007700C00FA8B40 /* WDFSocial.h in Headers */ = {isa = PBXBuildFile; fileRef = 01FC207D2007700C00FA8B40 /* WDFSocial.h */; settings = {ATTRIBUTES = (Public, ); }; };
		0429A26021805228003CEE83 /* WDFResourceVersion.m in Sources */ = {isa = PBXBuildFile; fileRef = 0429A25E21805228003CEE83 /* WDFResourceVersion.m */; };
		0429A26121805228003CEE83 /* WDFResourceVersion.h in Headers */ = {isa = PBXBuildFile; fileRef = 0429A25F21805228003CEE83 /* WDFResourceVersion.h */; settings = {ATTRIBUTES = (Public, ); }; };
		04327F3522F9642400B7670A /* WDFScreenCapture.h in Headers */ = {isa = PBXBuildFile; fileRef = 04327F3322F9642400B7670A /* WDFScreenCapture.h */; };
		04327F3522F9642400B7670A /* WDFScreenCapture.h in Headers */ = {isa = PBXBuildFile; fileRef = 04327F3322F9642400B7670A /* WDFScreenCapture.h */; settings = {ATTRIBUTES = (Public, ); }; };
		04327F3622F9642400B7670A /* WDFScreenCapture.m in Sources */ = {isa = PBXBuildFile; fileRef = 04327F3422F9642400B7670A /* WDFScreenCapture.m */; };
		0455D01A224B4DEC006B3F28 /* WDFTipsHUD.h in Headers */ = {isa = PBXBuildFile; fileRef = 0455D018224B4DEC006B3F28 /* WDFTipsHUD.h */; settings = {ATTRIBUTES = (Public, ); }; };
		0455D01B224B4DEC006B3F28 /* WDFTipsHUD.m in Sources */ = {isa = PBXBuildFile; fileRef = 0455D019224B4DEC006B3F28 /* WDFTipsHUD.m */; };
		046DC4F1211D21BC00BCA3F5 /* WDFImageCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 046DC4EF211D21BC00BCA3F5 /* WDFImageCache.h */; settings = {ATTRIBUTES = (Public, ); }; };
		046DC4F2211D21BC00BCA3F5 /* WDFImageCache.m in Sources */ = {isa = PBXBuildFile; fileRef = 046DC4F0211D21BC00BCA3F5 /* WDFImageCache.m */; };
		04B7AB5D22FBCE57009B6449 /* IPUGrayPlugin.h in Headers */ = {isa = PBXBuildFile; fileRef = 04B7AB5B22FBCE57009B6449 /* IPUGrayPlugin.h */; };
		04B7AB5D22FBCE57009B6449 /* IPUGrayPlugin.h in Headers */ = {isa = PBXBuildFile; fileRef = 04B7AB5B22FBCE57009B6449 /* IPUGrayPlugin.h */; settings = {ATTRIBUTES = (Public, ); }; };
		04B7AB5E22FBCE57009B6449 /* IPUGrayPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 04B7AB5C22FBCE57009B6449 /* IPUGrayPlugin.m */; };
		0A0A235D1CACB92100947564 /* WDFMobileContacts.h in Headers */ = {isa = PBXBuildFile; fileRef = 0A0A235B1CACB92100947564 /* WDFMobileContacts.h */; settings = {ATTRIBUTES = (Public, ); }; };
		0A0A235E1CACB92100947564 /* WDFMobileContacts.m in Sources */ = {isa = PBXBuildFile; fileRef = 0A0A235C1CACB92100947564 /* WDFMobileContacts.m */; };
@@ -457,6 +457,8 @@
			isa = PBXHeadersBuildPhase;
			buildActionMask = 2147483647;
			files = (
				04327F3522F9642400B7670A /* WDFScreenCapture.h in Headers */,
				04B7AB5D22FBCE57009B6449 /* IPUGrayPlugin.h in Headers */,
				0455D01A224B4DEC006B3F28 /* WDFTipsHUD.h in Headers */,
				B2E8BEB82175D89700A06A13 /* ImageDetailViewController.h in Headers */,
				B2E8BEBA2175D89700A06A13 /* WDFCustomCamera.h in Headers */,
@@ -480,14 +482,12 @@
				0A0A235D1CACB92100947564 /* WDFMobileContacts.h in Headers */,
				E2DE1B0F1B42DE6A00762141 /* WDFMobileLocation.h in Headers */,
				E2DE1B0D1B42DE6A00762141 /* WDFMobileFile.h in Headers */,
				04327F3522F9642400B7670A /* WDFScreenCapture.h in Headers */,
				E2DE1B151B42DE6A00762141 /* WDFMobileUI.h in Headers */,
				B2ADA4292186DEDB00F0E722 /* IpuAuthentication.h in Headers */,
				E2DE1B111B42DE6A00762141 /* WDFMobileNetwork.h in Headers */,
				E2DE1B131B42DE6A00762141 /* WDFMobileStorage.h in Headers */,
				B21A33FC20B516A700920072 /* WDFSystemPermissionPlugin.h in Headers */,
				E2DE1B091B42DE6A00762141 /* WDFMobileBasic.h in Headers */,
				04B7AB5D22FBCE57009B6449 /* IPUGrayPlugin.h in Headers */,
			);
			runOnlyForDeploymentPostprocessing = 0;
		};
@@ -550,7 +550,6 @@
					};
					E2DE1AD31B42DD9500762141 = {
						CreatedOnToolsVersion = 6.3.2;
						DevelopmentTeam = AKH3YVA3CT;
						ProvisioningStyle = Manual;
					};
				};
@@ -859,7 +858,7 @@
				CODE_SIGN_IDENTITY = "iPhone Developer";
				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
				DEFINES_MODULE = YES;
				DEVELOPMENT_TEAM = AKH3YVA3CT;
				DEVELOPMENT_TEAM = "";
				DYLIB_COMPATIBILITY_VERSION = 1;
				DYLIB_CURRENT_VERSION = 1;
				DYLIB_INSTALL_NAME_BASE = "@rpath";
@@ -876,7 +875,7 @@
				);
				INFOPLIST_FILE = WadeMobileFunc/Info.plist;
				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
				IPHONEOS_DEPLOYMENT_TARGET = 9.3;
				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
				LIBRARY_SEARCH_PATHS = (
					"$(inherited)",
@@ -902,7 +901,7 @@
				CODE_SIGN_IDENTITY = "iPhone Developer";
				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
				DEFINES_MODULE = YES;
				DEVELOPMENT_TEAM = AKH3YVA3CT;
				DEVELOPMENT_TEAM = "";
				DYLIB_COMPATIBILITY_VERSION = 1;
				DYLIB_CURRENT_VERSION = 1;
				DYLIB_INSTALL_NAME_BASE = "@rpath";
@@ -918,7 +917,7 @@
				);
				INFOPLIST_FILE = WadeMobileFunc/Info.plist;
				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
				IPHONEOS_DEPLOYMENT_TARGET = 9.3;
				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
				LIBRARY_SEARCH_PATHS = (
					"$(inherited)",

WadeMobileFunc/WadeMobileFunc.xcodeproj/xcuserdata/mac.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -26,7 +26,7 @@
                  moduleName = "WadeMobileFunc"
                  usesParentBreakpointCondition = "Yes"
                  urlString = "file:///Users/mac/work/asiainfo/ios-share/WadeMobileFunc/WadeMobileFunc/WDFSocial.m"
                  timestampString = "586926506.670706"
                  timestampString = "588065480.98122"
                  startingColumnNumber = "9223372036854775807"
                  endingColumnNumber = "9223372036854775807"
                  startingLineNumber = "291"
@@ -41,7 +41,7 @@
                  moduleName = "WadeMobileFunc"
                  usesParentBreakpointCondition = "Yes"
                  urlString = "file:///Users/mac/work/asiainfo/ios-share/WadeMobileFunc/WadeMobileFunc/WDFSocial.m"
                  timestampString = "586926506.673286"
                  timestampString = "588065480.983206"
                  startingColumnNumber = "9223372036854775807"
                  endingColumnNumber = "9223372036854775807"
                  startingLineNumber = "292"

WadeMobileFunc/WadeMobileFunc.xcodeproj/xcuserdata/mac.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -12,7 +12,7 @@
		<key>WadeMobileFunc.xcscheme_^#shared#^_</key>
		<dict>
			<key>orderHint</key>
			<integer>4</integer>
			<integer>7</integer>
		</dict>
		<key>WadeMobileFunc4Appstore.xcscheme</key>
		<dict>
@@ -22,7 +22,7 @@
		<key>WadeMobileFunc4Appstore.xcscheme_^#shared#^_</key>
		<dict>
			<key>orderHint</key>
			<integer>6</integer>
			<integer>5</integer>
		</dict>
		<key>WadeMobileFuncAggregate.xcscheme</key>
		<dict>
@@ -32,7 +32,7 @@
		<key>WadeMobileFuncAggregate.xcscheme_^#shared#^_</key>
		<dict>
			<key>orderHint</key>
			<integer>5</integer>
			<integer>6</integer>
		</dict>
	</dict>
</dict>

WadeMobileFunc/WadeMobileFunc/IPUGrayPlugin.h

@@ -12,10 +12,6 @@
/*
 设置主应用灰度环境
 a.输入参数：主应用灰度环境参数：g_user_flag，g_request_host,g_request_path,g_res_host
 b.如果g_user_flag=1，则根据灰度环境的参数，对主应用进行资源更新，并且保存灰度环境参数，下次启动app之后直接使用灰度环境参数进行，如果更新完成，则静默走success回调
 c.资源更新完成后，直接弹窗提示，“灰度环境资源更新完成，请重新进入蜂行动”，点击确定后关闭app
 d.如果g_user_flag=0，则直接使用mobile-config的资源路径与主环境资源进行比较，进行资源更新(如果无需更新则不更新)，更新完成后提示，“资源更新完成，请重新进入蜂行动”，点击确定后关闭app，下次进入
 */
-(void)updateGrayInfo:(NSArray *)params;

WadeMobileFunc/WadeMobileFunc/IPUGrayPlugin.m

@@ -19,11 +19,11 @@
 */
-(void)updateGrayInfo:(NSArray *)params{
    if (params && params.count>0) {
        BOOL isGrayUser = false;
        NSString *isGrayUser = nil;
        if (params[0]==[NSNull null]) {
            isGrayUser = false;
            isGrayUser = nil;
        }else{
            isGrayUser = [params[0] boolValue];
            isGrayUser = [NSString stringWithFormat:@"%@",params[0]];
        }
        
        NSString *grayRequestHost = nil;
@@ -53,48 +53,59 @@
            }
        }
        
        NSString * userFlag = [[NSUserDefaults standardUserDefaults] valueForKey:@"GRAY_USER_FLAG"];
        if (isGrayUser != [userFlag boolValue]) {//环境发生变化
        NSString * userFlag = [[NSUserDefaults standardUserDefaults] valueForKey:@"IS_GRAY_USER"];
        if (![isGrayUser isEqualToString:userFlag]) {//环境发生变化
            UIAlertController* alert = nil;
            if (isGrayUser==YES) {//灰度
                alert = [UIAlertController alertControllerWithTitle:nil
                       message:@"服务器环境发生变化，是否退出重新打开以切换到灰度服务器？"  preferredStyle:UIAlertControllerStyleAlert];
                UIAlertAction* confirmAction = [UIAlertAction actionWithTitle:@"确定"     style:UIAlertActionStyleDefault handler:^(UIAlertAction * action) {
                    
                    [self setGrayIsGrayUser:isGrayUser grayRequestHost:grayRequestHost grayRequestPath:grayRequestPath grayResourceHost:grayResourceHost];
                    
                    [[NSUserDefaults standardUserDefaults] setValue:@"1" forKey:@"GRAY_USER_FLAG"];
                    [[NSUserDefaults standardUserDefaults] synchronize];
                    exit(0);
                }];
                UIAlertAction* cancelAction = [UIAlertAction actionWithTitle:@"取消"     style:UIAlertActionStyleCancel handler:^(UIAlertAction * action) {
                    
                }];
                [alert addAction:confirmAction];
                [alert addAction:cancelAction];
            }else{//生产
                alert = [UIAlertController alertControllerWithTitle:nil
                         message:@"服务器环境发生变化，是否退出重新打开以切换到生产服务器？"  preferredStyle:UIAlertControllerStyleAlert];
                UIAlertAction* confirmAction = [UIAlertAction actionWithTitle:@"确定"     style:UIAlertActionStyleDefault handler:^(UIAlertAction * action) {
                    [[NSUserDefaults standardUserDefaults] setValue:@"0" forKey:@"GRAY_USER_FLAG"];
                    [[NSUserDefaults standardUserDefaults] synchronize];
                    exit(0);
                }];
                UIAlertAction* cancelAction = [UIAlertAction actionWithTitle:@"取消"     style:UIAlertActionStyleCancel handler:^(UIAlertAction * action) {
            if ([isGrayUser isEqualToString:@"0"]) {
                if ([userFlag isEqualToString:@"1"]){//主应用子应用从灰度切换到生产
                    [self alert:alert message:@"发现正式版本，选择更新后将关闭应用，请重新打开" userFlag:isGrayUser requestHost:grayRequestHost requestPath:grayRequestPath resourceHost:grayResourceHost isExit:YES];
                }
                else if ([userFlag isEqualToString:@"2"]){//主应用子应用切换到生产
                    [self alert:alert message:@"发现正式版本，选择更新后将关闭应用，请重新打开" userFlag:isGrayUser requestHost:grayRequestHost requestPath:grayRequestPath resourceHost:grayResourceHost isExit:YES];
                }
            }
            else if ([isGrayUser isEqualToString:@"1"]){
                if ([userFlag isEqualToString:@"0"]) {//主应用子应用从生产切换到灰度
                    [self alert:alert message:@"发现新版本，选择更新后将关闭应用，请重新打开" userFlag:isGrayUser requestHost:grayRequestHost requestPath:grayRequestPath resourceHost:grayResourceHost isExit:YES];
                }
                else if ([userFlag isEqualToString:@"2"]){//主应用切换到灰度
                    [self alert:alert message:@"发现新版本，选择更新后将关闭应用，请重新打开" userFlag:isGrayUser requestHost:grayRequestHost requestPath:grayRequestPath resourceHost:grayResourceHost isExit:YES];
                }
            }
            else if ([isGrayUser isEqualToString:@"2"]){
                if ([userFlag isEqualToString:@"0"]) {//子应用切换到灰度
                    [self alert:alert message:@"子应用发现新版本，选择更新后将加载新版本" userFlag:isGrayUser requestHost:grayRequestHost requestPath:grayRequestPath resourceHost:grayResourceHost isExit:NO];
                }
            }
            
            if (alert) {
                [[self getViewController] presentViewController:alert animated:YES completion:^{
                    
                }];
                [alert addAction:confirmAction];
                [alert addAction:cancelAction];
            }
            [[self getViewController] presentViewController:alert animated:YES completion:^{
                
            }];
        }
    }
}
-(void)setGrayIsGrayUser:(BOOL)isGrayUser grayRequestHost:(NSString *)grayRequestHost grayRequestPath:(NSString *)grayRequestPath grayResourceHost:(NSString *)grayResourceHost{
    [[NSUserDefaults standardUserDefaults] setBool:isGrayUser forKey:@"IS_GRAY_USER"];
    if (isGrayUser) {//灰度用户
    
-(void)alert:(UIAlertController *)alert message:(NSString *)message userFlag:(NSString *)userFlag requestHost:(NSString *)requestHost requestPath:(NSString *)requestPath resourceHost:(NSString *)resourceHost isExit:(BOOL)isExit{
        alert = [UIAlertController alertControllerWithTitle:nil
                                                    message:message  preferredStyle:UIAlertControllerStyleAlert];
        UIAlertAction* confirmAction = [UIAlertAction actionWithTitle:@"马上更新"     style:UIAlertActionStyleDefault handler:^(UIAlertAction * action) {
            [self setGrayIsGrayUser:userFlag grayRequestHost:requestHost grayRequestPath:requestPath grayResourceHost:resourceHost];
            if (isExit) {
                exit(0);
            }
        }];
        UIAlertAction* cancelAction = [UIAlertAction actionWithTitle:@"下次提醒"     style:UIAlertActionStyleCancel handler:^(UIAlertAction * action) {
            
        }];
        [alert addAction:confirmAction];
        [alert addAction:cancelAction];
    }
    
-(void)setGrayIsGrayUser:(NSString *)isGrayUser grayRequestHost:(NSString *)grayRequestHost grayRequestPath:(NSString *)grayRequestPath grayResourceHost:(NSString *)grayResourceHost{
    [[NSUserDefaults standardUserDefaults] setValue:isGrayUser forKey:@"IS_GRAY_USER"];
    if ([isGrayUser isEqualToString:@"1"]) {//灰度用户
        if (grayRequestHost) {
            [[NSUserDefaults standardUserDefaults] setValue:grayRequestHost forKey:@"GRAY_REQUEST_HOST"];
        }