update to v0.2.6.

ParryQiu · Jun 12, 2017 · adb329f · adb329f
1 parent 923e873
commit adb329f
Show file tree

Hide file tree

Showing 20 changed files with 191 additions and 186 deletions.
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/outputFileStates.bin b/platforms/android/.gradle/2.2.1/taskArtifacts/outputFileStates.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/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="204" android:versionName="0.2.4" package="com.gugujiankong.iosapp" xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest android:hardwareAccelerated="true" android:versionCode="204" android:versionName="0.2.6" 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/CordovaLib/CordovaLib.iml b/platforms/android/CordovaLib/CordovaLib.iml
@@ -9,15 +9,14 @@
     <facet type="android" name="Android">
       <configuration>
         <option name="SELECTED_BUILD_VARIANT" value="debug" />
-        <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
         <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
         <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
         <afterSyncTasks>
           <task>generateDebugSources</task>
         </afterSyncTasks>
         <option name="ALLOW_USER_CONFIGURATION" value="false" />
         <option name="RES_FOLDERS_RELATIVE_PATH" value="" />
-        <option name="LIBRARY_PROJECT" value="true" />
+        <option name="PROJECT_TYPE" value="1" />
       </configuration>
     </facet>
   </component>
@@ -41,19 +40,16 @@
       <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/assets" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />

diff --git a/platforms/android/android.iml b/platforms/android/android.iml
@@ -9,7 +9,6 @@
     <facet type="android" name="Android">
       <configuration>
         <option name="SELECTED_BUILD_VARIANT" value="debug" />
-        <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
         <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
         <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
         <afterSyncTasks>
@@ -40,21 +39,17 @@
       <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/assets" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
-      <excludeFolder url="file://$MODULE_DIR$/build/.DS_Store" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />

diff --git a/platforms/android/assets/www/js/services.js b/platforms/android/assets/www/js/services.js
@@ -150,7 +150,7 @@ angular.module('starter.services', ['ionic.ion.imageCacheFactory'])
 
                         var arrayObj = new Array("Tags" + loginResult.UserId);
                         window.plugins.jPushPlugin.setTags(arrayObj);
-
+                        console.log(arrayObj);
                         //上传设备ID
                         //console.log("Begin - JPushPlugin:registrationID is " + data);
                         //window.plugins.jPushPlugin.getRegistrationID(onGetRegistradionID);

diff --git a/platforms/android/assets/www/templates/about.html b/platforms/android/assets/www/templates/about.html
@@ -12,15 +12,15 @@
 
                 <h2>咕咕监控</h2>
 
-                <p>Version 0.2.4</p>
+                <p>Version 0.2.6</p>
             </div>
 
             <div class="item item-body">
                 <p>咕咕监控，专注于网站监控、网站测速、搜索引擎收录、服务器监控等服务。</p>
 
                 <p>有任何意见或建议，可以发送邮件给我们：feedback@gugujiankong.com</p>
 
-                <p>如您想支持该App，您可以去Store去给我们好评，谢谢！</p>
+                <p>如您想支持该 App，您可以去 Store 去给我们好评，谢谢！</p>
 
                 <p><img src="img/weibo16.png" style="vertical-align: sub;padding-right: 3px;">作者新浪微博：@Parry</p>
             </div>

diff --git a/platforms/android/res/xml/config.xml b/platforms/android/res/xml/config.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget id="com.gugujiankong.iosapp" version="0.2.4" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget id="com.gugujiankong.iosapp" version="0.2.6" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
     <feature name="Keyboard">
         <param name="android-package" value="com.ionic.keyboard.IonicKeyboard" />
         <param name="onload" value="true" />

diff --git a/platforms/ios/GuGuJianKong.xcodeproj/project.pbxproj b/platforms/ios/GuGuJianKong.xcodeproj/project.pbxproj
@@ -119,6 +119,7 @@
 		32EBE37A37B749F7A3161458 /* CDVConnection.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CDVConnection.m; path = "cordova-plugin-network-information/CDVConnection.m"; sourceTree = "<group>"; };
 		36A7AA6B4B9B48EE81CAA3FE /* CDVReachability.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CDVReachability.m; path = "cordova-plugin-network-information/CDVReachability.m"; sourceTree = "<group>"; };
 		4254E4C61BBAA804001A8D14 /* buguniao.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = buguniao.wav; sourceTree = "<group>"; };
+		42B753751EE10FB500CA895D /* GuGuJianKong.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; name = GuGuJianKong.entitlements; path = GuGuJianKong/GuGuJianKong.entitlements; sourceTree = "<group>"; };
 		4ABF28B046604CC680712A9F /* CDVInAppBrowser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CDVInAppBrowser.m; path = org.apache.cordova.inappbrowser/CDVInAppBrowser.m; sourceTree = "<group>"; };
 		4BAD231D303A46649CAF6AF8 /* PushConfig.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = unknown; path = PushConfig.plist; sourceTree = "<group>"; };
 		4E7767109B294249835C8829 /* CDVReachability.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CDVReachability.h; path = "cordova-plugin-network-information/CDVReachability.h"; sourceTree = "<group>"; };
@@ -211,6 +212,7 @@
 		29B97314FDCFA39411CA2CEA /* CustomTemplate */ = {
 			isa = PBXGroup;
 			children = (
+				42B753751EE10FB500CA895D /* GuGuJianKong.entitlements */,
 				4254E4C61BBAA804001A8D14 /* buguniao.wav */,
 				EB87FDF41871DAF40020F90C /* config.xml */,
 				EB87FDF31871DA8E0020F90C /* www */,
@@ -388,6 +390,11 @@
 					1D6058900D05DD3D006BFB54 = {
 						DevelopmentTeam = M83N3W9JC3;
 						ProvisioningStyle = Manual;
+						SystemCapabilities = {
+							com.apple.Push = {
+								enabled = 1;
+							};
+						};
 					};
 				};
 			};
@@ -524,6 +531,7 @@
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CODE_SIGN_ENTITLEMENTS = GuGuJianKong/GuGuJianKong.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Distribution: PengYuan Qiu (M83N3W9JC3)";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: PengYuan Qiu (M83N3W9JC3)";
 				COPY_PHASE_STRIP = NO;
@@ -561,8 +569,8 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.gugujiankong.iosapp;
 				PRODUCT_NAME = GuGuJianKong;
-				PROVISIONING_PROFILE = "0ad4205a-8472-4cdb-9d33-cb2934309f22";
-				PROVISIONING_PROFILE_SPECIFIER = "gugujiankong-0920";
+				PROVISIONING_PROFILE = "2b6e716e-5580-4435-b88d-67e50e776a4d";
+				PROVISIONING_PROFILE_SPECIFIER = "gugu-dis-appstore-profile";
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -572,6 +580,7 @@
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CODE_SIGN_ENTITLEMENTS = GuGuJianKong/GuGuJianKong.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Distribution: PengYuan Qiu (M83N3W9JC3)";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: PengYuan Qiu (M83N3W9JC3)";
 				COPY_PHASE_STRIP = YES;
@@ -607,8 +616,8 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.gugujiankong.iosapp;
 				PRODUCT_NAME = GuGuJianKong;
-				PROVISIONING_PROFILE = "0ad4205a-8472-4cdb-9d33-cb2934309f22";
-				PROVISIONING_PROFILE_SPECIFIER = "gugujiankong-0920";
+				PROVISIONING_PROFILE = "2b6e716e-5580-4435-b88d-67e50e776a4d";
+				PROVISIONING_PROFILE_SPECIFIER = "gugu-dis-appstore-profile";
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;

diff --git a/...xcodeproj/project.xcworkspace/xcuserdata/Parry.xcuserdatad/UserInterfaceState.xcuserstate b/...xcodeproj/project.xcworkspace/xcuserdata/Parry.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/platforms/ios/GuGuJianKong/GuGuJianKong-Info.plist b/platforms/ios/GuGuJianKong/GuGuJianKong-Info.plist
@@ -57,11 +57,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.2.5</string>
+	<string>0.2.6</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>0.2.5</string>
+	<string>0.2.6.2</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSAppTransportSecurity</key>
@@ -202,5 +202,12 @@
 	</array>
 	<key>UIRequiresFullScreen</key>
 	<true/>
+	<key>UISupportedInterfaceOrientations</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+		<string>UIInterfaceOrientationPortraitUpsideDown</string>
+	</array>
 </dict>
 </plist>
diff --git a/platforms/ios/www/js/services.js b/platforms/ios/www/js/services.js
@@ -150,7 +150,7 @@ angular.module('starter.services', ['ionic.ion.imageCacheFactory'])
 
                         var arrayObj = new Array("Tags" + loginResult.UserId);
                         window.plugins.jPushPlugin.setTags(arrayObj);
-
+                        console.log(arrayObj);
                         //上传设备ID
                         //console.log("Begin - JPushPlugin:registrationID is " + data);
                         //window.plugins.jPushPlugin.getRegistrationID(onGetRegistradionID);

diff --git a/platforms/ios/www/templates/about.html b/platforms/ios/www/templates/about.html
@@ -12,15 +12,15 @@
 
                 <h2>咕咕监控</h2>
 
-                <p>Version 0.2.4</p>
+                <p>Version 0.2.6</p>
             </div>
 
             <div class="item item-body">
                 <p>咕咕监控，专注于网站监控、网站测速、搜索引擎收录、服务器监控等服务。</p>
 
                 <p>有任何意见或建议，可以发送邮件给我们：feedback@gugujiankong.com</p>
 
-                <p>如您想支持该App，您可以去Store去给我们好评，谢谢！</p>
+                <p>如您想支持该 App，您可以去 Store 去给我们好评，谢谢！</p>
 
                 <p><img src="img/weibo16.png" style="vertical-align: sub;padding-right: 3px;">作者新浪微博：@Parry</p>
             </div>

diff --git a/www/js/services.js b/www/js/services.js
@@ -150,7 +150,7 @@ angular.module('starter.services', ['ionic.ion.imageCacheFactory'])
 
                         var arrayObj = new Array("Tags" + loginResult.UserId);
                         window.plugins.jPushPlugin.setTags(arrayObj);
-
+                        console.log(arrayObj);
                         //上传设备ID
                         //console.log("Begin - JPushPlugin:registrationID is " + data);
                         //window.plugins.jPushPlugin.getRegistrationID(onGetRegistradionID);

diff --git a/www/templates/about.html b/www/templates/about.html
@@ -12,15 +12,15 @@
 
                 <h2>咕咕监控</h2>
 
-                <p>Version 0.2.4</p>
+                <p>Version 0.2.6</p>
             </div>
 
             <div class="item item-body">
                 <p>咕咕监控，专注于网站监控、网站测速、搜索引擎收录、服务器监控等服务。</p>
 
                 <p>有任何意见或建议，可以发送邮件给我们：feedback@gugujiankong.com</p>
 
-                <p>如您想支持该App，您可以去Store去给我们好评，谢谢！</p>
+                <p>如您想支持该 App，您可以去 Store 去给我们好评，谢谢！</p>
 
                 <p><img src="img/weibo16.png" style="vertical-align: sub;padding-right: 3px;">作者新浪微博：@Parry</p>
             </div>

diff --git a/www/templates/setting.html b/www/templates/setting.html
@@ -34,7 +34,7 @@
                 <i class="icon ion-android-globe"></i>咕咕监控官网
             </a>
             <a class="item item-icon-left" onclick="window.open('https://gugujiankong.com?source=m', '_system', 'location=yes'); return false;">
-                <i class="icon ion-android-bookmark"></i>版本号：v0.2.4
+                <i class="icon ion-android-bookmark"></i>版本号：v0.2.6
             </a>
         </div>
         <button class="button button-full button-energized" ng-click="gotoaccountlist()">