Browse Source

isEscape改造

huangbo 9 years ago
parent
commit
8ef01102f4

+ 6 - 4
display-server/web/res/js/mobile/expand-mobile.js

279
				storageCallback("aliPay",callback);
279
				storageCallback("aliPay",callback);
280
				execute("aliPay",[tradeNo,subject,body,price],err);	
280
				execute("aliPay",[tradeNo,subject,body,price],err);	
281
			},uploadWithServlet:function(filePath,dataAction,param,callback,err){
281
			},uploadWithServlet:function(filePath,dataAction,param,callback,err){
282
				var isEscape = true;
282
				if(typeof(filePath)=="string"){
283
				if(typeof(filePath)=="string"){
283
					filePath = [filePath];
284
					filePath = [filePath];
284
				}
285
				}
285
				storageCallback("uploadWithServlet",callback);
286
				execute("uploadWithServlet",[filePath,dataAction,param],err);	
286
				storageCallback("uploadWithServlet",callback,isEscape);
287
				execute("uploadWithServlet",[filePath,dataAction,param,isEscape],err);	
287
			},downloadWithServlet:function(savePath,dataAction,param,callback,err){
288
			},downloadWithServlet:function(savePath,dataAction,param,callback,err){
288
				storageCallback("downloadWithServlet",callback);
289
				execute("downloadWithServlet",[savePath,dataAction,param],err);	
289
				var isEscape = true;
290
				storageCallback("downloadWithServlet",callback,isEscape);
291
				execute("downloadWithServlet",[savePath,dataAction,param,isEscape],err);	
290
			},uploadFile:function(filePath,servletUrl,callback,err){
292
			},uploadFile:function(filePath,servletUrl,callback,err){
291
				storageCallback("uploadFile",callback);
293
				storageCallback("uploadFile",callback);
292
				execute("uploadFile",[filePath,servletUrl],err);	
294
				execute("uploadFile",[filePath,servletUrl],err);	

+ 3 - 3
display-server/web/res/js/mobile/mobile-browser.js

17
		};
17
		};
18
		/******************数据请求**********************/
18
		/******************数据请求**********************/
19
		/*调用服务*/
19
		/*调用服务*/
20
		this.dataRequest = function(action, param, callback, isEscape, err) {
21
			browserTool.ajax.post(action, param, callback, isEscape, err);
20
		this.dataRequest = function(action, param, callback, err) {
21
			browserTool.ajax.post(action, param, callback, err);
22
			/*browserTool.ajax.post(action, param, function(resultData){
22
			/*browserTool.ajax.post(action, param, function(resultData){
23
				resultData = Wade.DataMap(resultData);
23
				resultData = Wade.DataMap(resultData);
24
				var x_resultcode = resultData.get("X_RESULTCODE");
24
				var x_resultcode = resultData.get("X_RESULTCODE");
27
				}else{
27
				}else{
28
					callback(resultData);
28
					callback(resultData);
29
				};
29
				};
30
			}, isEscape, err);*/
30
			}, err);*/
31
		};
31
		};
32
		/******************页面跳转**********************/
32
		/******************页面跳转**********************/
33
		/*页面跳转,url为跳转目标*/
33
		/*页面跳转,url为跳转目标*/

+ 2 - 2
display-server/web/res/js/mobile/mobile-client.js

15
		};
15
		};
16
		/******************数据请求**********************/
16
		/******************数据请求**********************/
17
		/*调用服务*/
17
		/*调用服务*/
18
		this.dataRequest = function(action, param, callback, isEscape, err) {
18
		this.dataRequest = function(action, param, callback, err) {
19
			param = param ? param : "";
19
			param = param ? param : "";
20
			WadeMobile.dataRequest(callback, action, param.toString(), isEscape, null, null, null, err);
20
			WadeMobile.dataRequest(callback, action, param.toString(), null, null, null, err);
21
		};
21
		};
22
		/******************页面跳转**********************/
22
		/******************页面跳转**********************/
23
		/*页面跳转,url为跳转目标*/
23
		/*页面跳转,url为跳转目标*/

+ 14 - 20
display-server/web/res/js/mobile/wade-mobile.js

37
					confirm = true;
37
					confirm = true;
38
				}
38
				}
39
				execute("close", [confirm],err);
39
				execute("close", [confirm],err);
40
			},httpRequest:function(callback,requestUrl,isEscape,encode,conTimeout,readTimeout,err){
41
				if (isEscape == undefined) {
42
					isEscape = true;
43
				}
40
			},httpRequest:function(callback,requestUrl,encode,conTimeout,readTimeout,err){
41
				var isEscape = true;
44
				if(terminalType=="i"){
42
				if(terminalType=="i"){
45
					requestUrl = encodeURIComponent(requestUrl);
43
					requestUrl = encodeURIComponent(requestUrl);
46
				}
44
				}
47
				WadeMobile.callback.storageCallback("httpRequest",callback,isEscape);
45
				WadeMobile.callback.storageCallback("httpRequest",callback,isEscape);
48
				execute("httpRequest", [requestUrl,isEscape,encode,conTimeout,readTimeout],err);
46
				execute("httpRequest", [requestUrl,isEscape,encode,conTimeout,readTimeout],err);
49
			},dataRequest:function(callback,dataAction,param,isEscape,encode,conTimeout,readTimeout,err){
47
			},dataRequest:function(callback,dataAction,param,isEscape,encode,conTimeout,readTimeout,err){
50
				if (isEscape == undefined) {
51
					isEscape = true;
52
				}
48
				var isEscape = true;
53
				WadeMobile.callback.storageCallback("dataRequest",callback,isEscape);
49
				WadeMobile.callback.storageCallback("dataRequest",callback,isEscape);
54
				execute("dataRequest", [dataAction,param,isEscape,encode,conTimeout,readTimeout],err);
50
				execute("dataRequest", [dataAction,param,isEscape,encode,conTimeout,readTimeout],err);
55
			},openUrl:function(url,err){
51
			},openUrl:function(url,err){
70
				execute("getTemplate", [action,context,isEscape],err);
66
				execute("getTemplate", [action,context,isEscape],err);
71
			},storageDataByThread:function(dataAction,param,waitoutTime,err){
67
			},storageDataByThread:function(dataAction,param,waitoutTime,err){
72
				execute("storageDataByThread", [dataAction,param,waitoutTime],err);
68
				execute("storageDataByThread", [dataAction,param,waitoutTime],err);
73
			},openDialog:function(callback,pageAction,param,width,height,isEscape,err){
74
				if (isEscape == undefined) {
75
					isEscape = true;
76
				}
69
			},openDialog:function(callback,pageAction,param,width,height,err){
70
				var isEscape = true;
77
				WadeMobile.callback.storageCallback("openDialog",callback,isEscape);
71
				WadeMobile.callback.storageCallback("openDialog",callback,isEscape);
78
				execute("openDialog", [pageAction,param,width,height,isEscape],err);
72
				execute("openDialog", [pageAction,param,width,height,isEscape],err);
79
			},closeDialog:function(result,state,err){
73
			},closeDialog:function(result,state,err){
80
				execute("closeDialog", [result,state],err);
74
				execute("closeDialog", [result,state],err);
81
			},openWindow:function(callback,pageAction,param,isEscape,err){
82
				if (isEscape == undefined) {
83
					isEscape = true;
84
				}
75
			},openWindow:function(callback,pageAction,param,err){
76
				var isEscape = true;
85
				WadeMobile.callback.storageCallback("openWindow",callback,isEscape);
77
				WadeMobile.callback.storageCallback("openWindow",callback,isEscape);
86
				execute("openWindow", [pageAction,param,isEscape],err);
78
				execute("openWindow", [pageAction,param,isEscape],err);
87
			},closeWindow:function(result,state,err){
79
			},closeWindow:function(result,state,err){
88
				execute("closeWindow", [result,state],err);
80
				execute("closeWindow", [result,state],err);
89
			},openSlidingMenu:function(callback,action,param,width,height,leftMargin,topMargin,isEscape,err){
81
			},openSlidingMenu:function(callback,action,param,width,height,leftMargin,topMargin,err){
82
				var isEscape = true;
90
				WadeMobile.callback.storageCallback("openSlidingMenu",callback,isEscape);
83
				WadeMobile.callback.storageCallback("openSlidingMenu",callback,isEscape);
91
				execute("openSlidingMenu", [action,param,width,height,leftMargin,topMargin,isEscape],err);
84
				execute("openSlidingMenu", [action,param,width,height,leftMargin,topMargin,isEscape],err);
92
			},closeSlidingMenu:function(result,state,err){
85
			},closeSlidingMenu:function(result,state,err){
218
			    }else{
211
			    }else{
219
			    	alert(message);
212
			    	alert(message);
220
			    }
213
			    }
221
			},storageCallback:function(action,callback,isEscape,isBase64){
214
			},storageCallback:function(action,callback,isEscape){
222
				var callbackKey = action+callbackId;
215
				var callbackKey = action+callbackId;
223
				if (callback) {
216
				if (callback) {
224
		            callbackDefine[callbackKey] = {callback:callback,isEscape:isEscape,isBase64:isBase64};
217
		            callbackDefine[callbackKey] = {callback:callback,isEscape:isEscape};
225
		        }
218
		        }
226
			},execCallback:function(callbackKey, data){
219
			},execCallback:function(callbackKey, data){
227
				globalErrorKey = callbackKey;
220
				globalErrorKey = callbackKey;
231
		        	if(data){
224
		        	if(data){
232
		        		if(callbackItem.isEscape==true){
225
		        		if(callbackItem.isEscape==true){
233
		        			data = unescape(data);
226
		        			data = unescape(data);
234
		        		}else if(callbackItem.isBase64==true){
235
		        			data = Base64.decode64(data);
236
		        		}
227
		        		}
228
		        		/*else if(callbackItem.isBase64==true){
229
		        			data = Base64.decode64(data);
230
		        		}*/
237
		        	}
231
		        	}
238
		            if (callbackItem.callback) {   
232
		            if (callbackItem.callback) {   
239
		                if(typeof callbackItem.callback==="function"){
233
		                if(typeof callbackItem.callback==="function"){