修改聪明宝

build/jsb-link/frameworks/runtime-src/proj.android-studio/app/build.gradle

@@ -6,7 +6,7 @@ versionberg {
     major 1
     minor 1
     patch 0
-    build 109 // ${commitCount}
+    build 110 // ${commitCount}
     nameTemplate '${major}.${minor}.${patch}.${build}'// 1.1.0.58
     codeTemplate '${major}0${minor}0${patch}${build}'// 1010058
 }
@@ -70,8 +70,8 @@ android {
             dimension "app"
             resValue "string", "app_name", "语言宝"
             applicationId android.defaultConfig.applicationId + ".chinese"
-            versionCode 1010027
-            versionName "1.1.0.27"
+            versionCode 1010028
+            versionName "1.1.0.28"
             manifestPlaceholders = [
                     FILE_PROVIDER: "com.zedu.chinese.fileprovider",
             ]
@@ -81,8 +81,8 @@ android {
             dimension "app"
             resValue "string", "app_name", "数感宝"
             applicationId android.defaultConfig.applicationId + ".math"
-            versionCode 101005
-            versionName "1.1.0.5"
+            versionCode 101006
+            versionName "1.1.0.6"
             manifestPlaceholders = [
                     FILE_PROVIDER: "com.zedu.math.fileprovider",
             ]
@@ -92,8 +92,8 @@ android {
             dimension "app"
             resValue "string", "app_name", "拼读宝"
             applicationId android.defaultConfig.applicationId + ".pinyin"
-            versionCode 101005
-            versionName "1.1.0.5"
+            versionCode 101006
+            versionName "1.1.0.6"
             manifestPlaceholders = [
                     FILE_PROVIDER: "com.zedu.pinyin.fileprovider",
             ]

build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/com/zedu/cocos/congming/page/launcher/LauncherActivity.java

@@ -201,6 +201,7 @@ public class LauncherActivity extends BaseFragmentActivity {
 
                 //判断是否开始验证欠费情况
                 if (mOrganClient.isFullMoon(activate.issued) && mOrganPrefs.checkArrearsSuccess().get() == ArrearsEvent.FAIL) {
+                    showToast("设备正在重新验证信息，请让设备正常链接网络");
                     mOrganClient.arrearsStatus(mOrganPrefs.organKey().get());
                     return;
                 }

build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/org/cocos2dx/javascript/AppActivity.java

@@ -142,7 +142,7 @@ public class AppActivity extends Cocos2dxActivity {
             }
         }).start();
         //删除更新包
-        new Thread(()->{
+        new Thread(() -> {
             String packName = AppUtils.getAppPackageName();
             String packStr = "zedu";
             if (!packName.substring(8).equals("")) {
@@ -157,7 +157,7 @@ public class AppActivity extends Cocos2dxActivity {
             sb.append(AppUtils.getAppVersionCode());
             sb.append(".apk");
             File file = new File(sb.toString());
-            if(file.exists()){
+            if (file.exists()) {
                 file.delete();
             }
         }).start();
@@ -244,7 +244,8 @@ public class AppActivity extends Cocos2dxActivity {
                 //判断是否开始验证欠费情况
                 OrganPrefs_ mOrganPrefs = new OrganPrefs_(this);
                 OrganClientZedu mOrganClient = new OrganClientZedu();
-                if (mOrganClient.isFullMoon(activate.issued) && mOrganPrefs.checkArrearsSuccess().get() == ArrearsEvent.FAIL) {
+                //只验证正式版，不验证临时版
+                if (mOrganClient.isFullMoon(activate.issued) && mOrganPrefs.checkArrearsSuccess().get() == ArrearsEvent.FAIL && activate.type == 2) {
                     LauncherActivity_.intent(this).start();
                     return;
                 }
@@ -341,11 +342,11 @@ public class AppActivity extends Cocos2dxActivity {
                     String base64Str = FaceActivity.bitmapToBase64(bitmap);
                     base64Str = base64Str.replaceAll("\n", "");
                     SDKUtils.evalString("createFace", "\'" + base64Str + "\'");
-                    if (isAndroidQ){
+                    if (isAndroidQ) {
                         getContentResolver().delete(faceImageUri, null, null);
-                    }else{
-                        File img=new File(mCameraImagePath);
-                        if(img.exists()){
+                    } else {
+                        File img = new File(mCameraImagePath);
+                        if (img.exists()) {
                             img.delete();
                         }
                     }
@@ -457,7 +458,7 @@ public class AppActivity extends Cocos2dxActivity {
                     NetworkInfo.State state = networkInfo.getState();
                     boolean isConnected = state == NetworkInfo.State.CONNECTED;// 当然，这边可以更精确的确定状态
                     if (isConnected) {
-                        if (SDKUtils.GAME_STARTED){
+                        if (SDKUtils.GAME_STARTED) {
                             MyWebSocketServer.startServer();
                         }
                     } else {
@@ -587,7 +588,7 @@ public class AppActivity extends Cocos2dxActivity {
         matrix.reset();
         System.out.println("====image getRotation=" + rotation);
         if (myBitmap.getWidth() > myBitmap.getHeight()) {
-            switch (rotation){
+            switch (rotation) {
                 case 0:
                 case 90:
                     matrix.setRotate(90);

packages-hot-update/win32/manifest/version.manifest

@@ -1 +1 @@
-{"packageUrl":"https://hotupdate.zhi-edu.com/win32/","remoteManifestUrl":"https://hotupdate.zhi-edu.com/win32/project.manifest","remoteVersionUrl":"https://hotupdate.zhi-edu.com/win32/version.manifest","version":"1.90.7"}
+{"packageUrl":"https://hotupdate.zhi-edu.com/win32/","remoteManifestUrl":"https://hotupdate.zhi-edu.com/win32/project.manifest","remoteVersionUrl":"https://hotupdate.zhi-edu.com/win32/version.manifest","version":"1.90.8"}