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/Scene/UserAddSceneDevice.cs | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/Scene/UserAddSceneDevice.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/Scene/UserAddSceneDevice.cs
index a89d8e3..e2b225e 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/Phone/Scene/UserAddSceneDevice.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/Scene/UserAddSceneDevice.cs
@@ -30,6 +30,7 @@
filesList = IO.FileUtils.ReadFiles ().FindAll ((obj) => { return obj.Split ('_').Length == 5; });
}
+
public void ShowScene (Action<string> action)
{
this.BackgroundColor = SkinStyle.Current.MainColor;
@@ -398,6 +399,7 @@
LightMixSwitch lightSwitch = Newtonsoft.Json.JsonConvert.DeserializeObject<LightMixSwitch> (System.Text.Encoding.UTF8.GetString (IO.FileUtils.ReadFile (deviceFilePath)));
#region
title.Text = lightSwitch.Name;
+ //2020-01-13 鏄惁绂佹帀寤惰繜鍔熻兘锛屽緟纭
Button lblChangeName = new Button () {
X = Application.GetRealWidth (30),
Y = Application.GetRealHeight (100),
@@ -605,7 +607,7 @@
};
dialogBodyLayout.AddChidren (btnMaxBrightness);
horizontalSeekBar.ProgressChanged += (sender, e) => {
- //Console.WriteLine (DateTime.Now.ToString ());
+ //Utlis.WriteLine (DateTime.Now.ToString ());
btnMaxBrightness.Text = horizontalSeekBar.Progress + "%";
System.Threading.Tasks.Task.Run (() => {
if ((System.DateTime.Now - (DateTime)(horizontalSeekBar.Tag)).TotalMilliseconds < 100) {
@@ -752,7 +754,7 @@
};
dialogBodyLayout.AddChidren (btnMaxBrightness);
horizontalSeekBar.ProgressChanged += (sender, e) => {
- //Console.WriteLine (DateTime.Now.ToString ());
+ //Utlis.WriteLine (DateTime.Now.ToString ());
btnMaxBrightness.Text = horizontalSeekBar.Progress + "%";
System.Threading.Tasks.Task.Run (() => {
if ((System.DateTime.Now - (DateTime)(horizontalSeekBar.Tag)).TotalMilliseconds < 100) {
@@ -2360,11 +2362,11 @@
};
var commonBytes = IO.FileUtils.ReadFile (deviceFilePath);
if (commonBytes.Length == 0) {
- Console.WriteLine ("length loss");
+ Utlis.WriteLine ("length loss");
continue;
}
if (commonBytes.Length == 1) {
- Console.WriteLine ("length loss 1");
+ Utlis.WriteLine ("length loss 1");
continue;
}
Common commonDevice = Newtonsoft.Json.JsonConvert.DeserializeObject<Common> (System.Text.Encoding.UTF8.GetString (commonBytes));
@@ -2389,7 +2391,7 @@
if (sceneFilePath == Scene.GlobalSceneFilePath) {
foreach (var filePath in scene.DeviceFilePathList) {
- System.Console.WriteLine (filePath);
+ Utlis.WriteLine (filePath);
if (filePath.EndsWith (deviceFilePath)) {
btnEquipment.IsSelected = true;
break;
--
Gitblit v1.8.0