fix: 下载文件超时时间修改

fix: 运单号不显示

app/src/main/AndroidManifest.xml

@@ -62,14 +62,14 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </receiver>
-<!--        <receiver-->
-<!--            android:name="com.emato.ich.update.InstallResultReceiver"-->
-<!--            android:enabled="true"-->
-<!--            android:exported="true">-->
-<!--            <intent-filter>-->
-<!--                <action android:name="android.content.pm.extra.STATUS"/>-->
-<!--            </intent-filter>-->
-<!--        </receiver>-->
+        <receiver
+            android:name="com.emato.ich.update.InstallResultReceiver"
+            android:enabled="true"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.content.pm.extra.STATUS"/>
+            </intent-filter>
+        </receiver>
 <!--        <receiver android:name=".update.InstallResultReceiver">-->
 <!--            <intent-filter>-->
 <!--                <action android:name="MyAction" />-->

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

@@ -223,6 +223,7 @@ public class MainActivity extends AppCompatActivity  {
                         .updateUrl(ICSPApi.GET_UPDATE_PATH.getUrl())
                         .isAutoMode(true) // 如果需要完全无人干预，自动更新，需要root权限【静默安装需要】
                         .update();
+                Log.i(TAG, "autoUpdateVersion: ====================================>更新完成! ");
 //                APKUpdateDownload.getInstance().downloadAPK(MainActivity.this, getApplication(), path);
             }  catch (Exception e) {
                 Log.e(TAG, "onCreate: 更新版本监听失败! ", e);

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

@@ -2,10 +2,10 @@ package com.emato.ich.api;
 
 public class ICSPConstant {
 
-//    public static final String ICSP_SERVICE = "http://icsp-api.ds-bay.com";
+    public static final String ICSP_SERVICE = "http://icsp-api.ds-bay.com";
 //    public static final String ICSP_SERVICE = "http://68rfyvi.nat.ipyingshe.com";
-    public static final String ICSP_SERVICE = "http://icsp-testend.ds-bay.com";
+//    public static final String ICSP_SERVICE = "http://icsp-testend.ds-bay.com";
 
-//    public static final String MQTT_SERVER_ADDRESS = "tcp://8.135.102.238:1883";
-    public static final String MQTT_SERVER_ADDRESS = "tcp://183.3.221.143:1883";
+    public static final String MQTT_SERVER_ADDRESS = "tcp://8.135.102.238:1883";
+//    public static final String MQTT_SERVER_ADDRESS = "tcp://183.3.221.143:1883";
 }

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

@@ -94,10 +94,8 @@ public class InputInfoFragment extends Fragment {
 
                 if (mailNoLock.get() == 1) {
                     Editable text = binding.mailNo.getText();
-                    if (!StringUtils.isNullOrEmpty(text.toString())) {
-                        text.clear();
-                        binding.mailNo.setText(text);
-                    }
+                    text.clear();
+                    binding.mailNo.setText(s);
                     mailNoLock.incrementAndGet();
                     // TODO 预定义,实际参数可能不一致 oms获取用户手机号 自动填充
                     ICSPClient.getUserPhoneNumber(LocalStorage.getInstance().getSession().getToken(), BaseUtils.getClientId(), s, new Callback() {

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

@@ -1,5 +1,7 @@
 package com.emato.ich.update;
 
+import android.util.Log;
+
 import androidx.annotation.NonNull;
 
 import com.emato.ich.api.ICSPClient;
@@ -17,13 +19,19 @@ import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
+import java.util.concurrent.TimeUnit;
 
 import okhttp3.Call;
 import okhttp3.Callback;
+import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.Response;
 
 public class UpdateService implements IUpdateHttpService {
+
+    private static final String TAG = UpdateService.class.getName();
+    private static final OkHttpClient client = new OkHttpClient.Builder().callTimeout(10, TimeUnit.MINUTES).readTimeout(10, TimeUnit.MINUTES).build();
+
     @Override
     public void asyncGet(@NonNull @NotNull String url, @NonNull @NotNull Map<String, Object> params, @NonNull @NotNull Callback callBack) {
         OkHttpUtils.get()
@@ -79,6 +87,7 @@ public class UpdateService implements IUpdateHttpService {
     @Override
     public void download(@NonNull @NotNull String url, @NonNull @NotNull String path, @NonNull @NotNull String fileName, @NonNull @NotNull DownloadCallback callback) {
 
+        OkHttpUtils.initClient(client);
         OkHttpUtils.get()
                 .url(url)
                 .tag(url)
@@ -87,21 +96,25 @@ public class UpdateService implements IUpdateHttpService {
                     @Override
                     public void inProgress(float progress, long total, int id) {
                         callback.onProgress(progress, total);
+                        Log.i(TAG, "inProgress: ====================================>progress完成! ===>" + progress);
                     }
 
                     @Override
                     public void onBefore(Request request, int id) {
                         callback.onStart();
+                        Log.i(TAG, "onBefore: ====================================>Before 完成! ");
                     }
 
                     @Override
                     public void onError(Call call, Exception e, int id) {
                         callback.onError(e);
+                        Log.e(TAG, "onError: ====================================>下载出现异常! ", e);
                     }
 
                     @Override
                     public void onResponse(File response, int id) {
                         callback.onSuccess(response);
+                        Log.i(TAG, "onResponse: ====================================>下载完成! 等待安装....");
                     }
                 });