ソースを参照

添加closeIpuApp插件

liufl5 6 年 前
コミット
8bd0c45e6c

+ 3 - 3
IpuLib/IpuLib.xcodeproj/xcuserdata/mac.xcuserdatad/xcschemes/xcschememanagement.plist

@ -7,17 +7,17 @@
7 7
		<key>IpuLib.xcscheme</key>
8 8
		<dict>
9 9
			<key>orderHint</key>
10
			<integer>10</integer>
10
			<integer>12</integer>
11 11
		</dict>
12 12
		<key>IpuLib4Appstore.xcscheme</key>
13 13
		<dict>
14 14
			<key>orderHint</key>
15
			<integer>12</integer>
15
			<integer>13</integer>
16 16
		</dict>
17 17
		<key>IpuLib4Develop.xcscheme</key>
18 18
		<dict>
19 19
			<key>orderHint</key>
20
			<integer>13</integer>
20
			<integer>14</integer>
21 21
		</dict>
22 22
	</dict>
23 23
</dict>

+ 1 - 1
SuperMenu/Res/config/mobile-action.xml

@ -2,12 +2,12 @@
2 2
<actions>
3 3
    
4 4
    <!--AppManagePlugin-->
5
    
6 5
    <action name="initAppConfig"    class="AppManagePlugin"     method="initAppConfig"/>
7 6
    <action name="getAppsConfig"    class="AppManagePlugin"     method="getAppsConfig"/>
8 7
    <action name="openNativeApp"    class="AppManagePlugin"     method="openNativeApp"/>
9 8
    <action name="openIpuApp"       class="AppManagePlugin"     method="openIpuApp"/>
10 9
    <action name="openRemoteURL"    class="AppManagePlugin"     method="openRemoteURL"/>
10
    <action name="closeIpuApp"    class="AppManagePlugin"     method="closeIpuApp"/>
11 11
<!--    <action name="openRemoteURL"    class="WDFMobileUI"     method="openUrl"/>-->
12 12
13 13
    <action name="initNfc"          class="AppManagePlugin"     method="initNfc"/>

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

@ -1,12 +1,12 @@
1 1
<?xml version="1.0" encoding="utf-8"?>
2 2
<configs>
3 3
    <!--appstore 正式环境-->
4
<!--    <config name="request_host" value="http://aiipu.com:8083"/>-->
5
<!--    <config name="request_path" value="/superapp"/>-->
4
    <config name="request_host" value="http://aiipu.com:8083"/>
5
    <config name="request_path" value="/superapp"/>
6 6
7 7
    <!--ghh-->
8
    <config name="request_host" value="http://10.13.10.94:8080"/>
9
    <config name="request_path" value="/superapp"/>
8
<!--    <config name="request_host" value="http://10.13.10.94:8080"/>-->
9
<!--    <config name="request_path" value="/superapp"/>-->
10 10
11 11
    <!--openUrl测试环境-->
12 12
<!--    <config name="request_host" value="http://121.42.183.206:8083"/>-->

BIN
SuperMenu/SuperMenu.xcodeproj/project.xcworkspace/xcuserdata/mac.xcuserdatad/UserInterfaceState.xcuserstate


+ 80 - 64
SuperMenu/SuperMenu.xcodeproj/xcuserdata/mac.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@ -265,22 +265,6 @@
265 265
            shouldBeEnabled = "Yes"
266 266
            ignoreCount = "0"
267 267
            continueAfterRunningActions = "No"
268
            filePath = "../../ios-plugin/IpuMap/IpuMap/IpuMap.m"
269
            timestampString = "565793745.402451"
270
            startingColumnNumber = "9223372036854775807"
271
            endingColumnNumber = "9223372036854775807"
272
            startingLineNumber = "30"
273
            endingLineNumber = "30"
274
            landmarkName = "-location:"
275
            landmarkType = "7">
276
         </BreakpointContent>
277
      </BreakpointProxy>
278
      <BreakpointProxy
279
         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
280
         <BreakpointContent
281
            shouldBeEnabled = "Yes"
282
            ignoreCount = "0"
283
            continueAfterRunningActions = "No"
284 268
            filePath = "../WadeMobileFunc/WadeMobileFunc/util/WDFDatabaseHelper.m"
285 269
            timestampString = "566729791.986195"
286 270
            startingColumnNumber = "9223372036854775807"
@ -362,7 +346,7 @@
362 346
            ignoreCount = "0"
363 347
            continueAfterRunningActions = "No"
364 348
            filePath = "../../ios/WadeMobile/WadeMobile/frame/template/IpuTemplateSubController.m"
365
            timestampString = "574138275.386088"
349
            timestampString = "576744120.302181"
366 350
            startingColumnNumber = "9223372036854775807"
367 351
            endingColumnNumber = "9223372036854775807"
368 352
            startingLineNumber = "289"
@ -826,7 +810,7 @@
826 810
                  moduleName = "WadeMobileFunc"
827 811
                  usesParentBreakpointCondition = "Yes"
828 812
                  urlString = "file:///Users/mac/work/asiainfo/ios-share/WadeMobileFunc/WadeMobileFunc/WDFUploadDownload.m"
829
                  timestampString = "576566988.767656"
813
                  timestampString = "576745700.918036"
830 814
                  startingColumnNumber = "9223372036854775807"
831 815
                  endingColumnNumber = "9223372036854775807"
832 816
                  startingLineNumber = "472"
@ -841,7 +825,7 @@
841 825
                  moduleName = "WadeMobileFunc"
842 826
                  usesParentBreakpointCondition = "Yes"
843 827
                  urlString = "file:///Users/mac/work/asiainfo/ios-share/WadeMobileFunc/WadeMobileFunc/WDFUploadDownload.m"
844
                  timestampString = "576566988.769453"
828
                  timestampString = "576745700.919804"
845 829
                  startingColumnNumber = "9223372036854775807"
846 830
                  endingColumnNumber = "9223372036854775807"
847 831
                  startingLineNumber = "472"
@ -874,11 +858,11 @@
874 858
            ignoreCount = "0"
875 859
            continueAfterRunningActions = "No"
876 860
            filePath = "SuperMenu/multiple/AppManagePlugin.m"
877
            timestampString = "576566988.307274"
861
            timestampString = "576745700.545729"
878 862
            startingColumnNumber = "9223372036854775807"
879 863
            endingColumnNumber = "9223372036854775807"
880
            startingLineNumber = "265"
881
            endingLineNumber = "265"
864
            startingLineNumber = "329"
865
            endingLineNumber = "329"
882 866
            landmarkName = "-reLogin:"
883 867
            landmarkType = "7">
884 868
         </BreakpointContent>
@ -890,11 +874,11 @@
890 874
            ignoreCount = "0"
891 875
            continueAfterRunningActions = "No"
892 876
            filePath = "SuperMenu/multiple/AppManagePlugin.m"
893
            timestampString = "576566988.307323"
877
            timestampString = "576745700.5457979"
894 878
            startingColumnNumber = "9223372036854775807"
895 879
            endingColumnNumber = "9223372036854775807"
896
            startingLineNumber = "274"
897
            endingLineNumber = "274"
880
            startingLineNumber = "338"
881
            endingLineNumber = "338"
898 882
            landmarkName = "-reLogin:"
899 883
            landmarkType = "7">
900 884
         </BreakpointContent>
@ -906,11 +890,11 @@
906 890
            ignoreCount = "0"
907 891
            continueAfterRunningActions = "No"
908 892
            filePath = "SuperMenu/multiple/AppManagePlugin.m"
909
            timestampString = "576566988.307366"
893
            timestampString = "576745700.5458421"
910 894
            startingColumnNumber = "9223372036854775807"
911 895
            endingColumnNumber = "9223372036854775807"
912
            startingLineNumber = "290"
913
            endingLineNumber = "290"
896
            startingLineNumber = "354"
897
            endingLineNumber = "354"
914 898
            landmarkName = "AppManagePlugin"
915 899
            landmarkType = "3">
916 900
         </BreakpointContent>
@ -1082,7 +1066,7 @@
1082 1066
            ignoreCount = "0"
1083 1067
            continueAfterRunningActions = "No"
1084 1068
            filePath = "../../ios/WadeMobile/WadeMobile/frame/template/IpuTemplateSubController.m"
1085
            timestampString = "574678584.271459"
1069
            timestampString = "576744120.3029031"
1086 1070
            startingColumnNumber = "9223372036854775807"
1087 1071
            endingColumnNumber = "9223372036854775807"
1088 1072
            startingLineNumber = "69"
@ -1098,7 +1082,7 @@
1098 1082
            ignoreCount = "0"
1099 1083
            continueAfterRunningActions = "No"
1100 1084
            filePath = "../../ios/WadeMobile/WadeMobile/frame/template/IpuTemplateSubController.m"
1101
            timestampString = "574678600.4635561"
1085
            timestampString = "576744120.302951"
1102 1086
            startingColumnNumber = "9223372036854775807"
1103 1087
            endingColumnNumber = "9223372036854775807"
1104 1088
            startingLineNumber = "94"
@ -1114,7 +1098,7 @@
1114 1098
            ignoreCount = "0"
1115 1099
            continueAfterRunningActions = "No"
1116 1100
            filePath = "../../ios/WadeMobile/WadeMobile/frame/template/IpuTemplateSubController.m"
1117
            timestampString = "574678639.078421"
1101
            timestampString = "576744120.302997"
1118 1102
            startingColumnNumber = "9223372036854775807"
1119 1103
            endingColumnNumber = "9223372036854775807"
1120 1104
            startingLineNumber = "216"
@ -1130,7 +1114,7 @@
1130 1114
                  moduleName = "WadeMobile"
1131 1115
                  usesParentBreakpointCondition = "Yes"
1132 1116
                  urlString = "file:///Users/mac/work/asiainfo/ios/WadeMobile/WadeMobile/frame/template/IpuTemplateSubController.m"
1133
                  timestampString = "576566988.86798"
1117
                  timestampString = "576745701.013247"
1134 1118
                  startingColumnNumber = "9223372036854775807"
1135 1119
                  endingColumnNumber = "9223372036854775807"
1136 1120
                  startingLineNumber = "216"
@ -1145,7 +1129,7 @@
1145 1129
                  moduleName = "WadeMobile"
1146 1130
                  usesParentBreakpointCondition = "Yes"
1147 1131
                  urlString = "file:///Users/mac/work/asiainfo/ios/WadeMobile/WadeMobile/frame/template/IpuTemplateSubController.m"
1148
                  timestampString = "576566988.869678"
1132
                  timestampString = "576745701.015143"
1149 1133
                  startingColumnNumber = "9223372036854775807"
1150 1134
                  endingColumnNumber = "9223372036854775807"
1151 1135
                  startingLineNumber = "217"
@ -1160,7 +1144,7 @@
1160 1144
                  moduleName = "WadeMobile"
1161 1145
                  usesParentBreakpointCondition = "Yes"
1162 1146
                  urlString = "file:///Users/mac/work/asiainfo/ios/WadeMobile/WadeMobile/frame/template/IpuTemplateSubController.m"
1163
                  timestampString = "576566988.871418"
1147
                  timestampString = "576745701.017011"
1164 1148
                  startingColumnNumber = "9223372036854775807"
1165 1149
                  endingColumnNumber = "9223372036854775807"
1166 1150
                  startingLineNumber = "216"
@ -1177,7 +1161,7 @@
1177 1161
            ignoreCount = "0"
1178 1162
            continueAfterRunningActions = "No"
1179 1163
            filePath = "../../ios/WadeMobile/WadeMobile/frame/template/IpuTemplateSubController.m"
1180
            timestampString = "574678741.526932"
1164
            timestampString = "576744120.3030421"
1181 1165
            startingColumnNumber = "9223372036854775807"
1182 1166
            endingColumnNumber = "9223372036854775807"
1183 1167
            startingLineNumber = "242"
@ -1272,13 +1256,13 @@
1272 1256
            shouldBeEnabled = "Yes"
1273 1257
            ignoreCount = "0"
1274 1258
            continueAfterRunningActions = "No"
1275
            filePath = "SuperMenu/multiple/AppManagePlugin.m"
1276
            timestampString = "576566988.307804"
1259
            filePath = "SuperMenu/ViewController.m"
1260
            timestampString = "576745700.546083"
1277 1261
            startingColumnNumber = "9223372036854775807"
1278 1262
            endingColumnNumber = "9223372036854775807"
1279
            startingLineNumber = "386"
1280
            endingLineNumber = "386"
1281
            landmarkName = "-getChoice:"
1263
            startingLineNumber = "177"
1264
            endingLineNumber = "177"
1265
            landmarkName = "-alert:content:"
1282 1266
            landmarkType = "7">
1283 1267
         </BreakpointContent>
1284 1268
      </BreakpointProxy>
@ -1288,13 +1272,13 @@
1288 1272
            shouldBeEnabled = "Yes"
1289 1273
            ignoreCount = "0"
1290 1274
            continueAfterRunningActions = "No"
1291
            filePath = "SuperMenu/ViewController.m"
1292
            timestampString = "576566988.307878"
1275
            filePath = "../WadeMobileFunc/WadeMobileFunc/WDFMobileUI.m"
1276
            timestampString = "575196812.291522"
1293 1277
            startingColumnNumber = "9223372036854775807"
1294 1278
            endingColumnNumber = "9223372036854775807"
1295
            startingLineNumber = "177"
1296
            endingLineNumber = "177"
1297
            landmarkName = "-alert:content:"
1279
            startingLineNumber = "561"
1280
            endingLineNumber = "561"
1281
            landmarkName = "-loadingStart:title:isCanceable:"
1298 1282
            landmarkType = "7">
1299 1283
         </BreakpointContent>
1300 1284
      </BreakpointProxy>
@ -1304,13 +1288,13 @@
1304 1288
            shouldBeEnabled = "Yes"
1305 1289
            ignoreCount = "0"
1306 1290
            continueAfterRunningActions = "No"
1307
            filePath = "../WadeMobileFunc/WadeMobileFunc/WDFMobileUI.m"
1308
            timestampString = "575196812.291522"
1291
            filePath = "SuperMenu/multiple/AppManagePlugin.m"
1292
            timestampString = "576745700.5461431"
1309 1293
            startingColumnNumber = "9223372036854775807"
1310 1294
            endingColumnNumber = "9223372036854775807"
1311
            startingLineNumber = "561"
1312
            endingLineNumber = "561"
1313
            landmarkName = "-loadingStart:title:isCanceable:"
1295
            startingLineNumber = "81"
1296
            endingLineNumber = "81"
1297
            landmarkName = "-openIpuApp:"
1314 1298
            landmarkType = "7">
1315 1299
         </BreakpointContent>
1316 1300
      </BreakpointProxy>
@ -1321,12 +1305,28 @@
1321 1305
            ignoreCount = "0"
1322 1306
            continueAfterRunningActions = "No"
1323 1307
            filePath = "SuperMenu/multiple/AppManagePlugin.m"
1324
            timestampString = "576566988.307968"
1308
            timestampString = "576745700.546185"
1309
            startingColumnNumber = "9223372036854775807"
1310
            endingColumnNumber = "9223372036854775807"
1311
            startingLineNumber = "271"
1312
            endingLineNumber = "271"
1313
            landmarkName = "AppManagePlugin"
1314
            landmarkType = "3">
1315
         </BreakpointContent>
1316
      </BreakpointProxy>
1317
      <BreakpointProxy
1318
         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
1319
         <BreakpointContent
1320
            shouldBeEnabled = "Yes"
1321
            ignoreCount = "0"
1322
            continueAfterRunningActions = "No"
1323
            filePath = "SuperMenu/multiple/IPUCountLogPlugin.m"
1324
            timestampString = "576744251.719043"
1325 1325
            startingColumnNumber = "9223372036854775807"
1326 1326
            endingColumnNumber = "9223372036854775807"
1327
            startingLineNumber = "311"
1328
            endingLineNumber = "311"
1329
            landmarkName = "-getSubAppParams"
1327
            startingLineNumber = "18"
1328
            endingLineNumber = "18"
1329
            landmarkName = "-closeCountLog:"
1330 1330
            landmarkType = "7">
1331 1331
         </BreakpointContent>
1332 1332
      </BreakpointProxy>
@ -1336,13 +1336,13 @@
1336 1336
            shouldBeEnabled = "Yes"
1337 1337
            ignoreCount = "0"
1338 1338
            continueAfterRunningActions = "No"
1339
            filePath = "SuperMenu/AppDelegate.m"
1340
            timestampString = "576566988.308032"
1339
            filePath = "../../ios-plugin/IpuCount/IpuCount/config/IpuCountConfig.m"
1340
            timestampString = "576745700.546281"
1341 1341
            startingColumnNumber = "9223372036854775807"
1342 1342
            endingColumnNumber = "9223372036854775807"
1343
            startingLineNumber = "133"
1344
            endingLineNumber = "133"
1345
            landmarkName = "-application:openURL:options:"
1343
            startingLineNumber = "41"
1344
            endingLineNumber = "41"
1345
            landmarkName = "-openCountLog"
1346 1346
            landmarkType = "7">
1347 1347
         </BreakpointContent>
1348 1348
      </BreakpointProxy>
@ -1352,13 +1352,29 @@
1352 1352
            shouldBeEnabled = "Yes"
1353 1353
            ignoreCount = "0"
1354 1354
            continueAfterRunningActions = "No"
1355
            filePath = "SuperMenu/ViewController.m"
1356
            timestampString = "576566988.308409"
1355
            filePath = "../../ios-plugin/IpuCount/IpuCount/config/IpuCountConfig.m"
1356
            timestampString = "576745700.546613"
1357 1357
            startingColumnNumber = "9223372036854775807"
1358 1358
            endingColumnNumber = "9223372036854775807"
1359
            startingLineNumber = "31"
1360
            endingLineNumber = "31"
1361
            landmarkName = "-viewDidLoad"
1359
            startingLineNumber = "47"
1360
            endingLineNumber = "47"
1361
            landmarkName = "-closeCountLog"
1362
            landmarkType = "7">
1363
         </BreakpointContent>
1364
      </BreakpointProxy>
1365
      <BreakpointProxy
1366
         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
1367
         <BreakpointContent
1368
            shouldBeEnabled = "Yes"
1369
            ignoreCount = "0"
1370
            continueAfterRunningActions = "No"
1371
            filePath = "SuperMenu/AppDelegate.m"
1372
            timestampString = "576745700.546821"
1373
            startingColumnNumber = "9223372036854775807"
1374
            endingColumnNumber = "9223372036854775807"
1375
            startingLineNumber = "32"
1376
            endingLineNumber = "32"
1377
            landmarkName = "-createViewController"
1362 1378
            landmarkType = "7">
1363 1379
         </BreakpointContent>
1364 1380
      </BreakpointProxy>

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

@ -17,12 +17,14 @@
17 17
18 18
- (void) initAppConfig:(NSArray *)args;
19 19
20
- (void) getAppsConfig:(NSArray *)args;
21
20 22
- (void) openIpuApp:(NSArray *)args;
21 23
22 24
- (void) openNativeApp:(NSArray *)args;
23 25
24
- (void) getAppsConfig:(NSArray *)args;
25
26 26
- (void) openRemoteURL:(NSArray *)param;
27 27
28
- (void)closeIpuApp:(NSArray *)args;
29
28 30
@end

+ 85 - 76
SuperMenu/SuperMenu/multiple/AppManagePlugin.m

@ -112,31 +112,93 @@
112 112
    
113 113
    //    }];
114 114
}
115
#pragma mark - edit by lql
115
116
- (void)closeIpuApp:(NSArray *)args {
117
    NSString *callbackStr = @"";
118
    if (args && args.count>0 && args[0]!=[NSNull null]) {
119
        callbackStr = args[0];
120
    }
121
    UIViewController *vc = (UIViewController *)self.wademobile;
122
    NSLog(@"vc================%@",vc);
123
    NSLog(@"vc1111111================%@",[self getViewController]);
124
    if([vc isKindOfClass:[IpuTemplateSubController class]])
125
        [vc dismissViewControllerAnimated:YES completion:^{
126
            [IpuMultipleManager setMultiple:NO];
127
            [self callback:callbackStr];
128
        }];
129
}
130
131
- (void) openRemoteURL:(NSArray *)param {
132
    if (param && param.count>0) {
133
        if (param[0]==[NSNull null]) {
134
            return;
135
        }
136
        NSString *url = param[0];
137
        NSString *title = nil;
138
        if (param.count>1) {
139
            if (param[1]==[NSNull null]) {
140
                title = nil;
141
            }else{
142
                title = param[1];
143
            }
144
        }
145
        NSArray *operates = nil;
146
        if (param.count>2) {
147
            if (param[2]==[NSNull null]) {
148
                operates = nil;
149
            }else{
150
                operates = param[2];
151
            }
152
        }
153
        NSArray *colors = nil;
154
        if (param.count>3) {
155
            if (param[3]==[NSNull null]) {
156
                colors = nil;
157
            }else{
158
                colors = param[3];
159
            }
160
        }
161
        BOOL hiddenBar = false;
162
        if (param.count>4) {
163
            if (param[4]==[NSNull null]) {
164
                hiddenBar = false;
165
            }else{
166
                hiddenBar = [param[4] boolValue];
167
            }
168
        }
169
        WDTemplateNavigateController *vc = [[WDTemplateNavigateController alloc] initWithUrl:url Callback:nil Title:title Operates:operates Colors:colors Hidden:hiddenBar];
170
        vc.plugin = self;
171
        UINavigationController *nc = [[UINavigationController alloc] initWithRootViewController:vc];
172
        [[self getViewController] presentViewController:nc animated:YES completion:^{
173
            
174
        }];
175
    }
176
}
177
116 178
/**
117 179
 * 打开原生应用
118 180
 
119 181
 {"APP_ID":"1051",
120
  "ACCOUNT":"liufl5",
121
  "PHONE_NBR":"",
122
  "TOKEN_ID":"661553136540023",
123
  "EXTRA_PARAMS":"{\"key1\":\"sb\",\"key2\":\"nb\"}",
124
  "IOS_DOWNLOAD_URL":"",
125
  "IOS_PACKAGE_NAME":"",
126
  "MENU_IOS_MAIN_CLASS":"EntranceViewController"}
182
 "ACCOUNT":"liufl5",
183
 "PHONE_NBR":"",
184
 "TOKEN_ID":"661553136540023",
185
 "EXTRA_PARAMS":"{\"key1\":\"sb\",\"key2\":\"nb\"}",
186
 "IOS_DOWNLOAD_URL":"",
187
 "IOS_PACKAGE_NAME":"",
188
 "MENU_IOS_MAIN_CLASS":"EntranceViewController"}
127 189
 
128 190
 
129
APP_ID===============1051
130
requestHost===============
131
requestPath===============
132
requestServlet===============
133
appPath===============
134
indexPage===============(null)
135
welcomePage===============(null)
136
packageName===============com-neomashgo-display://demoDisplay
137
downloadUrl===============itms-services://?action=download-manifest&url=https://gitee.com/AIIPU/neomashgo/raw/master/neomashgo.plist
138
version===============2.1.11
139
191
 APP_ID===============1051
192
 requestHost===============
193
 requestPath===============
194
 requestServlet===============
195
 appPath===============
196
 indexPage===============(null)
197
 welcomePage===============(null)
198
 packageName===============com-neomashgo-display://demoDisplay
199
 downloadUrl===============itms-services://?action=download-manifest&url=https://gitee.com/AIIPU/neomashgo/raw/master/neomashgo.plist
200
 version===============2.1.11
201
 
140 202
 */
141 203
- (void)openNativeApp:(NSArray *)args {
142 204
    // 检查参数
@ -179,7 +241,7 @@ version===============2.1.11
179 241
    if (phone_nbr && phone_nbr.length) {
180 242
        scheme = [scheme stringByAppendingFormat:@"&PHONE_NBR=%@", phone_nbr];
181 243
    }
182
244
    
183 245
    // 版本号
184 246
    NSString *version = appConfig.version;
185 247
    if (version && version.length) {
@ -199,12 +261,14 @@ version===============2.1.11
199 261
            }
200 262
        }
201 263
    }
202
264
    
203 265
    scheme = [scheme stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
204 266
    
205 267
    [self openNativeApp:scheme url:appConfig.downloadUrl];
206 268
    //===============      end      ==============
207 269
}
270
#pragma mark - edit by lql
271
208 272
- (void)openNativeApp:(NSString *)app url:(NSString *)urlStr {
209 273
//    NSLog(@"scheme===============%@",app);
210 274
//    NSLog(@"downloadUrl===============%@",urlStr);
@ -310,53 +374,6 @@ version===============2.1.11
310 374
    return [NSString stringWithFormat:@"{\"%@\":\"%@\",\"%@\":\"%@\"}", KEY_SESSION, sessionId, KEY_STAFF_ID, staffId];
311 375
}
312 376
313
- (void) openRemoteURL:(NSArray *)param {
314
    if (param && param.count>0) {
315
        if (param[0]==[NSNull null]) {
316
            return;
317
        }
318
        NSString *url = param[0];
319
        NSString *title = nil;
320
        if (param.count>1) {
321
            if (param[1]==[NSNull null]) {
322
                title = nil;
323
            }else{
324
                title = param[1];
325
            }
326
        }
327
        NSArray *operates = nil;
328
        if (param.count>2) {
329
            if (param[2]==[NSNull null]) {
330
                operates = nil;
331
            }else{
332
                operates = param[2];
333
            }
334
        }
335
        NSArray *colors = nil;
336
        if (param.count>3) {
337
            if (param[3]==[NSNull null]) {
338
                colors = nil;
339
            }else{
340
                colors = param[3];
341
            }
342
        }
343
        BOOL hiddenBar = false;
344
        if (param.count>4) {
345
            if (param[4]==[NSNull null]) {
346
                hiddenBar = false;
347
            }else{
348
                hiddenBar = [param[4] boolValue];
349
            }
350
        }
351
        WDTemplateNavigateController *vc = [[WDTemplateNavigateController alloc] initWithUrl:url Callback:nil Title:title Operates:operates Colors:colors Hidden:hiddenBar];
352
        vc.plugin = self;
353
        UINavigationController *nc = [[UINavigationController alloc] initWithRootViewController:vc];
354
        [[self getViewController] presentViewController:nc animated:YES completion:^{
355
            
356
        }];
357
    }
358
}
359
360 377
- (void)getChoice:(NSArray *)args {
361 378
    NSArray *options = [args[0] componentsSeparatedByString:@","];
362 379
    NSArray *values = [args[1] componentsSeparatedByString:@","];
@ -388,14 +405,6 @@ version===============2.1.11
388 405
    });
389 406
}
390 407
391
- (void)closeIpuApp:(NSArray *)args {
392
    UIViewController *vc = (UIViewController *)self.wademobile;
393
    if([vc isKindOfClass:[IpuTemplateSubController class]])
394
        [vc dismissViewControllerAnimated:YES completion:^{
395
            [IpuMultipleManager setMultiple:NO];
396
        }];
397
}
398
399 408
- (void)initNfc:(NSArray *)args {
400 409
    IpuAlertView *alert = [[IpuAlertView alloc]initWithTitle:@"提示" message:@"IOS暂不提供NFC功能,请等待!" block:^(IpuAlertView *alertView, BOOL isCancel, NSInteger buttonIndex) {
401 410
        //3.1.退出应用

+ 3 - 3
WadeMobileFunc/WadeMobileFunc.xcodeproj/xcuserdata/mac.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@ -26,7 +26,7 @@
26 26
                  moduleName = "WadeMobileFunc"
27 27
                  usesParentBreakpointCondition = "Yes"
28 28
                  urlString = "file:///Users/mac/work/asiainfo/ios-share/WadeMobileFunc/WadeMobileFunc/WDFSocial.m"
29
                  timestampString = "576566988.779863"
29
                  timestampString = "576745700.850844"
30 30
                  startingColumnNumber = "9223372036854775807"
31 31
                  endingColumnNumber = "9223372036854775807"
32 32
                  startingLineNumber = "291"
@ -41,7 +41,7 @@
41 41
                  moduleName = "WadeMobileFunc"
42 42
                  usesParentBreakpointCondition = "Yes"
43 43
                  urlString = "file:///Users/mac/work/asiainfo/ios-share/WadeMobileFunc/WadeMobileFunc/WDFSocial.m"
44
                  timestampString = "576566988.781642"
44
                  timestampString = "576745700.852929"
45 45
                  startingColumnNumber = "9223372036854775807"
46 46
                  endingColumnNumber = "9223372036854775807"
47 47
                  startingLineNumber = "292"
@ -56,7 +56,7 @@
56 56
                  moduleName = "WadeMobileFunc"
57 57
                  usesParentBreakpointCondition = "Yes"
58 58
                  urlString = "file:///Users/mac/work/asiainfo/ios-share/WadeMobileFunc/WadeMobileFunc/WDFSocial.m"
59
                  timestampString = "576566988.78345"
59
                  timestampString = "576745700.85478"
60 60
                  startingColumnNumber = "9223372036854775807"
61 61
                  endingColumnNumber = "9223372036854775807"
62 62
                  startingLineNumber = "291"

+ 3 - 3
WadeMobileFunc/WadeMobileFunc.xcodeproj/xcuserdata/mac.xcuserdatad/xcschemes/xcschememanagement.plist

@ -7,17 +7,17 @@
7 7
		<key>WadeMobileFunc.xcscheme</key>
8 8
		<dict>
9 9
			<key>orderHint</key>
10
			<integer>11</integer>
10
			<integer>15</integer>
11 11
		</dict>
12 12
		<key>WadeMobileFunc4Appstore.xcscheme</key>
13 13
		<dict>
14 14
			<key>orderHint</key>
15
			<integer>15</integer>
15
			<integer>17</integer>
16 16
		</dict>
17 17
		<key>WadeMobileFuncAggregate.xcscheme</key>
18 18
		<dict>
19 19
			<key>orderHint</key>
20
			<integer>14</integer>
20
			<integer>16</integer>
21 21
		</dict>
22 22
	</dict>
23 23
</dict>