update for release

DisplayClient/DisplayClient.xcodeproj/project.pbxproj

@@ -477,7 +477,7 @@
				OTHER_CODE_SIGN_FLAGS = "";
				OTHER_LDFLAGS = "-ObjC";
				"OTHER_LDFLAGS[arch=*]" = "-ObjC";
				PRODUCT_BUNDLE_IDENTIFIER = com.ai.ipu.display;
				PRODUCT_BUNDLE_IDENTIFIER = com.ai.ipu.idisplay;
				PRODUCT_NAME = "$(TARGET_NAME)";
				PROVISIONING_PROFILE = "";
				SKIP_INSTALL = NO;
@@ -515,7 +515,7 @@
				ONLY_ACTIVE_ARCH = NO;
				OTHER_CODE_SIGN_FLAGS = "";
				OTHER_LDFLAGS = "-ObjC";
				PRODUCT_BUNDLE_IDENTIFIER = com.ai.ipu.display;
				PRODUCT_BUNDLE_IDENTIFIER = com.ai.ipu.idisplay;
				PRODUCT_NAME = "$(TARGET_NAME)";
				PROVISIONING_PROFILE = "";
				SKIP_INSTALL = NO;

DisplayClient/DisplayClient/DisplayClient-Info.plist

@@ -2,14 +2,6 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
	<key>NSPhotoLibraryUsageDescription</key>
	<string>需要您的同意才能访问媒体资料库</string>
	<key>NSMicrophoneUsageDescription</key>
	<string>需要您的同意才能使用麦克风</string>
	<key>NSCameraUsageDescription</key>
	<string>需要您的同意才能使用照相机</string>
	<key>NSContactsUsageDescription</key>
	<string>需要您的同意才能访问联系人信息</string>
	<key>CFBundleDevelopmentRegion</key>
	<string>en</string>
	<key>CFBundleDisplayName</key>
@@ -52,8 +44,16 @@
		<key>NSAllowsArbitraryLoads</key>
		<true/>
	</dict>
	<key>NSCameraUsageDescription</key>
	<string>需要您的同意才能使用照相机</string>
	<key>NSContactsUsageDescription</key>
	<string>需要您的同意才能访问联系人信息</string>
	<key>NSLocationWhenInUseUsageDescription</key>
	<string>请允许访问您的位置信息</string>
	<key>NSMicrophoneUsageDescription</key>
	<string>需要您的同意才能使用麦克风</string>
	<key>NSPhotoLibraryUsageDescription</key>
	<string>需要您的同意才能访问媒体资料库</string>
	<key>UILaunchStoryboardName</key>
	<string>LaunchScreen</string>
	<key>UIMainStoryboardFile</key>

DisplayClient/Res/config/mobile-config.xml

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<configs>
<!--    <config name="request_host" value="http://aiipu.com"/>-->
    <config name="request_host" value="http://127.0.0.1:9001"/>
    <config name="request_host" value="http://aiipu.com"/>
<!--    <config name="request_host" value="http://127.0.0.1:9001"/>-->
    <config name="request_path" value="/display"/>
    <config name="request_servlet" value="/mobiledata"/>
    <config name="loading_page" value="Res/local/welcome.html"/>
@@ -10,7 +10,7 @@
    <config name="map_key" value="bd41376b509efb77494b5ab195c36a6c"/>
    <config name="yunba_push_key" value="5630418ff085fc471efdf2c9"/>
    <config name="update_url" value="https://oa51x0k0n.qnssl.com/DisplayClient.plist"/>
    <config name="license" value="Z2bGqGDZFWWqPTlqX3Cdi-cm9rTM4Ye22eXaY3/X8oXDON2y6Bzdqbq5PVosE79Sl/OzFhAXeu3jgRpqXMCwR7fdm5YYVaQqfZgm2lYSr1U6zD/5afTRWimMT3rhFaouaiUy8mVgv1yGAGeKHGqQ6KdFJTGeLebyQ3oxwdGP1lY=|@@MDBCNDdBMEJBNTQzQzUwODI3MjE0NjI5Q0RFRDRENjQwQTdEQkMzMTJGMjQyRThBQUE5QjE1QjJGRjU3QUIxNzU3RTcwQjBGRUZEOEZGNzhDOEZDRjRCNDUzODZBRkYxQThDQkREM0U1QkFFNkUyRjQzRUI2MzA1RUZCQkVCQkM4NUY4QUQxQ0I0MTIwOTUyNDlDRTk5MTJBREQyNUI5NUMyRTI3MEU3MzQ0M0NBQzM5MUM3NDZGMzI1N0NEQjg3MzlBQTFCMTU1NTk4NDczODgxRUQ2MkVERUVEMjJFM0QyQ0REQ0Q3NjVEMUZCNTA1QUU1Mzg4N0EyMzhCQjMzOUU1"/>
    <config name="license" value="MOQLTilHl3bGCY1dOOyGusu5UxHgb7XQwcG6TaJ3vRgel7wsC6Zv9AOpCYCRTzNkxLZI1ZJ8o4E6LHfBSifmoFWxJP6zIYKGSnfvKiBHlIFZOBksn4T8Ty03H2IkgeEd9/YaLet/GxRUPK4FVXuvEpPSAuYT-J/35V/R18DzUFY=|@@MDA4Mjc1MzAxNjYzNzYxQTI2NkNEMjZERTRFMjU3Nzg3Q0NCQkM4M0Q5MDg3QjNBMEY4MzFFMEZEMUFCRDNBMjUyMDhBQjZGQjhDRDEzRDdENDczQ0FCOTcxMEI5MUZDNkVGNEVGMTY3QzYzRjFDQzI0OTczQThFQzg0NTM3NTM5QjBBNDA5OTcyODQxMEYyODZBRDZCOTYwRkM4NUFFRUZGMEU0OEJFNTkxQTRGMTRCMDkxM0JBMkQwNzdDQ0UwMDBCRTA3OEE3RDJCQkE4RDcwRjBGMzBGNEUxQkYzMzI4RjczODk3QzAxNzkxQUU5QjlFRjVDOTY2NDQwRDE3QzJC"/>
    <config name="remote_url" value="http://127.0.0.1:8080/g/withiframe.html" />
    <config name="local_resources" value="/Res/display"/>
    <config name="webkit_select_forbid" value="true"/>

SuperMenu/Res/config/mobile-config.xml

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<configs>
    <config name="request_host" value="http://www.aiipu.com:8081"/>
<!--    <config name="request_host" value="http://aiipu.com"/>-->
<!--    <config name="request_host" value="http://localhost:9001"/>-->
    <config name="request_host" value="http://aiipu.com"/>
    <config name="request_path" value="/superapp"/>
    <config name="request_servlet" value="/mobiledata"/>
    <config name="loading_page" value="Res/local/welcome.html"/>
@@ -10,7 +10,7 @@
    <config name="map_key" value="bd41376b509efb77494b5ab195c36a6c"/>
    <config name="yunba_push_key" value="5630418ff085fc471efdf2c9"/>
    <config name="update_url" value="https://oa51x0k0n.qnssl.com/DisplayClient.plist"/>
    <config name="license" value="SQvoR2rX2Qmqq0UTRY0LstDXh8KkRMbSLMXYF8e56E0RvlE795U0/ioB6ex6drKjGdbAFre29ibL1S/--V5ZNYYeAQ1X3otLeG3fwIAB0/ELaoJ4HDSEhaDoaxk83Dk8ew10JIXEHUp23xHtsiqWZgDhzQGjvGdvSV/oSDSE86w=|@@MDBBMTQxRjdCMDRFRjU0NzYwOEU1RkM3QTY4RTMyMEI0QkI3RTcxNTdBNEEwQjRGQUEwODREMEVFNUJCMTlFQTQzOTVGOTQ4NzkzRjA5MTVGQzI0QjMwMjcxMEMxNUI2RDMzM0Q5MkY5MDdGMjFCNzdFQjc1Njk2MkUyQ0U0MTYwMzkwNDIzQzA1MEUyNzdEQjEyQUMwMTYxQkU5MDMyQjc0NzRBNzhCM0NFNzQ0NDYwQjc5NUU0MTc0NzU5MDUyNEVEMjc2NjY3QTYyMUE5Q0VCQjE4RDJEMEQ1OEY0NTQyRDVFMTU1MzhERTE2Qzk2NzgyMUIxMzIwQTg4RDhBQkI3"/>
    <config name="license" value="DLzw-cBg//oxElVh0UMPr2SowEABIjrRDqQ7adbC8YYvAqiJcIw2-oUxxrT1-OqRUn8mrV-Aq5DmosbdXvi4IakCBsvgAE0YM7K6e/05XahxEFVlDL8WgAMYeOF6U2VNtpuGEY3FBzX2xorEkh/3L2n1tvkj/Q9BkLy4HeoLMrc=|@@MDA4ODdBRjk5MzNGMzBENEJEODlENUY3M0ZCMjJBQjMzNDBFNUI1NDJBOTVGRTZFNzRBMzU2REU3MkUxRUEzNTMwRjJCMTk1RDMzRjFCNDNGNzgzNjUyN0IyRDU3ODc4M0ZFODdFQjRFMkI1MzA1NTk0MDU2NjQ2MDkwNzBGODVDNDYwRUI4MzAxQjlEREQwNkY0RUIyMTA1NUY5MzQ5MTQ2RTQzNzk5MTQ3RDk5MDg4RkVEMUM1Mjg5OTRGN0I0MjI4QUZGNTU5QjdDODA2ODIwQkU3QzI0MjVEODU5NjNDQzdFRjUwMzBGQ0E5NzdEMzA2NTYxODM0RDc2OUJFNTAx"/>
    <config name="remote_url" value="http://127.0.0.1:8080/g/withiframe.html" />
    <config name="local_resources" value="/Res/display"/>
    <config name="loading_time" value="3000"/>

SuperMenu/SuperMenu.xcodeproj/project.pbxproj

@@ -378,7 +378,7 @@
				INFOPLIST_FILE = SuperMenu/Info.plist;
				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
				OTHER_LDFLAGS = "-ObjC";
				PRODUCT_BUNDLE_IDENTIFIER = com.ai.ipu.forsuperclient;
				PRODUCT_BUNDLE_IDENTIFIER = com.ai.ipu.isupermenu;
				PRODUCT_NAME = "$(TARGET_NAME)";
				PROVISIONING_PROFILE = "";
				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -398,7 +398,7 @@
				INFOPLIST_FILE = SuperMenu/Info.plist;
				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
				OTHER_LDFLAGS = "-ObjC";
				PRODUCT_BUNDLE_IDENTIFIER = com.ai.ipu.forsuperclient;
				PRODUCT_BUNDLE_IDENTIFIER = com.ai.ipu.isupermenu;
				PRODUCT_NAME = "$(TARGET_NAME)";
				PROVISIONING_PROFILE = "";
				PROVISIONING_PROFILE_SPECIFIER = "";

SuperMenu/SuperMenu.xcodeproj/xcuserdata/kevin.xcuserdatad/xcschemes/SuperMenu.xcscheme

@@ -61,6 +61,13 @@
            ReferencedContainer = "container:SuperMenu.xcodeproj">
         </BuildableReference>
      </BuildableProductRunnable>
      <EnvironmentVariables>
         <EnvironmentVariable
            key = "OS_ACTIVITY_MODE"
            value = "disable"
            isEnabled = "YES">
         </EnvironmentVariable>
      </EnvironmentVariables>
      <AdditionalOptions>
      </AdditionalOptions>
   </LaunchAction>

SuperMenu/SuperMenu/Info.plist

@@ -24,8 +24,8 @@
	<string>1</string>
	<key>LSApplicationQueriesSchemes</key>
	<array>
        <string>assetHelper</string>
        <string>weixin</string>
		<string>assetHelper</string>
		<string>weixin</string>
	</array>
	<key>LSRequiresIPhoneOS</key>
	<true/>
@@ -34,6 +34,22 @@
		<key>NSAllowsArbitraryLoads</key>
		<true/>
	</dict>
	<key>NSBluetoothPeripheralUsageDescription</key>
	<string>是否许允“超级客户端”使用蓝牙？</string>
	<key>NSCalendarsUsageDescription</key>
	<string>是否允许“超级客户端”使用日历？</string>
	<key>NSCameraUsageDescription</key>
	<string>是否允许“超级客户端”使用您的相机？</string>
	<key>NSContactsUsageDescription</key>
	<string>是否允许“超级客户端”访问您的通讯录？</string>
	<key>NSLocationAlwaysUsageDescription</key>
	<string>是否允许“超级客户端”访问您的地理位置?</string>
	<key>NSLocationWhenInUseUsageDescription</key>
	<string>是否允许“超级客户端”访问您的地理位置?</string>
	<key>NSMicrophoneUsageDescription</key>
	<string>是否允许“超级客户端”使用您的麦克风？</string>
	<key>NSPhotoLibraryUsageDescription</key>
	<string>是否允许“超级客户端”访问您的相册？</string>
	<key>UILaunchStoryboardName</key>
	<string>LaunchScreen</string>
	<key>UIRequiredDeviceCapabilities</key>
@@ -44,21 +60,5 @@
	<array>
		<string>UIInterfaceOrientationPortrait</string>
	</array>
    <key>NSCalendarsUsageDescription</key>
    <string>是否允许“超级客户端”使用日历？</string>
    <key>NSBluetoothPeripheralUsageDescription</key>
    <string>是否许允“超级客户端”使用蓝牙？</string>
    <key>NSLocationWhenInUseUsageDescription</key>
    <string>是否允许“超级客户端”访问您的地理位置?</string>
    <key>NSLocationAlwaysUsageDescription</key>
    <string>是否允许“超级客户端”访问您的地理位置?</string>
    <key>NSContactsUsageDescription</key>
    <string>是否允许“超级客户端”访问您的通讯录？</string>
    <key>NSCameraUsageDescription</key>
    <string>是否允许“超级客户端”使用您的相机？</string>
    <key>NSPhotoLibraryUsageDescription</key>
    <string>是否允许“超级客户端”访问您的相册？</string>
    <key>NSMicrophoneUsageDescription</key>
    <string>是否允许“超级客户端”使用您的麦克风？</string>
</dict>
</plist>

SuperMenu/SuperMenu/multiple/AppManagePlugin.m

@@ -209,10 +209,12 @@
{
    dispatch_time_t time = dispatch_time(DISPATCH_TIME_NOW, 0.5*NSEC_PER_SEC);
    dispatch_after(time, dispatch_get_main_queue(), ^{
        UIViewController *vc = [self.wademobile getViewController];
        
        RemoteWebVC *vc = [[RemoteWebVC alloc] initWithTitle:@"" urlPath:args[0]];
        NSString *urlStr = @"https://m.10010.com/queen/tencent/king-tab.html?channel=2&from=singlemessage";
        RemoteWebVC *webVC = [[RemoteWebVC alloc] initWithTitle:@"" urlPath:urlStr];
        
        [[self.wademobile getViewController] presentViewController:vc animated:NO completion:^{
        [vc presentViewController:webVC animated:NO completion:^{
            ;
        }];
    });

SuperMenu/SuperMenu/plugin/RemoteWebVC.m

@@ -69,6 +69,8 @@
    self.webview = [[UIWebView alloc] initWithFrame:frame];
    NSURLRequest *urlReq = [NSURLRequest requestWithURL:[NSURL URLWithString: self->_urlPath]];
    [self.webview loadRequest:urlReq];
    //设置代理
    self.webview.delegate = self;
    
    [self.view addSubview: self.webview];
}
@@ -138,4 +140,45 @@
        }];
    }
}
#pragma mark 实现UIWebViewDelegate
/************实现UIWebViewDelegate协议**************/
- (BOOL)webView:(UIWebView *)_webView shouldStartLoadWithRequest:(NSURLRequest *)request navigationType:(UIWebViewNavigationType)navigationType;
{
    NSURL* url = [request URL];
    NSString *urlStr = [url absoluteString];
    
//    if([urlStr hasPrefix:@"https://wappass.baidu.com/wp/api/login"]){
        NSLog(@"\nURL地址:\n%@", urlStr);
    
        NSLog(@"\n请求提交方式:\n%@\n请求头信息:\n%@", [request HTTPMethod], request.allHTTPHeaderFields);
    
        NSString *body = [[NSString alloc] initWithData:[request HTTPBody] encoding:NSUTF8StringEncoding];
        NSLog(@"\n请求Body信息:\n%@", body);
//    }
    
    return YES;
}
- (void)webViewDidStartLoad:(UIWebView *)webView
{
//    NSLog(@"加载开始");
}
- (void)webViewDidFinishLoad:(UIWebView *)webView
{
    //1.根据配置，禁用webview选择
    NSString *webkitSelect = [WDMobileConfig getValue:@"webkit_select"];
    if(! [@"true" isEqualToString:webkitSelect]){
        // 禁用用户选择
        [webView stringByEvaluatingJavaScriptFromString:@"document.documentElement.style.webkitUserSelect='none';"];
        // 禁用弹出框
        [webView stringByEvaluatingJavaScriptFromString:@"document.documentElement.style.webkitTouchCallout='none';"];
    }
}
- (void)webView:(UIWebView *)webView didFailLoadWithError:(NSError *)error
{
    NSLog(@"加载错误: %@", [error localizedDescription]);
    if([NSURLErrorDomain isEqual:error.domain]){
        return;
    }
}
@end

display-center/Res/config/mobile-config.xml

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<configs>
    <config name="request_host" value="http://www.aiipu.com"/>
    <config name="request_path" value="/display-center"/>
    <config name="request_host" value="http://localhost:9001"/>
    <config name="request_path" value="/ipushow"/>
    <config name="request_servlet" value="/mobiledata"/>
    <config name="loading_page" value="Res/local/welcome.html"/>
    <config name="app_path" value="/display-center"/>

display-center/display-center.xcodeproj/xcuserdata/kevin.xcuserdatad/xcschemes/display-center.xcscheme

@@ -42,7 +42,7 @@
      </AdditionalOptions>
   </TestAction>
   <LaunchAction
      buildConfiguration = "Debug"
      buildConfiguration = "Release"
      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
      launchStyle = "0"