自动更新v1

app/src/main/java/com/emato/ich/MainActivity.java

@@ -3,7 +3,9 @@ package com.emato.ich;
 import android.os.Bundle;
 
 import com.cherry.sdk.controller.utils.ScanGunKeyEventHelper;
+import com.emato.ich.api.ICSPApi;
 import com.emato.ich.api.ICSPClient;
+import com.emato.ich.api.ICSPConstant;
 import com.emato.ich.api.ICSPResponseCodeEnum;
 import com.emato.ich.api.SystemConfigConstant;
 import com.emato.ich.crash.CrashApplication;
@@ -262,50 +264,50 @@ public class MainActivity extends AppCompatActivity  {
 
         // 注册柜子信息
 
-//        String appVersion = BaseUtils.getAppVersion(getApplicationContext());
-//        String androidVersion = BaseUtils.getVersionName();
-//        CountDownLatch countDownLatch = new CountDownLatch(10);
-//        Cabinet cabinet = DeviceControl.queryCabinetInfo(countDownLatch);
-//        try {
-//            countDownLatch.await();
-//        } catch (InterruptedException e) {
-//            e.printStackTrace();
-//        }
-//
-//        cabinet.setClientId(clientId);
-//        cabinet.setSoftwareVersion(appVersion);
-//        cabinet.setAndroidVersion(androidVersion);
-//        cabinet.setSoftwareType("android");
-//        cabinet.setImei(BaseUtils.getIMEI(getApplicationContext()));
-//        cabinet.setMacIpv4("111");
-//        cabinet.setMacIpv6("unknown");
-//        cabinet.setNetType("111");
-//        cabinet.setPlatType("S905");
-//        cabinet.setSim("111");
-//        cabinet.setWifiSSid("111");
-//
-//        ObjectMapper objectMapper = JacksonUtils.objectmapper;
-//
-//        try {
-//            String jsonData = objectMapper.writeValueAsString(cabinet);
-//            Log.i(TAG, "onCreate: jsonData===============>" + jsonData);
-//
-//            MqttMessage message = new MqttMessage();
-//            message.setQos(1);
-//            message.setPayload(jsonData.getBytes());
-//            ichPublishClient.publish(String.format(ICHTopic.CABINET_INFO_REPORT, clientId), message);
-//        } catch (JsonProcessingException e) {
-//            Log.e(TAG, "onCreate: 解析成JSON失败!", e);
-//        }
+        String appVersion = BaseUtils.getAppVersion(getApplicationContext());
+        String androidVersion = BaseUtils.getVersionName();
+        CountDownLatch countDownLatch = new CountDownLatch(10);
+        Cabinet cabinet = DeviceControl.queryCabinetInfo(countDownLatch);
+        try {
+            countDownLatch.await();
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }
+
+        cabinet.setClientId(clientId);
+        cabinet.setSoftwareVersion(appVersion);
+        cabinet.setAndroidVersion(androidVersion);
+        cabinet.setSoftwareType("android");
+        cabinet.setImei(BaseUtils.getIMEI(getApplicationContext()));
+        cabinet.setMacIpv4("111");
+        cabinet.setMacIpv6("unknown");
+        cabinet.setNetType("111");
+        cabinet.setPlatType("S905");
+        cabinet.setSim("111");
+        cabinet.setWifiSSid("111");
+
+        ObjectMapper objectMapper = JacksonUtils.objectmapper;
+
+        try {
+            String jsonData = objectMapper.writeValueAsString(cabinet);
+            Log.i(TAG, "onCreate: jsonData===============>" + jsonData);
+
+            MqttMessage message = new MqttMessage();
+            message.setQos(1);
+            message.setPayload(jsonData.getBytes());
+            ichPublishClient.publish(String.format(ICHTopic.CABINET_INFO_REPORT, clientId), message);
+        } catch (JsonProcessingException e) {
+            Log.e(TAG, "onCreate: 解析成JSON失败!", e);
+        }
 
         // TODO 更新版本监听
         ichPublishClient.subscribe(String.format(ICHTopic.APK_UPDATE_PATH, BaseUtils.getClientId()), (msgId, msg) -> {
             try {
-                String path = new String(msg.getPayload());
+                // String path = new String(msg.getPayload());
                 // 发起请求下载APK
                 XUpdate.newBuild(this)
-                        .updateUrl(path)
-                        .isAutoMode(true) //如果需要完全无人干预，自动更新，需要root权限【静默安装需要】
+                        .updateUrl(ICSPApi.GET_UPDATE_PATH.getUrl())
+                        .isAutoMode(true) // 如果需要完全无人干预，自动更新，需要root权限【静默安装需要】
                         .update();
 //                APKUpdateDownload.getInstance().downloadAPK(MainActivity.this, getApplication(), path);
             }  catch (Exception e) {

app/src/main/java/com/emato/ich/api/ICSPApi.java

@@ -33,7 +33,11 @@ public enum  ICSPApi {
     /**
      * 获取用户手机号
      */
-    GET_USER_PHONE_NUMBER(ICSPConstant.ICSP_SERVICE + "/deliverer/queryOrder", "POST")
+    GET_USER_PHONE_NUMBER(ICSPConstant.ICSP_SERVICE + "/deliverer/queryOrder", "POST"),
+    /**
+     * 获取更新apk信息
+     */
+    GET_UPDATE_PATH(ICSPConstant.ICSP_SERVICE + "/config/cabinet/upgradeByXUpdate", "POST")
     ;
 
 

app/src/main/java/com/emato/ich/crash/CrashApplication.java

@@ -34,7 +34,7 @@ public class CrashApplication extends Application {
         //设置版本更新出错的监听
         XUpdate.get()
                 .debug(true)
-                .isWifiOnly(true)                                               //默认设置只在wifi下检查版本更新
+                .isWifiOnly(false)                                               //默认设置只在wifi下检查版本更新
                 .isGet(false)                                                    //默认设置使用get请求检查版本
                 .isAutoMode(true)                                              //默认设置非自动模式，可根据具体使用配置
                 .param("versionCode", UpdateUtils.getVersionCode(this))         //设置默认公共请求参数

app/src/main/java/com/emato/ich/fragment/MainFragment.java

@@ -81,14 +81,6 @@ public class MainFragment extends Fragment {
         // 取件页面跳转
         binding.takeBtn.setOnClickListener(view1 -> NavHostFragment.findNavController(MainFragment.this)
                 .navigate(R.id.action_mainFragment_to_takeFragment));
-
-        binding.update.setOnClickListener(view1 -> {
-
-            XUpdate.newBuild(getActivity())
-                    .updateUrl("http://icsp-testend.ds-bay.com/config/cabinet/upgradeByXUpdate")
-                    .isAutoMode(true) //如果需要完全无人干预，自动更新，需要root权限【静默安装需要】
-                    .update();
-        });
     }
 
     @Override

app/src/main/java/com/emato/ich/update/UpdateService.java

@@ -58,19 +58,18 @@ public class UpdateService implements IUpdateHttpService {
         OkHttpUtils.post()
 //                .params(transform(params))
                 .url(url)
-//                .addParams("clientId", BaseUtils.getClientId())
-                .addParams("clientId", "285F18D92D0B6568")
+                .addParams("clientId", BaseUtils.getClientId())
+                // .addParams("clientId", "285F18D92D0B6568")
                 .build()
                 .execute(new StringCallback() {
                     @Override
                     public void onError(Call call, Exception e, int id) {
                         callBack.onError(e);
-                        onResponse("", 1);
                     }
 
                     @Override
                     public void onResponse(String response, int id) {
-                        response = "{\"Code\":0,\"Msg\":\"\",\"UpdateStatus\":2,\"VersionCode\":3,\"VersionName\":\"1.0.2\",\"ModifyContent\":\"1、优化api接口。\\r\\n2、添加使用demo演示。\\r\\n3、新增自定义更新服务API接口。\\r\\n4、优化更新提示界面。\",\"DownloadUrl\":\"http://icsp-api.ds-bay.com/profile/app-release.apk\",\"ApkSize\":10759906,\"ApkMd5\":\"3452dfgdg\"}";
+                        //response = "{\"Code\":0,\"Msg\":\"\",\"UpdateStatus\":2,\"VersionCode\":3,\"VersionName\":\"1.0.2\",\"ModifyContent\":\"1、优化api接口。\\r\\n2、添加使用demo演示。\\r\\n3、新增自定义更新服务API接口。\\r\\n4、优化更新提示界面。\",\"DownloadUrl\":\"http://icsp-api.ds-bay.com/profile/app-release.apk\",\"ApkSize\":10759906,\"ApkMd5\":\"3452dfgdg\"}";
                         callBack.onSuccess(response);
                     }
                 });

app/src/main/res/layout/fragment_main.xml

@@ -45,13 +45,5 @@
         android:layout_y="371dp"
         android:background="@drawable/e_mp_qrcode_8x8_backup" />
 
-    <Button
-        android:id="@+id/update"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_x="47dp"
-        android:layout_y="300dp"
-        android:text="update" />
-
 
 </AbsoluteLayout>