From b7591dba0127890e24eb1ae41e150a0ad8ee1a51 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 17 七月 2020 11:49:21 +0800
Subject: [PATCH] 2020-07-17 1.修复在大屏幕手机，部分界面图标会变形问题.
---
Crabtree/SmartHome/UI/SimpleControl/Phone/Room/UserDeviceListPage.cs | 24 ++++++++++++++++++++----
1 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/Room/UserDeviceListPage.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/Room/UserDeviceListPage.cs
index 8d935e9..f314b61 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/Phone/Room/UserDeviceListPage.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/Room/UserDeviceListPage.cs
@@ -343,11 +343,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;
}
if (str [1] == DeviceType.InfraredMode.ToString ()) {
@@ -530,7 +530,23 @@
if (reBytes != null) {
Application.RunOnMainThread (() => {
btnEquipment.Text = commonDevice.Name = etDeviceName.Text.Trim ();
- IO.FileUtils.SaveEquipmentMessage (commonDevice, commonDevice.LoopID.ToString ());
+ if (commonDevice.Type == DeviceType.InfraredMode) {
+ //2020-07-03 淇绾㈠鐢佃淇敼鍚庡彉绾㈠妯″潡闂
+ InfraredMode mTV = Newtonsoft.Json.JsonConvert.DeserializeObject<InfraredMode> (System.Text.Encoding.UTF8.GetString (commonBytes));
+ if (mTV == null) {
+ IO.FileUtils.SaveEquipmentMessage (commonDevice, commonDevice.LoopID.ToString ());
+ } else {
+ mTV.Name = etDeviceName.Text.Trim ();
+ IO.FileUtils.SaveEquipmentMessage (mTV, mTV.LoopID.ToString ());
+ }
+ } else {
+ IO.FileUtils.SaveEquipmentMessage (commonDevice, commonDevice.LoopID.ToString ());
+ }
+
+
+
+
+ //IO.FileUtils.SaveEquipmentMessage (commonDevice, commonDevice.LoopID.ToString ());
MainPage.Loading.Hide ();
dialog.Close ();
});
@@ -585,7 +601,7 @@
deviceScrolView.AddChidren (btnRowLine);
});
} catch (Exception ex) {
- Console.WriteLine (ex.Message);
+ Utlis.WriteLine (ex.Message);
}
}
});
--
Gitblit v1.8.0