From 4e25d344065ffd9248a254ec9d11f0bb4bbbdb5e Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期一, 30 三月 2020 11:34:58 +0800
Subject: [PATCH] 2020-03-30-1
---
ZigbeeApp/Shared/Phone/Device/Logic/Send.cs | 4 +---
ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml | 14 ++++++++------
ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs | 4 ++--
ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs | 4 ++--
ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide | 0
ZigbeeApp/Shared/Phone/Device/Logic/CurrentDeviceState.cs | 2 +-
ZigbeeApp/Shared/Phone/Device/Logic/TemplatePage.cs | 4 ++--
7 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
index 34c29ec..03e3710 100644
--- a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
+++ b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
@@ -1,12 +1,13 @@
锘�<Properties StartupConfiguration="{28EDE1FF-20EF-476B-8AF8-24A3EEB69F45}|Default">
<MonoDevelop.Ide.ItemProperties.GateWay.Droid PreferredExecutionTarget="Android.5c86e4357d63" />
<MonoDevelop.Ide.ItemProperties.ShardLib PreferredExecutionTarget="Android.M7BBB18B19152766" />
- <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Logic/MemberList.cs">
+ <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Logic/CurrentDeviceState.cs">
<Files>
- <File FileName="Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs" Line="64" Column="10" />
- <File FileName="Shared/Phone/Device/Logic/Method.cs" Line="721" Column="7" />
- <File FileName="Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs" Line="327" Column="62" />
- <File FileName="Shared/Phone/Device/Logic/MemberList.cs" Line="1" Column="1" />
+ <File FileName="Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs" Line="78" Column="63" />
+ <File FileName="Shared/Phone/Device/Logic/Send.cs" Line="982" Column="41" />
+ <File FileName="Shared/Phone/Device/Logic/TemplatePage.cs" Line="351" Column="50" />
+ <File FileName="Shared/Phone/Device/Logic/RoomAndDeviceView.cs" Line="451" Column="45" />
+ <File FileName="Shared/Phone/Device/Logic/CurrentDeviceState.cs" Line="22" Column="43" />
</Files>
<Pads>
<Pad Id="ProjectPad">
@@ -19,12 +20,13 @@
<Node name="Resources" expanded="True" />
</Node>
<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="DoorLockLogic" expanded="True" />
- <Node name="MemberList.cs" selected="True" />
+ <Node name="CurrentDeviceState.cs" selected="True" />
</Node>
</Node>
</Node>
diff --git a/ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide b/ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide
index 9b139ba..37ff254 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 203f4c8..1ece0ed 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/CurrentDeviceState.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/CurrentDeviceState.cs
@@ -19,7 +19,7 @@
UserView.HomePage.Instance.ScrollEnabled = false;
CompleteView completeView = new CompleteView();
flMain.AddChidren(completeView.Show(1));
- completeView.Btntitle.Text = common.DeviceEpointName;
+ completeView.Btntitle.Text = LocalDevice.Current.GetDeviceEpointName(common);
EventHandler<MouseEventArgs> clickcancel = (sender, e) =>
{
if (!edit)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs
index 8f4a3b9..713aae9 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs
@@ -139,7 +139,7 @@
{
var deviceinof = Method.GetCommonDevice(conditions["MacAddr"], conditions["Epoint"]);
selecteddevice.deviceNameBtn.Visible = true;
- selecteddevice.deviceNameBtn.Text = deviceinof.DeviceEpointName;
+ selecteddevice.deviceNameBtn.Text = LocalDevice.Current.GetDeviceEpointName(deviceinof);
selecteddevice.regionNameBtn.Visible = true;
Method.RoomNmae(selecteddevice.regionNameBtn, deviceinof);
selecteddevice.edit.Tag = i;
@@ -245,7 +245,7 @@
{
var deviceinof = Method.GetCommonDevice(actions["DeviceAddr"].ToString(), actions["Epoint"].ToString());
- name = deviceinof.DeviceEpointName;
+ name =LocalDevice.Current.GetDeviceEpointName(deviceinof);
actiondevice.regionNameBtn.Visible = true;
Method.RoomNmae(actiondevice.regionNameBtn, deviceinof);
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs
index 22f7e6d..026bdf0 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs
@@ -280,7 +280,7 @@
case 1:
{
var deviceinof = Method.GetCommonDevice(conditions["MacAddr"], conditions["Epoint"]);
- name = deviceinof.DeviceEpointName;
+ name = LocalDevice.Current.GetDeviceEpointName(deviceinof);
selecteddevice.regionNameBtn.Visible = true;
Method.RoomNmae(selecteddevice.regionNameBtn, deviceinof);
@@ -724,7 +724,7 @@
{
var deviceinof = Method.GetCommonDevice(actions["DeviceAddr"].ToString(), actions["Epoint"].ToString());
- name = deviceinof.DeviceEpointName;
+ name = LocalDevice.Current.GetDeviceEpointName(deviceinof);
actiondevice.regionNameBtn.Visible = true;
Method.RoomNmae(actiondevice.regionNameBtn, deviceinof);
switch (deviceinof.Type)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs b/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs
index 2ae0329..cc681d2 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs
@@ -934,7 +934,7 @@
{
string s = null;
var str = await WebClientAsync(0, CommonPage.RequestHttpsHost + "/App/GetHomePager");//涓嶅悓鍖哄煙鍩熷悕鍓嶇紑涓嶄竴鏍�
- // var str = await WebClientAsync(0, "https://global.hdlcontrol.com/HangZhouHdlCloudApi/App/GetHomePager");
+
var jObject = JObject.Parse(str);
if (jObject == null || jObject["StateCode"].ToString() != "Success")
{
@@ -959,13 +959,11 @@
residential.IsOtherAccountCtrl = true;
residential.doorlockmac = doorlockMac;
residential.Url = CommonPage.RequestHttpsHost + "/App/GetSharedHomeApiControl";
- //residential.Url = "https://global.hdlcontrol.com/HangZhouHdlCloudApi/App/GetSharedHomeApiControl";
s = await ReadUserDoorLock(residential);
}
else
{
residential.Url = CommonPage.RequestHttpsHost + "/DoorLock/GetDoorLockPager";
- //residential.Url = "https://global.hdlcontrol.com/HangZhouHdlCloudApi/DoorLock/GetDoorLockPager";
residential.Token = Config.Instance.Token;
residential.Id = Config.Instance.HomeId;
residential.IsOtherAccountCtrl = false;
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/TemplatePage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/TemplatePage.cs
index d781ff4..00d4b6c 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/TemplatePage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/TemplatePage.cs
@@ -215,7 +215,7 @@
{
var deviceinof = Method.GetCommonDevice(conditions["MacAddr"], conditions["Epoint"]);
selecteddevice.deviceNameBtn.Visible = true;
- selecteddevice.deviceNameBtn.Text = deviceinof.DeviceEpointName;
+ selecteddevice.deviceNameBtn.Text = LocalDevice.Current.GetDeviceEpointName(deviceinof);
selecteddevice.regionNameBtn.Visible = true;
Method.RoomNmae(selecteddevice.regionNameBtn, deviceinof);
selecteddevice.iconBtn.UnSelectedImagePath ="ZigeeLogic/sensor13.png";
@@ -356,7 +356,7 @@
{
var deviceinof = Method.GetCommonDevice(actions["DeviceAddr"].ToString(), actions["Epoint"].ToString());
actiondevice.deviceNameBtn.Visible = true;
- actiondevice.deviceNameBtn.Text = deviceinof.DeviceEpointName;
+ actiondevice.deviceNameBtn.Text = LocalDevice.Current.GetDeviceEpointName(deviceinof);
actiondevice.regionNameBtn.Visible = true;
Method.RoomNmae(actiondevice.regionNameBtn, deviceinof);
switch (deviceinof.Type)
--
Gitblit v1.8.0