From a5b3c4bae726ef6770d4bfcbf2f4b50a37ed4a15 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期五, 06 三月 2020 15:31:36 +0800
Subject: [PATCH] 删除了郭雪城的 DeviceUi 这个类
---
ZigbeeApp/Shared/Phone/Device/Category/CategoryAddScene.cs | 75 ++++++++++++++++++-------------------
1 files changed, 37 insertions(+), 38 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Category/CategoryAddScene.cs b/ZigbeeApp/Shared/Phone/Device/Category/CategoryAddScene.cs
index c0f80dd..ba9b610 100755
--- a/ZigbeeApp/Shared/Phone/Device/Category/CategoryAddScene.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Category/CategoryAddScene.cs
@@ -5,6 +5,7 @@
using Shared.Phone.Device.CommonForm;
using Shared.Phone.Device.Room;
using Shared.Phone.UserCenter;
+using ZigBee.Device;
using static ZigBee.Device.Scene;
namespace Shared.Phone.Device.Category
@@ -157,15 +158,15 @@
string devNameText = string.Empty;
if (targetDevice.Type == 0)
{
- if (targetDevice.DeviceUI == null || targetDevice.DeviceUI.CommonDevice == null) continue;
+ if (targetDevice.DeviceUI == null ) continue;
devImgPath = targetDevice.DeviceUI.IconPath;
- devNameText = Common.LocalDevice.Current.GetDeviceEpointName(targetDevice.DeviceUI.CommonDevice);
+ devNameText = Common.LocalDevice.Current.GetDeviceEpointName(targetDevice.DeviceUI);
var targetRow = new SceneTargetFunctionRow(13);
targetRow.Init();
targetRow.SetIcon(devImgPath);
targetRow.SetNameText(devNameText);
- targetRow.SetZoneText(targetDevice.DeviceUI.GetZone());
+ targetRow.SetZoneText(HdlRoomLogic.Current.GetRoomNameByDevice(targetDevice.DeviceUI, ","));
targetRow.SetStatuText(targetDevice.GetDeviceStatu());
targetRowLayout.AddChidren(targetRow);
if (i == sceneTargetDevicesList.Count - 1)
@@ -195,7 +196,7 @@
targetRow.Init();
targetRow.SetIcon(devImgPath);
targetRow.SetNameText(devNameText);
- targetRow.SetZoneText(targetDevice.SceneUI.GetZone());
+ targetRow.SetZoneText(HdlSceneLogic.Current.GetZoneById(targetDevice.SceneUI.Id));
targetRowLayout.AddChidren(targetRow);
if (i == sceneTargetDevicesList.Count - 1)
{
@@ -221,7 +222,7 @@
{
if (targetDevice.Type == 0)
{
- if (targetDevice.DeviceUI == null || targetDevice.DeviceUI.CommonDevice == null)
+ if (targetDevice.DeviceUI == null)
{
return;
}
@@ -471,7 +472,7 @@
confirmBtn = new CommonForm.CompleteButton(1656, 907, 127);
- confirmBtn.TextID = R.MyInternationalizationString.Next;
+ confirmBtn.TextID = R.MyInternationalizationString.uFinish;
AddChidren(confirmBtn);
if (isModify)
@@ -497,7 +498,7 @@
}
else
{
- zoneRow.SetTitle($"{Config.Instance.Home.GetFloorNameById(modifyRoom.FloorId)},{modifyRoom.Name}");
+ zoneRow.SetTitle($"{Config.Instance.Home.GetFloorNameById(modifyRoom.FloorId)}锛寋modifyRoom.Name}");
}
curRoom = modifyRoom;
sceneTargetDevicesList.AddRange(modifySceneTargetDevicesList);
@@ -683,7 +684,7 @@
zone.ZoneAction += (selectRoom) =>
{
curRoom = selectRoom;
- zoneRow.SetTitle(selectRoom.GetZoneName());
+ zoneRow.SetTitle(HdlRoomLogic.Current.GetZoneName(selectRoom));
};
};
zoneRow.ClickBtn.MouseUpEventHandler += zoneHander;
@@ -873,7 +874,7 @@
var fileName = $"SceneIcon_{tradeTime}.png";
if (modifySceneUI.Name != nameRow.NameText.Text.Trim())
{
- if (Common.Room.CurrentRoom.GetSameFloorScenes(curRoom.FloorId).Find(s => s.Name == nameRow.NameText.Text.Trim()) != null)
+ if (HdlSceneLogic.Current.GetSameFloorScenes(curRoom.FloorId).Find(s => s.Name == nameRow.NameText.Text.Trim()) != null)
{
CommonFormResouce.ShowTip(Language.StringByID(R.MyInternationalizationString.TheSceneHadExist));
return;
@@ -919,7 +920,7 @@
if (sceneTarget.Type == 0)
{
- if (sceneTarget.DeviceUI == null || sceneTarget.DeviceUI.CommonDevice == null)
+ if (sceneTarget.DeviceUI == null)
{
continue;
}
@@ -927,8 +928,8 @@
{
Type = 0,
ScenesId = 0,
- DeviceAddr = sceneTarget.DeviceUI.CommonDevice.DeviceAddr,
- Epoint = sceneTarget.DeviceUI.CommonDevice.DeviceEpoint,
+ DeviceAddr = sceneTarget.DeviceUI.DeviceAddr,
+ Epoint = sceneTarget.DeviceUI.DeviceEpoint,
TaskList = sceneTarget.TaskList,
DelayTime = 0,
MemberNumber = i + 1
@@ -967,15 +968,15 @@
var sceneTarget = modifySceneTargetDevicesList[i];
if (sceneTarget.Type == 0)
{
- if (sceneTarget.DeviceUI == null || sceneTarget.DeviceUI.CommonDevice == null)
+ if (sceneTarget.DeviceUI == null)
{
continue;
}
var removeDevice = new RemoveSceneDeviceListInfo
{
Type = 0,
- DeviceAddr = sceneTarget.DeviceUI.CommonDevice.DeviceAddr,
- Epoint = sceneTarget.DeviceUI.CommonDevice.DeviceEpoint,
+ DeviceAddr = sceneTarget.DeviceUI.DeviceAddr,
+ Epoint = sceneTarget.DeviceUI.DeviceEpoint,
MemberNumber = sceneTarget.DelayTimeSerialNumber
};
removeSceneDeviceListInfoList.Add(removeDevice);
@@ -1003,15 +1004,13 @@
}
sceneRemoveMemberData.DeviceList = removeSceneDeviceListInfoList;
sceneRemoveMemberData.ScenesId = modifySceneUI.Id;
- var result = await curRoom.ModifyScene(modifySceneUI, sceneRemoveMemberData, memberDataList);
+ var result = await HdlSceneLogic.Current.ModifyScene(modifySceneUI, sceneRemoveMemberData, memberDataList);
if (result == 1)
{
if (modifyRoom != curRoom)
{
- modifyRoom.SceneUIList.Remove(modifySceneUI);
- modifyRoom.SceneUIFilePathList.Remove(modifySceneUI.FileName);
- curRoom.SceneUIList.Add(modifySceneUI);
- curRoom.SceneUIFilePathList.Add(modifySceneUI.FileName);
+ modifyRoom.ListSceneId.Remove(modifySceneUI.Id);
+ curRoom.ListSceneId.Add(modifySceneUI.Id);
modifyRoom.Save();
curRoom.Save();
}
@@ -1075,7 +1074,7 @@
if (sceneTarget.Type == 0)
{
- if (sceneTarget.DeviceUI == null || sceneTarget.DeviceUI.CommonDevice == null)
+ if (sceneTarget.DeviceUI == null)
{
continue;
}
@@ -1083,8 +1082,8 @@
{
Type = 0,
ScenesId = 0,
- DeviceAddr = sceneTarget.DeviceUI.CommonDevice.DeviceAddr,
- Epoint = sceneTarget.DeviceUI.CommonDevice.DeviceEpoint,
+ DeviceAddr = sceneTarget.DeviceUI.DeviceAddr,
+ Epoint = sceneTarget.DeviceUI.DeviceEpoint,
TaskList = sceneTarget.TaskList,
DelayTime = 0,
MemberNumber = i+1
@@ -1116,7 +1115,7 @@
}
}
- var result = await curRoom.AddScene(nameRow.NameText.Text, imgPath, memberDataList, IconPathType);
+ var result = await HdlSceneLogic.Current.AddScene(curRoom, nameRow.NameText.Text, imgPath, memberDataList, IconPathType);
if (result == 1)
{
AddAction?.Invoke();
@@ -1154,7 +1153,7 @@
/// ShowSelectAction
/// </summary>
/// <param name="device"></param>
- private void ShowSelectAction(DeviceUI device, SceneTargetDeviceUI sceneTarget)
+ private void ShowSelectAction(CommonDevice device, SceneTargetDeviceUI sceneTarget)
{
var dialog = new FrameLayout()
{
@@ -1167,23 +1166,23 @@
dialog.RemoveFromParent();
};
- if (device.CommonDevice.Type == ZigBee.Device.DeviceType.OnOffOutput)
+ if (device.Type == ZigBee.Device.DeviceType.OnOffOutput)
{
SelectOnoffOutput(dialog, device, sceneTarget);
}
- else if (device.CommonDevice.Type == ZigBee.Device.DeviceType.AirSwitch)
+ else if (device.Type == ZigBee.Device.DeviceType.AirSwitch)
{
SelectOnoffOutput(dialog, device, sceneTarget);
}
- else if (device.CommonDevice.Type == ZigBee.Device.DeviceType.DimmableLight)
+ else if (device.Type == ZigBee.Device.DeviceType.DimmableLight)
{
SelectDimmableLight(dialog, device, sceneTarget);
}
- else if (device.CommonDevice.Type == ZigBee.Device.DeviceType.WindowCoveringDevice)
+ else if (device.Type == ZigBee.Device.DeviceType.WindowCoveringDevice)
{
SelectWindowCoveringDevice(dialog, device, sceneTarget);
}
- else if (device.CommonDevice.Type == ZigBee.Device.DeviceType.Thermostat)
+ else if (device.Type == ZigBee.Device.DeviceType.Thermostat)
{
SelectThermostat(dialog, device, sceneTarget);
}
@@ -1195,7 +1194,7 @@
/// <param name="dialog"></param>
/// <param name="device"></param>
/// <param name="sceneTarget"></param>
- private void SelectOnoffOutput(FrameLayout dialog, DeviceUI device, SceneTargetDeviceUI sceneTarget)
+ private void SelectOnoffOutput(FrameLayout dialog, CommonDevice device, SceneTargetDeviceUI sceneTarget)
{
var selectFL = new FrameLayout
{
@@ -1244,7 +1243,7 @@
Gravity = Gravity.CenterHorizontal,
TextColor = ZigbeeColor.Current.GXCTextBlackColor,
TextSize = 16,
- Text = Common.LocalDevice.Current.GetDeviceEpointName(device.CommonDevice)
+ Text = Common.LocalDevice.Current.GetDeviceEpointName(device)
};
titleFL.AddChidren(deviceName);
@@ -1351,7 +1350,7 @@
/// <param name="dialog"></param>
/// <param name="device"></param>
/// <param name="sceneTarget"></param>
- private void SelectWindowCoveringDevice(FrameLayout dialog, DeviceUI device, SceneTargetDeviceUI sceneTarget)
+ private void SelectWindowCoveringDevice(FrameLayout dialog, CommonDevice device, SceneTargetDeviceUI sceneTarget)
{
var selectFL = new FrameLayout
{
@@ -1400,7 +1399,7 @@
Gravity = Gravity.CenterHorizontal,
TextColor = ZigbeeColor.Current.GXCTextBlackColor,
TextSize = 16,
- Text = Common.LocalDevice.Current.GetDeviceEpointName(device.CommonDevice)
+ Text = Common.LocalDevice.Current.GetDeviceEpointName(device)
};
titleFL.AddChidren(deviceName);
@@ -1516,7 +1515,7 @@
/// <param name="dialog"></param>
/// <param name="device"></param>
/// <param name="sceneTarget"></param>
- private void SelectDimmableLight(FrameLayout dialog, DeviceUI device, SceneTargetDeviceUI sceneTarget)
+ private void SelectDimmableLight(FrameLayout dialog, CommonDevice device, SceneTargetDeviceUI sceneTarget)
{
var selectFL = new FrameLayout
{
@@ -1566,7 +1565,7 @@
TextColor = ZigbeeColor.Current.GXCTextBlackColor,
TextSize = 16,
TextAlignment = TextAlignment.CenterLeft,
- Text = Common.LocalDevice.Current.GetDeviceEpointName(device.CommonDevice)
+ Text = Common.LocalDevice.Current.GetDeviceEpointName(device)
};
titleFL.AddChidren(deviceName);
@@ -1682,7 +1681,7 @@
/// <param name="dialog"></param>
/// <param name="device"></param>
/// <param name="sceneTarget"></param>
- private void SelectThermostat(FrameLayout dialog, DeviceUI device, SceneTargetDeviceUI sceneTarget)
+ private void SelectThermostat(FrameLayout dialog, CommonDevice device, SceneTargetDeviceUI sceneTarget)
{
/// 娓╁害
int tempId=0;
@@ -1739,7 +1738,7 @@
TextColor = ZigbeeColor.Current.GXCTextBlackColor,
TextSize = 16,
TextAlignment = TextAlignment.CenterLeft,
- Text = Common.LocalDevice.Current.GetDeviceEpointName(device.CommonDevice)
+ Text = Common.LocalDevice.Current.GetDeviceEpointName(device)
};
titleFL.AddChidren(deviceName);
--
Gitblit v1.8.0