ProjectManage模块的UI

src/app/app.module.ts

@@ -121,6 +121,7 @@ import {ProjectManageChangeLoc} from "../pages/projectManage/changeLoc/changeLoc
 import {ProjectManageAddComment} from "../pages/projectManage/addComment/addComment";
 import {ProjectManageRegManage} from "../pages/projectManage/regManage/regManage";
 import {ProjectManageFileDetail} from "../pages/projectManage/fileDetail/fileDetail";
+import {ProjectManageProjectList} from "../pages/projectManage/videoManageList/videoManageList";
 
 
 @NgModule({
@@ -204,6 +205,7 @@ import {ProjectManageFileDetail} from "../pages/projectManage/fileDetail/fileDet
     ProjectManageChangeLoc,
     ProjectManageRegManage,
     ProjectManageFileDetail,
+    ProjectManageProjectList
   ],
   imports: [
     IonicModule.forRoot(MyApp, {
@@ -294,16 +296,17 @@ import {ProjectManageFileDetail} from "../pages/projectManage/fileDetail/fileDet
     ProjectManageChangeLoc,
     ProjectManageRegManage,
     ProjectManageFileDetail,
+    ProjectManageProjectList
   ],
   providers: [
-    HNBridge, 
-    CommonService, 
-    CommonHttpService, 
-    BusAdminService, 
-    TaxiDriverService, 
-    TaxiAdminService, 
-    BusDriverService, 
-    RoadSupportService, 
+    HNBridge,
+    CommonService,
+    CommonHttpService,
+    BusAdminService,
+    TaxiDriverService,
+    TaxiAdminService,
+    BusDriverService,
+    RoadSupportService,
     ProjectService,
     DropdownController
   ]

src/beans/beans.ts

@@ -442,6 +442,12 @@ export class EquipmentGPS {
   latitude: string;
 }
 
+export class VideoPlayBean {
+  guId: string;
+  playUrl: string;
+  tmpGuId: string;
+}
+
 export class CameraBean {
     channelName: string;
     guId: string;

src/pages/projectManage/fileManage/fileManage.scss

@@ -41,6 +41,9 @@
   }
   .list-ios {
     ion-item.item-block {
+      &:first-of-type {
+        padding: 0 16px;
+      }
       padding: 0;
       border: none;
       div.item-inner {

src/pages/projectManage/register/register.html

@@ -10,7 +10,7 @@
   <ion-list>
     <ion-item class="head">
       <ion-avatar item-left>
-        <img src="assets/img/road/event_list_default_img.png">
+        <img src="assets/img/road/event_process_user_img.png">
       </ion-avatar>
       <h2>{{signData.loginName}}</h2>
       <p>今日您已完成签到<span>{{signData.times}}</span>次</p>

src/pages/projectManage/register/register.scss

@@ -9,17 +9,19 @@
         width: 120px;
       }
       &:last-of-type {
-        margin-left: -81px;
+        margin-left: -80px;
         margin-top: 10px;
         width: 42px;
         height: 53px;
+        margin-right: 27px;
       }
     }
     span {
-      margin-left: -34px;
+      margin-left: -64px;
       margin-top: 73px;
       color: #fff;
       font-size: 16px;
+      margin-right: 27px;
     }
   }
   .list-ios .item-block .item-inner {
@@ -42,8 +44,8 @@
       align-items: center;
     }
     img {
-      height: 20px;
-      width: 20px;
+      height: 18px;
+      width: 18px;
       margin-right: 4px;
     }
     span {

src/pages/projectManage/videoManage/videoManage.html

@@ -9,9 +9,9 @@
   <!--todo:此处的搜索结果展现在地图下面的list中-->
   <!--<ion-searchbar button placeholder="项目名称/项目施工地点搜索" (click)="onClickSearch()"></ion-searchbar>-->
   <ion-list class="item-list">
-    <ion-item (click)="markPosition(116.470098,39.992838)">
+    <ion-item (click)="changeProject()">
       <img src="assets/img/video_02.png">
-      <span class="item-title">溧阳市改造工程建设局</span>
+      <span class="item-title">{{projectDetail.projectName}}</span>
     </ion-item>
   </ion-list>
   <div class="map-detail" id="videomap">

src/pages/projectManage/videoManage/videoManage.ts

@@ -1,8 +1,9 @@
-import { Component, AfterViewInit, OnDestroy, OnInit } from "@angular/core";
-import { NavController, Platform, App, NavParams } from "ionic-angular";
-import {CameraBean, CameraVideoUrl, ProjectDetailBean} from "../../../beans/beans";
-import { CommonHttpService } from "../../../services/common-http-service";
+import {Component, AfterViewInit, OnDestroy, OnInit} from "@angular/core";
+import {NavController, Platform, NavParams} from "ionic-angular";
+import {CameraVideoUrl, ProjectDetailBean, VideoPlayBean} from "../../../beans/beans";
+import {CommonHttpService} from "../../../services/common-http-service";
 import {ProjectService} from "../../../services/project-service";
+import {ProjectManageProjectList} from "../videoManageList/videoManageList";
 
 declare var AMap;
 declare var HNBridge;
@@ -13,6 +14,8 @@ declare var HNBridge;
 export class ProjectManageVideo implements OnInit, OnDestroy, AfterViewInit {
 
   public projectDetailList: ProjectDetailBean[] = [];
+  public projectDetail: ProjectDetailBean = new ProjectDetailBean();
+  public videoPlayList: VideoPlayBean[] = [];
 
   public map: any;
   public marker: any;
@@ -22,56 +25,70 @@ export class ProjectManageVideo implements OnInit, OnDestroy, AfterViewInit {
   public curVideoUrl: CameraVideoUrl;
 
   constructor(public navCtrl: NavController,
-    public params: NavParams,
-    public platform: Platform,
-    public commonHttpService: CommonHttpService,
-  public projectService: ProjectService) {
+              public params: NavParams,
+              public platform: Platform,
+              public commonHttpService: CommonHttpService,
+              public projectService: ProjectService) {
     this.beatHeartTimer = -1;
   }
 
   ngOnInit(): void {
+    this.map = new AMap.Map('videomap', {
+      zoom: 14,
+      zoomEnable: true,
+      center: [116.39,39.9]
+    });
+
+    AMap.plugin(['AMap.ToolBar', 'AMap.Scale'], () => {
+      this.map.addControl(new AMap.ToolBar());
+      this.map.addControl(new AMap.Scale());
+    });
+
     this.projectService.getProjectInfo('').subscribe(data => {
       if (data) {
         this.projectDetailList = data;
+        this.markWithVideo(this.projectDetailList[0]);
       }
     });
+
+    if (this.projectService.projectDetail) {
+      this.markWithVideo(this.projectService.projectDetail);
+    }
   }
 
   ngOnDestroy(): void {
     this.clearBeatHeart();
   }
+
   ngAfterViewInit(): void {
-    this.markWithVideo(this.projectDetailList[0]);
 
   }
 
+  changeProject() {
+    this.navCtrl.push(ProjectManageProjectList, {projectDetailList: this.projectDetailList});
+  }
+
   markWithVideo(projectDetail: ProjectDetailBean) {
     let pLon = projectDetail.lonLat.split(";")[0].split(",")[0];
     let pLat = projectDetail.lonLat.split(";")[0].split(",")[1];
-    this.map = new AMap.Map('videomap', {
-      zoom: 14,
-      zoomEnable: true,
-      center: [pLon, pLat]
-    });
 
-    AMap.plugin(['AMap.ToolBar', 'AMap.Scale'], () => {
-      this.map.addControl(new AMap.ToolBar());
-      this.map.addControl(new AMap.Scale());
-    });
+    this.map.setCenter(pLon, pLat);
 
     for (let i = 0; i < projectDetail.equips.length; i++) {
+      this.projectService.getVideoPlayUrl(projectDetail.equips[i].equipmentCode).subscribe(video => {
+        if (video) {
+          this.videoPlayList[i] = video;
+        }
+      });
+
       this.markers[i] = new AMap.Marker({
         position: [projectDetail.equips[i].longitude, projectDetail.equips[i].longitude],
         draggable: false,
         map: this.map
       });
-      AMap.event.addListener(this.marker, 'touchend', () => {
-        console.log("aaaaaaaaaaaa");
-        // this.startPlay();
-      });
-      AMap.event.addListener(this.marker, 'click', () => {
-        // this.startPlay();
-        console.log("aaaaaaaaaaaa");
+      AMap.event.addListener(this.markers[i], 'touchend', () => {
+        console.log("touchend");
+        this.startPlay(this.videoPlayList[i]);
       });
     }
   }
@@ -106,16 +123,10 @@ export class ProjectManageVideo implements OnInit, OnDestroy, AfterViewInit {
     }
   }
 
-  startPlay(item: any) {
-    let curCamera: CameraBean = item;
-    this.commonHttpService.getVideoPlayUrl(item.guId, "bus").subscribe(info => {
-      if (info) {
-        this.curVideoUrl = info;
-        this.startBeatHeart();
-        this.platform.ready().then(() => {
-          HNBridge.playVideoUrl(this.curVideoUrl.playUrl, curCamera.channelName);
-        });
-      }
+  startPlay(item: VideoPlayBean) {
+    this.startBeatHeart();
+    this.platform.ready().then(() => {
+      HNBridge.playVideoUrl(item.playUrl, item.tmpGuId);
     });
   }