amap增加客户端上报极光推注册信息

pages/alarmdetail/alarmdetail.css

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

pages/alarmdetail/alarmdetail.html

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

pages/alarmdetail/alarmdetail.js

@@ -0,0 +1,25 @@
+(function () {
+    var page = {
+        isScroll: true,
+        init: function ($page,$param) {
+			console.log($param);
+			var html = '';
+			userinfo = learun.storage.get('userinfo');
+			learun.http.get(config.webapi + "/?s=api/get_gonggao_info&plate="+userinfo.baseinfo.plate, {}, function(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>';
+				});
+				$page.find('.detail').html(html);
+				}
+			})
+        }
+    };
+    return page;
+})();

pages/amap/amap.css

@@ -47,11 +47,11 @@
     content: "\e604";
   }
   
-  .icon-shipin_shangyigewenjian:before {
+  .icon-last:before {
     content: "\e627";
   }
   
-  .icon-shipin_xiayigewenjian:before {
+  .icon-next:before {
     content: "\e628";
   }
   

pages/amap/amap.js

@@ -64,9 +64,26 @@
 					});
 				});
 			}
+			var userinfo = learun.storage.get('userinfo');
+			//上报客户端极光注册信息
+			function update_jg_registrationid(){
+				if(window.lrmui.jgRegistrationId){
+					var post_data = {
+						"regid":window.lrmui.jgRegistrationId,
+						"uid":userinfo['userId']
+					};
+					learun.httppost(config.webapi+'?s=api/update_jg_registrationid',post_data,function(res){
+						
+					});
+				}
+			}
+			//上报用户极光推注册信息
+			if(window.lrmui.isreal){
+				update_jg_registrationid();
+			}
 			init_nav();
 
-
+			
 
 
             //车辆信息初始化

pages/amap/route/route.css

@@ -38,7 +38,7 @@ html{
 
 .route-play-panel{
     display: flex;
-    height: 150px;
+    height: 165px;
     background: #fff;
     padding: 10px;
     flex-direction: column;
@@ -48,6 +48,39 @@ html{
     display: flex;
     flex-direction: column;
 }
+.text-area p{
+    margin: 0;
+    font-size: 14px;
+}
+
+.time-speed{
+    font-size: 12px;
+    color: gray;
+    margin-top: 4px;
+}
+
+.address-line{
+    display: flex;
+    flex-direction: row wrap;
+    align-items: center;
+    margin-top: 8px;
+}
+.address-line span{
+    font-size: 12px;
+    width: 45px;
+    color: gray;
+}
+.address-lin p{
+    margin: 0;
+    font-size: 14px;
+}
+
+.delimite-line{
+    height: 1px;
+    width: 100%;
+    margin-top: 10px;
+    background: #d4d2d2;
+}
 
 .button-area{
     display: flex;
@@ -69,7 +102,7 @@ html{
     color: gray;
 }
 
-.speed-levele{
+.speed-level{
     margin: 0;
     font-size:10px;
     -webkit-transform:scale(0.8);
@@ -84,7 +117,7 @@ html{
     align-items: center;
 }
 
-.play-control .icon-shipin_shangyigewenjian,.icon-shipin_xiayigewenjian{
+.play-control .icon-last,.icon-next{
     color: #2ea1ef;
     font-size: 2em;
 }
@@ -92,6 +125,11 @@ html{
     color: #2ea1ef;
     font-size: 3.5em;
 }
+.play-control .icon-zanting{
+    color: #2ea1ef;
+    font-size: 3.08em;
+}
+
 .icon-bottom-word{
     margin: 0;
     font-size:10px;

pages/amap/route/route.html

@@ -26,31 +26,34 @@
             <!-- 播放面板 -->
             <div class="outcase">
                 <div class="route-play-panel">
+                    <!-- 信息区 -->
                     <div class="text-area">
                         <p>1234567891012</p>
                         
                         <div class="time-speed">
-                            <span id="date-time">时间：</span>
-                            <span id="vehicle-speed">速度：</span>
+                            <span id="date-time">时间：2019-01-15 08:54:32</span>
+                            <span id="vehicle-speed">速度：26km/h</span>
                         </div>
 
                         <div class="address-line">
                             <span>地址：</span>
-                            <p>年发电量大肆砍伐卢卡斯京东方都发dfdsafas大水发射点发射点</p>
+                            <p>浙江省杭州市滨江区和瑞科技园S2地下车库</p>
                         </div>
                     </div>
-
+                    <!-- 分割(后续可能进度条替代) -->
+                    <div class="delimite-line"></div>
+                    <!-- 控制区 -->
                     <div class="button-area">
 
                         <div class="speed-set">
-                            <span class="iconfont icon-beisu1"></span>
-                            <p class="speed-levele">慢速</p>
+                            <span id="speed-icon" class="iconfont icon-beisu1"></span>
+                            <p class="speed-level">慢速</p>
                         </div>
 
                         <div class="play-control">
-                            <span class="iconfont icon-shipin_shangyigewenjian"></span>
-                            <span class="iconfont icon-bofang"></span>
-                            <span class="iconfont icon-shipin_xiayigewenjian"></span>
+                            <span class="iconfont icon-last"></span>
+                            <span id="play-pause" class="iconfont icon-bofang"></span>
+                            <span class="iconfont icon-next"></span>
                         </div>
 
                         <div class="speed-set">

pages/amap/route/route.js

@@ -48,9 +48,14 @@
                     name: '轨迹0',
                     path: [
                         [100.340417, 27.376994],
-                        [108.426354, 37.827452],
-                        [113.392174, 31.208439],
-                        [124.905846, 42.232876]
+                        [100.239417, 27.3764],
+                        [100.238417, 27.386994],
+                        [100.137417, 27.379994],
+                        [100.436417, 27.396994],
+                        [100.535417, 27.376694],
+                        [100.134417, 27.374994],
+                        [100.232417, 27.372994],
+                        [100.331417, 27.376994],
                     ]
                 }]);
             
@@ -58,15 +63,79 @@
                 var navg0 = learun.pathSimplifierIns.createPathNavigator(0, //关联第1条轨迹
                     {
                         loop: true, //循环播放
-                        speed: 1000000
+                        speed: 10000
                     });
                 
-                var index
-                
-                navg0.start();
 
-                $page.find('#pause').on('tap', function () {
+                //播放速度控制
+                $page.find('.speed-set').on('tap', function () {
+                    var speedSign = $page.find('#speed-icon');
+
+                    if(speedSign.hasClass('icon-beisu1')){
+                        speedSign.removeClass('icon-beisu1');
+                        speedSign.addClass('icon-beisu2');
+                        $page.find('.speed-level').html('中速');
+                        navg0.setSpeed(2*10000);
+                    }else if(speedSign.hasClass('icon-beisu2')){
+                        speedSign.removeClass('icon-beisu2');
+                        speedSign.addClass('icon-beisu4');
+                        $page.find('.speed-level').html('快速');
+                        navg0.setSpeed(4*10000);
+                    }else if(speedSign.hasClass('icon-beisu4')){
+                        speedSign.removeClass('icon-beisu4');
+                        speedSign.addClass('icon-beisu1');
+                        $page.find('.speed-level').html('慢速');
+                        navg0.setSpeed(10000);
+                    }
+                });
+
+                // 播放暂停切换
+                $page.find('.icon-bofang').on('tap', function () {
+                    var playSign = $page.find('#play-pause');
+                    if(playSign.hasClass('icon-bofang')){
+                        playSign.removeClass('icon-bofang');
+                        playSign.addClass('icon-zanting');
+                        if(navg0.getNaviStatus() == 'stop'){
+                            navg0.start();
+                        }else{
+                            navg0.resume();
+                        }
+                    }else{
+                        playSign.removeClass('icon-zanting');
+                        playSign.addClass('icon-bofang');
+                        navg0.pause();
+                    }
+                });
+
+                //节点控制
+                $page.find('.icon-last').on('tap', function () {
+                    if(navg0.getNaviStatus() == 'stop'){
+                        return;
+                    }
+                    if(navg0.getNaviStatus() == 'moving'){
+                        navg0.pause();
+                        $('#play-pause').removeClass('icon-bofang');
+                        $('#play-pause').addClass('icon-zanting');
+                    }
+                    //当前节点索引
+                    var lastNode = navg0.getCursor().idx;
+                    console.log(lastNode);
+                    if(lastNode == 0){
+                        navg0.moveToPoint(0, 0.1);
+                        return;
+                    }
+                    console.log(lastNode);
+                    console.log(navg0.getCursor());
+                    navg0.moveToPoint(lastNode-1, 0);
+                });
+                $page.find('.icon-next').on('tap', function () {
+                    //下一个节点
+                    var nextNode = navg0.getCursor().idx + 1;
+                    if(!lastNode){
+                        lastNode = 0;
+                    }
                     navg0.pause();
+                    navg0.moveToPoint(lastNode, 0);
                 });
             }
             

pages/baojing/baojing.html

@@ -6,8 +6,9 @@
         <label>车牌选择</label>
         <div id="plateselect"></div>
     </div>-->
-	<div class="lr-list-item">
-        车牌号<span class="lr-badge" id='plate' style='background-color:white'></span>
+	<div class="lr-form-row">
+        <label>车牌号</label>
+        <input id='plate' type="text" readonly>
     </div>
     <div class="lr-form-row">
         <label>手机号码</label>

pages/baojing/baojing.js

@@ -17,8 +17,8 @@
             });*/
 			
 			//var platedata = [{value:"123123122223",text:"bj123123"},{value:"123123122223",text:"bj123124"},{value:"1231122223",text:"bj123125"}];
-			$page.find('#plate').html(userinfo.baseinfo.plate);
-			$page.find('#mobile').html(userinfo.baseinfo.mobile);
+			$page.find('#plate').val(userinfo.baseinfo.plate);
+			$page.find('#mobile').val(userinfo.baseinfo.mobile);
             $page.find('#date2').lrdate({
                 type: 'date'
             });
@@ -36,7 +36,7 @@
                         StolenDate: date,
 						WoContent: reason
                     };
-				learun.http.post("http://czapp.rltest.cn/?s=api/submit_add_baojing", policedata, function(res) {
+				learun.http.post(config.webapi + "/?s=api/submit_add_baojing", policedata, function(res) {
 					if(res.success == true){
 						learun.layer.toast('提交成功');
 						learun.nav.go({ path: 'amap', title: '地图', type: 'right', isBack: false });

pages/baojinginfo/baojinginfo.js

@@ -31,24 +31,26 @@
 										<div class="f-scroll" id="gaojinginfo" style="transform: translate3d(0px, 0px, 0px) translateZ(0px);">';
 						
 						//var baojing_info = '';
-						
-						learun.http.get("http://czapp.rltest.cn/?s=api/get_baojing_info", {}, function(res) {
-							if(res){
+						userinfo = learun.storage.get('userinfo');
+						learun.http.get(config.webapi + "/?s=api/get_baojing_info&plate="+userinfo.baseinfo.plate, {}, function(res) {
+							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>'+ _item.AddTime +'</h4>\
-													<p class="lr-ellipsis">'+ _item.DeviceNumber +'<span class="" style="right: 15px;position: absolute;top: 50%;transform: translateY(-50%);">'+ _item.AddTime +'</span></p>\
-													<a class="lr-nav-right">'+ _item.Comment +'<span class="lr-badge lr-badge-primary lr-badge-inverted">详情</span></a>\
+													<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>\
 												</div>\
 											</div>';
 								});
-								
 							}else{
 								msg_html += '<h4>暂无消息</h4>';	
 							}
 							$page.find('#gaojinginfo').html(msg_html);
+							$('#gaojingdetail').on('tap', function () {	
+								learun.nav.go({ path: 'alarmdetail', title: '告警详情', type: 'right' });
+							});
 							});
 						
 						msg_html += '\
@@ -59,69 +61,6 @@
 										</div>\
 									</div>';
 						$this.html(msg_html);
-						
-							
-							/*var pageobj = $('#gaojinginfo').lrpagination({
-								lclass: "lr-list",
-								rows: 10,                            // 每页行数
-								getData: function (param, callback) {// 获取数据 param 分页参数,callback 异步回调
-									// param:   page: 当前页,rows:行数
-									setTimeout(function () {
-										var gaojing_data = [];
-										learun.http.get("http://czapp.rltest.cn/?s=api/get_baojing_info", {}, function(res) {
-											if(res){
-												$.each(res.data, function (_index, _item) {
-													gaojing_data = _item;
-													console.log(gaojing_data);
-													//gaojing_data.push({ data: _item });
-												})
-											}
-										})
-										console.log(gaojing_data);
-										callback(gaojing_data, 20);
-									}, 1000);
-								},
-								renderData: function (_index, _item) {// 渲染数据模板
-								console.log(_item);
-									var _html = '\
-										<div class="lr-list">\
-												<div class="lr-list-item lr-list-item-multi" style="line-height: 25px;">\
-													<h4>'+ _item.AddTime +'</h4>\
-													<p class="lr-ellipsis">'+ _item.DeviceNumber +'<span class="" style="right: 15px;position: absolute;top: 50%;transform: translateY(-50%);">'+ _item.AddTime +'</span></p>\
-													<a class="lr-nav-right">'+ _item.Comment +'<span class="lr-badge lr-badge-primary lr-badge-inverted">详情</span></a>\
-												</div>\
-											</div>';
-									return _html;
-								},
-								down: {
-									contentinit: '下拉可以刷新',
-									contentdown: '下拉可以刷新',
-									contentover: '释放立即刷新',
-									contentrefresh: '正在刷新...'
-								},
-								up: {
-									contentinit: '上拉显示更多',
-									contentdown: '上拉显示更多',
-									contentrefresh: '正在加载...',
-									contentnomore: '没有更多数据了'
-								},
-								click: function (item, $item) {// 列表行点击事件
-									
-								}
-							});*/
-							
-							
-							
-							
-						
-						
-						
-						/*$('.lr-nav-right').on('tap', function () {
-							var path = 'demo/test/map-detail';
-							console.log(path);
-							var title = '告警详情';
-							learun.nav.go({ path: path, title: title, type: 'right' });
-						});*/
                         break;
                     case 1:
                         var msg_html = '';
@@ -129,24 +68,30 @@
 									<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"}}';
-						
-						learun.http.get("http://czapp.rltest.cn/?s=api/get_baojing_info", {}, function(res) {
-							if(res){
+						userinfo = learun.storage.get('userinfo');
+						learun.http.get(config.webapi + "/?s=api/get_gonggao_info&plate="+userinfo.baseinfo.plate, {}, function(res) {
+							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>'+ _item.AddTime +'</h4>\
-													<p class="lr-ellipsis">'+ _item.DeviceNumber +'<span class="" style="right: 15px;position: absolute;top: 50%;transform: translateY(-50%);">'+ _item.AddTime +'</span></p>\
-													<a class="lr-nav-right">'+ _item.Comment +'<span class="lr-badge lr-badge-primary lr-badge-inverted">详情</span></a>\
+													<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>\
 												</div>\
 											</div>';
+									$page.find('.gonggaodetail').on('tap', function () {
+										learun.nav.go({ path: 'baojing', title: '自助报警', type: 'right' });
+									});
 								});
 								
 							}else{
 								msg_html += '<h4>暂无消息</h4>';	
 							}
 							$page.find('#gonggaoinfo').html(msg_html);
+							$('#gonggaodetail').on('tap', function () {	
+								learun.nav.go({ path: 'alarmdetail', title: '告警详情', type: 'right',param:'{"addtime":_item.AddTime}' });
+							});
 						});
 						msg_html += '\
 									</div>\
@@ -156,12 +101,6 @@
 									</div>\
 								</div>';
 						$this.html(msg_html);
-							/*$('.lr-nav-right').on('tap', function () {
-								var path = 'demo/test/map-detail';
-								console.log(path);
-								var title = '公告详情';
-								learun.nav.go({ path: path, title: title, type: 'right' });
-							});*/
                         break;
                 }
                 $this = null;

pages/login/login.js

@@ -73,7 +73,7 @@
 					//console.log(postdata);
                     var path = config.webapi;
                     learun.layer.loading(true, "正在登录，请稍后");
-                    learun.http.post("http://czapp.rltest.cn/?s=api/login", postdata, function(res) {
+                    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);
 

scripts/index.js

@@ -7,24 +7,18 @@
     // 初始化页面
     var tabdata = [
         {
-            page: 'workspace',
+            page: 'amap',
             text: '首页',
             img: 'images/tab10.png',
             fillimg: 'images/tab11.png'
         },
         {
-            page: 'message',
+            page: 'baojinginfo',
             text: '消息',
             img: 'images/tab20.png',
             fillimg: 'images/tab21.png'
         },
         {
-            page: 'contacts',
-            text: '通讯录',
-            img: 'images/tab30.png',
-            fillimg: 'images/tab31.png'
-        },
-        {
             page: 'my',
             text: '我的',
             img: 'images/tab40.png',
@@ -37,39 +31,7 @@
         document.addEventListener('pause', onPause.bind(this), false);
         document.addEventListener('resume', onResume.bind(this), false);
         learun.tab.init(tabdata);
-		/*
-		console.log('*****JPush.init*****');
-		//极光推送初始化
-		window.JPush.init();
-		window.JPush.setDebugMode(true);
-		window.JPush.getRegistrationID(function(rId) {       
-			console.log("getRegistrationID:"+rId);
-		});
-		window.JPush.getConnectionState(function (result) {
-		  console.log("getConnectionState:"+result);
-		});
-		//极光推送绑定事件
-		window.plugins.jPushPlugin.receiveNotificationInAndroidCallback = function(data) {
-			try {          
-			  cordova.plugins.notification.badge.increase(1, function (badge) {
-				
-			  });
-			  console.log(
-				"JPushPlugin:receiveNotificationInAndroidCallback:",
-				data
-			  );
-			} catch (exception) {
-			  console.log("JPushPlugin:pushCallback ", exception);
-			}
-		};
-		window.plugins.jPushPlugin.openNotificationInAndroidCallback = function(data) {
-			try {
-			   //location.href = 'index.html';  
-				cordova.plugins.notification.badge.clear();
-			   console.log(data);
-			} catch (error) {}
-		};
-		*/
+		
         var logininfo = learun.storage.get('logininfo');
         if (logininfo) {// 有登录的token
 			learun.nav.go({ path: 'amap', title: '地图', type: 'right', isBack: false });
@@ -83,7 +45,8 @@
 		},400);
         
     });
-
+	
+	
     function onPause() {
         // TODO: 此应用程序已挂起。在此处保存应用程序状态。
     }

scripts/lrmui.js

@@ -135,7 +135,8 @@ u[o]&&(delete u[o],c?delete n[l]:typeof n.removeAttribute!==i?n.removeAttribute(
         },
         md5: function (str) {
             return $.md5(str);
-        }
+        },
+		jgRegistrationId:false
     };
     function _init(callback) {// 框架初始化方法
         if (window.lrmui.isready) {
@@ -173,36 +174,41 @@ u[o]&&(delete u[o],c?delete n[l]:typeof n.removeAttribute!==i?n.removeAttribute(
             window.lrmui.isreal = true;
             window.lrmui.platform = cordova.platformId;
             StatusBar.styleDefault();
-			
-			//推送通知设置
-			try {
-				window.JPush.init();
-				window.JPush.setDebugMode(true);
-				cordova.plugins.notification.badge.configure({ autoClear: true });
-				var onGetRegistrationID = function(data) {
-				  try {
+			//推送通知初始化
+			init_jg_push();
+        }
+        window.lrmui.isready = true; // 表示设备加载完成
+    }
+	//推送通知初始化
+	function init_jg_push(){
+		try {
+			window.JPush.init();
+			//window.JPush.setDebugMode(true);
+			cordova.plugins.notification.badge.configure({ autoClear: true });
+			var onGetRegistrationID = function(data) {
+			  try {
+				
+				if (data.length == 0) {
+				  var t1 = window.setTimeout(getRegistrationID, 1000);
+				}else{
 					console.log("JPushPlugin:registrationID is " + data);
-					
-					if (data.length == 0) {
-					  var t1 = window.setTimeout(getRegistrationID, 1000);
-					}
-				  } catch (exception) {
-					console.log(exception);
-				  }
-				};
-				var getRegistrationID = function() {
-				  window.JPush.getRegistrationID(onGetRegistrationID);
-				};
-				window.setTimeout(getRegistrationID, 1000);
-				if (device.platform != "Android") {
-				  window.JPush.setApplicationIconBadgeNumber(0);
+					window.lrmui.jgRegistrationId = data;
 				}
-			} catch (exception) {
+			  } catch (exception) {
 				console.log(exception);
+			  }
+			};
+			var getRegistrationID = function() {
+			  window.JPush.getRegistrationID(onGetRegistrationID);
+			};
+			window.setTimeout(getRegistrationID, 1000);
+			if (device.platform != "Android") {
+			  window.JPush.setApplicationIconBadgeNumber(0);
 			}
-        }
-        window.lrmui.isready = true; // 表示设备加载完成
-    }
+		} catch (exception) {
+			console.log(exception);
+		}
+	}
 	function onOpenNotification(event){
 		try {
             var alertContent;

scripts/lrmuiex.js

@@ -45,7 +45,8 @@
                     callback(res.data);
                 } else {
                     callback(null);
-                    learun.layer.toast(res.info);
+                    //learun.layer.toast(res.info);
+                    learun.layer.toast(res.message);
                 }
             }
         });
@@ -83,10 +84,12 @@
                
             } else {
                 if (res.code === 200) {
-                    callback(res.data, res.info);
+                    //callback(res.data, res.info);
+                    callback(res);
                 } else {
                     callback(null);
-                    learun.layer.toast(res.info);
+                    //learun.layer.toast(res.info);
+                    learun.layer.toast(res.message);
                 }
             }
         });