From 66a9965c44ecc32a6696abca876ab9d1cd091584 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期五, 28 二月 2020 15:25:13 +0800
Subject: [PATCH] 2020.2.28
---
ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindTargetsPage.cs | 719 +++++++++++++++++++++++++++--------------------------------
1 files changed, 325 insertions(+), 394 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindTargetsPage.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindTargetsPage.cs
index 3e41259..3ea1cc6 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindTargetsPage.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindTargetsPage.cs
@@ -34,8 +34,7 @@
#region 鈼� 鍙橀噺鐢虫槑__________________________
ZigBee.Device.Panel currentKey;//褰撳墠鎸夐敭瀵硅薄
- VerticalRefreshLayout midVerticalRefreshLayout;//鏄剧ず琚粦瀹氳澶囨垨鍦烘櫙鐨剉iew
- FrameLayout topFrameLayout;//鏄剧ず褰撳墠妯″紡view
+ VerticalFrameRefreshControl midVerticalRefreshLayout;//鏄剧ず琚粦瀹氳澶囨垨鍦烘櫙鐨剉iew
int currentClusterID = 0;//鎸夐敭褰撳墠绨嘔D
Button entryStatusPic;
Button btnPicTip;
@@ -44,19 +43,19 @@
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;
+ List<int> typeModeList;//鍔ㄦ�佽幏鍙栨寜閿敮鎸佺殑妯″紡澶х被鍨�
+ public List<ScenesListInfo> gwScenesList = new List<ScenesListInfo>();//缃戝叧涓殑鍦烘櫙鍒楄〃
+ bool IsRead = false;
+
#endregion
//鍒濆鍖栨寜閿暟鎹�
- private void InitListInfo()
+ void InitListInfo()
{
System.Threading.Tasks.Task.Run(async () =>
{
try
{
- Application.RunOnMainThread(() =>
- {
- });
localDeviceList.Clear();
scList.Clear();
//鑾峰彇鏈湴璁惧鍒楄〃
@@ -66,7 +65,14 @@
}
//鑾峰彇鏈湴鍦烘櫙鍒楄〃
scList = Shared.Common.Room.AllRoomSceneUIList;
-
+ //鑾峰彇缃戝叧鍦烘櫙琛�
+ var gwSceneObj = await currentKey.GetSceneInfoAsync();
+ if (gwSceneObj != null && gwSceneObj.getSceneInfo != null)
+ {
+ gwScenesList = gwSceneObj.getSceneInfo.ScenesList;
+ }
+ //鍔ㄦ�佽幏鍙栨寜閿敮鎸佺殑澶х被
+ typeModeList = await GetTypeMode();
#region 璇诲彇闈㈡澘褰撳墠妯″紡
//璇诲彇鎸夐敭褰撳墠妯″紡
var tempDeata = await currentKey.ReadPanelConfigureInfoAsync();
@@ -91,78 +97,81 @@
{
currentClusterID = 258;
}
- currentKey.ReSave();
- //璇诲彇鎸夐敭褰撳墠缁戝畾鐩爣
- var getBindList = await currentKey.GetDeviceBindAsync();
- var bindDeviceListTemp = new System.Collections.Generic.List<BindListResponseObj> { };
- var bindSceneListTemp = new System.Collections.Generic.List<BindListResponseObj> { };
- if (getBindList != null && getBindList.getAllBindResponseData != null)
- {
- currentKey.bindList.Clear();
- foreach (var b in getBindList.getAllBindResponseData.BindList)
- {
- if (b.BindCluster == currentClusterID)
- {
- if (b.BindCluster == 6)
- {
- if (b.BindType == 2)
- {
- bindSceneListTemp.Add(b);
- }
- else
- {
- bindDeviceListTemp.Add(b);
- }
- }
- else
+ //璇诲彇鎸夐敭褰撳墠缁戝畾鐩爣
+ GetDeviceBindResponseAllData getBindList = null;
+ if (IsRead)
+ {
+ getBindList = await currentKey.GetDeviceBindAsync();
+ var bindDeviceListTemp = new System.Collections.Generic.List<BindListResponseObj> { };
+ var bindSceneListTemp = new System.Collections.Generic.List<BindListResponseObj> { };
+ if (getBindList != null && getBindList.getAllBindResponseData != null)
+ {
+ currentKey.bindList.Clear();
+ foreach (var b in getBindList.getAllBindResponseData.BindList)
+ {
+ if (b.BindCluster == currentClusterID)
{
- if (currentClusterID == 8)
+ if (b.BindCluster == 6)
{
- if (b.BindCluster == 8)
+
+ if (b.BindType == 2)
{
- currentKey.bindList.Add(b);
+ bindSceneListTemp.Add(b);
+ }
+ else
+ {
+ bindDeviceListTemp.Add(b);
}
}
else
{
- currentKey.bindList.Add(b);
+ if (currentClusterID == 8)
+ {
+ if (b.BindCluster == 8)
+ {
+ currentKey.bindList.Add(b);
+ }
+ }
+ else
+ {
+ currentKey.bindList.Add(b);
+ }
}
}
}
}
- }
- else
- {
- Application.RunOnMainThread(() =>
+ else
{
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
- });
+ Application.RunOnMainThread(() =>
+ {
+ CommonPage.Loading.Hide();
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
+ return;
+ });
+ }
+ if (currentKey.panelMode == 1)
+ {
+ currentKey.bindList = bindSceneListTemp;
+ currentKey.currentKeySelectModeText = Language.StringByID(R.MyInternationalizationString.AddScene);
+ }
+ else if (currentKey.panelMode == 100 || currentKey.panelMode == 101 || currentKey.panelMode == 102)
+ {
+ currentKey.bindList = bindDeviceListTemp;
+ currentKey.currentKeySelectModeText = Language.StringByID(R.MyInternationalizationString.AddSwitch);
+ }
+ else if (currentKey.panelMode == 200 || currentKey.panelMode == 201 || currentKey.panelMode == 203 || currentKey.panelMode == 204 || currentKey.panelMode == 205)
+ {
+ currentKey.currentKeySelectModeText = Language.StringByID(R.MyInternationalizationString.AddDimmer);
+ }
+ else if (currentKey.panelMode == 300 || currentKey.panelMode == 301 || currentKey.panelMode == 302 || currentKey.panelMode == 303 || currentKey.panelMode == 304)
+ {
+ currentKey.currentKeySelectModeText = Language.StringByID(R.MyInternationalizationString.AddCurtain);
+ }
}
-
- if (currentKey.panelMode == 1)
- {
- currentKey.bindList = bindSceneListTemp;
- currentKey.currentKeySelectModeText = Language.StringByID(R.MyInternationalizationString.AddScene);
- }
- else if (currentKey.panelMode == 100 || currentKey.panelMode == 101 || currentKey.panelMode == 102)
- {
- currentKey.bindList = bindDeviceListTemp;
- currentKey.currentKeySelectModeText = Language.StringByID(R.MyInternationalizationString.AddSwitch);
- }
- else if (currentKey.panelMode == 200 || currentKey.panelMode == 201 || currentKey.panelMode == 203 || currentKey.panelMode == 204 || currentKey.panelMode == 205)
- {
- currentKey.currentKeySelectModeText = Language.StringByID(R.MyInternationalizationString.AddDimmer);
- }
- else if (currentKey.panelMode == 300 || currentKey.panelMode == 301 || currentKey.panelMode == 302 || currentKey.panelMode == 303 || currentKey.panelMode == 304)
- {
- currentKey.currentKeySelectModeText = Language.StringByID(R.MyInternationalizationString.AddCurtain);
- }
+ currentKey.ReSave();
}
- #endregion
-
- //鍔ㄦ�佽幏鍙栨寜閿敮鎸佺殑澶х被
- typeModeList = await GetTypeMode();
+ #endregion
Application.RunOnMainThread(() =>
{
RefreshList();
@@ -174,7 +183,6 @@
Application.RunOnMainThread(() =>
{
CommonPage.Loading.Hide();
-
new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
});
return;
@@ -190,7 +198,7 @@
public void Show()
{
#region TopFrameLayout
- this.TopFrameLayout(this, Language.StringByID(R.MyInternationalizationString.AddBindTargets));
+ this.TopFrameLayout(this, Language.StringByID(R.MyInternationalizationString.PanelBindTargets));
EventHandler<MouseEventArgs> eHandlerBack = (sender, e) =>
{
RemoveFromParent();
@@ -201,13 +209,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",
@@ -224,7 +233,7 @@
{
currentClusterID = 6;
currentKey.panelMode = 1;
- var addScenePage = new Shared.Phone.UserCenter.DeviceBind.AddScenePage(currentKey);
+ var addScenePage = new Shared.Phone.UserCenter.DeviceBind.AddScenePage(currentKey, gwScenesList);
Shared.Phone.UserView.HomePage.Instance.AddChidren(addScenePage);
Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
addScenePage.Show();
@@ -295,6 +304,14 @@
#endregion
CommonPage.Loading.Start("");
middleFrameLayout();
+ if (currentKey.bindList.Count == 0)
+ {
+ IsRead = true;
+ }
+ else
+ {
+ IsRead = false;
+ }
InitListInfo();
}
@@ -303,22 +320,17 @@
/// </summary>
void middleFrameLayout()
{
- midVerticalRefreshLayout = new VerticalRefreshLayout()
+ midVerticalRefreshLayout = new VerticalFrameRefreshControl(29)
{
};
this.midFrameLayout.AddChidren(midVerticalRefreshLayout);
midVerticalRefreshLayout.BeginHeaderRefreshingAction += () =>
{
midVerticalRefreshLayout.BeginHeaderRefreshing();
+ IsRead = true;
InitListInfo();
midVerticalRefreshLayout.EndHeaderRefreshing();
};
- topFrameLayout = new FrameLayout
- {
- Height = Application.GetMinRealAverage(0),
- BackgroundColor = Shared.Common.ZigbeeColor.Current.XMWhite,
- };
- midVerticalRefreshLayout.AddChidren(topFrameLayout);
BlankPicUI();
}
@@ -349,6 +361,7 @@
TextColor = Shared.Common.ZigbeeColor.Current.XMGray3,
Gravity = Gravity.CenterHorizontal,
Visible = false,
+ TextSize = 12,
};
blankFrameLayout.AddChidren(btnPicTip);
}
@@ -360,13 +373,6 @@
midVerticalRefreshLayout.RemoveAll();
this.midFrameLayout.RemoveAll();
middleFrameLayout();
- var frameLayoutRow = new FrameLayout()
- {
- Height = Application.GetMinRealAverage(0),
- BackgroundColor = Shared.Common.ZigbeeColor.Current.XMWhite,
- };
- midVerticalRefreshLayout.AddChidren(frameLayoutRow);
-
#region 鏁版嵁澶勭悊
if (currentKey.bindList.Count == 0)
{
@@ -387,12 +393,10 @@
blankFrameLayout.Height = Application.GetRealHeight(0);
if (currentKey.panelMode == 1)
{
- topFrameLayout.Height = Application.GetRealHeight(0);
midVerticalRefreshLayout.Y = Application.GetRealHeight(0);
}
else
{
- topFrameLayout.Height = Application.GetRealHeight(150);
BindModeDisplay();
}
int curIndex = 0;
@@ -403,61 +407,17 @@
SceneUI curSceneUI = null;
bool isExistScene = false;
- var rowLayout = new RowLayout()
- {
- Height = Application.GetRealHeight(150),
- X = Application.GetRealWidth(58),
- Y = curIndex * Application.GetRealHeight(150),
- Width = Application.GetRealWidth(965),
- LineColor = Shared.Common.ZigbeeColor.Current.XMRowLine,
- };
- frameLayoutRow.AddChidren(rowLayout);
-
- #region 缁戝畾琛║I鏄撅紙鏃犳暟鎹鐞嗭級
- var devicePic = new Button()
- {
- Y = Application.GetRealHeight(35),
- Width = Application.GetMinRealAverage(81),
- Height = Application.GetMinRealAverage(81),
- };
- rowLayout.AddChidren(devicePic);
-
- var btnBindName = new Button()
- {
- Width = Application.GetRealWidth(1080 - 173),
- Height = Application.GetRealHeight(60),
- X = Application.GetRealWidth(173 - 58),
- Y = Application.GetRealHeight(20),
- TextSize = 14,
- TextColor = Shared.Common.ZigbeeColor.Current.XMBlack,
- TextAlignment = TextAlignment.CenterLeft,
- };
- rowLayout.AddChidren(btnBindName);
-
- var btnFloorRoomName = new Button()
- {
- Width = Application.GetRealWidth(1080 - 173),
- Height = Application.GetRealHeight(49),
- X = Application.GetRealWidth(173 - 58),
- Y = Application.GetRealHeight(81),
- TextColor = Shared.Common.ZigbeeColor.Current.XMGray3,
- TextSize = 14,
- TextAlignment = TextAlignment.CenterLeft,
- };
- rowLayout.AddChidren(btnFloorRoomName);
-
- var btnDel = new Button()
- {
- TextColor = Shared.Common.ZigbeeColor.Current.GXCTextWhiteColor,
- Width = Application.GetRealWidth(184),
- TextID = R.MyInternationalizationString.DelBindDevice,
- BackgroundColor = Shared.Common.ZigbeeColor.Current.DelRowLayout,
- };
- rowLayout.AddRightView(btnDel);
- #endregion
+ var rowLayout = new RowLayoutControl(midVerticalRefreshLayout.rowSpace / 2);
+ rowLayout.BackgroundColor = ZigbeeColor.Current.XMWhite;
+ midVerticalRefreshLayout.AddChidrenRow(rowLayout);
+ rowLayout.frameTable.UseClickStatu = false;
+ var devicePic = rowLayout.frameTable.AddLeftIcon();
+ devicePic.UnSelectedImagePath = "DoorLock/DoorLockUserPic.png";
#region 缁戝畾鏁版嵁澶勭悊
int currentIndex = i;
+ var btnBindNameText = "";
+ var btnFloorRoomNameText = "";
if (currentIndex == currentKey.bindList.Count - 1)
{
rowLayout.LineColor = Shared.Common.ZigbeeColor.Current.XMWhite;
@@ -477,19 +437,19 @@
{
if (string.IsNullOrEmpty(bindDevice.ESName))
{
- btnBindName.Text = Language.StringByID(R.MyInternationalizationString.OffLineScene) + "_" + "ID" + "_" + bindDevice.BindScenesId.ToString();
+ btnBindNameText = Language.StringByID(R.MyInternationalizationString.OffLineScene) + "_" + "ID" + "_" + bindDevice.BindScenesId.ToString();
}
else
{
- btnBindName.Text = Language.StringByID(R.MyInternationalizationString.OffLineScene) + "_" + bindDevice.ESName;
+ btnBindNameText = Language.StringByID(R.MyInternationalizationString.OffLineScene) + "_" + bindDevice.ESName;
}
}
else
{
- btnBindName.Text = curSceneUI.Name;
+ btnBindNameText = curSceneUI.Name;
if (curSceneUI.GetZone() != null)
{
- btnFloorRoomName.Text = curSceneUI.GetZone();
+ btnFloorRoomNameText = curSceneUI.GetZone();
}
}
}
@@ -513,11 +473,11 @@
var tempDevFloorName = Common.Config.Instance.Home.GetFloorNameById(tempDevFloorId);
if (string.IsNullOrEmpty(tempDevFloorName))
{
- btnFloorRoomName.Text = tempDevRoomName;
+ btnFloorRoomNameText = tempDevRoomName;
}
else
{
- btnFloorRoomName.Text = tempDevFloorName + "," + tempDevRoomName;
+ btnFloorRoomNameText = tempDevFloorName + "," + tempDevRoomName;
}
}
var deviceUi = Common.LocalDevice.Current.GetDeviceUI(tempDev);
@@ -527,18 +487,18 @@
devicePic.Width = Application.GetRealWidth(110);
devicePic.Text = "";
}
- if (tempDev.DeviceEpointName == "")
+ if (string.IsNullOrEmpty(tempDev.DeviceEpointName))
{
- btnBindName.Text = tempDev.DeviceEpoint + Language.StringByID(R.MyInternationalizationString.uDeviceCircuit);
+ btnBindNameText = tempDev.DeviceEpoint + Language.StringByID(R.MyInternationalizationString.uDeviceCircuit);
}
else
{
- btnBindName.Text = tempDev.DeviceEpointName;
+ btnBindNameText = tempDev.DeviceEpointName;
}
}
else
{
- btnBindName.Text = bindDevice.BindMacAddr + "_" + bindDevice.BindEpoint;
+ btnBindNameText = bindDevice.BindMacAddr + "_" + bindDevice.BindEpoint;
devicePic.Width = Application.GetMinRealAverage(200);
devicePic.TextAlignment = TextAlignment.CenterLeft;
devicePic.TextColor = UserCenterColor.Current.Gray;
@@ -547,14 +507,17 @@
}
}
- //鍒犻櫎浜嬩欢澶勭悊
- btnDel.MouseUpEventHandler += async (sender, e) =>
+ var btnBindName = rowLayout.frameTable.AddTopView(btnBindNameText, 800);
+ var btnFloorRoomName = rowLayout.frameTable.AddBottomView(btnFloorRoomNameText, 800);
+ rowLayout.frameTable.AddBottomLine();
+ var btnDel = rowLayout.AddDeleteControl();
+ btnDel.ButtonClickEvent += async (sender, e) =>
{
RemoveTargets(bindDevice, btnDel);
};
#endregion
}
- frameLayoutRow.Height = currentKey.bindList.Count * Application.GetRealHeight(150);
+ midVerticalRefreshLayout.AdjustTableHeight(Application.GetRealHeight(23));
}
#endregion
}
@@ -564,164 +527,122 @@
/// </summary>
public void BindModeDisplay()
{
- #region modeRowLayout
- var modeRowLayout = new RowLayout()
- {
- Height = Application.GetRealHeight(150),
- X = Application.GetRealWidth(58),
- Width = Application.GetRealWidth(965),
- LineColor = Shared.Common.ZigbeeColor.Current.XMRowLine,
- };
- topFrameLayout.AddChidren(modeRowLayout);
-
- var btnKeyMode = new Button
- {
- Y = Application.GetRealHeight(63),
- Width = Application.GetMinRealAverage(294),
- Height = Application.GetMinRealAverage(58),
- Text = Language.StringByID(R.MyInternationalizationString.keyMode),
- TextColor = Shared.Common.ZigbeeColor.Current.XMBlack,
- TextAlignment = TextAlignment.CenterLeft,
- };
- modeRowLayout.AddChidren(btnKeyMode);
-
- var btnKeyModeTip = new Button
- {
- X = Application.GetRealWidth(374 - 58),
- Y = Application.GetRealHeight(63),
- Width = Application.GetMinRealAverage(615),
- Height = Application.GetMinRealAverage(58),
- TextAlignment = TextAlignment.CenterRight,
- TextColor = Shared.Common.ZigbeeColor.Current.XMGray3,
- };
- modeRowLayout.AddChidren(btnKeyModeTip);
-
- var btnDel = new Button()
- {
- Width = Application.GetMinRealAverage(184),
- TextColor = Shared.Common.ZigbeeColor.Current.GXCTextWhiteColor,
- TextID = R.MyInternationalizationString.DelBindDevice,
- BackgroundColor = Shared.Common.ZigbeeColor.Current.DelRowLayout,
- };
- modeRowLayout.AddRightView(btnDel);
- #endregion
-
+ var modeRowLayout = new RowLayoutControl(midVerticalRefreshLayout.rowSpace / 2);
+ modeRowLayout.BackgroundColor = ZigbeeColor.Current.XMWhite;
+ midVerticalRefreshLayout.AddChidrenRow(modeRowLayout);
+ modeRowLayout.frameTable.UseClickStatu = false;
+ modeRowLayout.frameTable.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.keyMode), 400);
+ var btnKeyModeTipText = "";
#region 褰撳墠妯″紡鏂囨湰鏄剧ず
switch (currentKey.panelMode)
{
case 100:
- btnKeyModeTip.TextID = R.MyInternationalizationString.OnOffOn;
+ btnKeyModeTipText = Language.StringByID(R.MyInternationalizationString.OnOffOn);
break;
case 101:
- btnKeyModeTip.TextID = R.MyInternationalizationString.OnOffoFF;
+ btnKeyModeTipText = Language.StringByID(R.MyInternationalizationString.OnOffoFF);
break;
case 102:
- btnKeyModeTip.TextID = R.MyInternationalizationString.OnOffOnOff;
+ btnKeyModeTipText = Language.StringByID(R.MyInternationalizationString.OnOffOnOff);
break;
case 200:
- btnKeyModeTip.TextID = R.MyInternationalizationString.DimmerMode1;
+ btnKeyModeTipText = Language.StringByID(R.MyInternationalizationString.DimmerMode1);
break;
case 201:
- btnKeyModeTip.TextID = R.MyInternationalizationString.DimmerMode2;
+ btnKeyModeTipText = Language.StringByID(R.MyInternationalizationString.DimmerMode2);
break;
case 203:
- btnKeyModeTip.TextID = R.MyInternationalizationString.DimmerMode3;
+ btnKeyModeTipText = Language.StringByID(R.MyInternationalizationString.DimmerMode3);
break;
case 204:
- btnKeyModeTip.TextID = R.MyInternationalizationString.DimmerMode4;
+ btnKeyModeTipText = Language.StringByID(R.MyInternationalizationString.DimmerMode4);
break;
case 205:
- btnKeyModeTip.TextID = R.MyInternationalizationString.DimmerMode5;
+ btnKeyModeTipText = Language.StringByID(R.MyInternationalizationString.DimmerMode5);
break;
case 300:
- btnKeyModeTip.TextID = R.MyInternationalizationString.WcdUp;
+ btnKeyModeTipText = Language.StringByID(R.MyInternationalizationString.WcdUp);
break;
case 301:
- btnKeyModeTip.TextID = R.MyInternationalizationString.WcdDown;
+ btnKeyModeTipText = Language.StringByID(R.MyInternationalizationString.WcdDown);
break;
case 302:
- btnKeyModeTip.TextID = R.MyInternationalizationString.WcdStop;
+ btnKeyModeTipText = Language.StringByID(R.MyInternationalizationString.WcdStop);
break;
case 303:
- btnKeyModeTip.TextID = R.MyInternationalizationString.WcdUpStop;
+ btnKeyModeTipText = Language.StringByID(R.MyInternationalizationString.WcdUpStop);
break;
case 304:
- btnKeyModeTip.TextID = R.MyInternationalizationString.WcdDownStop;
+ btnKeyModeTipText = Language.StringByID(R.MyInternationalizationString.WcdDownStop);
break;
}
#endregion
-
+ modeRowLayout.frameTable.AddMostRightView(btnKeyModeTipText, 800);
+ modeRowLayout.frameTable.AddBottomLine();
+ var btnDel = modeRowLayout.AddDeleteControl();
//涓�閿竻闄ゆ寜閿簨浠�
- btnDel.MouseUpEventHandler += async (sender, e) =>
+ btnDel.ButtonClickEvent += async (sender, e) =>
{
- var alert = new Alert(Language.StringByID(R.MyInternationalizationString.Tip), Language.StringByID(R.MyInternationalizationString.SureClearKeyModeAndTargets),
- Language.StringByID(R.MyInternationalizationString.Cancel), Language.StringByID(R.MyInternationalizationString.Confrim));
+ string msg = Language.StringByID(R.MyInternationalizationString.ClearAllTargets).Replace("{0}", "\r\n");
+ var alert = new Shared.Phone.UserCenter.ShowMsgControl(ShowMsgType.Confirm, msg, Language.StringByID(R.MyInternationalizationString.DoorlockConfirm));
alert.Show();
-
- alert.ResultEventHandler += async (s1, e1) =>
- {
- if (e1)
- {
- bool isDelSuccess = false;
- try
- {
- CommonPage.Loading.Start("");
- var bindResult = await currentKey.ClearBindInfoAsync();
- if (bindResult != null && bindResult.clearBindInfoResponseData != null)
- {
- if (bindResult.clearBindInfoResponseData.Result != 0)
- {
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.RemoveFailed), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnDel);
- CommonPage.Loading.Hide();
- return;
- }
- else
- {
- var temp = await currentKey.ConfigureHdlKeyValueAsync(Panel.KeyMode.Default);
- if (temp.setWritableValueResponData?.Status != 0)
- {
- var temp1 = await currentKey.ConfigureHdlKeyValueAsync(Panel.KeyMode.Default);
- if (temp1.setWritableValueResponData?.Status != 0)
- {
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.ChangeBindMode), Direction = AMPopTipDirection.Up, CloseTime = 2 }.Show(btnDel);
- }
- else
- {
- isDelSuccess = true;
- }
- }
- else
- {
- isDelSuccess = true;
- }
- }
- }
- else
- {
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.Up, CloseTime = 2 }.Show(btnDel);
- }
- }
- catch { }
- finally
- {
- if (isDelSuccess)
- {
- currentKey.panelMode = 65535;
- currentKey.bindList.Clear();
- RefreshList();
- //濡傛灉鏄満鏅紝鐢ㄦ埛鍒犻櫎娓呯┖褰撳墠鍒版埧闂村垪琛�
- currentKey.RoomId = "";
- currentKey.ReSave();
- }
- CommonPage.Loading.Hide();
- }
- }
- else
- {
-
- }
- };
-
+ //浣跨敤纭鍨嬪脊妗嗘椂,鐨勫洖璋冨嚱鏁�
+ alert.ConfirmClickEvent += async () =>
+ {
+ bool isDelSuccess = false;
+ try
+ {
+ CommonPage.Loading.Start("");
+ var bindResult = await currentKey.ClearBindInfoAsync();
+ if (bindResult != null && bindResult.clearBindInfoResponseData != null)
+ {
+ if (bindResult.clearBindInfoResponseData.Result != 0)
+ {
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.RemoveFailed), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnDel);
+ CommonPage.Loading.Hide();
+ return;
+ }
+ else
+ {
+ var temp = await currentKey.ConfigureHdlKeyValueAsync(Panel.KeyMode.Default);
+ if (temp.setWritableValueResponData?.Status != 0)
+ {
+ var temp1 = await currentKey.ConfigureHdlKeyValueAsync(Panel.KeyMode.Default);
+ if (temp1.setWritableValueResponData?.Status != 0)
+ {
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.ChangeBindMode), Direction = AMPopTipDirection.Up, CloseTime = 2 }.Show(btnDel);
+ }
+ else
+ {
+ isDelSuccess = true;
+ }
+ }
+ else
+ {
+ isDelSuccess = true;
+ }
+ }
+ }
+ else
+ {
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.Up, CloseTime = 2 }.Show(btnDel);
+ }
+ }
+ catch { }
+ finally
+ {
+ if (isDelSuccess)
+ {
+ currentKey.panelMode = 65535;
+ currentKey.bindList.Clear();
+ RefreshList();
+ //濡傛灉鏄満鏅紝鐢ㄦ埛鍒犻櫎娓呯┖褰撳墠鍒版埧闂村垪琛�
+ currentKey.RoomId = "";
+ currentKey.ReSave();
+ }
+ CommonPage.Loading.Hide();
+ }
+ };
};
}
@@ -800,6 +721,7 @@
Y = Application.GetRealHeight(69),
TextColor = Shared.Common.ZigbeeColor.Current.XMGray3,
TextSize = 14,
+ IsBold = false,
TextAlignment = TextAlignment.CenterLeft,
};
rowView.AddChidren(btnMethodText);
@@ -814,27 +736,37 @@
};
rowView.AddChidren(line2);
+ if (string.IsNullOrEmpty(currentKey.currentKeySelectModeText) && value == 1)
+ {
+ btnMethodText.TextColor = Shared.Common.ZigbeeColor.Current.XMBlack;
+ btnMethodText.IsBold = true;
+ oldbuttonText = btnMethodText;
+ }
if (currentKey.currentKeySelectModeText == Language.StringByID(R.MyInternationalizationString.AddScene) && value == 1)
{
btnMethodText.TextColor = Shared.Common.ZigbeeColor.Current.XMBlack;
+ btnMethodText.IsBold = true;
oldbuttonText = btnMethodText;
}
else if (currentKey.currentKeySelectModeText == Language.StringByID(R.MyInternationalizationString.AddSwitch) && value == 100)
{
btnMethodText.TextColor = Shared.Common.ZigbeeColor.Current.XMBlack;
+ btnMethodText.IsBold = true;
oldbuttonText = btnMethodText;
}
else if (currentKey.currentKeySelectModeText == Language.StringByID(R.MyInternationalizationString.AddDimmer) && value == 200)
{
btnMethodText.TextColor = Shared.Common.ZigbeeColor.Current.XMBlack;
+ btnMethodText.IsBold = true;
oldbuttonText = btnMethodText;
}
else if (currentKey.currentKeySelectModeText == Language.StringByID(R.MyInternationalizationString.AddCurtain) && value == 300)
{
btnMethodText.TextColor = Shared.Common.ZigbeeColor.Current.XMBlack;
+ btnMethodText.IsBold = true;
oldbuttonText = btnMethodText;
}
- #endregion
+ #endregion
#region 鏁版嵁澶勭悊
switch (value)
@@ -857,21 +789,25 @@
if (currentKey.currentKeySelectModeText == Language.StringByID(R.MyInternationalizationString.AddScene) && value == 1)
{
btnMethodText.TextColor = Shared.Common.ZigbeeColor.Current.XMBlack;
+ btnMethodText.IsBold = true;
oldbuttonText = btnMethodText;
}
if (currentKey.currentKeySelectModeText == Language.StringByID(R.MyInternationalizationString.AddSwitch) && value == 100)
{
btnMethodText.TextColor = Shared.Common.ZigbeeColor.Current.XMBlack;
+ btnMethodText.IsBold = true;
oldbuttonText = btnMethodText;
}
if (currentKey.currentKeySelectModeText == Language.StringByID(R.MyInternationalizationString.AddDimmer) && value == 200)
{
btnMethodText.TextColor = Shared.Common.ZigbeeColor.Current.XMBlack;
+ btnMethodText.IsBold = true;
oldbuttonText = btnMethodText;
}
if (currentKey.currentKeySelectModeText == Language.StringByID(R.MyInternationalizationString.AddCurtain) && value == 300)
{
btnMethodText.TextColor = Shared.Common.ZigbeeColor.Current.XMBlack;
+ btnMethodText.IsBold = true;
oldbuttonText = btnMethodText;
}
#endregion
@@ -896,47 +832,39 @@
var bindSc = currentKey.bindList.Find(obj => (obj.BindType == 2));
if (bindSc != null)
{
- var alert = new Alert(Language.StringByID(R.MyInternationalizationString.Tip), Language.StringByID(R.MyInternationalizationString.DelLocalBindListThenAddAgain),
- Language.StringByID(R.MyInternationalizationString.Cancel), Language.StringByID(R.MyInternationalizationString.Confrim));
+ string msg = Language.StringByID(R.MyInternationalizationString.DelLocalBindListThenAddAgain);
+ var alert = new Shared.Phone.UserCenter.ShowMsgControl(ShowMsgType.Confirm, msg, Language.StringByID(R.MyInternationalizationString.DoorlockConfirm));
alert.Show();
+ //浣跨敤纭鍨嬪脊妗嗘椂,鐨勫洖璋冨嚱鏁�
+ alert.ConfirmClickEvent += async () =>
+ {
+ var result = await RemoveTargets(bindSc, line2);
+ if (result == 0)
+ {
+ var addScenePage = new Shared.Phone.UserCenter.DeviceBind.AddScenePage(currentKey, gwScenesList);
+ Shared.Phone.UserView.HomePage.Instance.AddChidren(addScenePage);
+ Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
+ addScenePage.Show();
- alert.ResultEventHandler += async (s1, e1) =>
- {
- if (e1)
- {
- var result = await RemoveTargets(bindSc, line2);
- if (result == 0)
- {
- var addScenePage = new Shared.Phone.UserCenter.DeviceBind.AddScenePage(currentKey);
- Shared.Phone.UserView.HomePage.Instance.AddChidren(addScenePage);
- Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
- addScenePage.Show();
-
- Action<List<BindListResponseObj>> action = (obj) =>
- {
- currentKey.bindList = obj;
- RefreshList();
- };
- addScenePage.action += action;
- dialog.Close();
- }
- else
- {
- currentKey.currentKeySelectModeText = oldKeySelectModeText;
- dialog.Close();
- }
- }
- else
- {
- currentKey.currentKeySelectModeText = oldKeySelectModeText;
- dialog.Close();
- }
- };
+ Action<List<BindListResponseObj>> action = (obj) =>
+ {
+ currentKey.bindList = obj;
+ RefreshList();
+ };
+ addScenePage.action += action;
+ dialog.Close();
+ }
+ else
+ {
+ currentKey.currentKeySelectModeText = oldKeySelectModeText;
+ dialog.Close();
+ }
+ };
}
}
else
{
- var addScenePage = new Shared.Phone.UserCenter.DeviceBind.AddScenePage(currentKey);
+ var addScenePage = new Shared.Phone.UserCenter.DeviceBind.AddScenePage(currentKey, gwScenesList);
Shared.Phone.UserView.HomePage.Instance.AddChidren(addScenePage);
Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
addScenePage.Show();
@@ -957,42 +885,34 @@
var bindSc = currentKey.bindList.Find(obj => (obj.BindType == 2));
if (bindSc != null)
{
- var alert = new Alert(Language.StringByID(R.MyInternationalizationString.Tip), Language.StringByID(R.MyInternationalizationString.DelLocalBindListThenAddAgain1),
- Language.StringByID(R.MyInternationalizationString.Cancel), Language.StringByID(R.MyInternationalizationString.Confrim));
+ string msg = Language.StringByID(R.MyInternationalizationString.DelLocalBindListThenAddAgain1);
+ var alert = new Shared.Phone.UserCenter.ShowMsgControl(ShowMsgType.Confirm, msg, Language.StringByID(R.MyInternationalizationString.DoorlockConfirm));
alert.Show();
+ //浣跨敤纭鍨嬪脊妗嗘椂,鐨勫洖璋冨嚱鏁�
+ alert.ConfirmClickEvent += async () =>
+ {
+ var result = await RemoveTargets(bindSc, line2);
+ if (result == 0)
+ {
+ var addDevicePage = new Shared.Phone.UserCenter.DeviceBind.AddDevicePage(currentKey, "AddSwitch");
+ Shared.Phone.UserView.HomePage.Instance.AddChidren(addDevicePage);
+ Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
+ addDevicePage.Show();
- alert.ResultEventHandler += async (s1, e1) =>
- {
- if (e1)
- {
- var result = await RemoveTargets(bindSc, line2);
- if (result == 0)
- {
- var addDevicePage = new Shared.Phone.UserCenter.DeviceBind.AddDevicePage(currentKey, "AddSwitch");
- Shared.Phone.UserView.HomePage.Instance.AddChidren(addDevicePage);
- Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
- addDevicePage.Show();
-
- Action<List<BindListResponseObj>> action = (obj) =>
- {
- currentKey.bindList = obj;
- RefreshList();
- };
- addDevicePage.actionAddDevicePage += action;
- dialog.Close();
- }
- else
- {
- currentKey.currentKeySelectModeText = oldKeySelectModeText;
- dialog.Close();
- }
- }
- else
- {
- currentKey.currentKeySelectModeText = oldKeySelectModeText;
- dialog.Close();
- }
- };
+ Action<List<BindListResponseObj>> action = (obj) =>
+ {
+ currentKey.bindList = obj;
+ RefreshList();
+ };
+ addDevicePage.actionAddDevicePage += action;
+ dialog.Close();
+ }
+ else
+ {
+ currentKey.currentKeySelectModeText = oldKeySelectModeText;
+ dialog.Close();
+ }
+ };
}
}
else
@@ -1018,41 +938,48 @@
var bindSc = currentKey.bindList.Find(obj => (obj.BindType == 2));
if (bindSc != null)
{
- var alert = new Alert(Language.StringByID(R.MyInternationalizationString.Tip), Language.StringByID(R.MyInternationalizationString.DelLocalBindListThenAddAgain2),
- Language.StringByID(R.MyInternationalizationString.Cancel), Language.StringByID(R.MyInternationalizationString.Confrim));
- alert.Show();
-
- alert.ResultEventHandler += async (s1, e1) =>
+ var dialog1 = new Dialog { };
+ var doorDialog = new Shared.Phone.UserCenter.DoorLock.DoorlockDialog(dialog1, Language.StringByID(R.MyInternationalizationString.Tip));
+ doorDialog.Show();
+ doorDialog.dialogMidFraFrameLayout.Height = Application.GetRealHeight(58);
+ doorDialog.dialogMidFraFrameLayout.X = Application.GetRealWidth(0);
+ doorDialog.dialogMidFraFrameLayout.Y = Application.GetRealHeight(202);
+ doorDialog.dialogMidFraFrameLayout.AddChidren(doorDialog.dialogMidText);
+ doorDialog.dialogMidText.Text = Language.StringByID(R.MyInternationalizationString.DelLocalBindListThenAddAgain2);
+ doorDialog.dialogMidFraFrameLayout.AddChidren(doorDialog.dialogMidText);
+ doorDialog.dialogBtnConfirm.Text = Language.StringByID(R.MyInternationalizationString.DoorlockConfirm);
+ doorDialog.dialogBtnCancel.MouseUpEventHandler += (sender1, e1) =>
{
- if (e1)
+ currentKey.currentKeySelectModeText = oldKeySelectModeText;
+ dialog.Close();
+ dialog1.Close();
+ };
+ doorDialog.dialogBtnConfirm.MouseUpEventHandler += async (sender1, e1) =>
+ {
+ var result = await RemoveTargets(bindSc, line2);
+ if (result == 0)
{
- var result = await RemoveTargets(bindSc, line2);
- if (result == 0)
- {
- var addDevicePage = new Shared.Phone.UserCenter.DeviceBind.AddDevicePage(currentKey, "AddDimmer");
- Shared.Phone.UserView.HomePage.Instance.AddChidren(addDevicePage);
- Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
- addDevicePage.Show();
+ var addDevicePage = new Shared.Phone.UserCenter.DeviceBind.AddDevicePage(currentKey, "AddDimmer");
+ Shared.Phone.UserView.HomePage.Instance.AddChidren(addDevicePage);
+ Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
+ addDevicePage.Show();
- Action<List<BindListResponseObj>> action = (obj) =>
- {
- currentKey.bindList = obj;
- RefreshList();
- };
- addDevicePage.actionAddDevicePage += action;
- dialog.Close();
- }
- else
+ Action<List<BindListResponseObj>> action = (obj) =>
{
- currentKey.currentKeySelectModeText = oldKeySelectModeText;
- dialog.Close();
- }
+ currentKey.bindList = obj;
+ RefreshList();
+ };
+ addDevicePage.actionAddDevicePage += action;
+ dialog.Close();
+ dialog1.Close();
}
else
{
currentKey.currentKeySelectModeText = oldKeySelectModeText;
dialog.Close();
+ dialog1.Close();
}
+
};
}
}
@@ -1071,8 +998,6 @@
addDevicePage.actionAddDevicePage += action;
dialog.Close();
}
-
-
}
if (currentKey.currentKeySelectModeText == Language.StringByID(R.MyInternationalizationString.AddCurtain))
{
@@ -1081,32 +1006,37 @@
var bindSc = currentKey.bindList.Find(obj => (obj.BindType == 2));
if (bindSc != null)
{
- var alert = new Alert(Language.StringByID(R.MyInternationalizationString.Tip), Language.StringByID(R.MyInternationalizationString.DelLocalBindListThenAddAgain3),
- Language.StringByID(R.MyInternationalizationString.Cancel), Language.StringByID(R.MyInternationalizationString.Confrim));
- alert.Show();
-
- alert.ResultEventHandler += async (s1, e1) =>
+ var dialog1 = new Dialog { };
+ var doorDialog = new Shared.Phone.UserCenter.DoorLock.DoorlockDialog(dialog1, Language.StringByID(R.MyInternationalizationString.Tip));
+ doorDialog.Show();
+ doorDialog.dialogMidFraFrameLayout.Height = Application.GetRealHeight(58);
+ doorDialog.dialogMidFraFrameLayout.X = Application.GetRealWidth(0);
+ doorDialog.dialogMidFraFrameLayout.Y = Application.GetRealHeight(202);
+ doorDialog.dialogMidFraFrameLayout.AddChidren(doorDialog.dialogMidText);
+ doorDialog.dialogMidText.Text = Language.StringByID(R.MyInternationalizationString.DelLocalBindListThenAddAgain3);
+ doorDialog.dialogMidFraFrameLayout.AddChidren(doorDialog.dialogMidText);
+ doorDialog.dialogBtnConfirm.Text = Language.StringByID(R.MyInternationalizationString.DoorlockConfirm);
+ doorDialog.dialogBtnCancel.MouseUpEventHandler += (sender1, e1) =>
{
- if (e1)
- {
- var addDevicePage = new Shared.Phone.UserCenter.DeviceBind.AddDevicePage(currentKey, "AddCurtain");
- Shared.Phone.UserView.HomePage.Instance.AddChidren(addDevicePage);
- Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
- addDevicePage.Show();
+ currentKey.currentKeySelectModeText = oldKeySelectModeText;
+ dialog.Close();
+ dialog1.Close();
+ };
+ doorDialog.dialogBtnConfirm.MouseUpEventHandler += async (sender1, e1) =>
+ {
+ var addDevicePage = new Shared.Phone.UserCenter.DeviceBind.AddDevicePage(currentKey, "AddCurtain");
+ Shared.Phone.UserView.HomePage.Instance.AddChidren(addDevicePage);
+ Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
+ addDevicePage.Show();
- Action<List<BindListResponseObj>> action = (obj) =>
- {
- currentKey.bindList = obj;
- RefreshList();
- };
- addDevicePage.actionAddDevicePage += action;
- dialog.Close();
- }
- else
+ Action<List<BindListResponseObj>> action = (obj) =>
{
- currentKey.currentKeySelectModeText = oldKeySelectModeText;
- dialog.Close();
- }
+ currentKey.bindList = obj;
+ RefreshList();
+ };
+ addDevicePage.actionAddDevicePage += action;
+ dialog.Close();
+ dialog1.Close();
};
}
}
@@ -1325,3 +1255,4 @@
}
}
}
+
--
Gitblit v1.8.0