fix

pages/amap/amap.js

@@ -64,7 +64,8 @@
 					});
 				});
 			}
-			//获取手机GPS位置
+            //获取手机GPS位置
+            var locationFlag = true;
 			function get_mobile_gps_location(onSuccess,onError){
 				var onSuccess = function(position) {
 					// alert('Latitude: '          + position.coords.latitude          + '\n' +
@@ -78,8 +79,13 @@
                     var lnglat = new AMap.LngLat(position.coords.longitude, position.coords.latitude);
                     userMarker.setPosition(lnglat);
                     userMarker.setMap(learun.map);
-                    learun.map.setFitView();
-                    console.log(lnglat);
+                    if(locationFlag){
+                        learun.map.setFitView();
+                        locationFlag = false;
+                    }else{
+                        learun.map.setFitView([learun.vehicleMarker]);
+                        locationFlag = true;
+                    }
 				};
 			 
 				// onError Callback receives a PositionError object
@@ -94,15 +100,29 @@
 			var userinfo = learun.storage.get('userinfo');
 			//上报客户端极光注册信息
 			function update_jg_registrationid(){
-				if(window.lrmui.jgRegistrationId){
-					var post_data = {
-						"regid":window.lrmui.jgRegistrationId,
-						"uid":userinfo.baseinfo.userId
-					};
-					learun.httppost(config.webapi+'?s=api/update_jg_registrationid',post_data,function(res){
-						
-					});
-				}
+				var onGetRegistrationID = function(data) {
+				  try {
+					
+					if (data.length == 0) {
+					  var t1 = window.setTimeout(getRegistrationID, 1000);
+					}else{
+						console.log("JPushPlugin:registrationID is " + data);
+						var post_data = {
+							"regid":data,
+							"uid":userinfo.baseinfo.userId
+						};
+						learun.httppost(config.webapi+'?s=api/update_jg_registrationid',post_data,function(res){
+							console.log(res.message);
+						});
+					}
+				  } catch (exception) {
+					console.log(exception);
+				  }
+				};
+				var getRegistrationID = function() {
+				  window.JPush.getRegistrationID(onGetRegistrationID);
+				};
+				window.setTimeout(getRegistrationID, 1000);
 			}
 			learun.layer.loading(true, "加载数据中");
 			if(window.lrmui.isreal){
@@ -121,8 +141,8 @@
 
             var fencePageData = null;
 
-            var userIcon = new AMap.Icon({size: new AMap.Size(50,50), image:'./images/gelocation.png'})
-            var userMarker = new AMap.Marker({icon: userIcon, offset:new AMap.Pixel(10, 10),position:[113.952,22.542991]});
+            // var userIcon = new AMap.Icon({size: new AMap.Size(50,50), image:'./images/gelocation.png'})
+            var userMarker = new AMap.Marker({icon: "./images/gelocation.png", offset:new AMap.Pixel(16, -16)});
             
             //车辆信息初始化
             learun.timeInterval = 5000;

pages/amap/fence/fence.js

@@ -6,9 +6,14 @@
                 center: [113.955439, 22.542956],//地图中心点
                 zoom: 12 //地图显示的缩放级别
             });
+            learun.layer.loading(true, "加载数据中");
 
 
 
+            map.on('complete', function(){
+                learun.layer.loading(false);
+                
+			});
 
             // // var polygonFence = new AMap.Polygon({
             // //     strokeColor: "#FF33FF", 

pages/amap/navigation/navigation.js

@@ -1,16 +1,30 @@
 (function () {
     var page = {
         init: function ($page, param) {
+            
+            learun.layer.loading(true, "加载数据中");
             //地图初始化
             var map = new AMap.Map("navigation-map", {
                 resizeEnable: true,
                 center: [113.955439, 22.542956],//地图中心点
                 zoom: 12 //地图显示的缩放级别
             });
+
+
+            
+
+
+
+            map.on('complete', function(){
+                learun.layer.loading(false);
+                
+			});
+
+            var userMarker = new AMap.Marker({icon: "./images/gelocation.png", offset:new AMap.Pixel(-16, -16)});
+
             //骑行导航
            var riding = new AMap.Riding({
                 map: map,
-                panel: "navg-panel",
                 autoFitView: true
             }); 
             //根据起终点坐标规划骑行路线
@@ -22,6 +36,46 @@
                     learun.layer.toast('骑行路线数据查询失败:' + result);
                 }
             });
+
+
+
+            function get_mobile_gps_location(onSuccess,onError){
+				var onSuccess = function(position) {
+					// alert('Latitude: '          + position.coords.latitude          + '\n' +
+					// 	  'Longitude: '         + position.coords.longitude         + '\n' +
+					// 	  'Altitude: '          + position.coords.altitude          + '\n' +
+					// 	  'Accuracy: '          + position.coords.accuracy          + '\n' +
+					// 	  'Altitude Accuracy: ' + position.coords.altitudeAccuracy  + '\n' +
+					// 	  'Heading: '           + position.coords.heading           + '\n' +
+					// 	  'Speed: '             + position.coords.speed             + '\n' +
+                    // 	  'Timestamp: '         + position.timestamp                + '\n');
+                    var lnglat = new AMap.LngLat(position.coords.longitude, position.coords.latitude);
+                    userMarker.setPosition(lnglat);
+                    userMarker.setMap(map);
+                    map.setFitView();
+				};
+			 
+				// onError Callback receives a PositionError object
+				//
+				function onError(error) {
+					alert('code: '    + error.code    + '\n' +
+						  'message: ' + error.message + '\n');
+				}
+				navigator.geolocation.getCurrentPosition(onSuccess, onError);
+            }
+            
+
+
+
+            setInterval(function(){
+                get_mobile_gps_location()
+            }, 5000);
+
+
+
+
+
+            
         }
     };
 

pages/amap/route/route.js

@@ -2,21 +2,10 @@
     var page = {
         init: function ($page) {
             //页面初始化
-            /*
-			$page.find('#date2').rldate({
-                type: 'date'
-            });
 
+           learun.layer.loading(true, "加载数据中");
 
 
-            $page.find('.date-set').on('tap', function(){
-                console.log('dsafd');
-                $('.widthset').show();
-                $('.outcase').hide();
-                
-            });
-            */
-
 			
             //播放控制相关事件清除
             function removeEvents(){
@@ -32,12 +21,20 @@
                 center: [117.000923, 36.675807],
                 zoom: 15
             });
+
+            routeMap.on('complete', function(){
+				learun.layer.loading(false);
+			});
+
+
+
             //test
             var initPage = function(PathSimplifier, data) {
 
                 if(!data){
                     window.pathSimplifierIns.setData([]);
                     window.pathSimplifierIns = null;
+                    return;
                 }
 
                 removeEvents();
@@ -221,6 +218,7 @@
                             });
                             console.log(data);
                         }
+                        
                         initPage(PathSimplifier, data);
 					});
                 });

scripts/lrmui.js

@@ -185,23 +185,6 @@ u[o]&&(delete u[o],c?delete n[l]:typeof n.removeAttribute!==i?n.removeAttribute(
 			window.JPush.init();
 			//window.JPush.setDebugMode(true);
 			cordova.plugins.notification.badge.configure({ autoClear: true });
-			var onGetRegistrationID = function(data) {
-			  try {
-				
-				if (data.length == 0) {
-				  var t1 = window.setTimeout(getRegistrationID, 1000);
-				}else{
-					console.log("JPushPlugin:registrationID is " + data);
-					window.lrmui.jgRegistrationId = data;
-				}
-			  } catch (exception) {
-				console.log(exception);
-			  }
-			};
-			var getRegistrationID = function() {
-			  window.JPush.getRegistrationID(onGetRegistrationID);
-			};
-			window.setTimeout(getRegistrationID, 1000);
 			if (device.platform != "Android") {
 			  window.JPush.setApplicationIconBadgeNumber(0);
 			}