From f441a3c49f8b5cedee3e4def6fbb448ef40eb9cb Mon Sep 17 00:00:00 2001 From: JLChen <551775569@qq.com> Date: 星期三, 10 六月 2020 14:46:58 +0800 Subject: [PATCH] Crabtree-ON 2020-06-10 基于最新HDL ON 优化问题,Crabtree-ONAPP部分功能同步修改优化调整 1. 增加大图片大文件上传处理. 2.远程连接交互提示,由原来的Loading修改成顶部Tip提示。 3.灯光全开、全关和场景控制多线程发送,和HDLON同样加锁处理。 4.Android ,判断移动网络失败,网络监测修复方法修改,后台前台切换优化。 --- Crabtree/SmartHome/UI/SimpleControl/Phone/Register/Databackup.cs | 63 +++++++++++++++++++++++++++++-- 1 files changed, 59 insertions(+), 4 deletions(-) diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/Register/Databackup.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/Register/Databackup.cs index 57b973d..60f529d 100644 --- a/Crabtree/SmartHome/UI/SimpleControl/Phone/Register/Databackup.cs +++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/Register/Databackup.cs @@ -949,7 +949,7 @@ new System.Threading.Thread (() => { for (var j = startIndex1; j <= endIndex1; j++) { - var result = DownloadSomeDataBackup (mDownLoad, mUrlHead, dataList [j]); + var result = DownloadSomeDataBackup (mDownLoad, mUrlHead, mFileList [j]); if (result) { index++; Application.RunOnMainThread (() => { @@ -1044,7 +1044,7 @@ /// 澶氭涓婁紶澶氫釜鏂囦欢 /// </summary> /// <param name="mBackupClassId"></param> - void UpLoadBackupFileToDBNew (string mBackupClassId, int maxThreads = 30) + void UpLoadBackupFileToDBNew (string mBackupClassId, int maxThreads = 20) { var backuplist = IO.FileUtils.ReadFiles (); var mFileList = backuplist.FindAll ((obj) => obj != "null" && obj != UserConfig.configFile && obj != UserInfo.GlobalRegisterFile && obj != "AccountListDB"); @@ -1080,8 +1080,8 @@ var id = i; var startIndex1 = startIndex; var endIndex1 = endIndex; - - var result = UploadDataBackup (upData, urlHead, mFileList, startIndex1, endIndex1); + //2020-06-10 淇敼澶у浘鐗囧ぇ鏂囦欢澶勭悊 + var result = UploadDataBackupNew (upData, urlHead, mFileList, startIndex1, endIndex1); if (result) { index++; Application.RunOnMainThread (() => { @@ -1114,5 +1114,60 @@ } + + /// <summary> + /// 2020-06-05 闇�瑕佺瓑寰呬簯绔鍔犳帴鍙� + /// 澶勭悊澶ф枃浠跺拰鍥剧墖涓婁紶 + /// + /// </summary> + /// <param name="upData"></param> + /// <param name="mUrlHead"></param> + /// <param name="fileList"></param> + /// <param name="startIndex1"></param> + /// <param name="endIndex1"></param> + /// <returns></returns> + bool UploadDataBackupNew (UploadHomeAppGatewaySubFilesObj upData, string mUrlHead, List<string> fileList, int startIndex1, int endIndex1) + { + try { + + var list = new List<FileInfoData> (); + for (var j = startIndex1; j <= endIndex1; j++) { + var datainfo = new FileInfoData (); + datainfo.BackupFileName = fileList [j]; + datainfo.BackupFileContent = Shared.IO.FileUtils.ReadFile (fileList [j]); + + if (datainfo.BackupFileContent.Length > 1024 * 10) { + var upDataBig = new UploadHomeAppGatewaySubFilesBigObj (); + upDataBig.RequestVersion = upData.RequestVersion; + upDataBig.HomeId = upData.HomeId; + upDataBig.BackupClassId = upData.BackupClassId; + upDataBig.FileName = fileList [j]; + upDataBig.IsOtherAccountCtrl = upData.IsOtherAccountCtrl; + + var revertObj5 = MainPage.RequestHttpsNewBig (API.UploadHomeAppGatewaySingleSubFile, datainfo.BackupFileContent, upDataBig, mUrlHead); + + } else { + list.Add (datainfo); + } + } + + //鏁寸悊鏁版嵁 + UploadHomeAppGatewaySubFilesObj mUpData = upData; + mUpData.UploadSubFileLists = list; + + var requestJson2 = Newtonsoft.Json.JsonConvert.SerializeObject (mUpData); + var revertObj2 = MainPage.RequestHttps (API.UploadHomeAppGatewaySubFiles, requestJson2, mUrlHead); + if (revertObj2.StateCode.ToUpper () == "SUCCESS") { + return true; + } else { + //鎻愮ず閿欒 + return false; + } + } catch { + return false; + } + } + + } } \ No newline at end of file -- Gitblit v1.8.0