1.0.1

pages/amap/amap.html

@@ -36,6 +36,10 @@
                     </div>
                 </div>
 
+                <div class="insurance-img">
+                    <img style="max-width: 100%!important;max-height: 100%!important;width: auto;height: auto;" src="./images/insurance.png" alt="">
+                </div>
+
                 <div style="z-index:555;flex: 0 0 auto;">
 
                                        
@@ -58,7 +62,7 @@
                     <!-- 底部面板 -->
                     <div id="device-info-panel">
                         <div style="width:50px;height:30px;background: #fff">Logo</div>
-                        <p>离线23天......</p>
+                        <p id="on-off-online"></p>
                         <div class="delimite-line"></div>
                         <p class="panel-right-content">GPS电量<span id="battery"></span></p>
                     </div>
@@ -66,7 +70,7 @@
                     <!-- 窗体模板 -->
                     <script id="my-infowin-tpl" type="text/template">
                         <div class="ract LeftBubble">
-                            <span><%= myCustomContent %></span>
+                            <span><%= infoBody %></span>
                         </div>
                     </script>
                     

pages/amap/amap.js

@@ -106,17 +106,15 @@
 					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() {
@@ -135,19 +133,17 @@
 			}
 			init_nav();
 
-
-            console.log(userinfo);
-            
-            
+            //地图
             var startEnd = {start:new AMap.LngLat(113.951104,22.542902), end:new AMap.LngLat(113.955439,22.532956)};
 
             var fencePageData = null;
+            var routePageData = null;
 
             // var userIcon = new AMap.Icon({size: new AMap.Size(50,50), image:'./images/gelocation.png'})
-            var userMarker = new AMap.Marker({icon: "./images/gelocation-2.png", offset:new AMap.Pixel(16, -16)});
+            var userMarker = new AMap.Marker({icon: "./images/gelocation-2.png", offset:new AMap.Pixel(-16, -28)});
             
             //车辆信息初始化
-            var timeInterval = 5000;
+            var timeInterval = 10000;
             //地图初始化
             var mainMap = new AMap.Map('amapcontainer');
 			mainMap.on('complete', function(){
@@ -172,16 +168,10 @@
 
             circle.setMap(mainMap);
 
-            // learun.vehicleInfoWin = new AMap.InfoWindow({
-            //     isCustom: true,
-            //     offset: new AMap.Pixel(60, -40),
-            //     content: '<div class="ract LeftBubble"><span>位置导航XX小区...</span></div>'
-            // });
-
-            var overlayData = {map:mainMap, vehicle:vehicleMarker, circle:circle, infoWin:learun.vehicleInfoWin};
+            var overlayData = {map:mainMap, vehicle:vehicleMarker, circle:circle};
 
             var getVehicleData = function(t, first=false){
-                var deviceNumber = 'AAAAAA000003';
+                var deviceNumber = userinfo.baseinfo['deviceNumber'];
                 var mapData = null;
                 learun.httpget(config.webapi+"/?s=api/get_map_index_data", {deviceNumber:deviceNumber}, function (_res) {
                     mapData = _res.data;
@@ -199,10 +189,18 @@
                     
                     t.vehicle.setPosition(vehiclePt);
                     t.vehicle.setMap(t.map);
-                    // t.infoWin.setPosition(vehiclePt)
-                    // t.infoWin.setMap(t.map);
-
-                    // console.log(mapData);
+                    //在线状态
+                    if(mapData.onlineTime){
+                        var interval = new Date() - mapData.onlineTime;;
+                        if(interval < 24*3600){
+                            $('#on-off-online').text('在线中');
+                            $('#on-off-online').css({color:"green"})
+                        }else{
+                            var day = parseInt(interval/24/3600);
+                            $('#on-off-online').text('离线'+day+'天');
+                            $('#on-off-online').css({color:"gray"})
+                        }
+                    }
 
                     var fence = JSON.parse(mapData.fenceShapeInfo);
                     if(fence.type == 'circle'){
@@ -218,14 +216,14 @@
                     }
                     
                     fencePageData = {fenceInfo: fence, defaultLocation: vehiclePt, fenceStatus:mapData.fenceAlarmStatus};
+                    var routeTime = new Date(mapData.onlineTime);
+                    
+                    routePageData = {speed:mapData.speed, lastTime:routeTime.Format("yyyy-MM-dd hh:mm:ss")}
                 });
          
             };
 
 
-
-
-
             //定位
             $page.find('#user-location').on('tap', function(){
                 get_mobile_gps_location(function(position){
@@ -237,16 +235,28 @@
             //锁车
             $page.find('#car-lock').on('tap', function(){
                 var lockStatus = $page.find('#lockStatus');
-                console.log(lockStatus.hasClass('icon-jiesuo'));
-                if(lockStatus.hasClass('icon-jiesuo')){
-                    lockStatus.removeClass('icon-jiesuo');
-                    lockStatus.addClass('icon-suo');
-                    learun.layer.toast('车辆已锁定');
-                }else{
-                    lockStatus.removeClass('icon-suo');
-                    lockStatus.addClass('icon-jiesuo');
-                    learun.layer.toast('车辆已解锁');
+
+                var postData = {
+                    deviceNumber:'AAAAAA000003',
+                    lockStatus: lockStatus.hasClass('icon-jiesuo') ? 1 : 0
                 }
+
+
+                learun.httppost(config.webapi+'?s=api/change_lock_status',postData,function(res){
+                    if(!res.success){
+                        learun.layer.toast('锁车失败');
+                        return;
+                    }
+                    if(lockStatus.hasClass('icon-jiesuo')){
+                        lockStatus.removeClass('icon-jiesuo');
+                        lockStatus.addClass('icon-suo');
+                        learun.layer.toast('车辆已锁定');
+                    }else{
+                        lockStatus.removeClass('icon-suo');
+                        lockStatus.addClass('icon-jiesuo');
+                        learun.layer.toast('车辆已解锁');
+                    }
+                });
             });
 
 
@@ -255,12 +265,6 @@
             getVehicleData(overlayData, true);
 
 
-            //导航页面跳转
-            // $page.find('.ract').on('tap', function(){
-            //     console.log('re');
-            //     learun.nav.go({ path: 'demo/amap/navigation', title: '导航', isBack: true, isHead: true, param: '我是一个参数' });
-                
-            // });
             var geocoder;
             AMapUI.defineTpl("ui/overlay/SimpleInfoWindow/tpl/container.html", [], function() {
                 return document.getElementById('my-infowin-tpl').innerHTML;
@@ -268,6 +272,7 @@
         
             AMapUI.loadUI(['overlay/SimpleInfoWindow'], function(SimpleInfoWindow) {
                 var lnglat = vehicleMarker.getPosition();
+                var address = '坐标未解析成功';
 
 
 
@@ -278,30 +283,25 @@
                         radius: 500 //范围，默认：500
                     });
                 }
-                var address = '坐标未解析成功'
+                
                 geocoder.getAddress(lnglat, function(status, result) {
                     if (status === 'complete' && result.regeocode) {
                         address = result.regeocode.formattedAddress;
 
                         if(!infoWindow){
                             var infoWindow = new SimpleInfoWindow({
-                                myCustomContent: '<span style="max-width:100%">'+address+'</span>',
+                                infoBody: '<span>'+address+'</span>',
                                 //基点指向marker的头部位置
-                                offset: new AMap.Pixel(54, -47)
+                                offset: new AMap.Pixel(50, -64)
                             });
                         }
                         infoWindow.open(mainMap, lnglat);
-                    }else{alert(JSON.stringify(result))}
-                });
+                        infoWindow.get$Container().on('click', function(){
+                            learun.nav.go({ path: 'amap/navigation', title: '导航', isBack: true, isHead: true, param: startEnd });
+                        });
 
-
-
-                
-                //marker 点击时打开
-                infoWindow.get$Container().on('click', function(){
-                    learun.nav.go({ path: 'amap/navigation', title: '导航', isBack: true, isHead: true, param: startEnd });
+                    }else{learun.layer.toast(JSON.stringify(result))}
                 });
-        
                 
             });
 
@@ -355,7 +355,7 @@
 
             //轨迹页跳转
             $page.find('#route-play').on('tap', function () {
-                learun.nav.go({ path: 'amap/route', title: '轨迹回放', isBack: true, isHead: true, param: '我是一个参数' });
+                learun.nav.go({ path: 'amap/route', title: '轨迹回放', isBack: true, isHead: true, param: routePageData });
             });
 
             //围栏页跳转
@@ -363,12 +363,19 @@
                 learun.nav.go({ path: 'amap/fence', title: '围栏设置', isBack: true, isHead: true, param: fencePageData });
             });
 
-
+            //保险页跳转
+            $page.find('.insurance-img').on('tap', function () {
+                learun.nav.go({ path: 'insure', title: '保险理赔', isBack: true, isHead: true, param: 'test' });
+            });
             //定时刷新数据
             
-            // setInterval(function(){
-            //     getVehicleData(overlayData);
-            // }, timeInterval);
+            var mainPageInterval = setInterval(function(){
+                if($('.f-page').length > 1){
+                    clearTimeout(mainPageInterval);
+                }
+                console.log('dd');
+                getVehicleData(overlayData);
+            }, timeInterval);
             
         }
     };

pages/amap/fence/fence.html

@@ -5,7 +5,7 @@
             <div class="mui-input-row mui-input-range">
                 <div class="part-layout">
                     <span style="min-width:40px">半径</span>
-                    <input type="range" min="0" max="500" value="100" id="fence-radius" data-input-slider="1">
+                    <input type="range" min="0" max="5000" value="100" id="fence-radius" data-input-slider="1">
                     <span id="display-radius"></span>
                 </div>
             </div>

pages/amap/fence/fence.js

@@ -1,6 +1,12 @@
 (function () {
     var page = {
         init: function ($page, param) {
+            
+            $page.find('#fence-switch').lrswitch();
+            var userinfo = learun.storage.get('userinfo');
+
+
+
             // //地图初始化
             var map = new AMap.Map("fence-map", {
                 center: [113.955439, 22.542956],//地图中心点
@@ -12,36 +18,28 @@
 
             map.on('complete', function(){
                 learun.layer.loading(false);
-                
 			});
 
-            // // var polygonFence = new AMap.Polygon({
-            // //     strokeColor: "#FF33FF", 
-            // //     strokeWeight: 6,
-            // //     strokeOpacity: 0.2,
-            // //     fillOpacity: 0.4,
-            // //     fillColor: '#1791fc',
-            // //     zIndex: 50,
-            // // })
 
+            var fenceInfo = null;
+            var defaultPt = [113.955439, 22.542956];
+            var ableStatus = null;
+            var radius = null;
 
             if(param){
-                var fenceInfo = param.fenceInfo;
-                var defaultPt = param.defaultLocation;
-                var ableStatus = param.fenceAlarmStatus;
-                var radius = fenceInfo.data.radius;
+                fenceInfo = param.fenceInfo;
+                defaultPt = param.defaultLocation;
+                ableStatus = param.fenceStatus;
+                radius = fenceInfo.data.radius;
+                console.log(param)
             }
             
 
 
-            if(ableStatus){
+            if(ableStatus !== '0'){
+                console.log(ableStatus);
                 $('#fence-switch').addClass('f-active');
             }
-            console.log(param);
-
-
-
-
             var circleFence = new AMap.Circle({
                 center: defaultPt,
                 radius: radius || 100, 
@@ -56,10 +54,8 @@
             circleFence.setMap(map)
             map.setFitView(circleFence);
 
-            // displayFence(fenceInfo);
-
 
-            $page.find('#fence-switch').lrswitch();
+            
 
             var rangeObj = $('#fence-radius');
             rangeObj[0].value = radius || 100;
@@ -73,7 +69,6 @@
                 $('#display-radius')[0].innerHTML = this.value;
                 var radius = getSetRadius();
                 circleFence.setRadius(radius);
-                // setFenceView(circleFence);
                 map.setFitView([ circleFence ]);
                 
             });
@@ -114,10 +109,7 @@
                 fenceData.data.center = center;
 
                 var data = {};
-                // vehicleNumber: 'AAAAAA000003',
-                // data: fenceData,
-                // fenceAlarmEnable: fenceEnable
-                data.vehicleNumber = 'AAAAAA000003';
+                data.vehicleNumber = userinfo.baseinfo.deviceNumber;
                 data.data =  JSON.stringify(fenceData);
                 data.fenceAlarmEnable = fenceEnable;
                 console.log(data)
@@ -135,7 +127,6 @@
             }
 
 
-
             //post围栏信息
             function postFence(data){
                 learun.httppost(config.webapi+'?s=api/save_fence_info',data,function(res){
@@ -149,48 +140,6 @@
 
 
             
-            
-            //显示围栏(初始)
-            // function displayFence(fenceInfo){
-            //     if(!fenceInfo){
-            //         circleFence.setCenter(defaultPt);
-            //         var radius = getSetRadius();
-            //         circleFence.setRadius(radius);
-            //         // circleFence.setMap(map);
-            //         map.setFitView([ circleFence ]);
-            //         return;
-            //     }
-
-            //     var fence = fenceInfo;
-            //     console.log(fence);
-            //     if(fence.type == 'circle'){
-            //         var pt = new AMap.LngLat(fence.data.center.lng, fence.data.center.lat);
-            //         // circleFence.setCenter(pt);
-            //         circleFence.setRadius(fence.data.radius);
-            //         // circleFence.setMap(map);
-            //         map.setFitView([ circleFence ]);
-            //         return;
-            //     }
-
-            //     // if(fence.type == 'polygon'){
-            //     //     var pts = [];
-            //     //     var paths = fence.data.vertex;
-                    
-            //     //     paths.forEach(v => {
-            //     //         pts.push([v.lng, v.lat]);
-            //     //     });
-            //     //     polygonFence.setPath(pts);
-            //     //     polygonFence.setMap(map);
-            //     //     map.setFitView([ polygonFence ]);
-            //     //     return;
-            //     // }
-            // }
-
-
-
-
-
-            
 
             
         }

pages/amap/navigation/navigation.css

@@ -12,5 +12,14 @@
 
 #navg-panel{
     width: 100%;
-    max-height: 200px;
+    min-height: 60px;
+    background: white;
+    padding: 10px;
+    display: flex;
+}
+
+/* id */
+#address{
+    word-break: break-all;
+    margin-left: 5px;
 }

pages/amap/navigation/navigation.html

@@ -1,4 +1,7 @@
 <div class="navigation-layout" >
     <div id='navigation-map' class="amap-navigation-contarner"></div>
-    <div id="navg-panel"></div>
+    <div id="navg-panel">
+        <span style="min-width:80px">当前位置:</span>
+        <span id="navg-address"></span>
+    </div>
 </div>

pages/amap/navigation/navigation.js

@@ -38,7 +38,7 @@
             });
 
 
-
+            var presentLnglat = null;
             function get_mobile_gps_location(onSuccess,onError){
 				var onSuccess = function(position) {
 					// alert('Latitude: '          + position.coords.latitude          + '\n' +
@@ -49,8 +49,8 @@
 					// 	  '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);
+                    presentLnglat = new AMap.LngLat(position.coords.longitude, position.coords.latitude);
+                    userMarker.setPosition(presentLnglat);
                     userMarker.setMap(map);
 				};
 			 
@@ -60,17 +60,36 @@
 					alert('code: '    + error.code    + '\n' +
 						  'message: ' + error.message + '\n');
 				}
-				navigator.geolocation.getCurrentPosition(onSuccess, onError);
+                navigator.geolocation.getCurrentPosition(onSuccess, onError);
             }
-            
 
+            
 
 
-            setInterval(function(){
-                if(window.lrmui.isreal){
-                    get_mobile_gps_location()
+            var geocoder = null;
+            var locationAuto = setInterval(function(){
+                if($('.f-page').length < 2){
+                    clearTimeout(locationAuto);
+                }
+                if(!window.lrmui.isreal){
+                    get_mobile_gps_location();
+                    var lnglat = presentLnglat;
+                    // var lnglat = [113.951104,22.542902];
+                    if(!geocoder){
+                        geocoder = new AMap.Geocoder({
+                            radius: 50 
+                        });
+                    }
+                    console.log('dd');
+
+                    geocoder.getAddress(lnglat, function(status, result) {
+                        if (status === 'complete' && result.regeocode) {
+                            address = result.regeocode.formattedAddress;
+                            $('#navg-address').text(address);
+                        }else{console.log(JSON.stringify(result))}
+                    });
                 }
-            }, 5000);
+            }, 2000);
 
 
 

pages/amap/route/route.css

@@ -54,7 +54,7 @@ html{
 
 .route-play-panel{
     display: flex;
-    height: 165px;
+    /* min-height: 150px; */
     background: #fff;
     padding: 10px;
     flex-direction: column;
@@ -62,7 +62,8 @@ html{
 
 .text-area{
     display: flex;
-    flex-direction: column;
+    /* flex-direction: column; */
+    justify-content: space-between;
 }
 .text-area p{
     margin: 0;
@@ -107,6 +108,27 @@ html{
     align-self: flex-end;
 }
 
+
+.route-reset{
+    display: flex;
+    flex-direction: column;
+    height: 40px;
+    align-items: center;
+}
+.route-reset span{
+    font-size: 1.2em;
+    color: gray;
+}
+
+.route-reset p{
+    margin: 0;
+    font-size:10px;
+    -webkit-transform:scale(0.8);
+    color: gray;
+}
+
+
+
 .speed-set{
     display: flex;
     flex-direction: column;

pages/amap/route/route.html

@@ -23,18 +23,31 @@
                 <div class="route-play-panel">
                     <!-- 信息区 -->
                     <div class="text-area">
-                        <p>1234567891012</p>
-                        
-                        <div class="time-speed">
-                            <span id="date-time">时间：2019-01-15 08:54:32</span>
-                            <span id="vehicle-speed">速度：26km/h</span>
+
+
+                        <div class="test">
+                            <p>1234567891012</p>
+                            
+                            <div class="time-speed">
+                                <span id="date-time">时间：0000-00-00 00:00:00</span>
+                                <span id="vehicle-speed">速度：0.00km/h</span>
+                            </div>
+
+                            <!-- <div class="address-line">
+                                <span>地址：</span>
+                                <p>浙江省杭州市滨江区和瑞科技园S2地下车库</p>
+                            </div> -->
+
                         </div>
 
-                        <div class="address-line">
-                            <span>地址：</span>
-                            <p>浙江省杭州市滨江区和瑞科技园S2地下车库</p>
+                        <div class="route-reset">
+                            <span class="iconfont icon-reset"></span>
+                            <p>重置</p>
                         </div>
+
                     </div>
+
+
                     <!-- 分割(后续可能进度条替代) -->
                     <div class="delimite-route-line"></div>
                     <!-- 控制区 -->

pages/amap/route/route.js

@@ -1,11 +1,12 @@
 (function () {
     var page = {
-        init: function ($page) {
+        init: function ($page, param) {
             //页面初始化
 
            learun.layer.loading(true, "加载数据中");
 
-
+            $('#date-time').text('时间：'+param.lastTime);
+            $('#vehicle-speed').text('速度：'+param.speed+'km/h')
 			
             //播放控制相关事件清除
             function removeEvents(){
@@ -32,13 +33,19 @@
             var initPage = function(PathSimplifier, data) {
 
                 if(!data){
-                    window.pathSimplifierIns.setData([]);
-                    window.pathSimplifierIns = null;
+                    if( window.pathSimplifierIns){
+                        window.pathSimplifierIns.setData([]);
+                        window.pathSimplifierIns = null;
+                    }
+
+                    $page.find('.icon-bofang').on('tap', function () {
+                        learun.layer.toast('当前日期无轨迹');
+                    });
+
                     return;
                 }
 
                 removeEvents();
-                console.log
                 if(window.pathSimplifierIns){
                     window.pathSimplifierIns.setData([]);
                     window.pathSimplifierIns = null;
@@ -73,15 +80,14 @@
 
                 pathSimplifierIns.setData(data);
                 
-                console.log(pathSimplifierIns.getPathNavigators());
                 //创建一个巡航器
                 var navg0 = pathSimplifierIns.createPathNavigator(0, //关联第1条轨迹
                     {
                         loop: false, //循环播放
                         speed: 1000
                     });
-                
 
+                
                 //播放速度控制
                 $page.find('.speed-set').on('tap', function () {
                     var speedSign = $page.find('#speed-icon');
@@ -162,16 +168,34 @@
                     pathSimplifierIns.render();
                 });
 
+                //重置
+                $page.find('.icon-reset').on('tap', function () {
+                    navg0.moveToPoint(0, 0);
+                    navg0.stop();
+                });
+
 
                 //检测末端
                 navg0.on('pause', function(){
                     $('#play-pause').removeClass('icon-zanting');
                     $('#play-pause').addClass('icon-bofang');                    
                 });
+                navg0.on('stop', function(){
+                    $('#play-pause').removeClass('icon-zanting');
+                    $('#play-pause').addClass('icon-bofang');                    
+                });
                 // $page.find('.text-area').on('tap', function(){
                 //     navg0.destroy();
 
                 // });
+                var pathData = pathSimplifierIns.getPathData(0).points;;
+                navg0.on('move', function(){
+                    var presentIndex = navg0.getCursor().idx;
+                    var time = pathData[presentIndex].time;
+                    var speed = pathData[presentIndex].speed;
+                    $('#date-time').text('时间：'+time);
+                    $('#vehicle-speed').text('速度：'+speed+'km/h');
+                });
 
                 window.pathSimplifierIns = pathSimplifierIns;
     
@@ -206,7 +230,14 @@
                         "date":date,
                         "deviceNumber":'868500028325363'
                     }
+                    var geocoder = null;
                     learun.httppost(config.webapi+'?s=api/get_gps_route',post_data,function(res){
+                        if(!geocoder){
+                            geocoder = new AMap.Geocoder({
+                                radius: 500 //范围，默认：500
+                            });
+                        }
+
                         if(!res.success){
                             learun.layer.toast(res.message);
                         }
@@ -214,54 +245,23 @@
                         if(res.data){
                             data = [{name:'test1',points:[]}];
                             JSON.parse(res.data).forEach(v => {
-                               data[0].points.push({speed:v.speed, lngLat:[v.lng, v.lat]});
+                               data[0].points.push({speed:v.speed, lngLat:[v.lng, v.lat], time:v.deviceTime});
+                            //    lngLats.push([v.lng, v.lat]);
                             });
-                            console.log(data);
                         }
                         
-                        initPage(PathSimplifier, data);
+                       initPage(PathSimplifier, data);
 					});
                 });
 
-                // $page.find('.lr-btn-primary').on('tap', function(){
-                //     var date = $('#date2')[0].innerText;
-                //     console.log(date);
-
-                //     $('.widthset').hide();
-                //     $('.outcase').show();
-
-
-    
-                // });
 
 
 
-
-                //日期格式化
-            Date.prototype.Format = function(fmt)   
-                { //author: meizz   
-                    var o = {   
-                        "M+" : this.getMonth()+1,                 //月份   
-                        "d+" : this.getDate(),                    //日   
-                        "h+" : this.getHours(),                   //小时   
-                        "m+" : this.getMinutes(),                 //分   
-                        "s+" : this.getSeconds(),                 //秒   
-                        "q+" : Math.floor((this.getMonth()+3)/3), //季度   
-                        "S"  : this.getMilliseconds()             //毫秒   
-                    };   
-                    if(/(y+)/.test(fmt))   
-                        fmt=fmt.replace(RegExp.$1, (this.getFullYear()+"").substr(4 - RegExp.$1.length));   
-                    for(var k in o)   
-                        if(new RegExp("("+ k +")").test(fmt))   
-                    fmt = fmt.replace(RegExp.$1, (RegExp.$1.length==1) ? (o[k]) : (("00"+ o[k]).substr((""+ o[k]).length)));   
-                    return fmt;   
-                }  
             
                 //启动页面
                 // initPage(PathSimplifier);
                 // 6789012345
                 var nowDate = new Date().Format("yyyy-MM-dd");
-                console.log(nowDate);
                 var post_data = {
                     "date": nowDate,
                     "deviceNumber":'6789012345'
@@ -269,15 +269,16 @@
                 learun.httppost(config.webapi+'?s=api/get_gps_route',post_data,function(res){
                     if(!res.success){
                         learun.layer.toast(res.message);
-                        return;
                     }
-                    var data = [{name:'test1',points:[]}];
-                    JSON.parse(res.data).forEach(v => {
-                        data[0].points.push({speed:v.speed, lngLat:[v.lng, v.lat]});
-                    });
-                    console.log(data);
-
-                    learun.initPage(PathSimplifier, data);
+                    var data = null;
+                    if(res.data){
+                        data = [{name:'test1',points:[]}];
+                        JSON.parse(res.data).forEach(v => {
+                           data[0].points.push({speed:v.speed, lngLat:[v.lng, v.lat], time:v.deviceTime});
+                        //    lngLats.push([v.lng, v.lat]);
+                        });
+                    }
+                    initPage(PathSimplifier, data);
                 });
 
             });

scripts/index.js

@@ -55,4 +55,24 @@
         // TODO: 此应用程序已重新激活。在此处还原应用程序状态。
     }
 
-})(window.jQuery, window.lrmui);
+})(window.jQuery, window.lrmui);
+
+//日期格式化
+Date.prototype.Format = function(fmt)   
+{ //author: meizz   
+    var o = {   
+        "M+" : this.getMonth()+1,                 //月份   
+        "d+" : this.getDate(),                    //日   
+        "h+" : this.getHours(),                   //小时   
+        "m+" : this.getMinutes(),                 //分   
+        "s+" : this.getSeconds(),                 //秒   
+        "q+" : Math.floor((this.getMonth()+3)/3), //季度   
+        "S"  : this.getMilliseconds()             //毫秒   
+    };   
+    if(/(y+)/.test(fmt))   
+        fmt=fmt.replace(RegExp.$1, (this.getFullYear()+"").substr(4 - RegExp.$1.length));   
+    for(var k in o)   
+        if(new RegExp("("+ k +")").test(fmt))   
+    fmt = fmt.replace(RegExp.$1, (RegExp.$1.length==1) ? (o[k]) : (("00"+ o[k]).substr((""+ o[k]).length)));   
+    return fmt;   
+}