fix

pages/alarmdetail/alarmdetail.js

@@ -3,21 +3,19 @@
         isScroll: true,
         init: function ($page,$param) {
 			var array = JSON.parse( $param );
-			console.log(array.addtime);
 			var html = '';
 			userinfo = learun.storage.get('userinfo');
-			learun.http.get(config.webapi + "/?s=api/get_gonggao_info&plate="+userinfo.baseinfo.plate+"&addtime="+$param.addtime, {}, function(res) {
+			learun.httpget(config.webapi + "/?s=api/get_baojing_detail&plate="+userinfo.baseinfo.plate+"&addtime="+array.addtime, {}, function(res) {
+				console.log(res);
 				if(res.success == true){
-				$.each(res.data, function (_index, _item) {
-					html += '<div class="lr-list-item">'+_item.AddTime+'</div>\
-						<div class="lr-list-item">'+_item.AddTime+'</div>\
-						<div class="lr-list-item">'+_item.AddTime+'</div>\
-						<div class="lr-list-item">'+_item.AddTime+'</div>\
-						<div class="lr-list-item">'+_item.AddTime+'</div>\
-						<div class="lr-list-item">'+_item.AddTime+'</div>\
-						<div class="lr-list-item">'+_item.AddTime+'</div>';
-				});
+				html += '<div class="lr-list-item">车牌号<span class="lr-badge" style="background-color:white">'+res.data.LicensePlate+'</span></div>\
+				<div class="lr-list-item">电子标签<span class="lr-badge" style="background-color:white">'+res.data.DeviceNumber+'</span></div>\
+				<div class="lr-list-item">报警时间<span class="lr-badge" style="background-color:white">'+res.data.AddTime+'</span></div>\
+				<div class="lr-list-item">报警类型<span class="lr-badge" style="background-color:white">告警</span></div>\
+				<div class="lr-list-item">报警信息<span class="lr-badge" style="background-color:white">'+res.data.Comment+'</span></div>';
 				$page.find('.detail').html(html);
+				}else{
+					learun.layer.warning("详情信息出错", function () { }, '提示', '关闭');
 				}
 			})
         }

pages/amap/amap.html

@@ -3,7 +3,7 @@
             <div class="map-panel">
                 <!-- 右上角功能面板 -->
 
-                <div style="z-index:555;flex: 0 0 auto;">
+                <div style="z-index:555;flex: 0 0 auto;width: 100px;align-self: flex-end;">
                     <div class="top-right-panel">
                         <div id="map-lelftright-func">
                             <div id="layer-change">
@@ -56,7 +56,7 @@
                 
                     <!-- 底部面板 -->
                     <div id="device-info-panel">
-                        <div style="width:50px;heght:30px;background: #fff">Logo</div>
+                        <div style="width:50px;height:30px;background: #fff">Logo</div>
                         <p>离线23天......</p>
                         <div class="delimite-line"></div>
                         <p class="panel-right-content">GPS电量<span id="battery"></span></p>

pages/amap/amap.js

@@ -90,7 +90,7 @@
             learun.timeInterval = 5000;
             //地图初始化
             learun.map = new AMap.Map('amapcontainer');
-            learun.vehicleMarker = new AMap.Marker({icon:'./images/bicycle.png'});
+            learun.vehicleMarker = new AMap.Marker({icon:'./images/bicycle.png', offset:new AMap.Pixel(0, -47)});
             learun.circle = new AMap.Circle({
                 borderWeight: 3,
                 strokeColor: "#FF33FF", 
@@ -116,10 +116,13 @@
             learun.getVehicleData = function(t, first=false){
                 var deviceNumber = 'A00000000031';
                 var mapData = null;
-                learun.http.get("http://czapp.rltest.cn/?s=api/get_map_index_data", {deviceNumber:deviceNumber}, function (_res) {
-                    mapData = _res.data;
+                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){
-                        layer.warning('无地图数据,请检测网络或联系管理员！', function () { }, '提示', '关闭');
+                        learun.layer.warning('无地图数据,请检测网络或联系管理员！', function () { }, '提示', '关闭');
+                        return;
                     }
                     // console.log(mapData); 
                     var vehiclePt = new AMap.LngLat(+mapData.vehicleLocation.longitude, +mapData.vehicleLocation.latitude)
@@ -190,11 +193,11 @@
                 var infoWindow = new SimpleInfoWindow({
                     myCustomContent: '<span>位置导航XX小区...</span>',
                     //基点指向marker的头部位置
-                    offset: new AMap.Pixel(60, -40)
+                    offset: new AMap.Pixel(54, -47)
                 });
         
                 function openInfoWin() {
-                    infoWindow.open(learun.map, new AMap.LngLat(114.104014, 22.532508));
+                    infoWindow.open(learun.map, learun.data.vehicle.getPosition());
                 }
                 openInfoWin();
                 //marker 点击时打开

pages/amap/route/route.css

@@ -11,6 +11,7 @@ html{
     height: 100%;
 }
 .widthset{
+    display: none;
     width: 100%;
     z-index: 555;
     flex: 1 0 auto;
@@ -29,7 +30,7 @@ html{
 }
 
 .outcase{
-    display: none;
+    /* display: none; */
     width: 100%;
     z-index: 555;
     flex: 1 0 auto;
@@ -75,7 +76,7 @@ html{
     font-size: 14px;
 }
 
-.delimite-line{
+.delimite-route-line{
     height: 1px;
     width: 100%;
     margin-top: 10px;

pages/amap/route/route.html

@@ -41,7 +41,7 @@
                         </div>
                     </div>
                     <!-- 分割(后续可能进度条替代) -->
-                    <div class="delimite-line"></div>
+                    <div class="delimite-route-line"></div>
                     <!-- 控制区 -->
                     <div class="button-area">
 

pages/amap/route/route.js

@@ -119,26 +119,32 @@
                     }
                     //当前节点索引
                     var presentNode = navg0.getCursor().idx;
-                    console.log(presentNode);
                     if(presentNode == 0){
                         navg0.moveToPoint(0, 0);
-                        console.log('tt');
                         return;
                     }
 
-                    
-                    console.log(navg0.getCursor());
                     navg0.moveToPoint(presentNode-1, 0);
                     learun.pathSimplifierIns.render();
                 });
                 $page.find('.icon-next').on('tap', function () {
-                    //下一个节点
-                    var nextNode = navg0.getCursor().idx + 1;
-                    if(!lastNode){
-                        lastNode = 0;
+                    if(navg0.getNaviStatus() == 'stop'){
+                        return;
+                    }
+                    if(navg0.getNaviStatus() == 'moving'){
+                        navg0.pause();
+                        $('#play-pause').removeClass('icon-zanting');
+                        $('#play-pause').addClass('icon-bofang');
                     }
-                    navg0.pause();
-                    navg0.moveToPoint(lastNode, 0);
+
+                    var endNode = navg0.getPathEndIdx();
+                    var presentNode = navg0.getCursor().idx;
+                    if(presentNode == endNode){
+                        return;
+                    }
+
+                    navg0.moveToPoint(presentNode+1, 0);
+                    learun.pathSimplifierIns.render();
                 });
             }
             
@@ -150,7 +156,6 @@
                 }
             
                 //启动页面
-                console.log(PathSimplifier);
                 learun.initPage(PathSimplifier);
             });
 

pages/baojing/baojing.js

@@ -36,8 +36,9 @@
                         StolenDate: date,
 						WoContent: reason
                     };
-				learun.http.post(config.webapi + "/?s=api/submit_add_baojing", policedata, function(res) {
-					if(res.success == true){
+				learun.httppost(config.webapi + "/?s=api/submit_add_baojing", policedata, function(res) {
+					console.log(res);
+					if(res){
 						learun.layer.toast('提交成功');
 						learun.nav.go({ path: 'amap', title: '地图', type: 'right', isBack: false });
 					}else{

pages/baojinginfo/baojinginfo.js

@@ -33,25 +33,26 @@
 						//var baojing_info = '';
 						userinfo = learun.storage.get('userinfo');
 						learun.httpget(config.webapi + "/?s=api/get_baojing_info&plate="+userinfo.baseinfo.plate, {}, function(res) {
-							if(res){
-								$.each(res, function (_index, _item) {
+							if(res.success == true){
+								$.each(res.data, function (_index, _item) {
 									msg_html += '\
 										<div class="lr-list">\
 												<div class="lr-list-item lr-list-item-multi" style="line-height: 25px;">\
 													<h4 id="time">'+ _item.AddTime +'</h4>\
 													<p class="lr-ellipsis">'+ _item.LicensePlate +'<span class="" style="right: 15px;position: absolute;top: 50%;transform: translateY(-50%);">'+ _item.DeviceNumber +'</span></p>\
-													<a class="lr-nav-right" id="gaojingdetail">'+ _item.Type +'<span class="lr-badge lr-badge-primary lr-badge-inverted">详情</span></a>\
+													<a class="lr-nav-right gaojingdetail">'+ _item.Type +'<span class="lr-badge lr-badge-primary lr-badge-inverted">详情</span></a>\
 												</div>\
 											</div>';
+									$page.find('#gaojinginfo').html(msg_html);
+									var addtime = $('#time').text();
+									$('.gaojingdetail').on('tap', function () {	
+										learun.nav.go({ path: 'alarmdetail', title: '告警详情', type: 'right', param:'{"addtime":"'+addtime+'"}'});
+									});
 								});
 							}else{
 								msg_html += '<h4>暂无消息</h4>';
+								$page.find('#gaojinginfo').html(msg_html);
 							}
-							$page.find('#gaojinginfo').html(msg_html);
-							var addtime = $('#time').text();
-							$('#gaojingdetail').on('tap', function () {	
-								learun.nav.go({ path: 'alarmdetail', title: '告警详情', type: 'right', param:'{"addtime":'+addtime+'}'});
-							});
 							});
 						
 						msg_html += '\
@@ -71,14 +72,14 @@
 						//var baojing_info = '{"0":{"data":"1111","msg":"公告","time":"2/28"},"1":{"data":"2222","msg":"公告","time":"2/29"}}';
 						userinfo = learun.storage.get('userinfo');
 						learun.httpget(config.webapi + "/?s=api/get_gonggao_info&plate="+userinfo.baseinfo.plate, {}, function(res) {
-							if(res){
-								$.each(res, function (_index, _item) {
+							if(res.success == true){
+								$.each(res.data, function (_index, _item) {
 									msg_html += '\
 										<div class="lr-list">\
 												<div class="lr-list-item lr-list-item-multi" style="line-height: 25px;">\
 													<h4 id="time">'+ _item.AddTime +'</h4>\
 													<p class="lr-ellipsis">'+ _item.LicensePlate +'<span class="" style="right: 15px;position: absolute;top: 50%;transform: translateY(-50%);">'+ _item.DeviceNumber +'</span></p>\
-													<a class="lr-nav-right" id="gonggaodetail">'+ _item.Type +'<span class="lr-badge lr-badge-primary lr-badge-inverted">详情</span></a>\
+													<a class="lr-nav-right gonggaodetail">'+ _item.Type +'<span class="lr-badge lr-badge-primary lr-badge-inverted">详情</span></a>\
 												</div>\
 											</div>';
 									$page.find('.gonggaodetail').on('tap', function () {
@@ -90,9 +91,9 @@
 								msg_html += '<h4>暂无消息</h4>';	
 							}
 							$page.find('#gonggaoinfo').html(msg_html);
-							$('#gonggaodetail').on('tap', function () {
+							$('.gonggaodetail').on('tap', function () {
 								var addtime = $('#time').text();
-								learun.nav.go({ path: 'alarmdetail', title: '告警详情', type: 'right',param:'{"addtime":'+addtime+'}' });
+								learun.nav.go({ path: 'noticedetail', title: '告警详情', type: 'right', param:'{"addtime":"'+addtime+'"}'});
 							});
 						});
 						msg_html += '\

pages/noticedetail/noticedetail.css

@@ -0,0 +1,2 @@
+body {
+}

pages/noticedetail/noticedetail.html

@@ -0,0 +1,2 @@
+<div class="lr-list detail">
+</div>

pages/noticedetail/noticedetail.js

@@ -0,0 +1,23 @@
+(function () {
+    var page = {
+        isScroll: true,
+        init: function ($page,$param) {
+			var array = JSON.parse( $param );
+			var html = '';
+			userinfo = learun.storage.get('userinfo');
+			learun.httpget(config.webapi + "/?s=api/get_gonggao_detail&plate="+userinfo.baseinfo.plate+"&addtime="+array.addtime, {}, function(res) {
+				if(res.success == true){
+					html += '<div class="lr-list-item">车牌号<span class="lr-badge" style="background-color:white">'+res.data.LicensePlate+'</span></div>\
+					<div class="lr-list-item">电子标签<span class="lr-badge" style="background-color:white">'+res.data.DeviceNumber+'</span></div>\
+					<div class="lr-list-item">报警时间<span class="lr-badge" style="background-color:white">'+res.data.AddTime+'</span></div>\
+					<div class="lr-list-item">报警类型<span class="lr-badge" style="background-color:white">公告</span></div>\
+					<div class="lr-list-item">报警信息<span class="lr-badge" style="background-color:white">'+res.data.Comment+'</span></div>';
+				$page.find('.detail').html(html);
+				}else{
+					learun.layer.warning(res.message, function () { }, '提示', '关闭');
+				}
+			})
+        }
+    };
+    return page;
+})();

scripts/lrmuiex.js

@@ -21,7 +21,7 @@
         param.loginMark = learun.deviceId();
         var type = learun.type(data);
         if (type === 'object' || type === 'array') {
-            param.data = JSON.stringify(data);
+            param.data = data;
         }
         else if (type === 'string') {
             param.data = data;
@@ -42,7 +42,7 @@
                 }
             } else {
                 if (res.code === 200) {
-                    callback(res.data);
+                    callback(res);
                 } else {
                     callback(null);
                     //learun.layer.toast(res.info);
@@ -62,7 +62,7 @@
         param.loginMark = learun.deviceId();
         var type = learun.type(data);
         if (type === 'object' || type === 'array') {
-            param.data = JSON.stringify(data);
+            param.data = data;
         }
         else if (type === 'string') {
             param.data = data;