Commit 60e0c39c authored by wangqinghua's avatar wangqinghua

cordova update

parent 0e6be715
This diff is collapsed.
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
"@angular/http": "5.0.3", "@angular/http": "5.0.3",
"@angular/platform-browser": "5.0.3", "@angular/platform-browser": "5.0.3",
"@angular/platform-browser-dynamic": "5.0.3", "@angular/platform-browser-dynamic": "5.0.3",
"@ionic-native/app-availability": "^4.20.0",
"@ionic-native/app-version": "^4.11.0", "@ionic-native/app-version": "^4.11.0",
"@ionic-native/badge": "^4.11.0", "@ionic-native/badge": "^4.11.0",
"@ionic-native/calendar": "^4.11.0", "@ionic-native/calendar": "^4.11.0",
...@@ -31,6 +32,7 @@ ...@@ -31,6 +32,7 @@
"@ionic-native/geolocation": "^4.15.0", "@ionic-native/geolocation": "^4.15.0",
"@ionic-native/keyboard": "^4.6.0", "@ionic-native/keyboard": "^4.6.0",
"@ionic-native/mobile-accessibility": "^4.20.0", "@ionic-native/mobile-accessibility": "^4.20.0",
"@ionic-native/screen-orientation": "^4.20.0",
"@ionic-native/splash-screen": "^4.20.0", "@ionic-native/splash-screen": "^4.20.0",
"@ionic-native/status-bar": "4.4.0", "@ionic-native/status-bar": "4.4.0",
"@ionic/storage": "2.1.3", "@ionic/storage": "2.1.3",
......
...@@ -185,6 +185,14 @@ ...@@ -185,6 +185,14 @@
{ {
"xml": "<feature name=\"VideoPlayer\"><param name=\"android-package\" value=\"com.moust.cordova.videoplayer.VideoPlayer\" /></feature>", "xml": "<feature name=\"VideoPlayer\"><param name=\"android-package\" value=\"com.moust.cordova.videoplayer.VideoPlayer\" /></feature>",
"count": 1 "count": 1
},
{
"xml": "<feature name=\"CDVOrientation\"><param name=\"android-package\" value=\"cordova.plugins.screenorientation.CDVOrientation\" /></feature>",
"count": 1
},
{
"xml": "<feature name=\"AppAvailability\"><param name=\"android-package\" value=\"com.ohh2ahh.appavailability.AppAvailability\" /></feature>",
"count": 1
} }
] ]
} }
...@@ -248,6 +256,15 @@ ...@@ -248,6 +256,15 @@
}, },
"com.moust.cordova.videoplayer": { "com.moust.cordova.videoplayer": {
"PACKAGE_NAME": "io.ionic.partyCloud.starter.test" "PACKAGE_NAME": "io.ionic.partyCloud.starter.test"
},
"es6-promise-plugin": {
"PACKAGE_NAME": "io.ionic.smart19.starter"
},
"cordova-plugin-screen-orientation": {
"PACKAGE_NAME": "io.ionic.smart19.starter"
},
"cordova-plugin-appavailability": {
"PACKAGE_NAME": "io.ionic.smart19.starter"
} }
}, },
"dependent_plugins": {}, "dependent_plugins": {},
...@@ -607,6 +624,28 @@ ...@@ -607,6 +624,28 @@
"clobbers": [ "clobbers": [
"VideoPlayer" "VideoPlayer"
] ]
},
{
"id": "es6-promise-plugin.Promise",
"file": "plugins/es6-promise-plugin/www/promise.js",
"pluginId": "es6-promise-plugin",
"runs": true
},
{
"id": "cordova-plugin-screen-orientation.screenorientation",
"file": "plugins/cordova-plugin-screen-orientation/www/screenorientation.js",
"pluginId": "cordova-plugin-screen-orientation",
"clobbers": [
"cordova.plugins.screenorientation"
]
},
{
"id": "cordova-plugin-appavailability.AppAvailability",
"file": "plugins/cordova-plugin-appavailability/www/AppAvailability.js",
"pluginId": "cordova-plugin-appavailability",
"clobbers": [
"appAvailability"
]
} }
], ],
"plugin_metadata": { "plugin_metadata": {
...@@ -628,6 +667,9 @@ ...@@ -628,6 +667,9 @@
"cordova-plugin-camera": "4.0.3", "cordova-plugin-camera": "4.0.3",
"cordova-plugin-file-transfer": "1.7.1", "cordova-plugin-file-transfer": "1.7.1",
"cordova-plugin-splashscreen": "5.0.2", "cordova-plugin-splashscreen": "5.0.2",
"com.moust.cordova.videoplayer": "1.0.1" "com.moust.cordova.videoplayer": "1.0.1",
"es6-promise-plugin": "4.2.2",
"cordova-plugin-screen-orientation": "3.0.1",
"cordova-plugin-appavailability": "0.4.2"
} }
} }
\ No newline at end of file
...@@ -61,6 +61,12 @@ ...@@ -61,6 +61,12 @@
<feature name="VideoPlayer"> <feature name="VideoPlayer">
<param name="android-package" value="com.moust.cordova.videoplayer.VideoPlayer" /> <param name="android-package" value="com.moust.cordova.videoplayer.VideoPlayer" />
</feature> </feature>
<feature name="CDVOrientation">
<param name="android-package" value="cordova.plugins.screenorientation.CDVOrientation" />
</feature>
<feature name="AppAvailability">
<param name="android-package" value="com.ohh2ahh.appavailability.AppAvailability" />
</feature>
<name>部机关党建云(试运行)</name> <name>部机关党建云(试运行)</name>
<description>An awesome Ionic/Cordova app.</description> <description>An awesome Ionic/Cordova app.</description>
<author email="hi@ionicframework" href="http://ionicframework.com/">Ionic Framework Team</author> <author email="hi@ionicframework" href="http://ionicframework.com/">Ionic Framework Team</author>
......
...@@ -355,6 +355,28 @@ module.exports = [ ...@@ -355,6 +355,28 @@ module.exports = [
"clobbers": [ "clobbers": [
"VideoPlayer" "VideoPlayer"
] ]
},
{
"id": "es6-promise-plugin.Promise",
"file": "plugins/es6-promise-plugin/www/promise.js",
"pluginId": "es6-promise-plugin",
"runs": true
},
{
"id": "cordova-plugin-screen-orientation.screenorientation",
"file": "plugins/cordova-plugin-screen-orientation/www/screenorientation.js",
"pluginId": "cordova-plugin-screen-orientation",
"clobbers": [
"cordova.plugins.screenorientation"
]
},
{
"id": "cordova-plugin-appavailability.AppAvailability",
"file": "plugins/cordova-plugin-appavailability/www/AppAvailability.js",
"pluginId": "cordova-plugin-appavailability",
"clobbers": [
"appAvailability"
]
} }
]; ];
module.exports.metadata = module.exports.metadata =
...@@ -378,7 +400,10 @@ module.exports.metadata = ...@@ -378,7 +400,10 @@ module.exports.metadata =
"cordova-plugin-camera": "4.0.3", "cordova-plugin-camera": "4.0.3",
"cordova-plugin-file-transfer": "1.7.1", "cordova-plugin-file-transfer": "1.7.1",
"cordova-plugin-splashscreen": "5.0.2", "cordova-plugin-splashscreen": "5.0.2",
"com.moust.cordova.videoplayer": "1.0.1" "com.moust.cordova.videoplayer": "1.0.1",
"es6-promise-plugin": "4.2.2",
"cordova-plugin-screen-orientation": "3.0.1",
"cordova-plugin-appavailability": "0.4.2"
}; };
// BOTTOM OF METADATA // BOTTOM OF METADATA
}); });
\ No newline at end of file
This diff is collapsed.
<?xml version='1.0' encoding='utf-8'?> <?xml version='1.0' encoding='utf-8'?>
<widget id="io.ionic.smart19.starter" version="4.3.1" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0"> <widget id="io.ionic.smart19.starter" version="4.3.2" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<name>部机关党建云(试运行)</name> <name>部机关党建云(试运行)</name>
<description>An awesome Ionic/Cordova app.</description> <description>An awesome Ionic/Cordova app.</description>
<author email="hi@ionicframework" href="http://ionicframework.com/">Ionic Framework Team</author> <author email="hi@ionicframework" href="http://ionicframework.com/">Ionic Framework Team</author>
......
...@@ -384,6 +384,22 @@ module.exports = [ ...@@ -384,6 +384,22 @@ module.exports = [
"clobbers": [ "clobbers": [
"VideoPlayer" "VideoPlayer"
] ]
},
{
"file": "plugins/cordova-plugin-screen-orientation/www/screenorientation.js",
"id": "cordova-plugin-screen-orientation.screenorientation",
"pluginId": "cordova-plugin-screen-orientation",
"clobbers": [
"cordova.plugins.screenorientation"
]
},
{
"file": "plugins/cordova-plugin-appavailability/www/AppAvailability.js",
"id": "cordova-plugin-appavailability.AppAvailability",
"pluginId": "cordova-plugin-appavailability",
"clobbers": [
"appAvailability"
]
} }
]; ];
module.exports.metadata = module.exports.metadata =
...@@ -408,7 +424,9 @@ module.exports.metadata = ...@@ -408,7 +424,9 @@ module.exports.metadata =
"ionic-plugin-keyboard": "2.2.1", "ionic-plugin-keyboard": "2.2.1",
"phonegap-plugin-mobile-accessibility": "1.0.5-dev", "phonegap-plugin-mobile-accessibility": "1.0.5-dev",
"cordova-plugin-splashscreen": "5.0.2", "cordova-plugin-splashscreen": "5.0.2",
"com.moust.cordova.videoplayer": "1.0.1" "com.moust.cordova.videoplayer": "1.0.1",
"cordova-plugin-screen-orientation": "3.0.1",
"cordova-plugin-appavailability": "0.4.2"
} }
// BOTTOM OF METADATA // BOTTOM OF METADATA
}); });
\ No newline at end of file
...@@ -60,11 +60,20 @@ ...@@ -60,11 +60,20 @@
}, },
"com.moust.cordova.videoplayer": { "com.moust.cordova.videoplayer": {
"PACKAGE_NAME": "io.ionic.partyCloud.starter.test" "PACKAGE_NAME": "io.ionic.partyCloud.starter.test"
},
"cordova-plugin-screen-orientation": {
"PACKAGE_NAME": "io.ionic.smart19.starter"
},
"cordova-plugin-appavailability": {
"PACKAGE_NAME": "io.ionic.smart19.starter"
} }
}, },
"dependent_plugins": { "dependent_plugins": {
"cordova-plugin-network-information": { "cordova-plugin-network-information": {
"PACKAGE_NAME": "io.ionic.partyCloud.starter.test" "PACKAGE_NAME": "io.ionic.partyCloud.starter.test"
},
"es6-promise-plugin": {
"PACKAGE_NAME": "io.ionic.smart19.starter"
} }
} }
} }
\ No newline at end of file
...@@ -63,6 +63,12 @@ ...@@ -63,6 +63,12 @@
}, },
"com.moust.cordova.videoplayer": { "com.moust.cordova.videoplayer": {
"PACKAGE_NAME": "io.ionic.partyCloud.starter.test" "PACKAGE_NAME": "io.ionic.partyCloud.starter.test"
},
"cordova-plugin-screen-orientation": {
"PACKAGE_NAME": "io.ionic.smart19.starter"
},
"cordova-plugin-appavailability": {
"PACKAGE_NAME": "io.ionic.smart19.starter"
} }
}, },
"dependent_plugins": { "dependent_plugins": {
......
...@@ -178,5 +178,29 @@ ...@@ -178,5 +178,29 @@
}, },
"is_top_level": true, "is_top_level": true,
"variables": {} "variables": {}
},
"cordova-plugin-screen-orientation": {
"source": {
"type": "registry",
"id": "cordova-plugin-screen-orientation"
},
"is_top_level": true,
"variables": {}
},
"es6-promise-plugin": {
"source": {
"type": "registry",
"id": "es6-promise-plugin"
},
"is_top_level": false,
"variables": {}
},
"cordova-plugin-appavailability": {
"source": {
"type": "registry",
"id": "cordova-plugin-appavailability"
},
"is_top_level": true,
"variables": {}
} }
} }
\ No newline at end of file
...@@ -12,10 +12,8 @@ import {TabsPage} from "../pages/tabs/tabs"; ...@@ -12,10 +12,8 @@ import {TabsPage} from "../pages/tabs/tabs";
import {AppService} from "../service/http.service"; import {AppService} from "../service/http.service";
import {EmitService} from "../provide/emit.service"; import {EmitService} from "../provide/emit.service";
import {MobileAccessibility} from "@ionic-native/mobile-accessibility"; import {MobileAccessibility} from "@ionic-native/mobile-accessibility";
import {FileOpener} from "@ionic-native/file-opener";
import {FileTransfer, FileTransferObject} from "@ionic-native/file-transfer";
import {File} from "@ionic-native/file";
import {timer} from "rxjs/observable/timer"; import {timer} from "rxjs/observable/timer";
import {ScreenOrientation} from "@ionic-native/screen-orientation";
@Component({ @Component({
templateUrl: 'app.html' templateUrl: 'app.html'
...@@ -35,10 +33,7 @@ export class MyApp { ...@@ -35,10 +33,7 @@ export class MyApp {
private keyboard: Keyboard, private keyboard: Keyboard,
private appUpdateService: AppUpdateService, private appUpdateService: AppUpdateService,
private appVersion: AppVersion, private appVersion: AppVersion,
private fileOpener: FileOpener, private screenOrientation: ScreenOrientation,
private fileTransfer: FileTransfer,
private fileTransferObject: FileTransferObject,
private file: File,
public emitSer: EmitService, public emitSer: EmitService,
public storage: Storage, public storage: Storage,
public mobileAccess: MobileAccessibility, public mobileAccess: MobileAccessibility,
...@@ -51,8 +46,11 @@ export class MyApp { ...@@ -51,8 +46,11 @@ export class MyApp {
this.statusBar.backgroundColorByHexString('#e12724'); this.statusBar.backgroundColorByHexString('#e12724');
this.statusBar.styleLightContent(); this.statusBar.styleLightContent();
timer(4500).subscribe((res) =>{ this.screenOrientation.lock('portrait-primary'); //锁定竖屏
this.showSplash = false
timer(4500).subscribe((res) => {
this.showSplash = false;
this.checkVersion(); this.checkVersion();
this.loadLogin(); this.loadLogin();
}); });
...@@ -67,13 +65,13 @@ export class MyApp { ...@@ -67,13 +65,13 @@ export class MyApp {
} }
//检测是否需要更新 //检测是否需要更新
checkVersion(){ checkVersion() {
//检测是否需要更新 //检测是否需要更新
this.appVersion.getVersionNumber().then((version: string) => { this.appVersion.getVersionNumber().then((version: string) => {
alert(version); version = version.replace(' ', '');
console.log(version)
this.appUpdateService.compariVersion().subscribe(res => { this.appUpdateService.compariVersion().subscribe(res => {
let data = res.json(); let data = res.json();
data.latestVersion = data.replace(' ', '');
if (data.code == 200) { if (data.code == 200) {
if (data.latestVersion != null && data.latestVersion != version) { if (data.latestVersion != null && data.latestVersion != version) {
this.appUpdateService.detectionUpgrade(data.androidDownload, true); //提示升级 this.appUpdateService.detectionUpgrade(data.androidDownload, true); //提示升级
......
...@@ -42,6 +42,8 @@ import {MobileAccessibility} from "@ionic-native/mobile-accessibility"; ...@@ -42,6 +42,8 @@ import {MobileAccessibility} from "@ionic-native/mobile-accessibility";
import {Camera} from "@ionic-native/camera"; import {Camera} from "@ionic-native/camera";
import {ProposalPageModule} from "../pages/mine-pages/proposal/proposal.module"; import {ProposalPageModule} from "../pages/mine-pages/proposal/proposal.module";
import {MineService} from "../pages/mine-pages/mine.service"; import {MineService} from "../pages/mine-pages/mine.service";
import {ScreenOrientation} from "@ionic-native/screen-orientation";
import {AppAvailability} from "@ionic-native/app-availability";
@NgModule({ @NgModule({
declarations: [ declarations: [
...@@ -99,6 +101,8 @@ import {MineService} from "../pages/mine-pages/mine.service"; ...@@ -99,6 +101,8 @@ import {MineService} from "../pages/mine-pages/mine.service";
Badge, Badge,
MobileAccessibility, MobileAccessibility,
Camera, Camera,
ScreenOrientation,
AppAvailability,
Geolocation, Geolocation,
DatePipe, DatePipe,
LearnService, LearnService,
......
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