h5 2

@@ -149,22 +149,36 @@ angular.module('myApp')
 			$rootScope.openRing = false;
 			$rootScope.openRing = false;
 			$rootScope.$watch("openScan",function(newVal, oldVal){
 			$rootScope.$watch("openScan",function(newVal, oldVal){
 				if(newVal !== oldVal && newVal) {
 				if(newVal !== oldVal && newVal) {
-					if(!$scope.checkLogin()) {
-						return;
-					}
-					
+					// if(!$scope.checkLogin()) {
+					// 	return;
+					// }
+					//
 					// if($scope.unfinishOrder.status == 200) {
 					// if($scope.unfinishOrder.status == 200) {
 					// 	$state.go('tripDetail' , { orderId : $scope.unfinishOrder.id});
 					// 	$state.go('tripDetail' , { orderId : $scope.unfinishOrder.id});
 					// 	return;
 					// 	return;
 					// }
 					// }
 					$rootScope.openScan = false;
 					$rootScope.openScan = false;
 
 
+
+                    if(isAndroid){
+                        // appClient.appObj.registerHandler('postERCode', function(data, responseCallback) {
+                        //     layer.open({
+                        //         content: JSON.stringify(data),
+                        //         time: 10
+                        //     });
+                        //     // log('ObjC called testJavascriptHandler with', data)
+                        //     // var responseData = { 'Javascript Says':'Right back atcha!' }
+                        //     // log('JS responding with', responseData)
+                        //     // responseCallback(responseData)
+                        // })
+                        window.WebViewJavascriptBridge.callHandler('getGPS', function (res) {
                             layer.open({
                             layer.open({
-						content: appClient,
-						time: 5
-					})
+                                content: res,
+                                time: 10
+                            });
+                        }, '')
 
 
-                    if(appClient){
+					}else if(isiOS){
                         appClient.appObj.registerHandler('postERCode', function(data, responseCallback) {
                         appClient.appObj.registerHandler('postERCode', function(data, responseCallback) {
                             layer.open({
                             layer.open({
                                 content: JSON.stringify(data),
                                 content: JSON.stringify(data),
@@ -181,7 +195,6 @@ angular.module('myApp')
                             //     time: 10
                             //     time: 10
                             // });
                             // });
                         }, '')
                         }, '')
-
                     } else {
                     } else {
                         layer.open({
                         layer.open({
                             content: '调起摄像头失败',
                             content: '调起摄像头失败',