test

index.html

@@ -26,7 +26,7 @@
         <script type="text/javascript" src="data/city.js"></script>
         <script type="text/javascript" src="scripts/echarts.js"></script>
         <!-- <script type="text/javascript" src="scripts/lrmui.min.js"></script> -->
-        <script type="text/javascript" src="scripts/lrmui.js"></script>
+        <script type="text/javascript" src="scripts/lrmuidebug.js"></script>
         <script type="text/javascript" src="scripts/lrmuiex.js"></script>
         <script type="text/javascript" src="scripts/platformOverrides.js"></script>
         <script type="text/javascript" src="config/config.js"></script>

pages/amap/amap.html

@@ -51,7 +51,7 @@
                         </div>
                         <div id="car-lock" class="func-panel-bg">
                             <div class="icon-circle-large"><span id="lockStatus" class="iconfont icon-jiesuo"></span></div>
-                            <p>锁车</p>
+                            <p id="lock-text">锁车</p>
                         </div>
                         <div id="electric-fence" class="func-panel-bg">
                             <div class="icon-circle-small"><span class="iconfont icon-dianziweilan"></span></div>

pages/amap/amap.js

@@ -2,6 +2,11 @@
     var infoWindow;
     var lnglat;
     var mainMap;
+    var getVehicleData;
+    var vehicleMarker;
+    var overlayData;
+    var vehicleMarker;
+    var circle;
     var page = {
         init: function ($page) {
 			//初始化顶部导航栏
@@ -32,7 +37,8 @@
 				_html += '<i class="iconfont icon-community"></i>';
 				_html += '<span class="red"></span>';
 				_html += '</div>';
-				$page.parent().find('.f-page-header').addClass('lr-workspace-header').html(_html);
+				// $page.parent().find('.f-page-header').addClass('lr-workspace-header').html(_html);
+				$('.f-page-header').addClass('lr-workspace-header').html(_html);
 				
 				/*
 				// 点击搜索框
@@ -41,26 +47,55 @@
 				});
 				*/
 				// 点击报警
-				$page.parent().find('.alarm').on('tap', function () {
+				// $page.parent().find('.alarm').on('tap', function () {
+                //     learun.nav.go({ path: 'baojingindex', title: '110丢失报警', isBack: true, isHead: true,type:'right' });
+                //     if(infoWindow){infoWindow.close( );}
+				// });
+				// // 点击图表
+				// $page.parent().find('.chart').on('tap', function () {
+                //     learun.nav.go({ path: 'tongji', title: '统计', isBack: true, isHead: true,type:'right' });
+                //     if(infoWindow){infoWindow.close( );}
+				// });
+				// // 点击消息图标
+				// $page.parent().find('.message').on('tap', function () {
+                //     learun.nav.go({ path: 'baojinginfo', title: '消息', isBack: true, isHead: true,type:'right' });
+                //     if(infoWindow){infoWindow.close( );}
+				// });
+				// $page.parent().find('.my').on('tap', function () {
+                //     learun.nav.go({ path: 'my', title: '我的', isBack: true, isHead: true,type:'right' });
+                //     if(infoWindow){infoWindow.close( );}
+				// });
+				// // 注册扫描
+				// $page.parent().find('.scanner').on('tap', function () {
+				// 	learun.code.scan(function (res) {
+				// 		if (res.status === 'success') {
+				// 			learun.layer.toast(res.msg);
+				// 		}
+				// 		else {
+				// 			learun.layer.toast('扫描失败:' + res.msg);
+				// 		}
+				// 	});
+                // });
+                $('.alarm').on('tap', function () {
                     learun.nav.go({ path: 'baojingindex', title: '110丢失报警', isBack: true, isHead: true,type:'right' });
                     if(infoWindow){infoWindow.close( );}
 				});
 				// 点击图表
-				$page.parent().find('.chart').on('tap', function () {
+				$('.chart').on('tap', function () {
                     learun.nav.go({ path: 'tongji', title: '统计', isBack: true, isHead: true,type:'right' });
                     if(infoWindow){infoWindow.close( );}
 				});
 				// 点击消息图标
-				$page.parent().find('.message').on('tap', function () {
+				$('.message').on('tap', function () {
                     learun.nav.go({ path: 'baojinginfo', title: '消息', isBack: true, isHead: true,type:'right' });
                     if(infoWindow){infoWindow.close( );}
 				});
-				$page.parent().find('.my').on('tap', function () {
+				$('.my').on('tap', function () {
                     learun.nav.go({ path: 'my', title: '我的', isBack: true, isHead: true,type:'right' });
                     if(infoWindow){infoWindow.close( );}
 				});
 				// 注册扫描
-				$page.parent().find('.scanner').on('tap', function () {
+				$('.scanner').on('tap', function () {
 					learun.code.scan(function (res) {
 						if (res.status === 'success') {
 							learun.layer.toast(res.msg);
@@ -151,7 +186,6 @@
 
             var startEnd = {start: null, end: null};
             
-            var fencePageData = null;
             var routePageData = null;
 
             var userIcon = new AMap.Icon({size: new AMap.Size(23,23), image:'./images/location.png', imageSize:new AMap.Size(23,23)})
@@ -161,43 +195,49 @@
             //车辆信息初始化
             var timeInterval = 10000;
             //地图初始化
-            mainMap = new AMap.Map('amapcontainer', {
-                center: [120.210649,30.246071],
-                zoom: 15
-            });
+            if(!mainMap){
+                mainMap = new AMap.Map('amapcontainer', {
+                    center: [120.210649,30.246071],
+                    zoom: 15
+                });
+            }
 			mainMap.on('complete', function(){
                 get_mobile_gps_location()
 				learun.layer.loading(false);
             });
             var bicycleIcon = new AMap.Icon({size: new AMap.Size(32,32), image:'./images/bicycle-2.png', imageSize:new AMap.Size(32,32)})
-            var vehicleMarker = new AMap.Marker({icon:bicycleIcon, offset:new AMap.Pixel(0, -51)});
-            var circle = new AMap.Circle({
-                radius: 0,
-                center: [0, 0],
-                borderWeight: 3,
-                strokeColor: "#FF33FF", 
-                strokeOpacity: 1,
-                strokeWeight: 6,
-                strokeOpacity: 0.2,
-                fillOpacity: 0.2,
-                strokeStyle: 'dashed',
-                strokeDasharray: [10, 10], 
-                // 线样式还支持 'dashed'
-                fillColor : '#1791fc',
-                zIndex: 50,
-            });
+            if(!vehicleMarker){
+                vehicleMarker = new AMap.Marker({icon:bicycleIcon, offset:new AMap.Pixel(0, -51)});
+            }
+            if(!circle){
+                circle = new AMap.Circle({
+                    radius: 0,
+                    center: [0, 0],
+                    borderWeight: 3,
+                    strokeColor: "#FF33FF", 
+                    strokeOpacity: 1,
+                    strokeWeight: 6,
+                    strokeOpacity: 0.2,
+                    fillOpacity: 0.2,
+                    strokeStyle: 'dashed',
+                    strokeDasharray: [10, 10], 
+                    // 线样式还支持 'dashed'
+                    fillColor : '#1791fc',
+                    zIndex: 50,
+                });
+            }
 
             circle.setMap(mainMap);
-
-            var overlayData = {map:mainMap, vehicle:vehicleMarker, circle:circle};
+            if(!overlayData){
+                overlayData = {map:mainMap, vehicle:vehicleMarker, circle:circle};
+            }
             var latlngSign = null;
 
-            var getVehicleData = function(t, first=false){
+            getVehicleData = function(t, first=false){
                 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;
-                    console.log(mapData);
                     if(!mapData){
                         learun.layer.warning('无地图数据,请检测网络或联系管理员！', function () { }, '提示', '关闭');
                         return;
@@ -212,12 +252,10 @@
                         t.vehicle.setMap(t.map);
                     }
 
-                    console.log(startEnd)
                     if(first){
                         t.map.setZoomAndCenter(15,vehiclePt);
                     }
-                    
-                    $page.find('#battery').html(mapData.battery+'%');
+                    $('#battery').html(mapData.battery+'%');
                     
 
                     //在线状态
@@ -230,7 +268,6 @@
                         }else{
                             var routeTime = new Date(mapData.onlineTime*1000);
                             routePageData = {speed: mapData.speed == null ? 0 : mapData.speed, lastTime:routeTime.Format("yyyy-MM-dd hh:mm:ss")}
-                            console.log('testtime')
                             var interval = parseInt(new Date().getTime()/1000) - mapData.onlineTime;
                             if(interval < 24*3600){
                                 $('#on-off-online').text('在线中');
@@ -239,9 +276,6 @@
                                 var day = parseInt(interval/24/3600);
                                 $('#on-off-online').text('离线'+day+'天');
                                 $('#on-off-online').css({color:"gray"})
-
-                                console.log(mapData.onlineTime);
-                                console.log(new Date().getTime());
                             }
                         }
 
@@ -259,11 +293,12 @@
                     }
 
                     if(mapData.lockStatus == 1){
-                        $page.find('#lockStatus').removeClass('icon-jiesuo');
-                        $page.find('#lockStatus').addClass('icon-suo');
+                        $('#lockStatus').removeClass('icon-jiesuo');
+                        $('#lockStatus').addClass('icon-suo');
+                        $('#lock-text').text('解锁');
+                    }else{
+                        $('#lock-text').text('锁车');
                     }
-                    
-                    fencePageData = {fenceInfo: fence, defaultLocation: vehiclePt, fenceStatus:mapData.fenceAlarmStatus};
 
 
                 });
@@ -272,13 +307,13 @@
 
 
             //定位
-            $page.find('#user-location').on('tap', function(){
+            $('#user-location').on('tap', function(){
                 get_mobile_gps_location();
             });
             
             //锁车
-            $page.find('#car-lock').on('tap', function(){
-                var lockStatus = $page.find('#lockStatus');
+            $('#car-lock').on('tap', function(){
+                var lockStatus = $('#lockStatus');
 
                 var postData = {
                     deviceNumber: userinfo.baseinfo.deviceNumber,
@@ -288,17 +323,19 @@
 
                 learun.httppost(config.webapi+'?s=api/change_lock_status',postData,function(res){
                     if(!res.success){
-                        learun.layer.toast('锁车失败');
+                        // learun.layer.toast('锁车失败');
                         return;
                     }
                     if(lockStatus.hasClass('icon-jiesuo')){
                         lockStatus.removeClass('icon-jiesuo');
                         lockStatus.addClass('icon-suo');
-                        learun.layer.toast('车辆已锁定');
+                        $('#lock-text').text('解锁');
+                        // learun.layer.toast('车辆已锁定');
                     }else{
                         lockStatus.removeClass('icon-suo');
                         lockStatus.addClass('icon-jiesuo');
-                        learun.layer.toast('车辆已解锁');
+                        $('#lock-text').text('锁车');
+                        // learun.layer.toast('车辆已解锁');
                     }
                 });
             });
@@ -313,11 +350,9 @@
             AMapUI.defineTpl("ui/overlay/SimpleInfoWindow/tpl/container.html", [], function() {
                 return document.getElementById('my-infowin-tpl').innerHTML;
             });
-            console.log('ccc')
             AMapUI.loadUI(['overlay/SimpleInfoWindow'], function(SimpleInfoWindow) {
                 
                 lnglat = vehicleMarker.getPosition();
-                console.log(lnglat+'vehicle-location');
                 var address = '坐标未解析成功';
 
 
@@ -340,9 +375,7 @@
                                 //基点指向marker的头部位置
                                 offset: new AMap.Pixel(50, -64)
                             });
-                            console.log('aaa')
                         }
-                        console.log('vvv')
                         infoWindow.open(mainMap, lnglat);
                         infoWindow.get$Container().on('click', function(){
                             learun.nav.go({ path: 'amap/navigation', title: '导航', isBack: true, isHead: true, param: startEnd });
@@ -375,14 +408,14 @@
                 if (trafficLayerAble) {
                     trafficLayer.hide();
                     trafficLayerAble = false;
-                    $page.find('#route-situation').html('<svg class="icon" aria-hidden="true"><use xlink:href="#icon-lukuang"></use></svg>');
+                    $('#route-situation').html('<svg class="icon" aria-hidden="true"><use xlink:href="#icon-lukuang"></use></svg>');
                 } else {
                     trafficLayer.show();
                     trafficLayerAble = true;
-                    $page.find('#route-situation').html('<svg class="icon" aria-hidden="true"><use xlink:href="#icon-lukuang1"></use></svg>');
+                    $('#route-situation').html('<svg class="icon" aria-hidden="true"><use xlink:href="#icon-lukuang1"></use></svg>');
                 }
             }
-            $page.find('#route-situation').on('tap', function () {
+            $('#route-situation').on('tap', function () {
                 routeSituationToggle();
             });
 
@@ -393,43 +426,43 @@
                 if (isSatelieteAble) {
                     mainMap.remove(satelliteLayer);
                     isSatelieteAble = false;
-                    $page.find('#layer-change').html('<svg class="icon" aria-hidden="true"><use xlink:href="#icon-qiehuan1"></use></svg>');
+                    $('#layer-change').html('<svg class="icon" aria-hidden="true"><use xlink:href="#icon-qiehuan1"></use></svg>');
                 } else {
                     mainMap.add(satelliteLayer);
                     isSatelieteAble = true;
-                    $page.find('#layer-change').html('<svg class="icon" aria-hidden="true"><use xlink:href="#icon-qiehuan"></use></svg>');
+                    $('#layer-change').html('<svg class="icon" aria-hidden="true"><use xlink:href="#icon-qiehuan"></use></svg>');
                 }
             }
-            $page.find('#layer-change').on('tap', function () {
+            $('#layer-change').on('tap', function () {
                 learun.mapLayerChange();
             });
 
             //轨迹页跳转
-            $page.find('#route-play').on('tap', function () {
+            $('#route-play').on('tap', function () {
                 learun.nav.go({ path: 'amap/route', title: '轨迹回放', isBack: true, isHead: true, param: routePageData });
                 if(infoWindow){infoWindow.close( );}
             });
 
             //围栏页跳转
-            $page.find('#electric-fence').on('tap', function () {
-                learun.nav.go({ path: 'amap/fence', title: '围栏设置', isBack: true, isHead: true, param: fencePageData });
+            $('#electric-fence').on('tap', function () {
+                learun.nav.go({ path: 'amap/fence', title: '围栏设置', isBack: true, isHead: true, param: 'test' });
                 if(infoWindow){infoWindow.close( );}
             });
 
             //保险页跳转
-            $page.find('.insurance-img').on('tap', function () {
+            $('.insurance-img').on('tap', function () {
                 learun.nav.go({ path: 'insure', title: '保险理赔', isBack: true, isHead: true, param: 'test' });
                 if(infoWindow){infoWindow.close( );}
             });
             //定时刷新数据
             
-            // var mainPageInterval = setInterval(function(){
-            //     if($('.f-page').length > 1){
-            //         clearTimeout(mainPageInterval);
-            //     }
-            //     console.log('dd');
-            //     getVehicleData(overlayData);
-            // }, timeInterval);
+            var mainPageInterval = setInterval(function(){
+                if($('.f-page').length > 1){
+                    // clearTimeout(mainPageInterval);
+                    return;
+                }
+                getVehicleData(overlayData);
+            }, timeInterval);
             
         },
 
@@ -438,18 +471,18 @@
             if(infoWindow){
                 infoWindow.open(mainMap, lnglat);
             }
-            
+            getVehicleData(overlayData);
+
+            console.log($page);
             console.log(pageinfo);
-            console.log(learun.storage.get('userinfo').baseinfo)
-            console.log(learun.nav.getpage('amap'));
+            
         },
 
 
-        destroy: function (pageinfo) {
-            console.log('destory page')
-            
-        },
 
+        destroy: function(pageinfo){
+            console.log('destroy amap')
+        }
 
         
     };

pages/amap/fence/fence.js

@@ -16,55 +16,88 @@
 
 
             map.on('complete', function(){
-                
+                getFenceData();
                 learun.layer.loading(false);
-			});
-
-
-            var fenceInfo = null;
-            var defaultPt = [120.210649,30.246071];
-            var storeCenter = null;
-            var ableStatus = null;
-            var radius = null;
-            console.log(param)
-            if(param){
-                fenceInfo = param.fenceInfo.data;
-                ableStatus = param.fenceStatus;
-                if(fenceInfo){
-                    radius = fenceInfo.radius;
-                    storeCenter = [fenceInfo.center.lng, fenceInfo.center.lat]
-                }
-                
-            }
-            console.log(storeCenter)
+            });
+            
+
+            var oldCircle = null;
+            var circleFence = null;
+            var rangeObj = $('#fence-radius');
+
+            function getFenceData(){
+                learun.httpget(config.webapi+'?s=api/get_fence_info',userinfo.baseinfo.deviceNumber,function(res){
+                    if(!res.success){
+                        learun.layer.toast(res.message);
+                        return;
+                    }
+                    if(!oldCircle){
+                        oldCircle = new AMap.Circle({
+                            center: [0,0],
+                            radius: 0, 
+                            strokeOpacity: 0,
+                            strokeWeight: 0,
+                            strokeOpacity: 0.2,
+                            fillOpacity: 0.3,
+                            fillColor : '#ff1111',
+                            zIndex: 50,
+                        });
+                    }
+
+                    var fence = JSON.parse(res.data);
+                    var fenceStatus = fence.fenceStatus;
+
+                    if(fenceStatus !== '0'){
+                        $('#fence-switch').addClass('f-active');
+                    }
+
+                  
+                    if(fence.fenceInfo){
+                        var fenceInfo = JSON.parse(fence.fenceInfo).data;
+                        fenceInfo.radius =  parseInt(fenceInfo.radius)
+                        fenceInfo.center = new AMap.LngLat(fenceInfo.center.lng, fenceInfo.center.lat)
+                        oldCircle.setCenter(fenceInfo.center);
+                        oldCircle.setRadius(fenceInfo.radius);
+                        oldCircle.setMap(map);
+                    }else{
+                        var fenceInfo = {radius:500, center:[120.210649,30.246071]}
+                    }
+
+                    if(!circleFence){
+                        circleFence = new AMap.Circle({
+                            center: fenceInfo.center,
+                            radius: fenceInfo.radius, 
+                            strokeOpacity: 0,
+                            strokeWeight: 0,
+                            strokeOpacity: 0.2,
+                            fillOpacity: 0.3,
+                            fillColor : '#1791fc',
+                            zIndex: 50,
+                        });
+                    }
+                    if(!rangeObj){
+                        rangeObj = $('#fence-radius');
+                    }
 
 
-            if(ableStatus !== '0'){
-                console.log(ableStatus);
-                $('#fence-switch').addClass('f-active');
+                    rangeObj[0].value = fenceInfo.radius;
+                    $('#display-radius')[0].innerHTML = rangeObj[0].value;
+
+
+                    circleFence.setMap(map)
+                    map.setFitView(circleFence);
+        
+                });
             }
-            var circleFence = new AMap.Circle({
-                center: storeCenter || defaultPt,
-                radius: radius || 100, 
-                strokeOpacity: 0,
-                strokeWeight: 0,
-                strokeOpacity: 0.2,
-                fillOpacity: 0.3,
-                fillColor : '#1791fc',
-                zIndex: 50,
-            });
 
-            console.log(defaultPt)
+            // getFenceData()
 
-            circleFence.setMap(map)
-            map.setFitView(circleFence);
 
+            
 
             
 
-            var rangeObj = $('#fence-radius');
-            rangeObj[0].value = radius || 100;
-            $('#display-radius')[0].innerHTML = rangeObj[0].value;
+
             //获取要设置的半径
             function getSetRadius(){
                 return rangeObj[0].value; 
@@ -89,7 +122,6 @@
                 learun.layer.confirm('保存将会覆盖原围栏', function (_index) { 
                     if(_index === '1'){
                         var data = getPostData();
-                        console.log(data);
                         if(!data){
                             learun.layer.toast('围栏信息有误或者为空');
                             return;
@@ -117,7 +149,6 @@
                 data.vehicleNumber = userinfo.baseinfo.deviceNumber;
                 data.data =  JSON.stringify(fenceData);
                 data.fenceAlarmEnable = fenceEnable;
-                console.log(data)
                 return data;
             }
 

pages/login/login.html

@@ -3,7 +3,7 @@
         <img src="images/logo.png" />
         <div class="line">
             <i class="iconfont icon-friend_light"></i>
-            <input id="account" type="text" placeholder="手机号">
+            <input id="account" type="text" placeholder="车牌/设备标签号">
         </div>
         <div class="line">
             <i class="iconfont icon-lock"></i>

pages/login/login.js

@@ -70,11 +70,9 @@
                         loginMark: learun.deviceId(),// 正式请换用设备号
                         data: data
                     };
-					//console.log(postdata);
                     var path = config.webapi;
                     learun.layer.loading(true, "正在登录，请稍后");
                     learun.http.post(config.webapi + "/?s=api/login", postdata, function(res) {
-                    //learun.http.post("/php/user/login.php", postdata, function(res) {
                         learun.layer.loading(false);
 
                         if (res === null) {
@@ -91,18 +89,7 @@
 							
                             learun.storage.set('logininfo', logininfo);
                             learun.storage.set('userinfo', res.data);
-							learun.nav.go({ path: 'amap', title: '地图', type: 'right', isBack: false });
-                            //learun.http.get("http://www.learun.cn/webapi/info", { data: account.split('/')[0] }, function (_res) {
-                            /*learun.http.get("/php/webapi/info.php", { data: account.split('/')[0] }, function (_res) {
-                                $('#account').val('');
-                                $('#password').val('');
-                                if (_res.code === 200 && _res.data.EnabledMark == -1) {
-                                    learun.nav.go({ path: 'info', isBack: false, title: '填写信息', param: account.split('/')[0]});
-                                }
-                                else {
-                                    learun.tab.go('workspace');
-                                }
-                            });*/
+							learun.nav.go({ path: 'amap', title: '地图', type: 'right', isBack: false});
                         } else {
                             learun.layer.warning(res.message, function () { }, '提示', '关闭');
                         }

pages/my/my_lr.js

@@ -23,6 +23,7 @@
                         learun.isOutLogin = true;
                         learun.storage.set('logininfo', null);
                         learun.nav.go({ path: 'login', isBack: false, isHead: false });
+                        window.reload()
                     }
 
                 }, '', ['取消', '退出']);

scripts/lrmui.js

@@ -66,7 +66,7 @@ u[o]&&(delete u[o],c?delete n[l]:typeof n.removeAttribute!==i?n.removeAttribute(
             // 判断下当前页面是否有返回键
             var pageInfo = fui.nav.page.data[fui.nav.page.activeid];
             if (pageInfo.op.isBack) {
-                window.lrmui.nav.closeCurrent();
+				window.lrmui.nav.closeCurrent();
             }
             else {
                 window.lrmui.layer.confirm('是否退出APP', function (_index) {
@@ -399,7 +399,7 @@ u[o]&&(delete u[o],c?delete n[l]:typeof n.removeAttribute!==i?n.removeAttribute(
             };
             $.extend(dfop, op || {}); 
             if (dfop.path === '') {
-                fui.dialog({ msg: '力软信息提示：不知道页面路径！' });
+                fui.dialog({ msg: '温馨提示：不知道页面路径！' });
                 return false;
             }
 
@@ -479,6 +479,7 @@ u[o]&&(delete u[o],c?delete n[l]:typeof n.removeAttribute!==i?n.removeAttribute(
                 // 页面销毁
                 var page = learun.nav.data[pageinfo.op.id];
                 if (!!page.jsObj && !!page.jsObj.destroy) {
+                    console.log('test destroy')
                     page.jsObj.destroy();
                 }
             };
@@ -508,7 +509,8 @@ u[o]&&(delete u[o],c?delete n[l]:typeof n.removeAttribute!==i?n.removeAttribute(
             fui.nav.closeCurrent();
         },
         close: function (id) {
-            fui.nav.close(id);
+            console.log('close*****************');
+			fui.nav.close(id);
         }
     };
     function load(path) {