Skip to content

杨建斌 / dy-wx2

Go to a project
Toggle navigation
Toggle navigation pinning
3699474c by ex
Options

h5

1 parent e70e826a
Inline Side-by-side
Showing 3 changed files with 65 additions and 77 deletions
js/JSBridge.js
...@@ -29,28 +29,28 @@ function toJson(str) { ...@@ -29,28 +29,28 @@ function toJson(str) {
29 // getSign(jsonStr); 29 // getSign(jsonStr);
30 // } 30 // }
31 // 31 //
32 AppClient.prototype.getERCode = function (callbackName, callback, jsonStr) { 32 AppClient.prototype.getERCode = function (jsonStr, getCallback, postCallback) {
33 var dataParams = ""; 33 var dataParams = "";
34 if(isJson(jsonStr)){ 34 if(isJson(jsonStr)){
35 dataParams = JSON.parse(jsonStr); 35 dataParams = JSON.parse(jsonStr);
36 } 36 }
37 var iOSData = { 37 var param = {
38 from: 'H5', 38 from: 'H5',
39 params: dataParams 39 params: dataParams
40 }; 40 };
41 if (this.isAndroid) { 41 // if(this.isAndroid) {
42 window.WebViewJavascriptBridge.callHandler('getERCode', jsonStr, function (res) { 42 // this.appObj.callHandler('getERCode', jsonStr, function (res) {
43 layer.open({ 43 // layer.open({
44 content: res, 44 // content: res,
45 time: 2 45 // time: 2
46 }) 46 // })
47 }); 47 // });
48 } else { 48 // } else {
49 this.appObj.callHandler("getERCode", iOSData, callback); 49 this.appObj.registerHandler("postERCOde", postCallback)
50 50 this.appObj.callHandler("getERCode", param, getCallback);
51 } 51 // }
52 }; 52 };
53 AppClient.prototype.getGPS = function (callbackName, callback, jsonStr) { 53 AppClient.prototype.getGPS = function (jsonStr, getCallback, postCallback) {
54 var dataParams = ""; 54 var dataParams = "";
55 if(isJson(jsonStr)){ 55 if(isJson(jsonStr)){
56 dataParams = JSON.parse(jsonStr); 56 dataParams = JSON.parse(jsonStr);
...@@ -59,39 +59,19 @@ AppClient.prototype.getGPS = function (callbackName, callback, jsonStr) { ...@@ -59,39 +59,19 @@ AppClient.prototype.getGPS = function (callbackName, callback, jsonStr) {
59 from: 'H5', 59 from: 'H5',
60 params: dataParams 60 params: dataParams
61 }; 61 };
62 if (this.isAndroid) { 62 // if (this.isAndroid) {
63 this.appObj.getGPS('H5', jsonStr); 63 // this.appObj.callHandler('getGPS', jsonStr, function (res) {
64 } else { 64 // layer.open({
65 this.appObj.callHandler("getGPS", iOSData, callback); 65 // content: res,
66 // time: 2
67 // })
68 // })
69 // } else {
70 this.appObj.registerHandler("postGPS", postCallback)
71 this.appObj.callHandler("getGPS", param, getCallback);
66 72
67 } 73 // }
68 }; 74 };
69 //
70 // window. = function (_params) {
71 //
72 // }
73 // window.postGPS = function (params) {
74 // layer.open({
75 // content: JSON.stringify(_params),
76 // time: 10
77 // });
78 // }
79 // var appClient = new AppClient(window.android, true);
80 // layer.open({
81 // content: window.android,
82 // time: 2
83 // })
84 // layer.open({
85 // content: 'hah' ,
86 // time: 2
87 // })
88 // bridge.registerHandler('postGPS', function(data, responseCallback) {
89 // log('ObjC called testJavascriptHandler with', data)
90 // var responseData = { 'Javascript Says':'Right back atcha!' }
91 // log('JS responding with', responseData)
92 // responseCallback(responseData)
93 // })
94
95 75
96 if(isAndroid || isiOS) { 76 if(isAndroid || isiOS) {
97 77
......
js/controller/mainController.js
...@@ -161,31 +161,33 @@ angular.module('myApp') ...@@ -161,31 +161,33 @@ angular.module('myApp')
161 161
162 162
163 if(isAndroid){ 163 if(isAndroid){
164 window.WebViewJavascriptBridge.registerHandler('postERCode', function(data, responseCallback) { 164 appClient.getERCode('', function (data, cb) {
165 layer.open({ 165 layer.open({
166 content: data, 166 content: data,
167 time: 10 167 time: 2
168 }); 168 })
169 })
170 window.WebViewJavascriptBridge.callHandler('getERCode', function(data, responseCallback) {
171 })
172 }else if(isiOS){
173 appClient.appObj.registerHandler('postERCode', function(data, responseCallback) {
174 layer.open({
175 content: JSON.stringify(data),
176 time: 10
177 });
178 // log('ObjC called testJavascriptHandler with', data)
179 // var responseData = { 'Javascript Says':'Right back atcha!' }
180 // log('JS responding with', responseData)
181 // responseCallback(responseData)
182 }) 169 })
183 appClient.getERCode('getERCode', function (res) { 170 // window.WebViewJavascriptBridge.registerHandler('postERCode', function(data, responseCallback) {
184 // layer.open({ 171 // layer.open({
185 // content: JSON.stringify(res) + 'cb', 172 // content: data,
186 // time: 10 173 // time: 10
187 // }); 174 // });
188 }, '') 175 // })
176 // window.WebViewJavascriptBridge.callHandler('getERCode', function(data, responseCallback) {
177 // })
178 // }else if(isiOS){
179 // appClient.appObj.registerHandler('postERCode', function(data, responseCallback) {
180 // layer.open({
181 // content: JSON.stringify(data),
182 // time: 10
183 // });
184 // })
185 // appClient.getERCode('getERCode', function (res) {
186 // // layer.open({
187 // // content: JSON.stringify(res) + 'cb',
188 // // time: 10
189 // // });
190 // }, '')
189 } else { 191 } else {
190 layer.open({ 192 layer.open({
191 content: '调起摄像头失败', 193 content: '调起摄像头失败',
......
js/controller/mapController.js
...@@ -298,22 +298,28 @@ angular.module('myApp') ...@@ -298,22 +298,28 @@ angular.module('myApp')
298 // } 298 // }
299 // }); 299 // });
300 if(isAndroid){ 300 if(isAndroid){
301 // // window.WebViewJavascriptBridge.callHandler('getGPS', '', function(res, responseCallback) {
302 // // var res = JSON.parse(data)
303 // // layer.open({
304 // // content: data,
305 // // time: 2
306 // // });
307 // // onSuccess(data)
308 // // })
301 // window.WebViewJavascriptBridge.callHandler('getGPS', '', function(res, responseCallback) { 309 // window.WebViewJavascriptBridge.callHandler('getGPS', '', function(res, responseCallback) {
302 // var res = JSON.parse(data) 310 // // var data = JSON.parse(res
311 // // var data = eval(res)
303 // layer.open({ 312 // layer.open({
304 // content: data, 313 // content: res,
305 // time: 2 314 // time: 2
306 // }); 315 // });
307 // onSuccess(data) 316 // onSuccess(data)
308 // }) 317 // })
309 window.WebViewJavascriptBridge.callHandler('getGPS', '', function(res, responseCallback) { 318 appClient.getGPS('', function (data, cb) {
310 // var data = JSON.parse(res 319 layer.open({
311 // var data = eval(res) 320 content: data,
312 layer.open({ 321 time: 2
313 content: res, 322 })
314 time: 2
315 });
316 onSuccess(data)
317 }) 323 })
318 // window.WebViewJavascriptBridge.callHandler('getGPS','1', function (res) { 324 // window.WebViewJavascriptBridge.callHandler('getGPS','1', function (res) {
319 // // layer.open({ 325 // // layer.open({
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!