Skip to content

Commit 0bbbf2b

Browse files
se7enmfkse7enmfk
committed
modify platform
1 parent 5a094b4 commit 0bbbf2b

File tree

10 files changed

+40
-168
lines changed

10 files changed

+40
-168
lines changed

‎src/app/app.config.ts

+3-2
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,12 @@
44
export class AppConfig {
55

66

7-
static PERSON_PASSWORD = "person_password";
7+
static GESTURE_PASSWORD = "gesture_password";
88
static SYS_NAME = "FTX";
99
static SYS_USER = "TestUser";
1010
static TOKEN = "token";
11-
static BASE_URL = 'http://localhost:2080/AppFrameworkServer/';
11+
// static BASE_URL = 'http://localhost:2080/AppFrameworkServer/';
12+
static BASE_URL = 'http://192.168.1.108:2080/AppFrameworkServer/';
1213
// static URL = 'http://uat.ftecx.com:2080/AppFrameworkServer/';
1314

1415
static PCmodel:boolean = false; //PC端调试模式

‎src/app/app.module.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import { GesturePasswordModule } from 'ngx-gesture-password';
1919
import { MyApp } from './app.component';
2020

2121
import { AdmUserProvider, AdmSysParamProvider } from '../providers/providers';
22-
import { Md5Provider, HttpProvider, BackButtonProvider, PopupProvider } from '../providers/common/commonProviders';
22+
import { PlatformProvider, Md5Provider, HttpProvider, PopupProvider } from '../providers/common/commonProviders';
2323

2424
// The translate loader needs to know where to load i18n files
2525
// in Ionic's static asset pipeline.
@@ -60,9 +60,9 @@ export function createTranslateLoader(http: HttpClient) {
6060
AdmSysParamProvider,
6161
AdmUserProvider,
6262
HttpProvider,
63-
BackButtonProvider,
6463
PopupProvider,
65-
Md5Provider
64+
Md5Provider,
65+
PlatformProvider
6666
]
6767
})
6868
export class AppModule { }

‎src/pages/common/gesture-password/gesture-password.ts

+2-3
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ export class GesturePasswordPage {
2323
public navParams: NavParams,
2424
public viewCtrl: ViewController,
2525
public storage: Storage) {
26-
this.storage.set(AppConfig.PERSON_PASSWORD, '12369');
27-
this.storage.get(AppConfig.PERSON_PASSWORD).then((result) => {
26+
this.storage.set(AppConfig.GESTURE_PASSWORD,'12369');
27+
this.storage.get(AppConfig.GESTURE_PASSWORD).then((result) => {
2828
this.pwd = result;
2929
});
3030
}
@@ -39,7 +39,6 @@ export class GesturePasswordPage {
3939

4040
}
4141
onChecked(e) {
42-
console.log(e);
4342
if(e.result ==this.pwd){
4443
this.viewCtrl.dismiss();
4544
}

‎src/pages/common/login/login.ts

+4-7
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import { Component } from '@angular/core';
22
import { TranslateService } from '@ngx-translate/core';
3-
import { IonicPage, NavController, Platform } from 'ionic-angular';
3+
import { IonicPage, NavController } from 'ionic-angular';
44
import { Storage } from '@ionic/storage';
55

66
import { AdmUserProvider } from '../../../providers/providers';
7-
import { BackButtonProvider, PopupProvider, Md5Provider } from '../../../providers/common/commonProviders';
7+
import { PopupProvider, Md5Provider, PlatformProvider } from '../../../providers/common/commonProviders';
88
import { FormBuilder, FormGroup, Validators } from '@angular/forms';
99

1010
@IonicPage()
@@ -21,8 +21,7 @@ export class LoginPage {
2121
private formBuilder: FormBuilder,
2222
public md5Provider: Md5Provider,
2323
public storage: Storage,
24-
private platform: Platform,
25-
public backButtonProvider: BackButtonProvider,
24+
private platform: PlatformProvider,
2625
public popup: PopupProvider,
2726
public translateService: TranslateService) {
2827

@@ -32,9 +31,7 @@ export class LoginPage {
3231
passwd: ['', []]
3332
});
3433

35-
platform.ready().then((result) => {
36-
this.backButtonProvider.registerBackButtonAction(null);
37-
})
34+
platform.registerBackButtonAction();
3835
}
3936

4037
// Attempt to login in through our User service

‎src/pages/common/tabs/tabs.ts

+9-11
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import { Component, ViewChild } from '@angular/core';
2-
import { IonicPage, NavController, Platform, Tabs, ModalController } from 'ionic-angular';
2+
import { IonicPage, NavController, Tabs, ModalController } from 'ionic-angular';
33
import { Storage } from '@ionic/storage';
4-
import { AppConfig } from '../../../app/app.config';
4+
import { AppConfig } from '../../../app/app.config';
55
import { GesturePasswordPage } from '../../pages';
6-
import { BackButtonProvider } from '../../../providers/common/commonProviders';
6+
import { PlatformProvider } from '../../../providers/common/commonProviders';
77

88
@IonicPage()
99
@Component({
@@ -18,20 +18,18 @@ export class TabsPage {
1818
personRoot = 'PersonPage'
1919

2020
@ViewChild('menuTabs') tabRef: Tabs;
21-
22-
constructor(public navCtrl: NavController,
21+
22+
constructor(public navCtrl: NavController,
2323
public storage: Storage,
24-
private platform: Platform,
25-
public modalCtrl: ModalController,
26-
public backButtonProvider :BackButtonProvider) {
24+
private platform: PlatformProvider,
25+
public modalCtrl: ModalController) {
2726
let p1 = this.storage.get(AppConfig.SYS_NAME);
2827
let p2 = this.storage.get(AppConfig.TOKEN);
2928
Promise.all([p1, p2]).then((result) => {
3029
// console.log(result);
3130
});
32-
platform.ready().then((result) => {
33-
this.backButtonProvider.registerBackButtonAction(this.tabRef);
34-
})
31+
32+
platform.registerBackButtonAction(this.tabRef);
3533

3634
this.modalCtrl.create(GesturePasswordPage).present();
3735
}

‎src/pages/home/home.ts

+1-121
Original file line numberDiff line numberDiff line change
@@ -20,127 +20,7 @@ export class HomePage {
2020
}
2121

2222
ionViewDidLoad() {
23-
this.storage.get(AppConfig.TOKEN).then((result) => {
24-
let options = {
25-
color: ['#3398DB'],
26-
grid: {
27-
left: '3%',
28-
right: '4%',
29-
bottom: '3%',
30-
containLabel: true
31-
},
32-
xAxis: [
33-
{
34-
type: 'category',
35-
data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'],
36-
axisTick: {
37-
alignWithLabel: true
38-
}
39-
}
40-
],
41-
yAxis: [
42-
{
43-
type: 'value'
44-
}
45-
],
46-
series: [
47-
{
48-
name: 'Test',
49-
type: 'bar',
50-
barWidth: '60%',
51-
data: [10, 52, 200, 334, 390, 330, 220]
52-
}
53-
]
54-
};
55-
this.options = options;
56-
57-
setTimeout(() => {
58-
console.log('2');
59-
60-
options.series[0].data = [10, 22, 30, 44, 390, 330, 220];
61-
// this.options = options;
62-
}, 5000);
63-
64-
65-
66-
let echartOption = {
67-
backgroundColor: '#2c343c',
68-
69-
title: {
70-
text: 'Customized Pie',
71-
left: 'center',
72-
top: 20,
73-
textStyle: {
74-
color: '#ccc'
75-
}
76-
},
77-
78-
tooltip: {
79-
trigger: 'item',
80-
formatter: "{a} <br/>{b} : {c} ({d}%)"
81-
},
82-
83-
visualMap: {
84-
show: false,
85-
min: 80,
86-
max: 600,
87-
inRange: {
88-
colorLightness: [0, 1]
89-
}
90-
},
91-
series: [
92-
{
93-
name: '访问来源',
94-
type: 'pie',
95-
radius: '55%',
96-
center: ['50%', '50%'],
97-
data: [
98-
{ value: 335, name: '直接访问' },
99-
{ value: 310, name: '邮件营销' },
100-
{ value: 274, name: '联盟广告' },
101-
{ value: 235, name: '视频广告' },
102-
{ value: 400, name: '搜索引擎' }
103-
].sort(function (a, b) { return a.value - b.value; }),
104-
roseType: 'radius',
105-
label: {
106-
normal: {
107-
textStyle: {
108-
color: 'rgba(255, 255, 255, 0.3)'
109-
}
110-
}
111-
},
112-
labelLine: {
113-
normal: {
114-
lineStyle: {
115-
color: 'rgba(255, 255, 255, 0.3)'
116-
},
117-
smooth: 0.2,
118-
length: 10,
119-
length2: 20
120-
}
121-
},
122-
itemStyle: {
123-
normal: {
124-
color: '#c23531',
125-
shadowBlur: 200,
126-
shadowColor: 'rgba(0, 0, 0, 0.5)'
127-
}
128-
},
129-
130-
animationType: 'scale',
131-
animationEasing: 'elasticOut',
132-
animationDelay: function (idx) {
133-
return Math.random() * 200;
134-
}
135-
}
136-
]
137-
}
138-
this.options = echartOption;
139-
140-
})
141-
console.log(this.admUserProvider._admUser);
142-
143-
console.log('ionViewDidLoad HomePage');
23+
14424
}
14525
onChartClick(e) {
14626
console.log(e.dataIndex);

‎src/pages/pages.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// export const FirstPage = 'TabsPage';
2-
export const FirstPage = 'LoginPage';
2+
export const FirstPage = 'TabsPage';
33

44

55
// export const FirstPage = 'SignUpPage';

‎src/providers/common/commonProviders.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import { HttpProvider } from "./http/http";
22
import { PopupProvider } from "./popup/popup";
3-
import { BackButtonProvider } from "./back-button/back-button";
43
import { Md5Provider } from "./md5/md5";
4+
import { PlatformProvider } from "./platform/platform";
55

66
export {
77
Md5Provider,
8-
HttpProvider,
98
PopupProvider,
10-
BackButtonProvider
9+
PlatformProvider,
10+
HttpProvider,
1111
};

‎src/providers/common/http/http.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { HttpClient, HttpParams } from '@angular/common/http';
1+
import { HttpClient } from '@angular/common/http';
22
// import { URLSearchParams } from '@angular/http';
33

44
import { Injectable, Injector } from '@angular/core';

‎src/providers/common/back-button/back-button.ts ‎src/providers/common/platform/platform.ts

+13-16
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,24 @@
1-
import { Platform, App, NavController, Tabs } from 'ionic-angular';
21
import { Injectable } from '@angular/core';
3-
import { PopupProvider } from '../popup/popup';
4-
5-
/*
6-
Generated class for the BackButtonProvider provider.
7-
8-
See https://angular.io/guide/dependency-injection for more info on providers
9-
and Angular DI.
10-
*/
2+
import { Platform, Tabs, App, NavController } from 'ionic-angular';
3+
import { PopupProvider } from "../popup/popup";
114
@Injectable()
12-
export class BackButtonProvider {
13-
5+
export class PlatformProvider {
146

157
//控制硬件返回按钮是否触发，默认false
168
backButtonPressed: boolean = false;
179

18-
//构造函数 依赖注入
19-
constructor(public platform: Platform,
10+
constructor(private platform: Platform,
2011
public appCtrl: App,
21-
private popup: PopupProvider) { }
12+
private popup: PopupProvider) {
13+
}
2214

23-
//注册方法
24-
registerBackButtonAction(tabRef: Tabs): void {
15+
registerBackButtonAction(tabRef?: Tabs) {
16+
this.platform.ready().then((result) => {
17+
this.registerBackButton(tabRef);
18+
})
19+
}
20+
21+
registerBackButton(tabRef: Tabs): void {
2522

2623
//registerBackButtonAction是系统自带的方法
2724
this.platform.registerBackButtonAction(() => {

0 commit comments

Comments
 (0)