Skip to content

M
muChangApp
Commit 8a34da97 authored by van.chen's avatar van.chen
Browse files
Options

物理返回键

parent 7bd8f707
Hide whitespace changes
Inline Side-by-side
Showing with 44 additions and 63 deletions
package.json
View file @ 8a34da97
...@@ -91,4 +91,4 @@ ...@@ -91,4 +91,4 @@
"ios" "ios"
] ]
} }
} }
\ No newline at end of file
src/app/app.component.ts
View file @ 8a34da97
import {Component, AfterViewInit, OnDestroy} from '@angular/core'; import {Component, AfterViewInit, OnDestroy} from '@angular/core';
import {NavController, Platform} from '@ionic/angular';
import {Platform} from '@ionic/angular';
import {SplashScreen} from '@ionic-native/splash-screen/ngx'; import {SplashScreen} from '@ionic-native/splash-screen/ngx';
import {StatusBar} from '@ionic-native/status-bar/ngx'; import {StatusBar} from '@ionic-native/status-bar/ngx';
import {Router, NavigationEnd} from '@angular/router'; import {Router, NavigationEnd} from '@angular/router';
...@@ -102,7 +101,8 @@ export class AppComponent implements AfterViewInit, OnDestroy { ...@@ -102,7 +101,8 @@ export class AppComponent implements AfterViewInit, OnDestroy {
private appMinimize: AppMinimize, private appMinimize: AppMinimize,
private router: Router, private router: Router,
private mqtt: Mqtt, private mqtt: Mqtt,
public load: Load public load: Load,
private nav: NavController
) { ) {
this.initializeApp(); this.initializeApp();
} }
...@@ -163,13 +163,13 @@ export class AppComponent implements AfterViewInit, OnDestroy { ...@@ -163,13 +163,13 @@ export class AppComponent implements AfterViewInit, OnDestroy {
} else { } else {
this.backBtnPressed = true; this.backBtnPressed = true;
setTimeout(() => this.backBtnPressed = false, 2000); setTimeout(() => this.backBtnPressed = false, 2000);
return;
} }
} else { } else {
this.backBtnPressed = true; this.backBtnPressed = true;
setTimeout(() => this.backBtnPressed = false, 2000); setTimeout(() => this.backBtnPressed = false, 2000);
return;
} }
this.nav.back();
return;
}); });
} }
} }
src/app/east/east.page.html
View file @ 8a34da97
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
[(ngModel)]="state.refreshState" [(ngModel)]="state.refreshState"
[endReachedRefresh]="state.endReachedRefresh" [endReachedRefresh]="state.endReachedRefresh"
(onRefresh)="pullToRefresh($event)" (onRefresh)="pullToRefresh($event)"
style="height: calc(100% - 45px)" style="min-height: calc(100% - 45px)"
> >
<div class="topPart"> <div class="topPart">
<ListItem multipleLine *ngIf="this.yewei"> <ListItem multipleLine *ngIf="this.yewei">
......
src/app/east/east.page.ts
View file @ 8a34da97
...@@ -104,8 +104,8 @@ export class EastPage implements OnInit { ...@@ -104,8 +104,8 @@ export class EastPage implements OnInit {
fieldDeviceNo: a.fieldDeviceNo, fieldDeviceNo: a.fieldDeviceNo,
op: a.value ? 0 : 1, op: a.value ? 0 : 1,
duration: this.duration, duration: this.duration,
startTime: new Date().getTime(), startTime: parseInt((new Date().getTime() / 1000).toString(), 10),
ts: new Date().getTime() ts: parseInt((new Date().getTime() / 1000).toString(), 10)
}; };
this.load.toLoad('指令已发送, 等待处理结果', true); this.load.toLoad('指令已发送, 等待处理结果', true);
this.api.control.controlSwitch([req, (data) => { this.api.control.controlSwitch([req, (data) => {
......
src/app/home/home.page.html
View file @ 8a34da97
...@@ -21,43 +21,37 @@ ...@@ -21,43 +21,37 @@
<v-alarm-bar></v-alarm-bar> <v-alarm-bar></v-alarm-bar>
<div class="seePart"> <div class="seePart">
<v-sub-title title="监测信息"></v-sub-title> <v-sub-title title="监测信息"></v-sub-title>
<PullToRefresh [direction]="state.direction" <div style="background-color: #efeff4">
[(ngModel)]="state.refreshState" <div class="out" *ngIf="items.length === 0 && !isError">
[endReachedRefresh]="state.endReachedRefresh" <i class="vo v-none"></i>
(onRefresh)="pullToRefresh($event)" <div class="in">暂无数据</div>
> </div>
<div style="background-color: #efeff4"> <div class="out" *ngIf="isError">
<div class="out" *ngIf="items.length === 0 && !isError"> <i class="vo v-no-signal"></i>
<i class="vo v-none"></i> <div class="in">网络连接失败</div>
<div class="in">暂无数据</div> </div>
</div> <div class="item" *ngFor="let item of items" (click)="toControl(item.url, item.name, item.no)">
<div class="out" *ngIf="isError"> <div>
<i class="vo v-no-signal"></i> <div class="top">{{item.name}}
<div class="in">网络连接失败</div> <div class="right">{{item.time | date: 'yyyy-MM-dd HH:mm:ss'}}</div>
</div> </div>
<div class="item" *ngFor="let item of items" (click)="toControl(item.url, item.name, item.no)"> <div class="content">
<div> <div class="left">
<div class="top">{{item.name}} <img [src]="'../../assets/icon/' + item.img">
<div class="right">{{item.time | date: 'yyyy-MM-dd HH:mm:ss'}}</div>
</div>
<div class="content">
<div class="left">
<img [src]="'../../assets/icon/' + item.img">
</div>
<div class="rightCon">
<div class="block1">池体液位: &nbsp;&nbsp;{{item.yewei}} m</div>
<div class="block2">液体温度: &nbsp;&nbsp;{{item.temp}} ℃</div>
<div class="block2">运行状态: &nbsp;&nbsp;{{item.state ? '工作中' : '离线'}} </div>
</div>
</div> </div>
<div class="bottom"> <div class="rightCon">
<div [ngClass]="{'sucCir': item.state, 'errCir': !item.state}"></div>&nbsp; <div class="block1">池体液位: &nbsp;&nbsp;{{item.yewei}} m</div>
<span style="font-size: 13px">{{item.state ? '在线' : '离线'}}</span> <div class="block2">液体温度: &nbsp;&nbsp;{{item.temp}} ℃</div>
<div class="block2">运行状态: &nbsp;&nbsp;{{item.state ? '工作中' : '离线'}} </div>
</div> </div>
</div> </div>
<div class="bottom">
<div [ngClass]="{'sucCir': item.state, 'errCir': !item.state}"></div>&nbsp;
<span style="font-size: 13px">{{item.state ? '在线' : '离线'}}</span>
</div>
</div> </div>
</div> </div>
</PullToRefresh> </div>
</div> </div>
</div> </div>
</div> </div>
src/app/other/other.page.html
View file @ 8a34da97
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
[(ngModel)]="state.refreshState" [(ngModel)]="state.refreshState"
[endReachedRefresh]="state.endReachedRefresh" [endReachedRefresh]="state.endReachedRefresh"
(onRefresh)="pullToRefresh($event)" (onRefresh)="pullToRefresh($event)"
style="min-height: calc(100% - 45px)"
> >
<div class="topPart"> <div class="topPart">
<ListItem multipleLine *ngIf="this.yewei"> <ListItem multipleLine *ngIf="this.yewei">
......
src/app/service/transfer.ts
View file @ 8a34da97
import { Router } from '@angular/router'; import {Router} from '@angular/router';
import { Injectable } from '@angular/core'; import {Injectable} from '@angular/core';
import {NavController} from '@ionic/angular'; import {NavController} from '@ionic/angular';
@Injectable() @Injectable()
export class Transfer { export class Transfer {
constructor(private router: Router, private nc: NavController) {} constructor(private router: Router, private nc: NavController) {
}
transfer(req) { transfer(req) {
// 此处为ionic4路由跳转的时候不清空之前的页面组件造成的页面短暂交叠 if (!req.query) {
// ionic4在发生路由跳转的时候是先进行新组件的加载再进行旧组件的隐藏 req.query = '';
// 我没有找到相关的api以及解决办法,如果后面的人找到了的话麻烦将这个麻烦的方法给解决掉 }
// if (document.getElementsByTagName('v' + req.url.replace(/\//, '-')).length > 0) { // const historys = JSON.parse(window.sessionStorage.getItem('router.history')) || [];
// 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 = ''; }
this.nc.navigateRoot(req.url + req.query); this.nc.navigateRoot(req.url + req.query);
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment