update to v0.2.2

ParryQiu · Dec 16, 2016 · f6dc77d · f6dc77d
1 parent 4b191c9
commit f6dc77d
Show file tree

Hide file tree

Showing 26 changed files with 242 additions and 189 deletions.
diff --git a/README.md b/README.md
@@ -9,8 +9,8 @@ GuGuJianKong App for website online monitor, implemented using [Ionic Framework]
 * website SEO. / 每日更新网站搜索引擎的收录情况，方便您直观、统一地对 SEO 做出合理的决策。
 * support iPhone, iPad, Android platfrom. / 支持 iPhone、iPad、Android 平台。
 
-## Official Website / 官网 
-[http://gugujiankong.com](http://gugujiankong.com "Official Website / 官网")
+## Official Website / 官网
+[https://gugujiankong.com](https://gugujiankong.com "Official Website / 官网")
 
 ## App Screenshot /  App截图
 ###### iPhone platform screenshot / iPhone 平台截图
@@ -52,4 +52,3 @@ GuGuJianKong App for website online monitor, implemented using [Ionic Framework]
 Available under the GPL v3 license. See the [LICENSE file](http://choosealicense.com/licenses/gpl-3.0/ "LICENSE file") for more informatiion.
 
 项目开源许可证使用 GPL v3，协议详情请查看 [LICENSE 文件](http://choosealicense.com/licenses/gpl-3.0/ "LICENSE 文件")。
-
diff --git a/config.xml b/config.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<widget id="com.gugujiankong.iosapp" version="0.2.1" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget id="com.gugujiankong.iosapp" version="0.2.2" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
   <name>GuGuJianKong</name>
   <description>
         专注于网站、服务器监控
     </description>
-  <author email="qiupengyuan@gmail.com" href="http://gugujiankong.com/">
+  <author email="qiupengyuan@gmail.com" href="https://gugujiankong.com/">
       Parry
     </author>
   <content src="index.html"/>
@@ -72,4 +72,4 @@
     <icon src="resources/android/icon/drawable-xxxhdpi-icon.png" density="xxxhdpi"/>
   </platform>
   <icon src="resources/android/icon/drawable-xhdpi-icon.png"/>
-</widget>
+</widget>
diff --git a/platforms/android/.gradle/2.2.1/taskArtifacts/cache.properties.lock b/platforms/android/.gradle/2.2.1/taskArtifacts/cache.properties.lock
diff --git a/platforms/android/.gradle/2.2.1/taskArtifacts/fileHashes.bin b/platforms/android/.gradle/2.2.1/taskArtifacts/fileHashes.bin
diff --git a/platforms/android/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin b/platforms/android/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin
diff --git a/platforms/android/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin b/platforms/android/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin
diff --git a/platforms/android/.idea/misc.xml b/platforms/android/.idea/misc.xml
diff --git a/platforms/android/.idea/workspace.xml b/platforms/android/.idea/workspace.xml
diff --git a/platforms/android/AndroidManifest.xml b/platforms/android/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<manifest android:hardwareAccelerated="true" android:versionCode="201" android:versionName="0.2.1" package="com.gugujiankong.iosapp" xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest android:hardwareAccelerated="true" android:versionCode="201" android:versionName="0.2.2" package="com.gugujiankong.iosapp" xmlns:android="http://schemas.android.com/apk/res/android">
     <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="22" />
     <supports-screens android:anyDensity="true" android:largeScreens="true" android:normalScreens="true" android:resizeable="true" android:smallScreens="true" android:xlargeScreens="true" />
     <application android:hardwareAccelerated="true" android:icon="@drawable/icon" android:label="咕咕监控" android:supportsRtl="true">

diff --git a/platforms/android/android-release.apk b/platforms/android/android-release.apk
diff --git a/platforms/android/assets/www/js/services.js b/platforms/android/assets/www/js/services.js
@@ -6,7 +6,7 @@ angular.module('starter.services', ['ionic.ion.imageCacheFactory'])
             var d = $q.defer();
             var promise = d.promise;
 
-            $http.jsonp("http://api.gugujiankong.com/website/GetMyWebsites?userId=" + localStorage.userid + "&signToken=" + localStorage.signtoken + "&callback=JSON_CALLBACK")
+            $http.jsonp("https://api.gugujiankong.com/website/GetMyWebsites?userId=" + localStorage.userid + "&signToken=" + localStorage.signtoken + "&callback=JSON_CALLBACK")
                 .success(function(data) {
                     $scope.sites = data;
 
@@ -40,7 +40,7 @@ angular.module('starter.services', ['ionic.ion.imageCacheFactory'])
             var d = $q.defer();
             var promise = d.promise;
 
-            $http.jsonp("http://api.gugujiankong.com/website/GetAllSitesTestSpeed?userId=" + localStorage.userid + "&signToken=" + localStorage.signtoken + "&callback=JSON_CALLBACK")
+            $http.jsonp("https://api.gugujiankong.com/website/GetAllSitesTestSpeed?userId=" + localStorage.userid + "&signToken=" + localStorage.signtoken + "&callback=JSON_CALLBACK")
                 .success(function(data) {
                     $scope.testspeeddata = data;
                     d.resolve(data);
@@ -63,7 +63,7 @@ angular.module('starter.services', ['ionic.ion.imageCacheFactory'])
             var d = $q.defer();
             var promise = d.promise;
 
-            $http.jsonp("http://api.gugujiankong.com/website/GetAllSitesSearchEngine?userId=" + localStorage.userid + "&signToken=" + localStorage.signtoken + "&callback=JSON_CALLBACK")
+            $http.jsonp("https://api.gugujiankong.com/website/GetAllSitesSearchEngine?userId=" + localStorage.userid + "&signToken=" + localStorage.signtoken + "&callback=JSON_CALLBACK")
                 .success(function(data) {
                     $scope.websitesearchengine = data;
                     d.resolve(data);
@@ -87,7 +87,7 @@ angular.module('starter.services', ['ionic.ion.imageCacheFactory'])
             var d = $q.defer();
             var promise = d.promise;
 
-            $http.jsonp("http://api.gugujiankong.com/website/AddWebsite?userId=" + localStorage.userid + "&signToken=" + localStorage.signtoken + "&url=" + $scope.data.siteurl + "&name=" + $scope.data.sitename + "&callback=JSON_CALLBACK")
+            $http.jsonp("https://api.gugujiankong.com/website/AddWebsite?userId=" + localStorage.userid + "&signToken=" + localStorage.signtoken + "&url=" + $scope.data.siteurl + "&name=" + $scope.data.sitename + "&callback=JSON_CALLBACK")
                 .success(function(data) {
                     d.resolve(data);
                 })
@@ -111,7 +111,7 @@ angular.module('starter.services', ['ionic.ion.imageCacheFactory'])
             var deferred = $q.defer();
             var promise = deferred.promise;
             //ajax请求
-            $http.jsonp("http://api.gugujiankong.com/website/DeleteWebsite?userId=" + localStorage.userid + "&signToken=" + localStorage.signtoken + "&siteId=" + site.SiteId + "&callback=JSON_CALLBACK")
+            $http.jsonp("https://api.gugujiankong.com/website/DeleteWebsite?userId=" + localStorage.userid + "&signToken=" + localStorage.signtoken + "&siteId=" + site.SiteId + "&callback=JSON_CALLBACK")
                 .success(function(response) {
                     //UI删除
                     allsites.splice(allsites.indexOf(site), 1);
@@ -138,7 +138,7 @@ angular.module('starter.services', ['ionic.ion.imageCacheFactory'])
 
             var loginResult = new Object();
             //ajax请求
-            $http.jsonp("http://api.gugujiankong.com/account/Login?email=" + name + "&password=" + pw + "&callback=JSON_CALLBACK")
+            $http.jsonp("https://api.gugujiankong.com/account/Login?email=" + name + "&password=" + pw + "&callback=JSON_CALLBACK")
                 .success(function(response) {
                     loginResult = response;
                     if (loginResult.LoginStatus == 1) {
@@ -158,7 +158,7 @@ angular.module('starter.services', ['ionic.ion.imageCacheFactory'])
                         //    try {
                         //        console.log("JPushPlugin:registrationID is " + data);
                         //        //ajax上传
-                        //        $http.jsonp("http://api.gugujiankong.com/account/Uploadregistrationid?userId=" + localStorage.userid + "&signToken=" + localStorage.signtoken + "&registrationid=" + data + "&callback=JSON_CALLBACK")
+                        //        $http.jsonp("https://api.gugujiankong.com/account/Uploadregistrationid?userId=" + localStorage.userid + "&signToken=" + localStorage.signtoken + "&registrationid=" + data + "&callback=JSON_CALLBACK")
                         //            .success(function (response) {
                         //            });
                         //    }
@@ -189,7 +189,7 @@ angular.module('starter.services', ['ionic.ion.imageCacheFactory'])
             var deferred = $q.defer();
             var promise = deferred.promise;
             //ajax请求
-            $http.jsonp("http://api.gugujiankong.com/account/Register?email=" + email + "&username=" + name + "&password=" + password + "&callback=JSON_CALLBACK")
+            $http.jsonp("https://api.gugujiankong.com/account/Register?email=" + email + "&username=" + name + "&password=" + password + "&callback=JSON_CALLBACK")
                 .success(function(response) {
                     if (response == 1) {
                         deferred.resolve('register successfully');
@@ -211,7 +211,7 @@ angular.module('starter.services', ['ionic.ion.imageCacheFactory'])
             var deferred = $q.defer();
             var promise = deferred.promise;
             //ajax请求
-            $http.jsonp("http://api.gugujiankong.com/account/resetpassword?email=" + email + "&callback=JSON_CALLBACK")
+            $http.jsonp("https://api.gugujiankong.com/account/resetpassword?email=" + email + "&callback=JSON_CALLBACK")
                 .success(function(response) {
                     if (response == 1) {
                         deferred.resolve('reset password successfully');
@@ -233,7 +233,7 @@ angular.module('starter.services', ['ionic.ion.imageCacheFactory'])
             var d = $q.defer();
             var promise = d.promise;
             //ajax请求
-            $http.jsonp("http://api.gugujiankong.com/account/GetUserSetting?userId=" + localStorage.userid + "&signToken=" + localStorage.signtoken + "&callback=JSON_CALLBACK")
+            $http.jsonp("https://api.gugujiankong.com/account/GetUserSetting?userId=" + localStorage.userid + "&signToken=" + localStorage.signtoken + "&callback=JSON_CALLBACK")
                 .success(function(data) {
                     $scope.apppush.checked = data.AppPush;
                     $scope.smspush.checked = data.SmsPush;
@@ -263,7 +263,7 @@ angular.module('starter.services', ['ionic.ion.imageCacheFactory'])
             var d = $q.defer();
             var promise = d.promise;
             //ajax请求
-            $http.jsonp("http://api.gugujiankong.com/account/SendPhoneValidateCode?userId=" + localStorage.userid + "&signToken=" + localStorage.signtoken + "&phone=" + $scope.data.userphone + "&callback=JSON_CALLBACK")
+            $http.jsonp("https://api.gugujiankong.com/account/SendPhoneValidateCode?userId=" + localStorage.userid + "&signToken=" + localStorage.signtoken + "&phone=" + $scope.data.userphone + "&callback=JSON_CALLBACK")
                 .success(function(data) {
                     if (data.SetPushStatus != 1) {
                         var confirmPopup = $ionicPopup.alert({
@@ -297,7 +297,7 @@ angular.module('starter.services', ['ionic.ion.imageCacheFactory'])
             var d = $q.defer();
             var promise = d.promise;
             //ajax请求
-            $http.jsonp("http://api.gugujiankong.com/account/FinalBind?userId=" + localStorage.userid + "&phone=" + $scope.data.userphone + "&code=" + $scope.data.code + "&signToken=" + localStorage.signtoken + "&callback=JSON_CALLBACK")
+            $http.jsonp("https://api.gugujiankong.com/account/FinalBind?userId=" + localStorage.userid + "&phone=" + $scope.data.userphone + "&code=" + $scope.data.code + "&signToken=" + localStorage.signtoken + "&callback=JSON_CALLBACK")
                 .success(function(data) {
                     if (data.SetPushStatus != 1) {
                         var confirmPopup = $ionicPopup.alert({
@@ -340,7 +340,7 @@ angular.module('starter.services', ['ionic.ion.imageCacheFactory'])
                 value = $scope.phonepush.checked;
             }
             //ajax请求
-            $http.jsonp("http://api.gugujiankong.com/account/SetPush?userId=" + localStorage.userid + "&signToken=" + localStorage.signtoken + "&type=" + type + "&value=" + value + "&callback=JSON_CALLBACK")
+            $http.jsonp("https://api.gugujiankong.com/account/SetPush?userId=" + localStorage.userid + "&signToken=" + localStorage.signtoken + "&type=" + type + "&value=" + value + "&callback=JSON_CALLBACK")
                 .success(function(data) {
                     if (data.SetPushStatus != 1) {
                         var confirmPopup = $ionicPopup.alert({
@@ -353,7 +353,7 @@ angular.module('starter.services', ['ionic.ion.imageCacheFactory'])
                 .error(function(error) {
                     var confirmPopup = $ionicPopup.alert({
                         title: '推送设置',
-                        template: '手机号码绑定失败，请重试！'
+                        template: '设置推送失败，请重试！'
                     });
                     d.reject(error);
                 });

diff --git a/platforms/android/assets/www/templates/about.html b/platforms/android/assets/www/templates/about.html
@@ -12,7 +12,7 @@
 
                 <h2>咕咕监控</h2>
 
-                <p>Version 0.2.1</p>
+                <p>Version 0.2.2</p>
             </div>
 
             <div class="item item-body">

diff --git a/platforms/android/assets/www/templates/tab-account.html b/platforms/android/assets/www/templates/tab-account.html
@@ -19,7 +19,7 @@
                 <i class="icon ion-ios-help-outline"></i>&nbsp;忘记密码？
             </button>
 
-            <button class="button button-outline" style="width:100%;margin-top: 10px;" onclick="window.open('http://gugujiankong.com?source=m', '_system', 'location=yes'); return false;">
+            <button class="button button-outline" style="width:100%;margin-top: 10px;" onclick="window.open('https://gugujiankong.com?source=m', '_system', 'location=yes'); return false;">
                 <i class="icon ion-ios-home"></i>&nbsp;咕咕监控官网
             </button>
         </div>
@@ -35,4 +35,4 @@
         <!--&lt;!&ndash;</a>&ndash;&gt;-->
         <!--</div>-->
     </ion-content>
-</ion-view>
+</ion-view>
diff --git a/platforms/android/manifest-merger-release-report.txt b/platforms/android/manifest-merger-release-report.txt
@@ -1,18 +1,18 @@
 -- Merging decision tree log ---
 manifest
 ADDED from AndroidManifest.xml:2:1
-	android:hardwareAccelerated
-		ADDED from AndroidManifest.xml:2:11
-	xmlns:android
-		ADDED from AndroidManifest.xml:2:134
 	package
 		ADDED from AndroidManifest.xml:2:100
 	android:versionName
 		ADDED from AndroidManifest.xml:2:72
+	android:hardwareAccelerated
+		ADDED from AndroidManifest.xml:2:11
 	android:versionCode
 		ADDED from AndroidManifest.xml:2:46
 		INJECTED from AndroidManifest.xml:0:0
 		INJECTED from AndroidManifest.xml:0:0
+	xmlns:android
+		ADDED from AndroidManifest.xml:2:134
 uses-sdk
 ADDED from AndroidManifest.xml:3:5
 MERGED from android:CordovaLib:unspecified:release:25:5
@@ -22,42 +22,42 @@ MERGED from android:CordovaLib:unspecified:release:25:5
 		ADDED from AndroidManifest.xml:3:15
 supports-screens
 ADDED from AndroidManifest.xml:4:5
-	android:resizeable
-		ADDED from AndroidManifest.xml:4:106
 	android:largeScreens
 		ADDED from AndroidManifest.xml:4:49
-	android:anyDensity
-		ADDED from AndroidManifest.xml:4:23
+	android:smallScreens
+		ADDED from AndroidManifest.xml:4:132
 	android:normalScreens
 		ADDED from AndroidManifest.xml:4:77
 	android:xlargeScreens
 		ADDED from AndroidManifest.xml:4:160
-	android:smallScreens
-		ADDED from AndroidManifest.xml:4:132
+	android:resizeable
+		ADDED from AndroidManifest.xml:4:106
+	android:anyDensity
+		ADDED from AndroidManifest.xml:4:23
 application
 ADDED from AndroidManifest.xml:5:5
-	android:supportsRtl
-		ADDED from AndroidManifest.xml:5:104
 	android:label
 		ADDED from AndroidManifest.xml:5:83
-	android:icon
-		ADDED from AndroidManifest.xml:5:53
+	android:supportsRtl
+		ADDED from AndroidManifest.xml:5:104
 	android:hardwareAccelerated
 		ADDED from AndroidManifest.xml:5:18
+	android:icon
+		ADDED from AndroidManifest.xml:5:53
 activity#com.gugujiankong.iosapp.MainActivity
 ADDED from AndroidManifest.xml:6:9
-	android:windowSoftInputMode
-		ADDED from AndroidManifest.xml:6:248
 	android:label
 		ADDED from AndroidManifest.xml:6:97
+	android:launchMode
+		ADDED from AndroidManifest.xml:6:135
+	android:windowSoftInputMode
+		ADDED from AndroidManifest.xml:6:248
 	android:configChanges
 		ADDED from AndroidManifest.xml:6:19
 	android:theme
 		ADDED from AndroidManifest.xml:6:194
 	android:name
 		ADDED from AndroidManifest.xml:6:166
-	android:launchMode
-		ADDED from AndroidManifest.xml:6:135
 intent-filter#android.intent.action.MAIN+android.intent.category.LAUNCHER
 ADDED from AndroidManifest.xml:7:13
 	android:label
@@ -72,12 +72,12 @@ ADDED from AndroidManifest.xml:9:17
 		ADDED from AndroidManifest.xml:9:27
 activity#cn.jpush.android.ui.PushActivity
 ADDED from AndroidManifest.xml:12:9
+	android:exported
+		ADDED from AndroidManifest.xml:12:70
 	android:configChanges
 		ADDED from AndroidManifest.xml:12:19
 	android:theme
 		ADDED from AndroidManifest.xml:12:143
-	android:exported
-		ADDED from AndroidManifest.xml:12:70
 	android:name
 		ADDED from AndroidManifest.xml:12:95
 intent-filter#android.intent.category.DEFAULT+cn.jpush.android.ui.PushActivity+com.gugujiankong.iosapp
@@ -96,18 +96,18 @@ ADDED from AndroidManifest.xml:16:17
 		ADDED from AndroidManifest.xml:16:27
 service#cn.jpush.android.service.DownloadService
 ADDED from AndroidManifest.xml:19:9
-	android:exported
-		ADDED from AndroidManifest.xml:19:41
 	android:enabled
 		ADDED from AndroidManifest.xml:19:18
+	android:exported
+		ADDED from AndroidManifest.xml:19:41
 	android:name
 		ADDED from AndroidManifest.xml:19:66
 service#cn.jpush.android.service.PushService
 ADDED from AndroidManifest.xml:21:9
-	android:exported
-		ADDED from AndroidManifest.xml:21:41
 	android:enabled
 		ADDED from AndroidManifest.xml:21:18
+	android:exported
+		ADDED from AndroidManifest.xml:21:41
 	android:name
 		ADDED from AndroidManifest.xml:21:66
 intent-filter#cn.jpush.android.intent.PUSH_TIME+cn.jpush.android.intent.PushService+cn.jpush.android.intent.REGISTER+cn.jpush.android.intent.REPORT
@@ -192,16 +192,16 @@ ADDED from AndroidManifest.xml:54:9
 		ADDED from AndroidManifest.xml:54:44
 meta-data#JPUSH_CHANNEL
 ADDED from AndroidManifest.xml:55:9
-	android:name
-		ADDED from AndroidManifest.xml:55:20
 	android:value
 		ADDED from AndroidManifest.xml:55:49
+	android:name
+		ADDED from AndroidManifest.xml:55:20
 meta-data#JPUSH_APPKEY
 ADDED from AndroidManifest.xml:56:9
-	android:name
-		ADDED from AndroidManifest.xml:56:20
 	android:value
 		ADDED from AndroidManifest.xml:56:48
+	android:name
+		ADDED from AndroidManifest.xml:56:20
 permission#com.gugujiankong.iosapp.permission.JPUSH_MESSAGE
 ADDED from AndroidManifest.xml:58:5
 	android:protectionLevel