From a4924de3136289d10cabbf2f61a228387d44ded7 Mon Sep 17 00:00:00 2001 From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local> Date: 星期四, 07 十一月 2019 13:48:36 +0800 Subject: [PATCH] Merge branch 'dev-tzy' into DEV_GXC --- ZigbeeApp/Shared/Phone/UserCenter/SharedContent/SearchConfigureSharedMainForm.cs | 703 ++++++++++++++++++++++++++++++++++------------------------ 1 files changed, 411 insertions(+), 292 deletions(-) diff --git a/ZigbeeApp/Shared/Phone/UserCenter/SharedContent/SearchConfigureSharedMainForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/SharedContent/SearchConfigureSharedMainForm.cs index ae6cfbb..a962d6c 100755 --- a/ZigbeeApp/Shared/Phone/UserCenter/SharedContent/SearchConfigureSharedMainForm.cs +++ b/ZigbeeApp/Shared/Phone/UserCenter/SharedContent/SearchConfigureSharedMainForm.cs @@ -1,7 +1,6 @@ 锘縰sing System; using System.Collections.Generic; using System.Text; -using System.Threading.Tasks; using ZigBee.Device; namespace Shared.Phone.UserCenter.SharedContent @@ -9,315 +8,451 @@ /// <summary> /// 鏌ョ湅宸查厤缃叡浜唴瀹圭殑涓荤晫闈� /// </summary> - public class SearchConfigureSharedMainForm : UserCenterCommonForm + public class SearchConfigureSharedMainForm : EditorCommonForm { #region 鈻� 鍙橀噺澹版槑___________________________ /// <summary> - /// 璁惧鍒楄〃鎺т欢 + /// 鏌ョ湅鐨勬埧闂村璞� /// </summary> - private VerticalScrolViewLayout listDeviceView = null; - /// <summary> - /// 鍦烘櫙鍒楄〃鎺т欢 - /// </summary> - private VerticalScrolViewLayout listSceneView = null; - /// <summary> - /// 鎴愬憳淇℃伅 - /// </summary> - private MemberInfoRes memberResult = null; + private Common.Room lookRoom = null; /// <summary> /// 鎴愬憳鐨勫垎浜暟鎹� /// </summary> private MemberShardInfoData memberShardInfo = null; /// <summary> - /// 鎴块棿瀵硅薄 + /// 璁惧妗屽竷鎺т欢 /// </summary> - private Common.Room room = null; + private FrameLayout frameDeviceTable = null; /// <summary> - /// Tab鐨勯�夋嫨銆�1锛氬姛鑳絋ab 2锛氬満鏅疶ab - /// </summary> - private int TabSelectIndex = 1; + /// 璁惧妗屽竷鎺т欢 + /// </summary> + private FrameLayout frameSceneTable = null; + /// <summary> + /// 鍒犻櫎鎸夐挳 + /// </summary> + private BottomClickButton btnDelete = null; + /// <summary> + /// 閫夋嫨鐨勫満鏅� + /// </summary> + private Dictionary<int, Common.SceneUI> dicSelectScene = new Dictionary<int, Common.SceneUI>(); + /// <summary> + /// 閫夋嫨鐨勮澶� + /// </summary> + private Dictionary<string, CommonDevice> dicSelectDevice = new Dictionary<string, CommonDevice>(); + /// <summary> + /// 褰撳墠閫夋嫨鐨勫垎鏀� 1锛氬満鏅� 2锛氬姛鑳� + /// </summary> + private int nowSwitchIndex = 1; + /// <summary> + /// 褰撳墠閫夋嫨鐨勮澶囩储寮� + /// </summary> + private string nowDeviceIndex = string.Empty; + #endregion #region 鈻� 鍒濆鍖朹____________________________ /// <summary> /// 鐢婚潰鏄剧ず(搴曞眰浼氬浐瀹氳皟鐢ㄦ鏂规硶锛屽�熶互瀹屾垚鐢婚潰鍒涘缓) - /// </summary> - /// <param name="i_room">鎴块棿淇℃伅</param> - /// <param name="i_memberResult">鎴愬憳淇℃伅</param> - /// <param name="i_memberShardInfo">鎴愬憳鐨勫垎浜暟鎹�</param> - public void ShowForm(Common.Room i_room, MemberInfoRes i_memberResult, MemberShardInfoData i_memberShardInfo) - { - this.memberResult = i_memberResult; - this.room = i_room; - this.memberShardInfo = i_memberShardInfo; - - //璁剧疆澶撮儴淇℃伅 - base.SetTitleText(i_room.Name); - - //鍒濆鍖栦腑閮ㄤ俊鎭� - this.InitMiddleFrame(); - } - - /// <summary> - /// 鍒濆鍖栦腑閮ㄤ俊鎭� - /// </summary> - private void InitMiddleFrame() - { - bodyFrameLayout.RemoveAll(); + /// </summary> + /// <param name="i_room">鏌ョ湅鐨勬埧闂村璞�</param> + /// <param name="i_memberShardInfo">鎴愬憳鐨勫垎浜暟鎹�</param> + public void ShowForm(Common.Room i_room, MemberShardInfoData i_memberShardInfo) + { + this.lookRoom = i_room; + this.memberShardInfo = i_memberShardInfo; - //鍒濆鍖朤ab鎺т欢 - var frame = this.InitTabControl(); + //璁剧疆澶撮儴淇℃伅 + base.SetTitleText(i_room.Name); - this.listDeviceView = new VerticalScrolViewLayout(); - listDeviceView.Y = frame.Bottom; - listDeviceView.Height = bodyFrameLayout.Height - frame.Bottom; - listDeviceView.Visible = this.TabSelectIndex == 1; - bodyFrameLayout.AddChidren(listDeviceView); - - this.listSceneView = new VerticalScrolViewLayout(); - listSceneView.Y = frame.Bottom; - listSceneView.Height = bodyFrameLayout.Height - frame.Bottom; - listSceneView.Visible = this.TabSelectIndex == 2; - bodyFrameLayout.AddChidren(listSceneView); - - new System.Threading.Thread(() => - { - //鍒濆鍖栧姛鑳絋ab鍒楄〃 - this.InitFunctionTabList(); - //鍒濆鍖栧満鏅疶ab鍒楄〃 - this.InitSceneTabList(); - }) - { IsBackground = true }.Start(); + //鍒濆鍖栦腑閮ㄤ俊鎭� + this.InitMiddleFrame(); } - #endregion - - #region 鈻� 鍒濆鍖朤ab鎺т欢______________________ - /// <summary> - /// 鍒濆鍖朤ab鎺т欢 + /// 鍒濆鍖栦腑閮ㄤ俊鎭� /// </summary> - /// <returns></returns> - private FrameLayout InitTabControl() + private void InitMiddleFrame() { - //Tab鍒囨崲鎺т欢 - var frameSwich = new FrameLayout(); - frameSwich.Height = Application.GetRealHeight(150); - frameSwich.BackgroundColor = UserCenterColor.Current.TopFrameLayout; - bodyFrameLayout.AddChidren(frameSwich); - - //鍔熻兘 - var btnFunction = new ViewNormalControl(frameSwich.Width / 2, Application.GetRealHeight(100)); - btnFunction.Gravity = Gravity.CenterVertical; - btnFunction.TextID = R.MyInternationalizationString.Function; - btnFunction.TextAlignment = TextAlignment.Center; - btnFunction.TextColor = UserCenterColor.Current.SelectTextColor; - btnFunction.TextAlignment = TextAlignment.Center; - frameSwich.AddChidren(btnFunction); - - //鍦烘櫙 - var btnScene = new ViewNormalControl(frameSwich.Width / 2, Application.GetRealHeight(100)); - btnScene.Gravity = Gravity.CenterVertical; - btnScene.X = frameSwich.Width / 2; - btnScene.TextID = R.MyInternationalizationString.uScence; - btnScene.TextAlignment = TextAlignment.Center; - frameSwich.AddChidren(btnScene); - - //绾� - var btnLine = new ProgressLine(); - btnLine.Gravity = Gravity.BottomLeft; - frameSwich.AddChidren(btnLine); - btnLine.SetValue(50, true); - - if (this.TabSelectIndex == 2) + //娓呯┖bodyFrame + this.ClearBodyFrame(); + this.dicSelectDevice = new Dictionary<string, CommonDevice>(); + this.dicSelectScene = new Dictionary<int, Common.SceneUI>(); + + //鍒濆鍖栨甯冩帶浠� + this.frameSceneTable = new FrameLayout(); + frameSceneTable.Y = Application.GetRealHeight(132); + frameSceneTable.Height = bodyFrameLayout.Height - Application.GetRealHeight(132); + bodyFrameLayout.AddChidren(frameSceneTable); + + this.frameDeviceTable = new FrameLayout(); + frameDeviceTable.Y = frameSceneTable.Y; + frameDeviceTable.Height = frameSceneTable.Height; + bodyFrameLayout.AddChidren(frameDeviceTable); + frameDeviceTable.Visible = false; + + //鍒濆鍖栧垎鏀帶浠� + this.InitSwitchControl(); + + //鍒犻櫎鎸夐挳 + this.btnDelete = new BottomClickButton(); + btnDelete.BackgroundColor = 0xfff75858; + btnDelete.TextID = R.MyInternationalizationString.uDelete; + bodyFrameLayout.AddChidren(btnDelete); + btnDelete.Visible = false; + btnDelete.ButtonClickEvent += (sender, e) => { - btnScene.TextColor = UserCenterColor.Current.SelectTextColor; - btnFunction.TextColor = Common.ZigbeeColor.Current.TextColor; - btnLine.SetValue(50, false); - } - - //鍔熻兘Tab - btnFunction.MouseUpEventHandler += (sender, e) => - { - if (this.TabSelectIndex == 1) - { - return; - } - btnScene.TextColor = Common.ZigbeeColor.Current.TextColor; - btnFunction.TextColor = UserCenterColor.Current.SelectTextColor; - btnLine.SetValue(50); - this.TabSelectIndex = 1; - - //闅愯棌鍦烘櫙鍒楄〃鎺т欢,鏄剧ず璁惧鍒楄〃鎺т欢 - this.listSceneView.Visible = false; - this.listDeviceView.Visible = true; - }; - - //鍦烘櫙Tab - btnScene.MouseUpEventHandler += (sender, e) => - { - if (this.TabSelectIndex == 2) - { - return; - } - btnScene.TextColor = UserCenterColor.Current.SelectTextColor; - btnFunction.TextColor = Common.ZigbeeColor.Current.TextColor; - btnLine.SetValue(50, false); - this.TabSelectIndex = 2; - - //闅愯棌璁惧鍒楄〃鎺т欢,鏄剧ず鍦烘櫙鍒楄〃鎺т欢 - this.listDeviceView.Visible = false; - this.listSceneView.Visible = true; + //鍒犻櫎鍒嗕韩 + this.DeleteShardData(); }; - return frameSwich; + //鍒濆鍖栧満鏅垪琛� + this.InitSceneList(); + //鍒濆鍔熻兘鍒楄〃 + this.InitFunctionList(); + } + + /// <summary> + /// 鍒濆鍖栧垎鏀帶浠� + /// </summary> + private void InitSwitchControl() + { + var tabControl = new SceneFunctionSwitchControl(); + tabControl.Y = Application.GetRealHeight(40); + bodyFrameLayout.AddChidren(tabControl); + //璁剧疆鍒濆鍖栧�� + tabControl.SetDefultIndex(nowSwitchIndex); + tabControl.SelectTabEvent += (tabIndex) => + { + this.nowSwitchIndex = tabIndex; + if (tabIndex == 1) + { + //鏄剧ず鍦烘櫙鍒楄〃 + this.frameSceneTable.Visible = true; + this.frameDeviceTable.Visible = false; + } + else + { + //鏄剧ず鍔熻兘鍒楄〃 + this.frameSceneTable.Visible = false; + this.frameDeviceTable.Visible = true; + } + }; + tabControl.InitControl(); } #endregion - #region 鈻� 鏄剧ず鍔熻兘Tab鍒楄〃____________________ + #region 鈻� 鍦烘櫙鏄剧ず___________________________ /// <summary> - /// 鍒濆鍖栧姛鑳絋ab鍒楄〃 + /// 鍒濆鍖栧満鏅垪琛� /// </summary> - private void InitFunctionTabList() + private void InitSceneList() { - //鑾峰彇鍒嗕韩鐨勮澶� - var listDevice = this.GetShardListDevice(); + //娓呯┖妗屽竷 + this.frameSceneTable.RemoveAll(); + + var listScene = new List<Common.SceneUI>(); + for (int i = 0; i < lookRoom.SceneUIList.Count; i++) + { + if (HdlShardLogic.Current.IsFileExists(lookRoom.SceneUIList[i].FileName) == true) + { + listScene.Add(lookRoom.SceneUIList[i]); + } + } + if (listScene.Count == 0) + { + //鏃犲彲鍙栨秷鍏变韩鐨勫満鏅� + this.ShowNotDataImage(frameSceneTable, Language.StringByID(R.MyInternationalizationString.uNotCanCancelShardSceneMsg), "Item/NotShardPic.png", 383, 279); + return; + } + + HdlThreadLogic.Current.RunMainInThread(() => + { + var listView = new VerticalFrameControl(29); + listView.Y = Application.GetRealHeight(53); + listView.Height = bodyFrameLayout.Height - Application.GetRealHeight(187); + frameSceneTable.AddChidren(listView); + + foreach (var data in listScene) + { + //鍦烘櫙鍥剧墖 + var frameContr = new FrameLayoutControl(); + frameContr.UseClickStatu = false; + frameContr.Width = Application.GetRealWidth(878); + frameContr.Height = Application.GetRealHeight(440); + frameContr.Gravity = Gravity.CenterHorizontal; + frameContr.BackgroundImagePath = data.IconPath; + listView.AddChidrenFrame(frameContr); + + var btnSelect = new IconViewControl(58); + btnSelect.UnSelectedImagePath = "Item/ItemUnSelected.png"; + btnSelect.SelectedImagePath = "Item/ItemSelected.png"; + btnSelect.X = Application.GetRealWidth(786); + btnSelect.Y = Application.GetRealHeight(35); + frameContr.AddChidren(btnSelect, ChidrenBindMode.BindEventOnly); + if (dicSelectScene.ContainsKey(data.Id) == true) + { + btnSelect.IsSelected = true; + } + frameContr.ButtonClickEvent += (sender, e) => + { + //閫夋嫨 + btnSelect.IsSelected = !btnSelect.IsSelected; + if (btnSelect.IsSelected == true) + { + dicSelectScene[data.Id] = data; + if (this.btnDelete.Visible == false) + { + this.btnDelete.Visible = true; + } + } + else + { + dicSelectScene.Remove(data.Id); + if (dicSelectScene.Count == 0 && dicSelectDevice.Count == 0) + { + this.btnDelete.Visible = false; + } + } + }; + } + }); + } + + #endregion + + #region 鈻� 鍔熻兘鏄剧ず___________________________ + + /// <summary> + /// 鍒濆鍖栧姛鑳藉垪琛� + /// </summary> + private void InitFunctionList() + { + //娓呯┖妗屽竷 + this.frameDeviceTable.RemoveAll(); + + HdlThreadLogic.Current.RunMainInThread(() => + { + //鑾峰彇鍒嗙粍鍚庣殑璁惧鍒楄〃 + var dicGroupDevice = this.GetAllGroupDevice(); + if (dicGroupDevice.Count == 0) + { + //鏃犲彲鍙栨秷鍏变韩鐨勮澶� + this.ShowNotDataImage(frameDeviceTable, Language.StringByID(R.MyInternationalizationString.uNotCanCancelDeviceMsg), "Item/NotShardPic.png", 383, 279); + } + else + { + var frameBack = new FrameLayoutControl(false); + frameBack.X = ControlCommonResourse.XXLeft; + frameBack.Y = Application.GetRealHeight(178); + frameBack.BackgroundColor = UserCenterColor.Current.White; + frameBack.Width = bodyFrameLayout.Width; + frameBack.Height = Application.GetRealHeight(1650); + frameBack.RadiusEx = 20; + frameDeviceTable.AddChidren(frameBack); + + var listView = new VerticalListControl(23); + listView.Y = Application.GetRealHeight(23); + listView.Height = Application.GetRealHeight(1437 - 23); + frameBack.AddChidren(listView); + //鍒濆鍖栬澶囩被鍨嬭 + this.InitDeviceObjectRow(dicGroupDevice, listView); + } + }); + } + + #endregion + + #region 鈻� 鍒濆鍖栬澶囩被鍨嬭___________________ + + /// <summary> + /// 鍒濆鍖栬澶囩被鍨嬭 + /// </summary> + /// <param name="dicData"></param> + /// <param name="listView"></param> + private void InitDeviceObjectRow(Dictionary<int, List<CommonDevice>> dicData, VerticalListControl listView) + { + var scrolContr = new RoomDeviceGroupMenuControl(dicData); + this.frameDeviceTable.AddChidren(scrolContr); + //璁剧疆鍒濆鍊� + scrolContr.SetDefultIndex(nowDeviceIndex); + scrolContr.SelectDeviceEvent += (listdevice) => + { + this.nowDeviceIndex = scrolContr.nowSelectKeys; + //娣诲姞璁惧琛� + this.AddDeviceRow(listdevice, listView); + }; + scrolContr.InitControl(); + } + + #endregion + + #region 鈻� 娣诲姞璁惧琛宊________________________ + + /// <summary> + /// 娣诲姞璁惧琛� + /// </summary> + /// <param name="listDevice"></param> + /// <param name="listView"></param> + private void AddDeviceRow(List<CommonDevice> listDevice, VerticalListControl listView) + { + listView.RemoveAll(); foreach (var device in listDevice) { - Application.RunOnMainThread(() => + var frameRow = new FrameRowControl(listView.rowSpace / 2); + frameRow.LeftOffset = Application.GetRealWidth(46) - ControlCommonResourse.XXLeft; + frameRow.RightOffset = -ControlCommonResourse.XXLeft; + listView.AddChidren(frameRow); + //鍥炬爣 + var btnIcon = frameRow.AddLeftIcon(81); + Common.LocalDevice.Current.SetDeviceIconToControl(btnIcon, device); + //鍚嶇О + var btnView = frameRow.AddLeftCaption(string.Empty, 600); + btnView.Text = Common.LocalDevice.Current.GetDeviceEpointName(device); + btnView.TextSize = 15; + //搴曠嚎 + frameRow.AddBottomLine(); + //閫夋嫨 + var btnSelect = frameRow.AddMostRightEmptyIcon(69, 69); + btnSelect.UnSelectedImagePath = "Item/ItemUnSelected.png"; + btnSelect.SelectedImagePath = "Item/ItemSelected.png"; + + string mainKeys = Common.LocalDevice.Current.GetDeviceMainKeys(device); + if (dicSelectDevice.ContainsKey(mainKeys) == true) { - //娣诲姞璁惧鐨勬槑缁嗚 - this.AddDeviceDetailRow(device); - }); - } - } - - /// <summary> - /// 娣诲姞璁惧鐨勬槑缁嗚 - /// </summary> - /// <param name="device">璁惧瀵硅薄</param> - private void AddDeviceDetailRow(CommonDevice device) - { - var row = new StatuRowLayout(listDeviceView); - - //鍥剧墖 - var btnIcon = new RowLeftIconView(); - Common.LocalDevice.Current.SetDeviceIconToControl(btnIcon, device); - row.AddChidren(btnIcon, ChidrenBindMode.NotBind); - - //璁惧绫诲瀷鐨勭炕璇戝悕瀛� - var btnName = new RowCenterView(); - btnName.Text = Common.LocalDevice.Current.GetDeviceEpointName(device); - row.AddChidren(btnName, ChidrenBindMode.NotBind); - - //绉婚櫎 - var btnDelete = new RowDeleteButton(); - btnDelete.TextID = R.MyInternationalizationString.RemoveBotton; - row.AddRightView(btnDelete); - btnDelete.MouseUpEventHandler += (sender, e) => - { - //纭畾绉婚櫎閫変腑鐨勮澶囷紵 - string msg = Language.StringByID(R.MyInternationalizationString.uConfirmRemoveSelectDeviceMsg); - this.ShowConfirmMsg(msg, "DeleteShardDevice", row, device); - }; - } - - /// <summary> - /// 鍒犻櫎鍏变韩璁惧 - /// </summary> - /// <param name="row"></param> - /// <param name="device"></param> - public async void DeleteShardDevice(StatuRowLayout row, CommonDevice device) - { - var result = await HdlShardLogic.Current.DoDeleteSharedContent(memberShardInfo, this.room, new List<CommonDevice>() { device }, new List<Common.SceneUI>()); - if (result == true) - { - Application.RunOnMainThread(() => - { - row.RemoveFromParent(); - if (this.listDeviceView.ChildrenCount == 0 && this.listSceneView.ChildrenCount == 0) - { - //浠�涔堥兘娌℃湁浜�,鍒欏叧闂晫闈� - this.CloseForm(); - } - }); - } - } - - #endregion - - #region 鈻� 鏄剧ず鍦烘櫙Tab鍒楄〃____________________ - - /// <summary> - /// 鍒濆鍖栧満鏅疶ab鍒楄〃 - /// </summary> - private void InitSceneTabList() - { - foreach (var sceneUi in this.room.SceneUIList) - { - if (sceneUi == null || memberShardInfo.dicAllMemberShard[this.room.FileName].Contains(sceneUi.FileName) == false) - { - //寮傚父锛屾垨鑰呬笉瀛樺湪,鍒欎笉鏄剧ず - continue; + btnSelect.IsSelected = true; } - Application.RunOnMainThread(() => + frameRow.ButtonClickEvent += (sender, e) => { - //娣诲姞鍦烘櫙琛� - this.AddSceneDetailRow(sceneUi); - }); - } - } - - /// <summary> - /// 娣诲姞鍦烘櫙鐨勬槑缁嗚 - /// </summary> - /// <param name="sceneUI">鍦烘櫙瀵硅薄</param> - private void AddSceneDetailRow(Common.SceneUI sceneUI) - { - var sceneRow = new SceneViewRow(this.listSceneView, sceneUI); - - //绉婚櫎 - var btnDelete = new RowDeleteButton(); - btnDelete.TextID = R.MyInternationalizationString.RemoveBotton; - sceneRow.AddRightView(btnDelete); - btnDelete.MouseUpEventHandler += (sender, e) => - { - //纭畾绉婚櫎閫変腑鐨勫満鏅紵 - string msg = Language.StringByID(R.MyInternationalizationString.uConfirmRemoveSelectSceneMsg); - this.ShowConfirmMsg(msg, "DeleteShardScene", sceneRow, sceneUI); - }; - } - - /// <summary> - /// 鍒犻櫎鍏变韩鍦烘櫙 - /// </summary> - /// <param name="row"></param> - /// <param name="sceneUI"></param> - public async void DeleteShardScene(SceneViewRow row, Common.SceneUI sceneUI) - { - var result = await HdlShardLogic.Current.DoDeleteSharedContent(memberShardInfo, this.room, new List<CommonDevice>(), new List<Common.SceneUI>() { sceneUI }); - if (result == true) - { - Application.RunOnMainThread(() => - { - row.RemoveFromParent(); - if (this.listDeviceView.ChildrenCount == 0 && this.listSceneView.ChildrenCount == 0) + //閫夋嫨 + btnSelect.IsSelected = !btnSelect.IsSelected; + if (btnSelect.IsSelected == true) { - //浠�涔堥兘娌℃湁浜�,鍒欏叧闂晫闈� - this.CloseForm(); + dicSelectDevice[mainKeys] = device; + if (this.btnDelete.Visible == false) + { + this.btnDelete.Visible = true; + } } - }); + else + { + dicSelectDevice.Remove(mainKeys); + if (dicSelectScene.Count == 0 && dicSelectDevice.Count == 0) + { + this.btnDelete.Visible = false; + } + } + }; } } #endregion - #region 鈻� 鑾峰彇鍙互鍒嗕韩鐨勮澶嘷________________ + #region 鈻� 鏁村悎璁惧___________________________ + + /// <summary> + /// 鑾峰彇鍒嗙粍鍚庣殑璁惧 + /// </summary> + /// <returns></returns> + private Dictionary<int, List<CommonDevice>> GetAllGroupDevice() + { + //鍏ㄩ儴鐨勮澶� + var listDevice = this.GetShardListDevice(); + var dic = new Dictionary<int, List<CommonDevice>>(); + foreach (var device in listDevice) + { + var typeInfo = Common.LocalDevice.Current.GetNotHdlMyDeviceEnumInfo(new List<ZigBee.Device.CommonDevice>() { device }); + if (device.Type == DeviceType.IASZone) + { + //杩欎釜寮哄埗涓轰紶鎰熷櫒 + typeInfo.BeloneTextId = R.MyInternationalizationString.uDeviceBelongId1200; + typeInfo.ConcreteType = Common.DeviceConcreteType.Sensor; + } + if (device.Type == DeviceType.OnOffOutput) + { + //缁х數鍣ㄧ殑鏃跺��,闇�瑕佺壒娈婂鐞� + if (device.DfunctionType == DeviceFunctionType.A寮�鍏�) + { + typeInfo.BeloneTextId = R.MyInternationalizationString.uSwitch; + } + else if (device.DfunctionType == DeviceFunctionType.A鎻掑骇) + { + typeInfo.BeloneTextId = R.MyInternationalizationString.uSocket1; + } + else if (device.DfunctionType == DeviceFunctionType.A鐏厜) + { + typeInfo.BeloneTextId = R.MyInternationalizationString.uLight; + } + else + { + //缁х數鍣� + typeInfo.BeloneTextId = R.MyInternationalizationString.uDeviceBelongId2300; + } + if (dic.ContainsKey(typeInfo.BeloneTextId) == false) + { + dic[typeInfo.BeloneTextId] = new List<CommonDevice>(); + } + } + else + { + if (dic.ContainsKey(typeInfo.BeloneTextId) == false) + { + dic[typeInfo.BeloneTextId] = new List<CommonDevice>(); + } + } + dic[typeInfo.BeloneTextId].Add(device); + } + return dic; + } + + #endregion + + #region 鈻� 鍒犻櫎鍒嗕韩___________________________ + + /// <summary> + /// 鍒犻櫎鍒嗕韩 + /// </summary> + private void DeleteShardData() + { + //閫夋嫨鐨勮澶� + var listDevice = new List<CommonDevice>(); + foreach (var device in dicSelectDevice.Values) + { + listDevice.Add(device); + } + //閫夋嫨鐨勫満鏅� + var listScene = new List<Common.SceneUI>(); + foreach (var scene in dicSelectScene.Values) + { + listScene.Add(scene); + } + + //纭鍒犻櫎閫夋嫨鐨勫叡浜満鏅拰鍔熻兘锛� + this.ShowMassage(ShowMsgType.Confirm, Language.StringByID(R.MyInternationalizationString.uDeleteShardContentMsg), () => + { + HdlThreadLogic.Current.RunThread(async () => + { + //涓婁紶鏂囦欢 + var result = await HdlShardLogic.Current.DoDeleteSharedContent(memberShardInfo, this.lookRoom, listDevice, listScene); + if (result == true) + { + HdlThreadLogic.Current.RunMain(() => + { + //閲嶆柊鍒濆鍖栫晫闈� + this.InitMiddleFrame(); + }); + } + }); + }); + } + + #endregion + + #region 鈻� 涓�鑸柟娉昣__________________________ /// <summary> /// 鑾峰彇鍒嗕韩鐨勮澶� @@ -325,44 +460,28 @@ /// <returns></returns> private List<CommonDevice> GetShardListDevice() { - //鑾峰彇杩欎釜鎴块棿閲岄潰鐨勫垎浜澶囩殑璺緞 - var listDeviceFile = new List<string>(); - foreach (var ui in this.room.DeviceUIList) - { - if (ui.CommonDevice != null && memberShardInfo.dicAllMemberShard[this.room.FileName].Contains(ui.CommonDevice.FilePath) == true) - { - listDeviceFile.Add(ui.CommonDevice.FilePath); - } - } - - var listFile = HdlShardLogic.Current.GetLocalAllShardFile(); + //鑾峰彇杩欎釜鎴块棿閲岄潰鐨勫垎浜澶� var listDevice = new List<CommonDevice>(); - foreach (string file in listFile) + foreach (var deviceFile in this.lookRoom.DeviceUIFilePathList) { - //濡傛灉涓嶆槸璁惧鏂囦欢锛屾垨鑰呰繖涓埧闂撮噷闈㈡病鏈夎繖涓澶� - if (file.StartsWith(Common.LocalDevice.deviceFirstName) == false || listDeviceFile.Contains(file) == false) + if (memberShardInfo.dicAllShardKeys.ContainsKey(deviceFile) == true) { - continue; - } - var strArry = file.Split('_'); - if (strArry.Length < 3) - { - continue; - } - //浠庡垎浜枃浠朵腑搴忓垪鍖栧洖鏉� - var deviceData = HdlShardLogic.Current.GetShardFileContent(file); - var device = ZigBee.Device.CommonDevice.CommonDeviceByByteString(strArry[1], System.Text.Encoding.UTF8.GetString(deviceData)); - if (device != null) - { - listDevice.Add(device); + var strArry = deviceFile.Split('_'); + if (strArry.Length < 3) + { + continue; + } + //浠庡垎浜枃浠朵腑搴忓垪鍖栧洖鏉� + var deviceData = HdlShardLogic.Current.GetShardFileContent(deviceFile); + var device = ZigBee.Device.CommonDevice.CommonDeviceByByteString(strArry[1], System.Text.Encoding.UTF8.GetString(deviceData)); + if (device != null) + { + listDevice.Add(device); + } } } return listDevice; } - - #endregion - - #region 鈻� 涓�鑸柟娉昣__________________________ #endregion } -- Gitblit v1.8.0