net 1.2.9.3

app/src/main/java/com/sobot/moduletest/MainActivity.java

@@ -28,6 +28,7 @@ import com.sobot.common.login.callback.SobotResultBlock;
 import com.sobot.common.login.callback.SobotResultCode;
 import com.sobot.common.login.model.SobotServiceInfoModel;
 import com.sobot.common.utils.SobotImageUtils;
+import com.sobot.network.http.db.SobotDownloadManager;
 import com.sobot.network.http.log.SobotNetLogUtils;
 import com.sobot.pictureframe.SobotBitmapUtil;
 import com.sobot.utils.SobotLogUtils;
@@ -64,6 +65,7 @@ public class MainActivity extends SobotBaseActivity {
     @Override
     protected void initView() {
         tv = findViewById(R.id.tv);
+        SobotDownloadManager.getInstance();
         HtmlToolUtils.getInstance(MainActivity.this).setRichText(tv, "<h3><span style=\"color: rgb(255, 77, 79);\"><strong>【若摄像机因出现自动呼叫导致设备离线，建议您</strong></span><span style=\"color: rgb(0, 0, 0);\"><strong>优先更换电</strong></span><span style=\"color: rgb(255, 77, 79);\"><strong>源适配器尝试。若</strong></span><span style=\"color: rgb(235, 144, 58);\"><strong>设备恢复正常建</strong></span><span style=\"color: rgb(255, 77, 79);\"><strong>议联系在</strong></span><span style=\"color: rgb(115, 209, 61);\"><strong>线人工客服</strong></span><span style=\"color: rgb(255, 77, 79);\"><strong>咨询（早9-晚21），</strong></span><span style=\"color: rgb(38, 38, 38);\"><strong>若仍无法解决</strong></span><span style=\"color: rgb(255, 77, 79);\"><strong>建议您按以下方式排查】</strong></span></h3><h2>您好，若是摄像机联网成功后，突然离线，建议您按以下方式排查：一、离线后，请确认最近摄像机环境是否有变化，是否更换过路由器，目前仅<span style=\"color: rgb(225, 60, 57);\">AB2L、P8MAX、K6pro、P8 pro</span>型号摄像机支持5GWiFi，其余型号摄像机需连接2.4G网络。请查看摄像机信息里面的WIFI信号强度（尽可能大于80%），检查摄像机所处环境中电源、网络是否正常。</h2><h2>二、重新插拔电源线，如果设备没有问题，18510555567每次通电后，都是先绿灯常亮然后是绿灯闪烁。如果不亮，可能是适配器电源线或者摄像机有问题，这种情况建议您更换适配器或电源线，还不行则需要寄回售后检测维修。</h2><p>三、建议您重新连接（如果有安装内存卡，建议取出内存卡，不排除内存卡损坏导致设备离线的可能），重新连接方式如下：</p><p>1）直接点击右上角加号，选择“连接我的摄像机”2）摄像机设置中，选择“让摄像机连接到其他WIFI”</p><p>四、建议更换网络WiFi或连接手机热点尝试。五、查看固件 <a href=\"https://www.baidu.com\" target=\"_blank\">百度</a> 版本是否最新，若不是建议升级固件，并重新联网尝试。</p><p>若仍无法解决，可点击【自助报修】或通过“360智慧生活服务”公众号报修。&lt;/p&gt;</p>", R.color.sobot_common_green);
         SobotToastUtil.showCustomToast(getSobotBaseActivity(), "sdafdsafsadfasdfsdaf");
         SobotWidgetApi.setSwitchMarkStatus(SobotMarkConfig.SHOW_PERMISSION_TIPS_POP, true);

sobot_common/build.gradle

@@ -37,7 +37,7 @@ dependencies {
 
     api 'com.sobot.library:utils:1.1.3'
     api 'com.sobot.library:picture_x:1.2.4'
-    api 'com.sobot.library:net:1.2.8'
+    api 'com.sobot.library:net:1.2.9.3'
     api 'com.sobot.library:gson:1.1.1'
 }
 

sobot_network/sobot-network-publish-mavencentral.gradle

@@ -12,7 +12,7 @@ task androidSourcesJar(type: Jar) {
 ext {
     PUBLISH_GROUP_ID = "com.sobot.library"        //项目包名
     PUBLISH_ARTIFACT_ID = 'net'            //项目名
-    PUBLISH_VERSION = '1.2.8'                    //版本号
+    PUBLISH_VERSION = '1.2.9.3'                    //版本号
 }
 
 

sobot_network/src/main/java/com/sobot/network/http/model/SobotProgress.java

 package com.sobot.network.http.model;
 
+import android.annotation.SuppressLint;
 import android.content.ContentValues;
 import android.database.Cursor;
 import android.os.SystemClock;
@@ -43,6 +44,7 @@ public class SobotProgress implements Serializable {
     public String tmpTag;                              //下载的标识键
     public boolean isUpload;                        //标识此文件 是上传还是下载  false为下载 true为上传
     public String url;                              //网址
+    public String snapshot;                              //缩略图
     public String folder;                           //保存文件夹
     public String filePath;                         //保存文件地址
     public String fileName;                         //保存的文件名
@@ -149,6 +151,7 @@ public class SobotProgress implements Serializable {
         return values;
     }
 
+    @SuppressLint("Range")
     public static SobotProgress parseCursorToBean(Cursor cursor) {
         SobotProgress progress = new SobotProgress();
         progress.tag = cursor.getString(cursor.getColumnIndex(SobotProgress.TAG));
@@ -196,6 +199,7 @@ public class SobotProgress implements Serializable {
                ", fileName=" + fileName +//
                ", tag=" + tag +//
                ", url=" + url +//
+                ", snapshot=" + snapshot +//
                '}';
     }
 }

sobot_network/src/main/java/com/sobot/network/http/model/UploadFileResult.java

@@ -6,6 +6,9 @@ package com.sobot.network.http.model;
 public class UploadFileResult {
     private String msgId;
     private String url;
+    private String fileSize;
+    private String snapshot;
+    private String fileName;
 
     public String getMsgId() {
         return msgId;
@@ -22,4 +25,39 @@ public class UploadFileResult {
     public void setUrl(String url) {
         this.url = url;
     }
+
+    public String getFileSize() {
+        return fileSize;
+    }
+
+    public void setFileSize(String fileSize) {
+        this.fileSize = fileSize;
+    }
+
+    public String getSnapshot() {
+        return snapshot;
+    }
+
+    public void setSnapshot(String snapshot) {
+        this.snapshot = snapshot;
+    }
+
+    public String getFileName() {
+        return fileName;
+    }
+
+    public void setFileName(String fileName) {
+        this.fileName = fileName;
+    }
+
+    @Override
+    public String toString() {
+        return "UploadFileResult{" +
+                "msgId='" + msgId + '\'' +
+                ", url='" + url + '\'' +
+                ", fileSize='" + fileSize + '\'' +
+                ", snapshot='" + snapshot + '\'' +
+                ", fileName='" + fileName + '\'' +
+                '}';
+    }
 }

sobot_network/src/main/java/com/sobot/network/http/upload/SobotCommonGsonUtil.java

@@ -60,6 +60,9 @@ public class SobotCommonGsonUtil {
             data = new UploadFileResult();
             data.setMsgId(jsonObject.optString("msgId"));
             data.setUrl(jsonObject.optString("msg"));
+            data.setFileName(jsonObject.optString("fileName"));
+            data.setFileSize(jsonObject.optString("fileSize"));
+            data.setSnapshot(jsonObject.optString("snapshot"));
             return data;
         } catch (JSONException e) {
             e.printStackTrace();

sobot_network/src/main/java/com/sobot/network/http/upload/SobotUploadTask.java

@@ -193,6 +193,8 @@ public class SobotUploadTask<T> implements Runnable {
                                 // 解析msgid
                                 progress.tag = tmpData.getMsgId();
                                 progress.url = tmpData.getUrl();
+                                progress.fileName=tmpData.getFileName();
+                                progress.snapshot=tmpData.getSnapshot();
                                 postOnFinish(progress, data);
                             } else {
                                 postOnError(progress, new RuntimeException(result.getMsg()));