diff --git a/README.md b/README.md index 8ac452b..04149ee 100644 --- 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 index 69c5772..19b7ba5 100644 --- a/config.xml +++ b/config.xml @@ -1,10 +1,10 @@ - + GuGuJianKong 专注于网站、服务器监控 - + Parry @@ -72,4 +72,4 @@ - \ No newline at end of file + diff --git a/platforms/android/.gradle/2.2.1/taskArtifacts/cache.properties.lock b/platforms/android/.gradle/2.2.1/taskArtifacts/cache.properties.lock index 6c90204..8a7091e 100644 Binary files a/platforms/android/.gradle/2.2.1/taskArtifacts/cache.properties.lock and b/platforms/android/.gradle/2.2.1/taskArtifacts/cache.properties.lock differ diff --git a/platforms/android/.gradle/2.2.1/taskArtifacts/fileHashes.bin b/platforms/android/.gradle/2.2.1/taskArtifacts/fileHashes.bin index a58e081..f1d502b 100644 Binary files a/platforms/android/.gradle/2.2.1/taskArtifacts/fileHashes.bin and b/platforms/android/.gradle/2.2.1/taskArtifacts/fileHashes.bin differ diff --git a/platforms/android/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin b/platforms/android/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin index 2b805ba..36cf623 100644 Binary files a/platforms/android/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin and b/platforms/android/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin differ diff --git a/platforms/android/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin b/platforms/android/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin index 42695b6..478aa8b 100644 Binary files a/platforms/android/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin and b/platforms/android/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin differ diff --git a/platforms/android/.idea/misc.xml b/platforms/android/.idea/misc.xml index 4b8bd01..9ee2c27 100644 --- a/platforms/android/.idea/misc.xml +++ b/platforms/android/.idea/misc.xml @@ -37,7 +37,7 @@ - + diff --git a/platforms/android/.idea/workspace.xml b/platforms/android/.idea/workspace.xml index f591aaf..4086316 100644 --- a/platforms/android/.idea/workspace.xml +++ b/platforms/android/.idea/workspace.xml @@ -41,7 +41,21 @@ - + + + + + + + + + + + + + + + @@ -1311,8 +1326,6 @@ - - @@ -1321,8 +1334,20 @@ + + + + + + + + @@ -1342,6 +1367,7 @@ + @@ -1372,17 +1398,17 @@ - + - - + + - + - + - - + + - + - - + + @@ -1744,7 +1770,7 @@ - + @@ -1805,13 +1831,6 @@ - - - - - - - @@ -2106,13 +2125,6 @@ - - - - - - - @@ -2134,32 +2146,49 @@ - + - - + - + - + - - + + - + - - + + + + + + + + + + + + + + + + + + + + diff --git a/platforms/android/AndroidManifest.xml b/platforms/android/AndroidManifest.xml index 65af7cd..e25bfdf 100644 --- a/platforms/android/AndroidManifest.xml +++ b/platforms/android/AndroidManifest.xml @@ -1,5 +1,5 @@ - + diff --git a/platforms/android/android-release.apk b/platforms/android/android-release.apk deleted file mode 100644 index 0212158..0000000 Binary files a/platforms/android/android-release.apk and /dev/null differ diff --git a/platforms/android/assets/www/js/services.js b/platforms/android/assets/www/js/services.js index 60786fc..9dc0c24 100644 --- 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 + "®istrationid=" + data + "&callback=JSON_CALLBACK") + // $http.jsonp("https://api.gugujiankong.com/account/Uploadregistrationid?userId=" + localStorage.userid + "&signToken=" + localStorage.signtoken + "®istrationid=" + 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 index 6ae9e3f..f7de20d 100644 --- a/platforms/android/assets/www/templates/about.html +++ b/platforms/android/assets/www/templates/about.html @@ -12,7 +12,7 @@

咕咕监控

-

Version 0.2.1

+

Version 0.2.2

diff --git a/platforms/android/assets/www/templates/tab-account.html b/platforms/android/assets/www/templates/tab-account.html index f0c31af..1c0193e 100644 --- a/platforms/android/assets/www/templates/tab-account.html +++ b/platforms/android/assets/www/templates/tab-account.html @@ -19,7 +19,7 @@  忘记密码？ -
@@ -35,4 +35,4 @@ - \ No newline at end of file + diff --git a/platforms/android/manifest-merger-release-report.txt b/platforms/android/manifest-merger-release-report.txt index f1c02da..1b63933 100644 --- 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 diff --git a/platforms/android/res/xml/config.xml b/platforms/android/res/xml/config.xml index 80daabe..4292851 100644 --- a/platforms/android/res/xml/config.xml +++ b/platforms/android/res/xml/config.xml @@ -1,6 +1,5 @@ - - + @@ -16,6 +15,9 @@ + + + @@ -25,6 +27,16 @@ + GuGuJianKong + + 专注于网站、服务器监控 + + + Parry + + + + @@ -43,15 +55,7 @@ - GuGuJianKong - - 专注于网站、服务器监控 - - - Parry - - - + @@ -59,5 +63,4 @@ - diff --git a/platforms/ios/GuGuJianKong.xcodeproj/project.pbxproj b/platforms/ios/GuGuJianKong.xcodeproj/project.pbxproj index 29ff117..ec0ef29 100644 --- a/platforms/ios/GuGuJianKong.xcodeproj/project.pbxproj +++ b/platforms/ios/GuGuJianKong.xcodeproj/project.pbxproj @@ -387,7 +387,7 @@ TargetAttributes = { 1D6058900D05DD3D006BFB54 = { DevelopmentTeam = M83N3W9JC3; - ProvisioningStyle = Automatic; + ProvisioningStyle = Manual; }; }; }; @@ -524,8 +524,8 @@ buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ENABLE_OBJC_ARC = YES; - CODE_SIGN_IDENTITY = "iPhone Developer"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + CODE_SIGN_IDENTITY = "iPhone Distribution"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; COPY_PHASE_STRIP = NO; DEVELOPMENT_TEAM = M83N3W9JC3; GCC_DYNAMIC_NO_PIC = NO; @@ -561,8 +561,8 @@ ); PRODUCT_BUNDLE_IDENTIFIER = com.gugujiankong.iosapp; PRODUCT_NAME = GuGuJianKong; - PROVISIONING_PROFILE = ""; - PROVISIONING_PROFILE_SPECIFIER = ""; + PROVISIONING_PROFILE = "0ad4205a-8472-4cdb-9d33-cb2934309f22"; + PROVISIONING_PROFILE_SPECIFIER = "gugujiankong-0920"; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Debug; @@ -573,7 +573,7 @@ ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ENABLE_OBJC_ARC = YES; CODE_SIGN_IDENTITY = "iPhone Distribution"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; COPY_PHASE_STRIP = YES; DEVELOPMENT_TEAM = M83N3W9JC3; GCC_PRECOMPILE_PREFIX_HEADER = YES; @@ -607,8 +607,8 @@ ); PRODUCT_BUNDLE_IDENTIFIER = com.gugujiankong.iosapp; PRODUCT_NAME = GuGuJianKong; - PROVISIONING_PROFILE = ""; - PROVISIONING_PROFILE_SPECIFIER = ""; + PROVISIONING_PROFILE = "0ad4205a-8472-4cdb-9d33-cb2934309f22"; + PROVISIONING_PROFILE_SPECIFIER = "gugujiankong-0920"; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Release; diff --git a/platforms/ios/GuGuJianKong.xcodeproj/project.xcworkspace/xcuserdata/Parry.xcuserdatad/UserInterfaceState.xcuserstate b/platforms/ios/GuGuJianKong.xcodeproj/project.xcworkspace/xcuserdata/Parry.xcuserdatad/UserInterfaceState.xcuserstate index e91c740..2ae7b39 100644 Binary files a/platforms/ios/GuGuJianKong.xcodeproj/project.xcworkspace/xcuserdata/Parry.xcuserdatad/UserInterfaceState.xcuserstate and b/platforms/ios/GuGuJianKong.xcodeproj/project.xcworkspace/xcuserdata/Parry.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/platforms/ios/GuGuJianKong/GuGuJianKong-Info.plist b/platforms/ios/GuGuJianKong/GuGuJianKong-Info.plist index 0b967e5..4220ced 100644 --- a/platforms/ios/GuGuJianKong/GuGuJianKong-Info.plist +++ b/platforms/ios/GuGuJianKong/GuGuJianKong-Info.plist @@ -57,11 +57,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 0.2.1 + 0.2.2 CFBundleSignature ???? CFBundleVersion - 0.2.1.1 + 0.2.2.3 LSRequiresIPhoneOS NSAppTransportSecurity @@ -69,10 +69,34 @@ NSAllowsArbitraryLoads + NSBluetoothPeripheralUsageDescription + App需要您的同意,才能访问蓝牙 + NSCalendarsUsageDescription + App需要您的同意,才能访问日历 + NSCameraUsageDescription + App需要您的同意,才能访问相机 + NSHealthShareUsageDescription + App需要您的同意,才能访问健康分享 + NSHealthUpdateUsageDescription + App需要您的同意,才能访问健康更新 + NSLocationAlwaysUsageDescription + App需要您的同意,才能始终访问位置 + NSLocationUsageDescription + App需要您的同意,才能访问位置 + NSLocationWhenInUseUsageDescription + App需要您的同意,才能在使用期间访问位置 NSMainNibFile NSMainNibFile~ipad + NSMicrophoneUsageDescription + App需要您的同意,才能访问麦克风 + NSMotionUsageDescription + App需要您的同意,才能访问运动与健身 + NSPhotoLibraryUsageDescription + App需要您的同意,才能访问相册 + NSRemindersUsageDescription + App需要您的同意,才能访问提醒事项 UILaunchImages diff --git a/platforms/ios/GuGuJianKong/config.xml b/platforms/ios/GuGuJianKong/config.xml index 70db587..595dd94 100755 --- a/platforms/ios/GuGuJianKong/config.xml +++ b/platforms/ios/GuGuJianKong/config.xml @@ -1,16 +1,5 @@ - - - - - - - - - - - - + @@ -39,6 +28,16 @@ + GuGuJianKong + + 专注于网站、服务器监控 + + + Parry + + + + @@ -65,21 +64,20 @@ - GuGuJianKong - - 专注于网站、服务器监控 - - - Parry - - - + + + + + + + + + + + - - - diff --git a/platforms/ios/www/js/services.js b/platforms/ios/www/js/services.js index 60786fc..9dc0c24 100644 --- a/platforms/ios/www/js/services.js +++ b/platforms/ios/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 + "®istrationid=" + data + "&callback=JSON_CALLBACK") + // $http.jsonp("https://api.gugujiankong.com/account/Uploadregistrationid?userId=" + localStorage.userid + "&signToken=" + localStorage.signtoken + "®istrationid=" + 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/ios/www/templates/about.html b/platforms/ios/www/templates/about.html index 2f1f387..0c6b33d 100644 --- a/platforms/ios/www/templates/about.html +++ b/platforms/ios/www/templates/about.html @@ -12,7 +12,7 @@

咕咕监控

-

Version 0.1

+

Version 0.2.2

@@ -29,4 +29,4 @@

咕咕监控

- \ No newline at end of file + diff --git a/platforms/ios/www/templates/tab-account.html b/platforms/ios/www/templates/tab-account.html index f0c31af..1c0193e 100644 --- a/platforms/ios/www/templates/tab-account.html +++ b/platforms/ios/www/templates/tab-account.html @@ -19,7 +19,7 @@  忘记密码？ -
@@ -35,4 +35,4 @@ - \ No newline at end of file + diff --git a/www/js/services.js b/www/js/services.js index eca9d63..9dc0c24 100644 --- a/www/js/services.js +++ b/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 + "®istrationid=" + data + "&callback=JSON_CALLBACK") + // $http.jsonp("https://api.gugujiankong.com/account/Uploadregistrationid?userId=" + localStorage.userid + "&signToken=" + localStorage.signtoken + "®istrationid=" + 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({ diff --git a/www/templates/about.html b/www/templates/about.html index 6ae9e3f..0c6b33d 100644 --- a/www/templates/about.html +++ b/www/templates/about.html @@ -12,7 +12,7 @@

咕咕监控

-

Version 0.2.1

+

Version 0.2.2

@@ -29,4 +29,4 @@

咕咕监控

- \ No newline at end of file + diff --git a/www/templates/setting.html b/www/templates/setting.html index 9191ed1..a00311c 100644 --- a/www/templates/setting.html +++ b/www/templates/setting.html @@ -30,11 +30,11 @@
帮助
- + 咕咕监控官网 - - 版本号：v0.2.1 + + 版本号：v0.2.2
- @@ -35,4 +35,4 @@ - \ No newline at end of file +