Skip to content
This repository has been archived by the owner on Sep 23, 2023. It is now read-only.

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
@jasonz1987
jasonz1987 committed Jan 17, 2018
2 parents 59bb511 + b90ac7c commit a813f09
Show file tree
Hide file tree
Showing 23 changed files with 3,399 additions and 1,010 deletions.
51 changes: 14 additions & 37 deletions config.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,44 +91,21 @@
<config-file url="http://drip.growu.me/www/chcp.json" />
<native-interface version="12" />
</chcp>
<engine name="android" spec="^6.2.3" />
<engine name="ios" spec="^4.4.0" />
<plugin name="cordova-plugin-datepicker" spec="^0.9.3" />
<plugin name="cordova-plugin-console" spec="^1.0.5" />
<plugin name="cordova-plugin-device" spec="^1.1.4" />
<plugin name="cordova-plugin-splashscreen" spec="^4.0.3" />
<plugin name="cordova-plugin-whitelist" spec="^1.3.1" />
<plugin name="cordova-plugin-inappbrowser" spec="^1.7.1" />
<plugin name="com.synconset.imagepicker" spec="~2.1.8">
<variable name="PHOTO_LIBRARY_USAGE_DESCRIPTION" value=" " />
</plugin>
<plugin name="cordova-plugin-file-transfer" spec="^1.6.3" />
<engine name="android" spec="~7.0.0" />
<plugin name="cordova-plugin-camera" spec="^4.0.1" />
<plugin name="cordova-plugin-file-transfer" spec="^1.7.0" />
<plugin name="cordova-plugin-device" spec="^2.0.1" />
<plugin name="cordova-plugin-statusbar" spec="^2.4.1" />
<plugin name="cordova-plugin-crop" spec="^0.4.0" />
<plugin name="cordova-plugin-file" spec="^4.3.3" />
<plugin name="cordova-sqlite-storage" spec="^2.0.4" />
<plugin name="cordova-plugin-wechat" spec="^2.0.0">
<variable name="WECHATAPPID" value="wxac31b5ac3e65915a" />
</plugin>
<plugin name="cordova-plugin-weibosdk" spec="^0.6.0">
<variable name="WEIBO_APP_ID" value="3987556016" />
</plugin>
<plugin name="cordova-plugin-qqsdk" spec="^0.9.6">
<variable name="QQ_APP_ID" value="1106192747" />
</plugin>
<plugin name="jpush-phonegap-plugin" spec="3.2.12">
<variable name="APP_KEY" value="46becc0d96be0a46d601867f" />
</plugin>
<plugin name="cordova-plugin-statusbar" spec="^2.2.3" />
<plugin name="cordova-hot-code-push-plugin" spec="^1.5.3" />
<plugin name="cordova-plugin-bugly-sdk" spec="0.0.1">
<variable name="ANDROID_APPID" value="a3f4bd261d" />
<variable name="IOS_APPID" value="986c38f567" />
</plugin>
<plugin name="cordova-plugin-camera" spec="^2.4.1">
<variable name="CAMERA_USAGE_DESCRIPTION" value=" " />
<variable name="PHOTOLIBRARY_USAGE_DESCRIPTION" value=" " />
</plugin>
<plugin name="cordova-plugin-whitelist" spec="^1.3.3" />
<plugin name="cordova-plugin-x-socialsharing" spec="^5.2.1" />
<plugin name="cordova-plugin-inappbrowser" spec="^2.0.1" />
<plugin name="cordova-hot-code-push-plugin" spec="^1.5.3" />
<plugin name="cordova-plugin-ionic-keyboard" spec="^2.0.5" />
<plugin name="cordova-plugin-apprate" spec="^1.3.0" />
<plugin name="cordova-plugin-ionic-webview" spec="^1.1.16" />
<plugin name="cordova-plugin-ionic-keyboard" spec="^2.0.4" />
<plugin name="cordova-plugin-wechat" spec="^2.1.0">
<variable name="WECHATAPPID" value="wxac31b5ac3e65915a" />
</plugin>
<plugin name="cordova-plugin-compat" spec="^1.2.0" />
</widget>
4,027 changes: 3,185 additions & 842 deletions package-lock.json
View file

Large diffs are not rendered by default.

165 changes: 72 additions & 93 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,140 +12,119 @@
"ionic:serve": "ionic-app-scripts serve"
},
"dependencies": {
"@angular/cli": "^1.4.4",
"@angular/common": "5.0.0",
"@angular/compiler": "5.0.0",
"@angular/compiler-cli": "5.0.0",
"@angular/core": "5.0.0",
"@angular/forms": "5.0.0",
"@angular/http": "5.0.0",
"@angular/platform-browser": "5.0.0",
"@angular/platform-browser-dynamic": "5.0.0",
"@angular/tsc-wrapped": "^4.4.4",
"@angular/cli": "^1.5.2",
"@angular/common": "5.1.2",
"@angular/compiler": "5.1.2",
"@angular/compiler-cli": "5.1.2",
"@angular/core": "5.1.2",
"@angular/forms": "5.1.2",
"@angular/http": "5.1.2",
"@angular/platform-browser": "5.1.2",
"@angular/platform-browser-dynamic": "5.1.2",
"@angular/tsc-wrapped": "^4.4.6",
"@ionic-native-mocks/app-rate": "^2.0.3",
"@ionic-native-mocks/crop": "^2.0.3",
"@ionic-native-mocks/date-picker": "^2.0.3",
"@ionic-native-mocks/file": "^2.0.3",
"@ionic-native-mocks/file-transfer": "^2.0.3",
"@ionic-native-mocks/image-picker": "^2.0.3",
"@ionic-native-mocks/keyboard": "^2.0.6",
"@ionic-native/app-rate": "4.4.2",
"@ionic-native/camera": "4.4.2",
"@ionic-native/core": "^4.4.2",
"@ionic-native/crop": "4.4.2",
"@ionic-native/date-picker": "4.4.2",
"@ionic-native/device": "4.4.2",
"@ionic-native/file": "4.4.2",
"@ionic-native/file-transfer": "4.4.2",
"@ionic-native/image-picker": "4.4.2",
"@ionic-native/in-app-browser": "4.4.2",
"@ionic-native/keyboard": "4.4.2",
"@ionic-native/social-sharing": "4.4.2",
"@ionic-native/splash-screen": "4.4.2",
"@ionic-native/status-bar": "4.4.2",
"@ionic-native/app-rate": "^4.5.2",
"@ionic-native/camera": "4.5.2",
"@ionic-native/core": "^4.5.2",
"@ionic-native/crop": "4.5.2",
"@ionic-native/date-picker": "4.5.2",
"@ionic-native/deeplinks": "^4.5.2",
"@ionic-native/device": "4.5.2",
"@ionic-native/file": "4.5.2",
"@ionic-native/file-transfer": "4.5.2",
"@ionic-native/image-picker": "4.5.2",
"@ionic-native/in-app-browser": "4.5.2",
"@ionic-native/keyboard": "4.5.2",
"@ionic-native/native-storage": "^4.5.2",
"@ionic-native/social-sharing": "4.5.2",
"@ionic-native/splash-screen": "4.5.2",
"@ionic-native/status-bar": "4.5.2",
"@ionic/storage": "2.1.3",
"ajv": "^5.3.0",
"@jiguang-ionic/jpush": "^1.0.2",
"ajv": "^5.5.2",
"angular-svg-round-progressbar": "^1.2.1",
"angular2-moment": "^1.7.0",
"autoprefixer": "^7.1.4",
"angular2-moment": "^1.7.1",
"autoprefixer": "^7.2.3",
"chart.js": "^2.7.1",
"com.synconset.imagepicker": "~2.1.8",
"cordova-android": "^6.2.3",
"cordova-android": "7.0.0",
"cordova-hot-code-push-plugin": "^1.5.3",
"cordova-ios": "^4.4.0",
"cordova-plugin-bugly-sdk": "0.0.1",
"cordova-plugin-camera": "^2.4.1",
"cordova-plugin-compat": "^1.1.0",
"cordova-plugin-console": "^1.0.5",
"cordova-ios": "4.5.4",
"cordova-plugin-apprate": "^1.3.0",
"cordova-plugin-bugly-sdk": "0.0.3",
"cordova-plugin-camera": "^4.0.1",
"cordova-plugin-compat": "^1.2.0",
"cordova-plugin-crop": "^0.4.0",
"cordova-plugin-datepicker": "^0.9.3",
"cordova-plugin-device": "^1.1.4",
"cordova-plugin-file": "^4.3.3",
"cordova-plugin-file-transfer": "^1.6.3",
"cordova-plugin-inappbrowser": "^1.7.1",
"cordova-plugin-ionic-keyboard": "^2.0.4",
"cordova-plugin-device": "^2.0.1",
"cordova-plugin-dialogs": "^2.0.1",
"cordova-plugin-file": "^5.0.0",
"cordova-plugin-file-transfer": "^1.7.0",
"cordova-plugin-globalization": "^1.0.9",
"cordova-plugin-inappbrowser": "^2.0.1",
"cordova-plugin-ionic-keyboard": "^2.0.5",
"cordova-plugin-ionic-webview": "^1.1.16",
"cordova-plugin-jcore": "^1.1.9",
"cordova-plugin-qqsdk": "^0.9.6",
"cordova-plugin-splashscreen": "^4.0.3",
"cordova-plugin-statusbar": "^2.2.3",
"cordova-plugin-telerik-imagepicker": "^2.1.8",
"cordova-plugin-wechat": "^2.0.0",
"cordova-plugin-weibosdk": "^0.6.0",
"cordova-plugin-whitelist": "^1.3.1",
"cordova-plugin-splashscreen": "^5.0.1",
"cordova-plugin-statusbar": "^2.4.1",
"cordova-plugin-telerik-imagepicker": "git+https://github.com/Telerik-Verified-Plugins/ImagePicker.git",
"cordova-plugin-wechat": "^2.1.0",
"cordova-plugin-weibosdk": "^0.6.1",
"cordova-plugin-whitelist": "^1.3.3",
"cordova-plugin-x-socialsharing": "^5.2.1",
"cordova-sqlite-storage": "^2.0.4",
"cordova-sqlite-storage": "^2.1.5",
"dom-autoscroller": "^2.3.3",
"es6-promise-plugin": "4.1.1",
"es6-promise-plugin": "^4.1.0",
"hammerjs": "^2.0.8",
"html2canvas": "1.0.0-alpha.1",
"html2canvas": "^1.0.0-alpha.6",
"ion-multi-picker": "^2.1.1",
"ion2-calendar": "2.1.4",
"ionic-angular": "^3.9.2",
"ionic-img-viewer": "2.9.0",
"ionic2-super-tabs": "^4.1.4",
"ionic2-super-tabs": "^4.1.5",
"ionicons": "3.0.0",
"jpush-phonegap-plugin": "3.2.12",
"moment": "2.19.3",
"jpush-phonegap-plugin": "^3.2.13",
"moment": "^2.20.1",
"ng2-charts": "^1.6.0",
"ng2-dragula": "^1.5.0",
"ngx-clipboard": "^9.0.0",
"rxjs": "5.5.2",
"rxjs": "5.5.6",
"sw-toolbox": "3.6.0",
"sweetalert2": "6.11.5",
"zone.js": "^0.8.18"
"sweetalert2": "^7.3.1",
"zone.js": "^0.8.19"
},
"devDependencies": {
"@ionic/app-scripts": "3.1.0",
"@ionic/app-scripts": "^3.1.7",
"@types/hammerjs": "^2.0.35",
"ionic": "^3.19.0",
"typescript": "2.4.2"
"typescript": "2.6.2"
},
"description": "An Ionic project",
"cordova": {
"plugins": {
"cordova-plugin-datepicker": {},
"cordova-plugin-console": {},
"cordova-plugin-camera": {},
"cordova-plugin-file-transfer": {},
"cordova-plugin-device": {},
"cordova-plugin-splashscreen": {},
"cordova-plugin-statusbar": {},
"cordova-plugin-crop": {},
"cordova-plugin-whitelist": {},
"cordova-plugin-x-socialsharing": {},
"cordova-plugin-inappbrowser": {},
"com.synconset.imagepicker": {
"PHOTO_LIBRARY_USAGE_DESCRIPTION": " "
},
"cordova-plugin-file-transfer": {},
"cordova-plugin-crop": {},
"cordova-plugin-file": {},
"cordova-sqlite-storage": {},
"cordova-hot-code-push-plugin": {},
"cordova-plugin-ionic-keyboard": {},
"cordova-plugin-apprate": {},
"cordova-plugin-ionic-webview": {},
"cordova-plugin-wechat": {
"WECHATAPPID": "wxac31b5ac3e65915a"
},
"cordova-plugin-weibosdk": {
"WEIBO_APP_ID": "3987556016"
},
"cordova-plugin-qqsdk": {
"QQ_APP_ID": "1106192747"
},
"jpush-phonegap-plugin": {
"APP_KEY": "46becc0d96be0a46d601867f"
},
"cordova-plugin-statusbar": {},
"cordova-hot-code-push-plugin": {},
"cordova-plugin-bugly-sdk": {
"ANDROID_APPID": "a3f4bd261d",
"IOS_APPID": "986c38f567"
},
"cordova-plugin-camera": {
"CAMERA_USAGE_DESCRIPTION": " ",
"PHOTOLIBRARY_USAGE_DESCRIPTION": " "
},
"cordova-plugin-x-socialsharing": {},
"cordova-plugin-ionic-webview": {},
"cordova-plugin-ionic-keyboard": {}
"cordova-plugin-compat": {}
},
"platforms": [
"android",
"ios"
"android"
]
}
}
}
49 changes: 39 additions & 10 deletions src/app/app.component.ts
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
import {Component} from '@angular/core';
import {Platform} from 'ionic-angular';
import {Component, ViewChild} from '@angular/core';
import {Nav, Platform} from 'ionic-angular';
import {StatusBar} from '@ionic-native/status-bar';
import {SplashScreen} from '@ionic-native/splash-screen';
import {UserProvider} from '../providers/user/user';
import {Storage} from '@ionic/storage';
import { Keyboard } from '@ionic-native/keyboard';
import { Deeplinks } from '@ionic-native/deeplinks';
import { JPush } from '@jiguang-ionic/jpush';


declare var chcp;

Expand All @@ -14,10 +17,13 @@ declare var chcp;

export class MyApp {
rootPage: any = 'welcome';
@ViewChild(Nav) nav:Nav;

constructor(platform: Platform,
statusBar: StatusBar,
splashScreen: SplashScreen,
jpush: JPush,
private deeplinks:Deeplinks,
storage: Storage,
private keyboard: Keyboard,
public userProvider: UserProvider) {
Expand All @@ -28,15 +34,38 @@ export class MyApp {

if (platform.is('cordova')) {

(<any>window).plugins.jPushPlugin.init();
jpush.init();
jpush.setDebugMode(true);
jpush.setApplicationIconBadgeNumber(0);

document.addEventListener("jpush.openNotification", (event: any) => {
var page;
var params;

if(platform.is('Android')) {
page = event["extras"]["page"];
params = event["extras"]["params"];
} else {
page = event["page"];
params = event["params"];
}

if(page) {
this.nav.push(page,params);
}

}, false);


// this.deeplinks.routeWithNavController(this.nav, {
// '/about': "about",
// '/goal/:id/checkin': "goal-checkin",
// }).subscribe((match) => {
// console.log('Successfully routed', match);
// }, (nomatch) => {
// console.warn('Unmatched Route', nomatch);
// });

if (!platform.is('android')) {
(<any>window).plugins.jPushPlugin.setDebugModeFromIos(true);
(<any>window).plugins.jPushPlugin.setApplicationIconBadgeNumber(0);
} else {
(<any>window).plugins.jPushPlugin.setDebugMode(true);
(<any>window).plugins.jPushPlugin.setStatisticsOpen(true);
}

var appUpdate = {
// Application Constructor
Expand Down
2 changes: 1 addition & 1 deletion src/app/app.html
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<ion-nav [root]="rootPage"></ion-nav>
<ion-nav #nav [root]="rootPage"></ion-nav>
6 changes: 6 additions & 0 deletions src/app/app.module.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ import {StatusBar} from '@ionic-native/status-bar';
import {Keyboard} from '@ionic-native/keyboard';
import {MyApp} from './app.component';
import {IonicStorageModule} from '@ionic/storage';
import {Deeplinks} from '@ionic-native/deeplinks';
import { JPush } from '@jiguang-ionic/jpush';
import { NativeStorage } from '@ionic-native/native-storage';

import {MyHammerConfig} from '../components/MyHammerConfig'
import {HAMMER_GESTURE_CONFIG} from '@angular/platform-browser';
Expand Down Expand Up @@ -52,6 +55,9 @@ import {MyShareModule} from '../components/my-share/my-share.module';
SplashScreen,
Device,
Keyboard,
Deeplinks,
JPush,
NativeStorage,
{provide: ErrorHandler, useClass: IonicErrorHandler},
{
provide: HAMMER_GESTURE_CONFIG,
Expand Down
8 changes: 5 additions & 3 deletions src/app/app.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,14 +81,16 @@
}

.segment-md .segment-button {
color: color($colors, gray) !important;
color: color($colors, dark) !important;
height:42px;
line-height: 40px;
}
.segment-md .segment-button.segment-activated {
color: color($colors, primary) !important;
font-weight: bold;
.bolder-sm{
border: 5px solid color($colors, primary);
width: 20px;
border: 2px solid color($colors, primary);
width: 25px;
margin: 0 auto;
}
}
Loading

0 comments on commit a813f09

Please sign in to comment.