修复登录跳转

pages/amap/amap.js

@@ -112,7 +112,7 @@
 
             
             
-            var startEnd = {start:new AMap.LngLat(113.951104,22.542902), end:new AMap.LngLat(113.955439,22.542956)};
+            var startEnd = {start:new AMap.LngLat(113.951104,22.542902), end:new AMap.LngLat(113.955439,22.532956)};
 
             var fencePageData = null;
 
@@ -128,6 +128,8 @@
 			});
             learun.vehicleMarker = new AMap.Marker({icon:'./images/bicycle.png', offset:new AMap.Pixel(0, -51)});
             learun.circle = new AMap.Circle({
+                radius: 0,
+                center: [0, 0],
                 borderWeight: 3,
                 strokeColor: "#FF33FF", 
                 strokeOpacity: 1,
@@ -141,6 +143,8 @@
                 zIndex: 50,
             });
 
+            learun.circle.setMap(learun.map);
+
             // learun.vehicleInfoWin = new AMap.InfoWindow({
             //     isCustom: true,
             //     offset: new AMap.Pixel(60, -40),
@@ -153,14 +157,11 @@
                 var deviceNumber = 'A00000000031';
                 var mapData = null;
                 learun.httpget(config.webapi+"/?s=api/get_map_index_data", {deviceNumber:deviceNumber}, function (_res) {
-                    console.log("******** "+JSON.stringify(_res));
-                    // console.log(_res);
 					mapData = _res.data;
                     if(!mapData){
                         learun.layer.warning('无地图数据,请检测网络或联系管理员！', function () { }, '提示', '关闭');
                         return;
                     }
-                    // console.log(mapData); 
                     var vehiclePt = new AMap.LngLat(+mapData.vehicleLocation.longitude, +mapData.vehicleLocation.latitude)
                     if(first){
                         t.map.setZoomAndCenter(15,vehiclePt);
@@ -173,7 +174,7 @@
                     // t.infoWin.setPosition(vehiclePt)
                     // t.infoWin.setMap(t.map);
 
-                    console.log(mapData);
+                    // console.log(mapData);
 
                     var fence = JSON.parse(mapData.fenceShapeInfo);
                     if(fence.type == 'circle'){

pages/amap/fence/fence.js

@@ -23,7 +23,7 @@
 
             var fenceInfo = param.fenceInfo;
             var defaultPt = param.defaultLocation;
-            var ableStatus = parm.fenceAlarmStatus;
+            var ableStatus = param.fenceAlarmStatus;
 
             if(ableStatus){
                 $('#fence-switch').addClass('f-active');
@@ -35,7 +35,7 @@
 
             var circleFence = new AMap.Circle({
                 center: defaultPt,
-                radius: fenceInfo.data.radius, 
+                radius: fenceInfo.data.radius || 100, 
                 strokeOpacity: 0,
                 strokeWeight: 0,
                 strokeOpacity: 0.2,
@@ -53,6 +53,7 @@
             $page.find('#fence-switch').lrswitch();
 
             var rangeObj = $('#fence-radius');
+            rangeObj[0].value = fenceInfo.data.radius || 100;
             $('#display-radius')[0].innerHTML = rangeObj[0].value;
             //获取要设置的半径
             function getSetRadius(){

pages/amap/navigation/navigation.css

@@ -0,0 +1,16 @@
+.navigation-layout{
+    display: flex;
+    flex-direction: column;
+    height: 100%;
+}
+
+.amap-navigation-contarner{
+    position: relative;
+    width: 100%;
+    flex: 1 0 auto;
+}
+
+#navg-panel{
+    width: 100%;
+    max-height: 200px;
+}

pages/amap/navigation/navigation.html

@@ -1,3 +1,4 @@
-<div class="lr-amap-page" >
-    <div id='navigation-map' class="lr-amap-contarner"></div>
+<div class="navigation-layout" >
+    <div id='navigation-map' class="amap-navigation-contarner"></div>
+    <div id="navg-panel"></div>
 </div>

pages/amap/navigation/navigation.js

@@ -10,6 +10,7 @@
             //骑行导航
            var riding = new AMap.Riding({
                 map: map,
+                panel: "navg-panel"
             }); 
             //根据起终点坐标规划骑行路线
             riding.search(param.start, param.end, function(status, result) {

pages/amap/route/route.css

@@ -4,11 +4,26 @@ html{
     -webkit-text-size-adjust:none;
 }
 
+.route-layout{
+    display: flex;
+    flex-direction: column;
+    height: 100%;
+}
+
+.amap-route-container{
+    position: relative;
+    width: 100%;
+    flex: 1 0 auto;
+}
+
+
 .route-content{
     width: 100%;
     display: flex;
     z-index: 555;
-    height: 100%;
+    /* height: 100%; */
+    flex: 0 0 auto;
+    align-self: flex-end;
 }
 .widthset{
     display: none;

pages/amap/route/route.html

@@ -1,16 +1,11 @@
-<div class="lr-amap-page" >
-    <div id="route-map" class="lr-amap-contarner">
-        <!-- <div id="test">
-            <button id='pause' style="z-index:555">pause</button>
-            <button id='up' style="z-index:555">up</button>
-            <button id='down' style="z-index:555">down</button>
-            <button id='reset' style="z-index:555">reset</button>
-        </div> -->
-        <div class="route-content">
+<div class="route-layout" >
+    <div id="route-map" class="amap-route-container">
+    </div>
+    <div class="route-content">
             <!-- 内容占位 -->
             <div style="flex: 1 0 auto"></div>
             <!-- 日期选择面板 -->
-            <div class="widthset lr-form-container">
+            <!-- <div class="widthset lr-form-container">
                 <div class="bottom-panel">
                     <div class="lr-form-row">
                         <label>自定义</label>
@@ -22,7 +17,7 @@
                         <button type="button" class="lr-btn-primary">确认</button>
                     </div>
                 </div>  
-            </div>
+            </div> -->
             <!-- 播放面板 -->
             <div class="outcase">
                 <div class="route-play-panel">
@@ -68,6 +63,4 @@
 
         </div>
 
-    </div>
-
 </div>

pages/amap/route/route.js

@@ -132,8 +132,8 @@
                     }
                     if(navg0.getNaviStatus() == 'moving'){
                         navg0.pause();
-                        $('#play-pause').removeClass('icon-zanting');
-                        $('#play-pause').addClass('icon-bofang');
+                        // $('#play-pause').removeClass('icon-zanting');
+                        // $('#play-pause').addClass('icon-bofang');
                     }
                     //当前节点索引
                     var presentNode = navg0.getCursor().idx;
@@ -151,8 +151,8 @@
                     }
                     if(navg0.getNaviStatus() == 'moving'){
                         navg0.pause();
-                        $('#play-pause').removeClass('icon-zanting');
-                        $('#play-pause').addClass('icon-bofang');
+                        // $('#play-pause').removeClass('icon-zanting');
+                        // $('#play-pause').addClass('icon-bofang');
                     }
 
                     var endNode = navg0.getPathEndIdx();
@@ -165,6 +165,12 @@
                     pathSimplifierIns.render();
                 });
 
+
+                //检测末端
+                navg0.on('pause', function(){
+                    $('#play-pause').removeClass('icon-zanting');
+                    $('#play-pause').addClass('icon-bofang');                    
+                });
                 // $page.find('.text-area').on('tap', function(){
                 //     navg0.destroy();
 

scripts/lrmuiex.js

@@ -13,7 +13,7 @@
         var param = {};
         var logininfo = learun.storage.get('logininfo');
         if (!logininfo) {
-            callback(null);
+            //callback(null);
             return false;
         }
 
@@ -30,10 +30,10 @@
         learun.http.get(url, param, function (res) {
             if (res === null) {
                 learun.layer.toast('无法连接服务器,请检测网络！');
-                callback(null);
+                //callback(null);
             }
             else if (res.code === 410) {
-                callback(null);
+                //callback(null);
                 if (!learun.isOutLogin) {
                     learun.isOutLogin = true;
                     learun.layer.toast('登录过期,请重新登录!');
@@ -56,7 +56,7 @@
         var param = {};
         var logininfo = learun.storage.get('logininfo');
         if (!logininfo) {
-            callback(null);
+            //callback(null);
             return false;
         }
         param.token = logininfo.token;
@@ -72,10 +72,10 @@
         learun.http.post(url, param, function (res) {
             if (res === null) {
                 learun.layer.toast('无法连接服务器,请检测网络！');
-                callback(null);
+                //callback(null);
             }
             else if (res.code === 410) {
-                callback(null);
+                //callback(null);
                 if (!learun.isOutLogin) {
                     learun.isOutLogin = true;
                     learun.layer.toast('登录过期,请重新登录!');