获取设备信息前不要走请求服务器接口

修复mac地址登录问题
修复整包更新问题

assets/script/game/data/AppData.ts

@@ -34,7 +34,7 @@ export class AppData {
     /** 安卓版本号 */
     public androidVersion: string = '';
 
-    public mac: string = '1e:06:e5:13:b3:55,f6:65:e4:1a:b7:27';
+    public mac: string = '';
 
     /** 设备信息 */
     public machineInfo = {
@@ -63,7 +63,7 @@ export class AppData {
         this.machineInfo.UA = arr[11];
         this.tfChannel = arr[6];
         this.appVersion = arr[7];
-        
+
         /** 友盟渠道 */
         this.umengChannel = arr[8];
         /** 设备型号 */
@@ -71,10 +71,11 @@ export class AppData {
         /** 安卓版本号 */
         this.androidVersion = arr[10];
         this.IP = arr[12]
-        
+
         this.getDeviceInfoCompelete = true;
         console.log("===[this.tfChannel", this.tfChannel);
         console.log("===[this.appVersion", this.appVersion);
+        console.log("===[this.mac", this.mac);
     }
 
     public init() {

assets/script/game/data/LoginData.ts

@@ -63,7 +63,7 @@ export class LoginData {
         this.sessionKey = sessionKey ? sessionKey : "";
         let loginTicket = mk.storage.getStorage(StorageKey.loginTicket);
         this.loginTicket = loginTicket ? loginTicket : "";
-
+        
         console.log(`===[LoginData] uin =${uin} sessionKey = ${sessionKey}"`);
     }
 
@@ -89,6 +89,9 @@ export class LoginData {
      * @description 获取临时的uin
      */
     private async connect() {
+        if (CC_DEBUG) {
+            gData.appData.mac = '1e:06:e5:13:b3:55,f6:65:e4:1a:b7:27';
+        }
         //connect
         this.randomKey = mk.encrypt.randomString();
         let data: any = {
@@ -97,6 +100,8 @@ export class LoginData {
             "appId": gData.appData.appId
         }
 
+        mk.console.logSingle('mac  ', gData.appData.mac);
+
         let response = await mk.http.sendRequest('connectTest', 'POST', JSON.stringify(data));
         if (response.errcode != 0) {
             return;

assets/script/game/module/login/Login.ts

@@ -43,6 +43,11 @@ export default class Login extends cc.Component {
     }
 
     update() {
+        if (gData.appData.getDeviceInfoCompelete) {
+            gData.appData.getDeviceInfoCompelete = false;
+            this.getDeviceInfoBack();
+        }
+
         //如果更新没有结束,就不进入正常加载流程
         if (gData.appData.updateState == UpdateState.ForceUpdateFinish) {
             gData.appData.updateState = UpdateState.CheckHot;
@@ -59,10 +64,9 @@ export default class Login extends cc.Component {
         }
 
         if (gData.loginData.loadResCompelete) {
-            if (gData.appData.getDeviceInfoCompelete && mk.aliRiskManager.getRiskCode) {
-                this.login();
-                gData.appData.getDeviceInfoCompelete = false;
+            if (mk.aliRiskManager.getRiskCode) {
                 mk.aliRiskManager.getRiskCode = false;
+                this.login();
             }
             else if (gData.gameData.dataFinish) {//登录流程完毕
                 if (mk.storage.getStorage("agreementTip", false) != 1) {
@@ -95,9 +99,10 @@ export default class Login extends cc.Component {
         JsbSystem.getWxAppId();
         //获取手机授权
         JsbSystem.checkPermission();
-        //获取设备信息
-        // JsbSystem.getDeviceInfo();
-        console.log('appversion   ', gData.appData.appVersion);
+    }
+
+    /** 获取设备信息后 */
+    public async getDeviceInfoBack() {
         //获取登录需要的sessionkey
         gData.loginData.init();
         await this.checkForceUpate();
@@ -160,6 +165,8 @@ export default class Login extends cc.Component {
             version: gData.appData.appVersion
         }
 
+        mk.console.logSingle('getForceVersionInfo  ', data);
+
         let response = await mk.http.sendRequest("getForceVersionInfo", 'POST', JSON.stringify(data), false, false)
         if (response.data) {
             gData.appData.needForceUpdate = response.data.isForceUpdate;

assets/script/mk/utils/LogUtil.ts

@@ -9,7 +9,7 @@ export default class LogUtil {
      * 是否显示Log
      * @description
      */
-    public ifShowLog: boolean = false;
+    public ifShowLog: boolean = true;
 
     /**
      * 标签符号

build/jsb-link/frameworks/runtime-src/proj.android-studio/.idea/modules/1786486690/libcocos2dx.iml

@@ -33,16 +33,16 @@
       <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/java/src" isTestSource="false" />
     </content>
     <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx">
-      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/aidl_source_output_dir/debug/compileDebugAidl/out" isTestSource="false" generated="true" />
       <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/source/apt/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/aidl_source_output_dir/debug/compileDebugAidl/out" isTestSource="false" generated="true" />
       <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/renderscript_source_output_dir/debug/compileDebugRenderscript/out" isTestSource="false" generated="true" />
       <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/res/rs/debug" type="java-resource" generated="true" />
       <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/res/resValues/debug" type="java-resource" generated="true" />
-      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/renderscript_source_output_dir/debugAndroidTest/compileDebugAndroidTestRenderscript/out" isTestSource="true" generated="true" />
       <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/aidl_source_output_dir/debugAndroidTest/compileDebugAndroidTestAidl/out" isTestSource="true" generated="true" />
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/renderscript_source_output_dir/debugAndroidTest/compileDebugAndroidTestRenderscript/out" isTestSource="true" generated="true" />
       <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/res/rs/androidTest/debug" type="java-test-resource" generated="true" />
       <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/res/resValues/androidTest/debug" type="java-test-resource" generated="true" />
       <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/source/apt/test/debug" isTestSource="true" generated="true" />

build/jsb-link/frameworks/runtime-src/proj.android-studio/.idea/modules/app/EasyEliminate.iml

@@ -187,16 +187,16 @@
       <sourceFolder url="file://$MODULE_DIR$/../../../../Classes" isTestSource="false" />
     </content>
     <content url="file://$MODULE_DIR$/../../../app">
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/apt/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/aidl_source_output_dir/debug/compileDebugAidl/out" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/renderscript_source_output_dir/debug/compileDebugRenderscript/out" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/res/rs/debug" type="java-resource" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/res/resValues/debug" type="java-resource" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/renderscript_source_output_dir/debugAndroidTest/compileDebugAndroidTestRenderscript/out" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/aidl_source_output_dir/debugAndroidTest/compileDebugAndroidTestAidl/out" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/renderscript_source_output_dir/debugAndroidTest/compileDebugAndroidTestRenderscript/out" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/res/rs/androidTest/debug" type="java-test-resource" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/res/resValues/androidTest/debug" type="java-test-resource" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/apt/test/debug" isTestSource="true" generated="true" />

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

@@ -10,7 +10,7 @@ UM_SECRET="";       //友盟秘钥
 WX_APP_ID="wxcf31f0e54f7fefda"; //微信appidUM_CHANNEL
 MY_APP_NAME=\u5929\u5929\u7231\u6d88\u6d88
 PACKAGE_NAME=com.aries.qsllx.mz
-VERSION_NAME=1.0.1
+VERSION_NAME=1.0.0
 VERSION_CODE=2
 TOPON="a60cac090a6eb0,66b742dd0e502b64d783d9c66a9d30c4,b60cac0e43c0e1,b60cac0e4892fa,b60cac0e4d08e8,b60cac0e5754fc,b60cac0e524313"; //巨量渠道topon的 AppId,AppSecreate,激励视频，插屏，信息流，全屏开屏,banner
 APP_CONFIG_CODE="1.1.1"

build/jsb-link/js backups (useful for debugging)/main.index.js

@@ -2243,7 +2243,7 @@ this.appId = "";
 this.umengChannel = "";
 this.deviceType = "";
 this.androidVersion = "";
-this.mac = "1e:06:e5:13:b3:55,f6:65:e4:1a:b7:27";
+this.mac = "";
 this.machineInfo = {
 android_id: "",
 idfa: "",
@@ -2273,6 +2273,7 @@ this.IP = e[12];
 this.getDeviceInfoCompelete = !0;
 console.log("===[this.tfChannel", this.tfChannel);
 console.log("===[this.appVersion", this.appVersion);
+console.log("===[this.mac", this.mac);
 };
 t.prototype.init = function() {};
 return t;
@@ -11123,7 +11124,7 @@ value: !0
 n.LogTagColor = void 0;
 var i, a = function() {
 function t() {
-this.ifShowLog = !1;
+this.ifShowLog = !0;
 this._tagChar = "...";
 this._frontChar = "    ";
 this._keyValueChar = " = ";
@@ -11390,6 +11391,7 @@ mac: gData.appData.mac,
 psk: this.randomKey,
 appId: gData.appData.appId
 };
+mk.console.logSingle("mac  ", gData.appData.mac);
 return [ 4, mk.http.sendRequest("connectTest", "POST", JSON.stringify(t)) ];
 
 case 1:
@@ -11749,6 +11751,10 @@ this.init();
 }
 };
 e.prototype.update = function() {
+if (gData.appData.getDeviceInfoCompelete) {
+gData.appData.getDeviceInfoCompelete = !1;
+this.getDeviceInfoBack();
+}
 if (gData.appData.updateState == p.UpdateState.ForceUpdateFinish) {
 gData.appData.updateState = p.UpdateState.CheckHot;
 this.checkHotUpdate();
@@ -11759,10 +11765,9 @@ this.process += 2;
 this.setProgress(this.process);
 }
 if (gData.loginData.loadResCompelete) {
-if (gData.appData.getDeviceInfoCompelete && mk.aliRiskManager.getRiskCode) {
-this.login();
-gData.appData.getDeviceInfoCompelete = !1;
+if (mk.aliRiskManager.getRiskCode) {
 mk.aliRiskManager.getRiskCode = !1;
+this.login();
 } else if (gData.gameData.dataFinish) {
 if (1 != mk.storage.getStorage("agreementTip", !1)) {
 mk.ui.openPanel("module/login/agreementTip");
@@ -11783,12 +11788,18 @@ this.lbl_progress.string = "加载不消耗流量 " + t + "%";
 };
 e.prototype.init = function() {
 return r(this, void 0, void 0, function() {
+return c(this, function() {
+l.default.getWxAppId();
+l.default.checkPermission();
+return [ 2 ];
+});
+});
+};
+e.prototype.getDeviceInfoBack = function() {
+return r(this, void 0, void 0, function() {
 return c(this, function(t) {
 switch (t.label) {
 case 0:
-l.default.getWxAppId();
-l.default.checkPermission();
-console.log("appversion   ", gData.appData.appVersion);
 gData.loginData.init();
 return [ 4, this.checkForceUpate() ];
 
@@ -11859,6 +11870,7 @@ appId: gData.appData.appId,
 channel: gData.appData.tfChannel,
 version: gData.appData.appVersion
 };
+mk.console.logSingle("getForceVersionInfo  ", t);
 return [ 4, mk.http.sendRequest("getForceVersionInfo", "POST", JSON.stringify(t), !1, !1) ];
 
 case 1:

packages-hot-update/cfg.json

@@ -9,7 +9,7 @@
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote/",
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote1/"
     ],
-    "buildTime": 1628316824841,
-    "genTime": 1628316824841,
+    "buildTime": 1628320180539,
+    "genTime": 1628320180539,
     "genVersion": null
 }