增加真机GPS定位功能函数

pages/amap/amap.css

@@ -296,6 +296,9 @@ hr{
     z-index: 555;
     margin-right: 15px;
     justify-content: flex-end;
+    width: 28px;
+    height: 28px;
+    align-self: flex-end;
     margin-bottom: 2em;
 }
 .big-circle{

pages/amap/amap.html

@@ -25,18 +25,19 @@
 
                 <!-- 内容占位 -->
                 <div style="flex: 1 0 auto"></div>
-
-                <div style="z-index:555;flex: 0 0 auto;">
-                    <!-- 用户定位 -->
-                    <div id="user-location">
-                        <div class="base-circle">
-                            <div class="big-circle">
-                                <div class="medium-circle">
-                                    <div class="small-circle"></div>
-                                </div>
+                <!-- 用户定位 -->
+                <div id="user-location">
+                    <div class="base-circle">
+                        <div class="big-circle">
+                            <div class="medium-circle">
+                                <div class="small-circle"></div>
                             </div>
                         </div>
                     </div>
+                </div>
+
+                <div style="z-index:555;flex: 0 0 auto;">
+
                                        
                     <!-- 底部功能面板 -->
                     <div id="func-panel" >

pages/amap/amap.js

@@ -1,8 +1,8 @@
 (function () {
     var page = {
         init: function ($page) {
+			//初始化顶部导航栏
             function init_nav(){
-				//初始化顶部导航栏
 				var _html = '';
 				_html += '<div class="my">';
 				_html += '<i class="iconfont icon-people"></i>';
@@ -64,6 +64,28 @@
 					});
 				});
 			}
+			//获取手机GPS位置
+			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');
+				};
+			 
+				// onError Callback receives a PositionError object
+				//
+				function onError(error) {
+					alert('code: '    + error.code    + '\n' +
+						  'message: ' + error.message + '\n');
+				}
+				navigator.geolocation.getCurrentPosition(onSuccess, onError);
+			}
+			
 			var userinfo = learun.storage.get('userinfo');
 			//上报客户端极光注册信息
 			function update_jg_registrationid(){
@@ -77,9 +99,14 @@
 					});
 				}
 			}
-			//上报用户极光推注册信息
+			learun.layer.loading(true, "加载数据中");
 			if(window.lrmui.isreal){
+				//上报用户极光推注册信息
 				update_jg_registrationid();
+				
+				//获取手机GPS位置信息
+				get_mobile_gps_location();
+				
 			}
 			init_nav();
 
@@ -90,7 +117,10 @@
             learun.timeInterval = 5000;
             //地图初始化
             learun.map = new AMap.Map('amapcontainer');
-            learun.vehicleMarker = new AMap.Marker({icon:'./images/bicycle.png', offset:new AMap.Pixel(0, -47)});
+			learun.map.on('complete', function(){
+				learun.layer.loading(false);
+			});
+            learun.vehicleMarker = new AMap.Marker({icon:'./images/bicycle.png', offset:new AMap.Pixel(0, -51)});
             learun.circle = new AMap.Circle({
                 borderWeight: 3,
                 strokeColor: "#FF33FF", 
@@ -197,7 +227,8 @@
                 });
         
                 function openInfoWin() {
-                    infoWindow.open(learun.map, learun.data.vehicle.getPosition());
+                    // infoWindow.open(learun.map, learun.data.vehicle.getPosition());
+                    infoWindow.open(learun.map, learun.vehicleMarker.getPosition());
                 }
                 openInfoWin();
                 //marker 点击时打开

pages/amap/route/route.css

@@ -137,3 +137,14 @@ html{
     -webkit-transform:scale(0.8);
     color: gray;
 }
+
+.date-set{
+    display: flex;
+    flex-direction: column;
+    height: 40px;
+    align-items: center;
+}
+.date-set span{
+    font-size: 1.2em;
+    color: gray;
+}

pages/amap/route/route.html

@@ -56,10 +56,11 @@
                             <span class="iconfont icon-next"></span>
                         </div>
 
-                        <div class="speed-set">
+                        <div class="date-set">
                             <span class="iconfont icon-sheding"></span>
                             <p class="icon-bottom-word">重设</p>
                         </div>
+                        
                     </div>
                 
                 </div>

pages/amap/route/route.js

@@ -146,6 +146,15 @@
                     navg0.moveToPoint(presentNode+1, 0);
                     learun.pathSimplifierIns.render();
                 });
+
+
+
+
+                $page.find('date-set').on('tap', function(){
+                    // $('.outcase').hide();
+                    $('.widthset').show();
+                });
+    
             }
             
             AMapUI.load(['ui/misc/PathSimplifier'], function(PathSimplifier) {
@@ -157,8 +166,11 @@
             
                 //启动页面
                 learun.initPage(PathSimplifier);
+
             });
 
+            
+
 
             
 

pages/baojing/baojing.js

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

pages/baojingindex/baojingindex.css

@@ -1,2 +1,20 @@
-body {
+.box {
+  position: relative;
+  width: 100%;
+  height: 200px;
+  text-align: center;
+  color: #2828d6;
+  background-color: #2828d6;
+}
+.box:after {
+  position: absolute;
+  left: 0;
+  right: 0;
+  bottom: -100px;
+  z-index: -1;
+  content: ' ';
+  height: 100px;
+  width: 100%;
+  border-radius: 0 0 70% 70%;
+  background-color: #2828d6;
 }

pages/baojingindex/baojingindex.html

@@ -1,5 +1,9 @@
-<img id="picture1" style='width:100%' ></img>
-<div style="padding:10px;">
+<div class='box' style='width:100%;height:250px;text-align:center;'>
+	<img id="picture1"></img>
+	<h3 style='color:white;text-align:center'>公安110</h3>
+	<h4 style='color:white;text-align:center'>车辆被盗,请点击下方报警按钮</h4>
+</div>
+<div style="padding:120px 10px 10px 10px;">
     <button type="button" class="lr-btn-danger lr-btn-block call-baojing">
         电话报警
     </button>

pages/baojingindex/baojingindex.js

@@ -3,7 +3,7 @@
         isScroll: true,
         init: function ($page) {
             //$page.find('#picture1').slider({ data: ['images/tubiao1.png'], indicator: true });//
-            $page.find('#picture1').attr('src','images/tubiao1.png');
+            $page.find('#picture1').attr('src','images/tubiao.png');
 			
 			$page.find('.call-baojing').on('tap', function () {
 				learun.tab.go('demo/baojing');

pages/baojinginfo/baojinginfo.js

@@ -28,22 +28,29 @@
 						var msg_html = '';
 						msg_html += '\
 									<div class="f-page-body f-scroll-wrapper">\
-										<div class="f-scroll" id="gaojinginfo" style="transform: translate3d(0px, 0px, 0px) translateZ(0px);">';
-						
+										<div class="f-scroll" style="overflow:auto;height: 100%;">\
+											<div class="lr-list gaojinginfo">\
+											</div>\
+										</div>\
+										<div class="f-scrollbar f-scrollbar-vertical">\
+											<div class="f-scrollbar-indicator" style="transition-duration: 0ms; display: none; height: 830px; transform: translate3d(0px, 0px, 0px) translateZ(0px);">\
+											</div>\
+										</div>\
+									</div>';
+						$this.html(msg_html);
 						//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.success == true){
+								var msg_html_list = '';
 								$.each(res.data, function (_index, _item) {
-									msg_html += '\
-										<div class="lr-list">\
+									msg_html_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 gaojingdetail">'+ _item.Type +'<span class="lr-badge lr-badge-primary lr-badge-inverted">详情</span></a>\
-												</div>\
-											</div>';
-									$page.find('#gaojinginfo').html(msg_html);
+												</div>';
+									$page.find('.gaojinginfo').html(msg_html_list);
 									var addtime = $('#time').text();
 									$('.gaojingdetail').on('tap', function () {	
 										learun.nav.go({ path: 'alarmdetail', title: '告警详情', type: 'right', param:'{"addtime":"'+addtime+'"}'});
@@ -51,11 +58,21 @@
 								});
 							}else{
 								msg_html += '<h4>暂无消息</h4>';
-								$page.find('#gaojinginfo').html(msg_html);
+								$page.find('.gaojinginfo').html(msg_html);
 							}
 							});
 						
+						//msg_html += '';
+						
+                        break;
+                    case 1:
+                        var msg_html = '';
+						var msg_html = '';
 						msg_html += '\
+									<div class="f-page-body f-scroll-wrapper">\
+										<div class="f-scroll" style="overflow:auto;height: 100%;">\
+											<div class="lr-list gonggaoinfo">\
+											</div>\
 										</div>\
 										<div class="f-scrollbar f-scrollbar-vertical">\
 											<div class="f-scrollbar-indicator" style="transition-duration: 0ms; display: none; height: 830px; transform: translate3d(0px, 0px, 0px) translateZ(0px);">\
@@ -63,47 +80,30 @@
 										</div>\
 									</div>';
 						$this.html(msg_html);
-                        break;
-                    case 1:
-                        var msg_html = '';
-						msg_html += '\
-									<div class="f-page-body f-scroll-wrapper">\
-										<div class="f-scroll" id="gonggaoinfo" style="transform: translate3d(0px, 0px, 0px) translateZ(0px);">';
 						//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) {
+							var msg_html_list = '';
 							if(res.success == true){
 								$.each(res.data, function (_index, _item) {
-									msg_html += '\
-										<div class="lr-list">\
+									msg_html_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 gonggaodetail">'+ _item.Type +'<span class="lr-badge lr-badge-primary lr-badge-inverted">详情</span></a>\
-												</div>\
-											</div>';
-									$page.find('.gonggaodetail').on('tap', function () {
-										learun.nav.go({ path: 'baojing', title: '自助报警', type: 'right' });
+												</div>';
+									$page.find('.gonggaoinfo').html(msg_html_list);
+									$('.gonggaodetail').on('tap', function () {
+										var addtime = $('#time').text();
+										learun.nav.go({ path: 'noticedetail', title: '告警详情', type: 'right', param:'{"addtime":"'+addtime+'"}'});
 									});
 								});
 								
 							}else{
-								msg_html += '<h4>暂无消息</h4>';	
+								msg_html += '<h4>暂无消息</h4>';
+								$page.find('.gonggaoinfo').html(msg_html);
 							}
-							$page.find('#gonggaoinfo').html(msg_html);
-							$('.gonggaodetail').on('tap', function () {
-								var addtime = $('#time').text();
-								learun.nav.go({ path: 'noticedetail', title: '告警详情', type: 'right', param:'{"addtime":"'+addtime+'"}'});
-							});
 						});
-						msg_html += '\
-									</div>\
-									<div class="f-scrollbar f-scrollbar-vertical">\
-										<div class="f-scrollbar-indicator" style="transition-duration: 0ms; display: none; height: 830px; transform: translate3d(0px, 0px, 0px) translateZ(0px);">\
-										</div>\
-									</div>\
-								</div>';
-						$this.html(msg_html);
                         break;
                 }
                 $this = null;

scripts/lrmuiex.js

@@ -44,7 +44,8 @@
                 if (res.code === 200) {
                     callback(res);
                 } else {
-                    callback(null);
+                    //callback(null);
+                    callback(res);
                     //learun.layer.toast(res.info);
                     learun.layer.toast(res.message);
                 }
@@ -87,7 +88,8 @@
                     //callback(res.data, res.info);
                     callback(res);
                 } else {
-                    callback(null);
+                    //callback(null);
+                    callback(res);
                     //learun.layer.toast(res.info);
                     learun.layer.toast(res.message);
                 }