Parcourir la Source

update for release

kevin 7 ans auparavant
Parent
commit
bb0194e357

+ 2 - 2
DisplayClient/DisplayClient.xcodeproj/project.pbxproj

@ -477,7 +477,7 @@
477 477
				OTHER_CODE_SIGN_FLAGS = "";
478 478
				OTHER_LDFLAGS = "-ObjC";
479 479
				"OTHER_LDFLAGS[arch=*]" = "-ObjC";
480
				PRODUCT_BUNDLE_IDENTIFIER = com.ai.ipu.display;
480
				PRODUCT_BUNDLE_IDENTIFIER = com.ai.ipu.idisplay;
481 481
				PRODUCT_NAME = "$(TARGET_NAME)";
482 482
				PROVISIONING_PROFILE = "";
483 483
				SKIP_INSTALL = NO;
@ -515,7 +515,7 @@
515 515
				ONLY_ACTIVE_ARCH = NO;
516 516
				OTHER_CODE_SIGN_FLAGS = "";
517 517
				OTHER_LDFLAGS = "-ObjC";
518
				PRODUCT_BUNDLE_IDENTIFIER = com.ai.ipu.display;
518
				PRODUCT_BUNDLE_IDENTIFIER = com.ai.ipu.idisplay;
519 519
				PRODUCT_NAME = "$(TARGET_NAME)";
520 520
				PROVISIONING_PROFILE = "";
521 521
				SKIP_INSTALL = NO;

+ 8 - 8
DisplayClient/DisplayClient/DisplayClient-Info.plist

@ -2,14 +2,6 @@
2 2
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3 3
<plist version="1.0">
4 4
<dict>
5
	<key>NSPhotoLibraryUsageDescription</key>
6
	<string>需要您的同意才能访问媒体资料库</string>
7
	<key>NSMicrophoneUsageDescription</key>
8
	<string>需要您的同意才能使用麦克风</string>
9
	<key>NSCameraUsageDescription</key>
10
	<string>需要您的同意才能使用照相机</string>
11
	<key>NSContactsUsageDescription</key>
12
	<string>需要您的同意才能访问联系人信息</string>
13 5
	<key>CFBundleDevelopmentRegion</key>
14 6
	<string>en</string>
15 7
	<key>CFBundleDisplayName</key>
@ -52,8 +44,16 @@
52 44
		<key>NSAllowsArbitraryLoads</key>
53 45
		<true/>
54 46
	</dict>
47
	<key>NSCameraUsageDescription</key>
48
	<string>需要您的同意才能使用照相机</string>
49
	<key>NSContactsUsageDescription</key>
50
	<string>需要您的同意才能访问联系人信息</string>
55 51
	<key>NSLocationWhenInUseUsageDescription</key>
56 52
	<string>请允许访问您的位置信息</string>
53
	<key>NSMicrophoneUsageDescription</key>
54
	<string>需要您的同意才能使用麦克风</string>
55
	<key>NSPhotoLibraryUsageDescription</key>
56
	<string>需要您的同意才能访问媒体资料库</string>
57 57
	<key>UILaunchStoryboardName</key>
58 58
	<string>LaunchScreen</string>
59 59
	<key>UIMainStoryboardFile</key>

+ 3 - 3
DisplayClient/Res/config/mobile-config.xml

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

+ 3 - 3
SuperMenu/Res/config/mobile-config.xml

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

+ 2 - 2
SuperMenu/SuperMenu.xcodeproj/project.pbxproj

@ -378,7 +378,7 @@
378 378
				INFOPLIST_FILE = SuperMenu/Info.plist;
379 379
				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
380 380
				OTHER_LDFLAGS = "-ObjC";
381
				PRODUCT_BUNDLE_IDENTIFIER = com.ai.ipu.forsuperclient;
381
				PRODUCT_BUNDLE_IDENTIFIER = com.ai.ipu.isupermenu;
382 382
				PRODUCT_NAME = "$(TARGET_NAME)";
383 383
				PROVISIONING_PROFILE = "";
384 384
				PROVISIONING_PROFILE_SPECIFIER = "";
@ -398,7 +398,7 @@
398 398
				INFOPLIST_FILE = SuperMenu/Info.plist;
399 399
				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
400 400
				OTHER_LDFLAGS = "-ObjC";
401
				PRODUCT_BUNDLE_IDENTIFIER = com.ai.ipu.forsuperclient;
401
				PRODUCT_BUNDLE_IDENTIFIER = com.ai.ipu.isupermenu;
402 402
				PRODUCT_NAME = "$(TARGET_NAME)";
403 403
				PROVISIONING_PROFILE = "";
404 404
				PROVISIONING_PROFILE_SPECIFIER = "";

+ 7 - 0
SuperMenu/SuperMenu.xcodeproj/xcuserdata/kevin.xcuserdatad/xcschemes/SuperMenu.xcscheme

@ -61,6 +61,13 @@
61 61
            ReferencedContainer = "container:SuperMenu.xcodeproj">
62 62
         </BuildableReference>
63 63
      </BuildableProductRunnable>
64
      <EnvironmentVariables>
65
         <EnvironmentVariable
66
            key = "OS_ACTIVITY_MODE"
67
            value = "disable"
68
            isEnabled = "YES">
69
         </EnvironmentVariable>
70
      </EnvironmentVariables>
64 71
      <AdditionalOptions>
65 72
      </AdditionalOptions>
66 73
   </LaunchAction>

+ 18 - 18
SuperMenu/SuperMenu/Info.plist

@ -24,8 +24,8 @@
24 24
	<string>1</string>
25 25
	<key>LSApplicationQueriesSchemes</key>
26 26
	<array>
27
        <string>assetHelper</string>
28
        <string>weixin</string>
27
		<string>assetHelper</string>
28
		<string>weixin</string>
29 29
	</array>
30 30
	<key>LSRequiresIPhoneOS</key>
31 31
	<true/>
@ -34,6 +34,22 @@
34 34
		<key>NSAllowsArbitraryLoads</key>
35 35
		<true/>
36 36
	</dict>
37
	<key>NSBluetoothPeripheralUsageDescription</key>
38
	<string>是否许允“超级客户端”使用蓝牙?</string>
39
	<key>NSCalendarsUsageDescription</key>
40
	<string>是否允许“超级客户端”使用日历?</string>
41
	<key>NSCameraUsageDescription</key>
42
	<string>是否允许“超级客户端”使用您的相机?</string>
43
	<key>NSContactsUsageDescription</key>
44
	<string>是否允许“超级客户端”访问您的通讯录?</string>
45
	<key>NSLocationAlwaysUsageDescription</key>
46
	<string>是否允许“超级客户端”访问您的地理位置?</string>
47
	<key>NSLocationWhenInUseUsageDescription</key>
48
	<string>是否允许“超级客户端”访问您的地理位置?</string>
49
	<key>NSMicrophoneUsageDescription</key>
50
	<string>是否允许“超级客户端”使用您的麦克风?</string>
51
	<key>NSPhotoLibraryUsageDescription</key>
52
	<string>是否允许“超级客户端”访问您的相册?</string>
37 53
	<key>UILaunchStoryboardName</key>
38 54
	<string>LaunchScreen</string>
39 55
	<key>UIRequiredDeviceCapabilities</key>
@ -44,21 +60,5 @@
44 60
	<array>
45 61
		<string>UIInterfaceOrientationPortrait</string>
46 62
	</array>
47
    <key>NSCalendarsUsageDescription</key>
48
    <string>是否允许“超级客户端”使用日历?</string>
49
    <key>NSBluetoothPeripheralUsageDescription</key>
50
    <string>是否许允“超级客户端”使用蓝牙?</string>
51
    <key>NSLocationWhenInUseUsageDescription</key>
52
    <string>是否允许“超级客户端”访问您的地理位置?</string>
53
    <key>NSLocationAlwaysUsageDescription</key>
54
    <string>是否允许“超级客户端”访问您的地理位置?</string>
55
    <key>NSContactsUsageDescription</key>
56
    <string>是否允许“超级客户端”访问您的通讯录?</string>
57
    <key>NSCameraUsageDescription</key>
58
    <string>是否允许“超级客户端”使用您的相机?</string>
59
    <key>NSPhotoLibraryUsageDescription</key>
60
    <string>是否允许“超级客户端”访问您的相册?</string>
61
    <key>NSMicrophoneUsageDescription</key>
62
    <string>是否允许“超级客户端”使用您的麦克风?</string>
63 63
</dict>
64 64
</plist>

+ 4 - 2
SuperMenu/SuperMenu/multiple/AppManagePlugin.m

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

+ 43 - 0
SuperMenu/SuperMenu/plugin/RemoteWebVC.m

@ -69,6 +69,8 @@
69 69
    self.webview = [[UIWebView alloc] initWithFrame:frame];
70 70
    NSURLRequest *urlReq = [NSURLRequest requestWithURL:[NSURL URLWithString: self->_urlPath]];
71 71
    [self.webview loadRequest:urlReq];
72
    //设置代理
73
    self.webview.delegate = self;
72 74
    
73 75
    [self.view addSubview: self.webview];
74 76
}
@ -138,4 +140,45 @@
138 140
        }];
139 141
    }
140 142
}
143
#pragma mark 实现UIWebViewDelegate
144
/************实现UIWebViewDelegate协议**************/
145
- (BOOL)webView:(UIWebView *)_webView shouldStartLoadWithRequest:(NSURLRequest *)request navigationType:(UIWebViewNavigationType)navigationType;
146
{
147
    NSURL* url = [request URL];
148
    NSString *urlStr = [url absoluteString];
149
    
150
//    if([urlStr hasPrefix:@"https://wappass.baidu.com/wp/api/login"]){
151
        NSLog(@"\nURL地址:\n%@", urlStr);
152
    
153
        NSLog(@"\n请求提交方式:\n%@\n请求头信息:\n%@", [request HTTPMethod], request.allHTTPHeaderFields);
154
    
155
        NSString *body = [[NSString alloc] initWithData:[request HTTPBody] encoding:NSUTF8StringEncoding];
156
        NSLog(@"\n请求Body信息:\n%@", body);
157
//    }
158
    
159
    return YES;
160
}
161
162
- (void)webViewDidStartLoad:(UIWebView *)webView
163
{
164
//    NSLog(@"加载开始");
165
}
166
- (void)webViewDidFinishLoad:(UIWebView *)webView
167
{
168
    //1.根据配置,禁用webview选择
169
    NSString *webkitSelect = [WDMobileConfig getValue:@"webkit_select"];
170
    if(! [@"true" isEqualToString:webkitSelect]){
171
        // 禁用用户选择
172
        [webView stringByEvaluatingJavaScriptFromString:@"document.documentElement.style.webkitUserSelect='none';"];
173
        // 禁用弹出框
174
        [webView stringByEvaluatingJavaScriptFromString:@"document.documentElement.style.webkitTouchCallout='none';"];
175
    }
176
}
177
- (void)webView:(UIWebView *)webView didFailLoadWithError:(NSError *)error
178
{
179
    NSLog(@"加载错误: %@", [error localizedDescription]);
180
    if([NSURLErrorDomain isEqual:error.domain]){
181
        return;
182
    }
183
}
141 184
@end

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

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

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

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