物理返回键

src/app/app.component.ts

 import {Component, AfterViewInit, OnDestroy} from '@angular/core';
-
-import {Platform} from '@ionic/angular';
+import {NavController, Platform} from '@ionic/angular';
 import {SplashScreen} from '@ionic-native/splash-screen/ngx';
 import {StatusBar} from '@ionic-native/status-bar/ngx';
 import {Router, NavigationEnd} from '@angular/router';
@@ -102,7 +101,8 @@ export class AppComponent implements AfterViewInit, OnDestroy {
         private appMinimize: AppMinimize,
         private router: Router,
         private mqtt: Mqtt,
-        public load: Load
+        public load: Load,
+        private nav: NavController
     ) {
         this.initializeApp();
     }
@@ -163,13 +163,13 @@ export class AppComponent implements AfterViewInit, OnDestroy {
                 } else {
                     this.backBtnPressed = true;
                     setTimeout(() => this.backBtnPressed = false, 2000);
-                    return;
                 }
             } else {
                 this.backBtnPressed = true;
                 setTimeout(() => this.backBtnPressed = false, 2000);
-                return;
             }
+            this.nav.back();
+            return;
         });
     }
 }

src/app/east/east.page.html

@@ -9,7 +9,7 @@
                    [(ngModel)]="state.refreshState"
                    [endReachedRefresh]="state.endReachedRefresh"
                    (onRefresh)="pullToRefresh($event)"
-                   style="height: calc(100% - 45px)"
+                   style="min-height: calc(100% - 45px)"
     >
     <div class="topPart">
         <ListItem multipleLine *ngIf="this.yewei">

src/app/east/east.page.ts

@@ -104,8 +104,8 @@ export class EastPage implements OnInit {
             fieldDeviceNo: a.fieldDeviceNo,
             op: a.value ? 0 : 1,
             duration: this.duration,
-            startTime: new Date().getTime(),
-            ts: new Date().getTime()
+            startTime: parseInt((new Date().getTime() / 1000).toString(), 10),
+            ts: parseInt((new Date().getTime() / 1000).toString(), 10)
         };
         this.load.toLoad('指令已发送, 等待处理结果', true);
         this.api.control.controlSwitch([req, (data) => {

src/app/home/home.page.html

@@ -21,11 +21,6 @@
         <v-alarm-bar></v-alarm-bar>
         <div class="seePart">
             <v-sub-title title="监测信息"></v-sub-title>
-            <PullToRefresh [direction]="state.direction"
-                           [(ngModel)]="state.refreshState"
-                           [endReachedRefresh]="state.endReachedRefresh"
-                           (onRefresh)="pullToRefresh($event)"
-            >
             <div style="background-color: #efeff4">
                 <div class="out" *ngIf="items.length === 0 && !isError">
                     <i class="vo v-none"></i>
@@ -57,7 +52,6 @@
                     </div>
                 </div>
             </div>
-            </PullToRefresh>
         </div>
     </div>
 </div>

src/app/other/other.page.html

@@ -9,6 +9,7 @@
                    [(ngModel)]="state.refreshState"
                    [endReachedRefresh]="state.endReachedRefresh"
                    (onRefresh)="pullToRefresh($event)"
+                   style="min-height: calc(100% - 45px)"
     >
     <div class="topPart">
         <ListItem multipleLine *ngIf="this.yewei">

src/app/service/transfer.ts

-import { Router } from '@angular/router';
-import { Injectable } from '@angular/core';
+import {Router} from '@angular/router';
+import {Injectable} from '@angular/core';
 import {NavController} from '@ionic/angular';
 
 @Injectable()
 export class Transfer {
-    constructor(private router: Router, private nc: NavController) {}
+    constructor(private router: Router, private nc: NavController) {
+    }
 
     transfer(req) {
-        // 此处为ionic4路由跳转的时候不清空之前的页面组件造成的页面短暂交叠
-        // ionic4在发生路由跳转的时候是先进行新组件的加载再进行旧组件的隐藏
-        // 我没有找到相关的api以及解决办法,如果后面的人找到了的话麻烦将这个麻烦的方法给解决掉
-        // if (document.getElementsByTagName('v' + req.url.replace(/\//, '-')).length > 0) {
-        //     const y = <HTMLBodyElement>document.getElementsByTagName('v' + req.url.replace(/\//, '-'))[0];
-        //     y.style.visibility = 'visible';
-        // }
-        // req.query = req.query ? req.query : {};
-        // req.query.refresh = + new Date();
-        // this.router.navigate([req.url], {queryParams: req.query, fragment: req.hash});
-        // if (document.getElementsByTagName('v' + window.location.pathname.replace(/\//, '-')).length > 0) {
-        //     const x = <HTMLBodyElement>document.getElementsByTagName('v' + window.location.pathname.replace(/\//, '-'))[0];
-        //     x.style.visibility = 'hidden';
-        //     setTimeout(() => {
-        //         // 此处是防止移动端自己的back button跳转导致页面空白
-        //         x.style.visibility = 'visible';
-        //     }, 1000);
-        // }
-        if (!req.query) { req.query = ''; }
+        if (!req.query) {
+            req.query = '';
+        }
+        // const historys = JSON.parse(window.sessionStorage.getItem('router.history')) || [];
         this.nc.navigateRoot(req.url + req.query);
     }
 }