[FC]：上传整包更新流程相关代码

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

@@ -93,7 +93,7 @@ export default class Login extends cc.Component {
         await this.getForceVersionInfo();
         console.log("===[Login] checkHotUpdate ", gData.appData.needForceUpdate);
         if (gData.appData.needForceUpdate === 1) {
-
+            this.updateState = UpdateState.UpdateFinish;
         }
         else {
 
@@ -105,38 +105,28 @@ export default class Login extends cc.Component {
 
         console.log("===[Login] getForceVersionInfo发送请求整包更新")
         mk.console.log("===[Login] getForceVersionInfo", gData.loginData.uin, gData.loginData.sessionKey);
-        let data: any = {
-            "appId": gData.appData.appId,
-            'channel': gData.appData.tfChannel,
-            'version': gData.appData.appVersion,
-        }
+        // let data: any = {
+        //     "appId": gData.appData.appId,
+        //     'channel': gData.appData.tfChannel,
+        //     'version': gData.appData.appVersion,
+        // }
         mk.console.log("===[Login] getForceVersionInfo appId", gData.appData.appId);
         mk.console.log("===[Login] getForceVersionInfo channel", gData.appData.tfChannel);
         mk.console.log("===[Login] getForceVersionInfo version", gData.appData.appVersion);
-        // let data :any = {
-        //     "appId": "wxcf31f0e54f7fefda",
-        //     "channel": "1",
-        //     "version": "1.0.1"
-        // }
-     
-
-        // data.timestamp = Math.floor(new Date().getTime() * 0.001)
-        // data.appVersion = gData.appData.appVersion;
-        // data.tfChannel = gData.appData.tfChannel;
-        // data.versioncfg = gData.appData.version;
+        let data: any = {
+            "appId": "wxcf31f0e54f7fefda",
+            "channel": "1",
+            "version": "1.0.0"
+        }
 
-        // let encode = mk.encrypt.encrypt(JSON.stringify(data), gData.loginData.sessionKey, gData.loginData.sessionKey);
-        // let bodyData = {
-        //     "uin": gData.loginData.uin,
-        //     "encrypt": data
-        // }
         let response = await mk.http.sendRequest("getForceVersionInfo", 'POST', JSON.stringify(data), false, false)
-        mk.console.logSingle("===[Login] getForceVersionInfo response", response);
-        gData.appData.needForceUpdate = response.isForceUpdate;
-        gData.appData.installVersion = response.version;
-        gData.appData.installUrl = response.downloadAddress;
-        gData.appData.updateDes = response.versionRemark;
-        gData.appData.fixDes = response.bugRestoreRemark;
+        // mk.console.logSingle("===[Login] getForceVersionInfo response", response);
+        gData.appData.needForceUpdate = response.data.isForceUpdate;
+        gData.appData.installVersion = response.data.version;
+        gData.appData.installUrl = response.data.downloadAddress;
+        gData.appData.updateDes = response.data.versionRemark;
+        gData.appData.fixDes = response.data.bugRestoreRemark;
+        mk.console.log("===[Login] gData.appData.needForceUpdate", gData.appData.needForceUpdate, response.data.isForceUpdate);
     }
 
     //热更新-----------------------------------------------------------------

assets/script/mk/system/JsbSystem.ts

@@ -75,9 +75,10 @@ export default class JsbSystem {
     public static getDeviceInfo() {
         let deviceInfo = "";
         if (cc.sys.os == cc.sys.OS_ANDROID) {
-          deviceInfo =  this.callStaticMethod(this._JSB_ANDROID_PATH, "getDeviceInfo", "()Ljava/lang/String;");
-          console.log("===[JsbSystem] getDeviceInfo ",deviceInfo);
-          return deviceInfo;
+            deviceInfo = this.callStaticMethod(this._JSB_ANDROID_PATH, "getDeviceInfo", "()Ljava/lang/String;");
+            console.log("===[JsbSystem] getDeviceInfo ",deviceInfo);
+            gData.appData.updateDeviceInfo(deviceInfo);
+            return deviceInfo;
         }
         else if (cc.sys.os == cc.sys.OS_IOS) {
             this.callStaticMethod(this._JSB_IOS_PATH, "getDeviceInfo", "");

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

@@ -84,14 +84,14 @@ public class ThirdSdkMgr {
         //获取安卓版本
         String androidVersion = DevicesUtil.getSystemModel();
 
-        updateDeviceInfo(ANDROID_ID, "", imei1, mac, mOAID, BuildConfig.UM_AID, versionName, umengChannel, deviceType, androidVersion);
+        //updateDeviceInfo(ANDROID_ID, "", imei1, mac, mOAID, BuildConfig.UM_AID, versionName, umengChannel, deviceType, androidVersion);
 
         String param =  ANDROID_ID + "#" + "" + "#" + imei1 + "#" + mac + "#" + mOAID + "#" + BuildConfig.UM_AID + "#" + BuildConfig.TF_CHANNEL +
                 "#" + versionName + "#" + umengChannel + "#" + deviceType + "#" + androidVersion ;
         Log.d("===[ThridSdkMgr ",param);
 //        return param;
 
-        return  BuildConfig.UM_AID + "#" + BuildConfig.TF_CHANNEL;
+        return param;
     }
 
     /** 更新设备信息 */