From 7b171b5d8aad1f433b244b98b15bfdb1350200ce Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 14 七月 2020 17:37:56 +0800
Subject: [PATCH] 2020-07-14-2
---
ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml | 27 ++++++---------------------
ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide | 0
ZigbeeApp/Shared/Phone/Device/Logic/CurrentDeviceState.cs | 3 ++-
3 files changed, 8 insertions(+), 22 deletions(-)
diff --git a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
index fe09fb8..1a12e14 100644
--- a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
+++ b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
@@ -1,37 +1,22 @@
锘�<Properties StartupConfiguration="{F1296E2C-3777-4385-85B2-DA77617E3178}|Default">
<MonoDevelop.Ide.ItemProperties.GateWay.Droid PreferredExecutionTarget="Android.5c86e4357d63" />
<MonoDevelop.Ide.ItemProperties.ShardLib PreferredExecutionTarget="Android.Android_Accelerated_Oreo" />
- <MonoDevelop.Ide.Workbench ActiveDocument="Home.Ios/AppDelegate.cs">
+ <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Logic/CurrentDeviceState.cs">
<Files>
- <File FileName="Shared/Phone/Device/VideoIntercom/VideoMachine.cs" Line="181" Column="41" IsPinned="True" />
- <File FileName="Shared/Common/CommonPage.cs" Line="238" Column="74" IsPinned="True" />
- <File FileName="Shared/Phone/Category/CategoryMainForm.cs" Line="1" Column="1" />
- <File FileName="Shared/Phone/Device/Logic/Send.cs" Line="1302" Column="83" />
- <File FileName="Shared/Phone/MainPage/HomeMainPageForm.cs" Line="159" Column="39" />
- <File FileName="Home.Ios/AppDelegate.cs" Line="207" Column="23" />
- <File FileName="GateWay.Droid/Application.cs" />
- <File FileName="Shared/Phone/MainPage/ListRoomViewFrom.cs" />
- <File FileName="Shared/Phone/UserCenter/Residence/EditorRoomInforForm.cs" />
- <File FileName="Shared/Phone/UserView/HomePage.cs" />
- <File FileName="Shared/Phone/UserView/UserPage.cs" Line="32" Column="42" />
+ <File FileName="Shared/Phone/Device/Logic/CurrentDeviceState.cs" Line="22" Column="42" />
</Files>
<Pads>
<Pad Id="ProjectPad">
<State name="__root__">
<Node name="GateWay" expanded="True">
- <Node name="Home.IOS" expanded="True">
- <Node name="AppDelegate.cs" selected="True" />
- </Node>
+ <Node name="Home.IOS" expanded="True" />
<Node name="Shared" expanded="True">
- <Node name="Common" expanded="True" />
<Node name="Phone" expanded="True">
- <Node name="Category" expanded="True" />
<Node name="Device" expanded="True">
- <Node name="Logic" expanded="True" />
- <Node name="VideoIntercom" expanded="True" />
+ <Node name="Logic" expanded="True">
+ <Node name="CurrentDeviceState.cs" selected="True" />
+ </Node>
</Node>
- <Node name="MainPage" expanded="True" />
- <Node name="UserView" expanded="True" />
</Node>
</Node>
</Node>
diff --git a/ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide b/ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide
index 76536c7..8740293 100644
--- a/ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide
+++ b/ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide
Binary files differ
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/CurrentDeviceState.cs b/ZigbeeApp/Shared/Phone/Device/Logic/CurrentDeviceState.cs
index cb02f21..6906d88 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/CurrentDeviceState.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/CurrentDeviceState.cs
@@ -543,7 +543,8 @@
Send.dictionary(deviceConditionsInfo, "AttriButeData2", "0");
completeView.Show(l).AddChidren(openView.Show());
- openView.titleBtn.Text = Language.StringByID(MyInternationalizationString.OnOffSwitch) + common.DeviceEpoint.ToString();
+ openView.titleBtn.Text = LocalDevice.Current.GetDeviceEpointName(common);
+ //openView.titleBtn.Text =Language.StringByID(MyInternationalizationString.OnOffSwitch) + common.DeviceEpoint.ToString();
openView.lineBtn.BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor;
openView.clickviewBtn.MouseUpEventHandler += (sender, e) =>
{
--
Gitblit v1.8.0