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/UserCenter/Device/Bind/BindTargetsPage.cs | 107 ++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 76 insertions(+), 31 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindTargetsPage.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindTargetsPage.cs
index 1d6b571..b6a7c54 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindTargetsPage.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindTargetsPage.cs
@@ -32,24 +32,65 @@
this.currentKey = key;
}
- #region 鈼� 鍙橀噺鐢虫槑__________________________
- ZigBee.Device.Panel currentKey;//褰撳墠鎸夐敭瀵硅薄
- VerticalFrameRefreshControl midVerticalRefreshLayout;//鏄剧ず琚粦瀹氳澶囨垨鍦烘櫙鐨剉iew
- int currentClusterID = 0;//鎸夐敭褰撳墠绨嘔D
+ #region 鍙橀噺鐢虫槑
+ /// <summary>
+ /// 褰撳墠鎸夐敭瀵硅薄
+ /// </summary>
+ ZigBee.Device.Panel currentKey;
+ /// <summary>
+ /// 鏄剧ず琚粦瀹氳澶囨垨鍦烘櫙鐨剉iew
+ /// </summary>
+ VerticalFrameRefreshControl midVerticalRefreshLayout;
+ /// <summary>
+ /// 鎸夐敭褰撳墠绨嘔D
+ /// </summary>
+ int currentClusterID = 0;
+ /// <summary>
+ /// 绌烘暟鎹椂鐨勫浘鐗�
+ /// </summary>
Button entryStatusPic;
+ /// <summary>
+ /// 绌烘暟鎹殑鎻愮ず
+ /// </summary>
Button btnPicTip;
- Action<List<BindListResponseObj>> action;//鎸夐敭缁戝畾琛ㄩ�氱煡
- Action<List<BindListResponseObj>> devicBindAction;//璁惧琚粦瀹氶�氱煡
- private System.Collections.Generic.List<CommonDevice> localDeviceList = new System.Collections.Generic.List<CommonDevice>();//鏈湴璁惧鍒楄〃
- private System.Collections.Generic.List<SceneUI> scList = new System.Collections.Generic.List<SceneUI> { };//鏈湴鍦烘櫙鍒楄〃
- FrameLayout blankFrameLayout;//绌烘暟鎹樉绀哄竷灞�
- List<int> typeModeList;//鍔ㄦ�佽幏鍙栨寜閿敮鎸佺殑妯″紡澶х被鍨�
- public List<ScenesListInfo> gwScenesList = new List<ScenesListInfo>();//缃戝叧涓殑鍦烘櫙鍒楄〃
+ /// <summary>
+ /// 鎸夐敭缁戝畾琛ㄩ�氱煡
+ /// </summary>
+ Action<List<BindListResponseObj>> action;
+ /// <summary>
+ /// 璁惧琚粦瀹氶�氱煡
+ /// </summary>
+ Action<List<BindListResponseObj>> devicBindAction;
+ /// <summary>
+ /// 鏈湴璁惧鍒楄〃
+ /// </summary>
+ private System.Collections.Generic.List<CommonDevice> localDeviceList = new System.Collections.Generic.List<CommonDevice>();
+ /// <summary>
+ /// 鏈湴鍦烘櫙鍒楄〃
+ /// </summary>
+ private System.Collections.Generic.List<SceneUI> scList = new System.Collections.Generic.List<SceneUI> { };
+ /// <summary>
+ /// 绌烘暟鎹樉绀哄竷灞�
+ /// </summary>
+ FrameLayout blankFrameLayout;
+ /// <summary>
+ /// 鍔ㄦ�佽幏鍙栨寜閿敮鎸佺殑妯″紡澶х被鍨�
+ /// </summary>
+ List<int> typeModeList;
+ /// <summary>
+ /// 缃戝叧涓殑鍦烘櫙鍒楄〃
+ /// </summary>
+ public List<ScenesListInfo> gwScenesList = new List<ScenesListInfo>();
+ /// <summary>
+ /// 鏄惁鏀寔璇诲彇
+ /// </summary>
bool IsRead = false;
#endregion
- //鍒濆鍖栨寜閿暟鎹�
+ /// <summary>
+ /// 鍒濆鍖栨寜閿暟鎹�
+ /// </summary>
void InitListInfo()
{
System.Threading.Tasks.Task.Run(async () =>
@@ -64,7 +105,7 @@
localDeviceList.Add(dev);
}
//鑾峰彇鏈湴鍦烘櫙鍒楄〃
- scList = Shared.Common.Room.AllRoomSceneUIList;
+ scList = HdlSceneLogic.Current.GetAllRoomSceneList();
//鑾峰彇缃戝叧鍦烘櫙琛�
var gwSceneObj = await currentKey.GetSceneInfoAsync();
if (gwSceneObj != null && gwSceneObj.getSceneInfo != null)
@@ -97,7 +138,7 @@
{
currentClusterID = 258;
}
- currentKey.ReSave();
+
//璇诲彇鎸夐敭褰撳墠缁戝畾鐩爣
GetDeviceBindResponseAllData getBindList = null;
if (IsRead)
@@ -169,6 +210,7 @@
currentKey.currentKeySelectModeText = Language.StringByID(R.MyInternationalizationString.AddCurtain);
}
}
+ currentKey.ReSave();
}
#endregion
Application.RunOnMainThread(() =>
@@ -208,13 +250,14 @@
var btnAddFrameLayout = new FrameLayout()
{
- X = Application.GetRealWidth(913),
+ X = Application.GetRealWidth(888),
Width = Application.GetRealWidth(192),
};
this.titleFrameLayout.AddChidren(btnAddFrameLayout);
var btnBindAdd = new Button
{
+ X = Application.GetRealWidth(62),
Height = Application.GetRealHeight(72),
Width = Application.GetRealWidth(72),
UnSelectedImagePath = "BindPic/BindAdd.png",
@@ -429,7 +472,7 @@
}
if (isExistScene)
{
- curSceneUI = Room.CurrentRoom.GetSceneUIBySceneId(bindDevice.BindScenesId);
+ curSceneUI = HdlSceneLogic.Current.GetSceneUIBySceneId(bindDevice.BindScenesId);
devicePic.UnSelectedImagePath = "Scene/SceneIcon.png";
if (curSceneUI == null)
{
@@ -445,9 +488,10 @@
else
{
btnBindNameText = curSceneUI.Name;
- if (curSceneUI.GetZone() != null)
+ string myName = HdlSceneLogic.Current.GetZoneById(curSceneUI.Id);
+ if (myName != null)
{
- btnFloorRoomNameText = curSceneUI.GetZone();
+ btnFloorRoomNameText = myName;
}
}
}
@@ -460,7 +504,7 @@
if (tempDev != null)
{
//鑾峰彇璁惧鎵�灞炴埧闂�
- var tempDevRoom = Common.Room.CurrentRoom.GetRoomByDevice(tempDev);
+ var tempDevRoom = HdlRoomLogic.Current.GetRoomByDevice(tempDev);
if (tempDevRoom != null)
{
@@ -477,15 +521,13 @@
{
btnFloorRoomNameText = tempDevFloorName + "," + tempDevRoomName;
}
- }
- var deviceUi = Common.LocalDevice.Current.GetDeviceUI(tempDev);
- if (deviceUi != null)
- {
- devicePic.UnSelectedImagePath = deviceUi.IconPath;
- devicePic.Width = Application.GetRealWidth(110);
- devicePic.Text = "";
- }
- if (tempDev.DeviceEpointName == "")
+ }
+
+ devicePic.UnSelectedImagePath = tempDev.IconPath;
+ devicePic.Width = Application.GetRealWidth(110);
+ devicePic.Text = "";
+
+ if (string.IsNullOrEmpty(tempDev.DeviceEpointName))
{
btnBindNameText = tempDev.DeviceEpoint + Language.StringByID(R.MyInternationalizationString.uDeviceCircuit);
}
@@ -529,7 +571,7 @@
modeRowLayout.BackgroundColor = ZigbeeColor.Current.XMWhite;
midVerticalRefreshLayout.AddChidrenRow(modeRowLayout);
modeRowLayout.frameTable.UseClickStatu = false;
- modeRowLayout.frameTable.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.keyMode), 500);
+ modeRowLayout.frameTable.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.keyMode), 400);
var btnKeyModeTipText = "";
#region 褰撳墠妯″紡鏂囨湰鏄剧ず
switch (currentKey.panelMode)
@@ -575,7 +617,7 @@
break;
}
#endregion
- modeRowLayout.frameTable.AddMostRightView(btnKeyModeTipText, 500);
+ modeRowLayout.frameTable.AddMostRightView(btnKeyModeTipText, 800);
modeRowLayout.frameTable.AddBottomLine();
var btnDel = modeRowLayout.AddDeleteControl();
//涓�閿竻闄ゆ寜閿簨浠�
@@ -1060,7 +1102,10 @@
}
}
- //鑾峰彇鎸夐敭鏀寔鐨勫ぇ绫�
+ /// <summary>
+ /// 鑾峰彇鎸夐敭鏀寔鐨勫ぇ绫�
+ /// </summary>
+ /// <returns></returns>
private async System.Threading.Tasks.Task<List<int>> GetTypeMode()
{
if (typeModeList != null)
--
Gitblit v1.8.0