From 404cdc88627f942df7944af04ee05b9d527752d6 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 30 九月 2019 13:22:40 +0800
Subject: [PATCH] 合并了徐梅的按键面板绑定
---
ZigbeeApp/Shared/Phone/UserCenter/SharedContent/ConfigureNewSharedListRoomForm.cs | 463 +++++++++++++++++++++++++++++----------------------------
1 files changed, 237 insertions(+), 226 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/SharedContent/ConfigureNewSharedListRoomForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/SharedContent/ConfigureNewSharedListRoomForm.cs
index 21e0661..4846515 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/SharedContent/ConfigureNewSharedListRoomForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/SharedContent/ConfigureNewSharedListRoomForm.cs
@@ -9,7 +9,7 @@
/// <summary>
/// 閰嶇疆鏂板叡浜唴瀹圭殑涓荤晫闈�
/// </summary>
- public class ConfigureNewSharedListRoomForm : UserCenterCommonForm
+ public class ConfigureNewSharedListRoomForm : EditorCommonForm
{
#region 鈻� 鍙橀噺澹版槑___________________________
@@ -33,256 +33,267 @@
/// <summary>
/// 鐢婚潰鏄剧ず(搴曞眰浼氬浐瀹氳皟鐢ㄦ鏂规硶锛屽�熶互瀹屾垚鐢婚潰鍒涘缓)
/// </summary>
- /// <param name="i_memberResult">鎴愬憳淇℃伅</param>
- /// <param name="i_memberShardInfo">鎴愬憳鐨勫叡浜俊鎭�</param>
- public void ShowForm(MemberInfoRes i_memberResult, MemberShardInfoData i_memberShardInfo)
- {
- this.memberResult = i_memberResult;
+ /// <param name="i_memberResult">鎴愬憳淇℃伅</param>
+ /// <param name="i_memberShardInfo">鎴愬憳鐨勫叡浜俊鎭�</param>
+ public void ShowForm(MemberInfoRes i_memberResult, MemberShardInfoData i_memberShardInfo)
+ {
+ this.memberResult = i_memberResult;
this.memberShardInfo = i_memberShardInfo;
this.memberShardInfo.SubAccountDistributedMark = this.memberResult.SubAccountDistributedMark;
-
- //璁剧疆澶撮儴淇℃伅
- base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uAddShared));
-
- //鍒濆鍖栦腑閮ㄤ俊鎭�
- this.InitMiddleFrame();
- }
-
- /// <summary>
- /// 鍒濆鍖栦腑閮ㄤ俊鎭�
- /// </summary>
- private void InitMiddleFrame()
- {
- bodyFrameLayout.RemoveAll();
- //鍖哄煙鍒楄〃
- var btnTitle = new TitleViewControl(1000, true);
- btnTitle.TextID = R.MyInternationalizationString.uAreaList;
- btnTitle.Y = Application.GetRealHeight(30);
- bodyFrameLayout.AddChidren(btnTitle);
+ //璁剧疆澶撮儴淇℃伅
+ base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uAddShared));
- this.listView = new VerticalScrolViewLayout();
- listView.Y = btnTitle.Bottom + Application.GetRealHeight(30);
- listView.Height = bodyFrameLayout.Height - Application.GetRealHeight(30) - btnTitle.Bottom;
- bodyFrameLayout.AddChidren(listView);
-
- new System.Threading.Thread(() =>
- {
- //鍒濆鍖栧尯鍩熷垪琛�
- this.InitAreaListRow();
- })
- { IsBackground = true }.Start();
+ //鍒濆鍖栦腑閮ㄤ俊鎭�
+ //this.InitMiddleFrame();
}
+
+ ///// <summary>
+ ///// 鍒濆鍖栦腑閮ㄤ俊鎭�
+ ///// </summary>
+ //private void InitMiddleFrame()
+ //{
+ // //娓呯┖bodyFrame
+ // this.ClearBodyFrame();
+
+ // //鍖哄煙鍒楄〃
+ // var btnTitle = new NormalViewControl(1000, true);
+ // btnTitle.X = ControlCommonResourse.XXLeft;
+ // btnTitle.TextID = R.MyInternationalizationString.uAreaList;
+ // btnTitle.Y = Application.GetRealHeight(30);
+ // bodyFrameLayout.AddChidren(btnTitle);
+
+ // this.listView = new VerticalScrolViewLayout();
+ // listView.Y = btnTitle.Bottom + Application.GetRealHeight(30);
+ // listView.Height = bodyFrameLayout.Height - Application.GetRealHeight(30) - btnTitle.Bottom;
+ // bodyFrameLayout.AddChidren(listView);
+
+ // new System.Threading.Thread(() =>
+ // {
+ // //鍒濆鍖栧尯鍩熷垪琛�
+ // this.InitAreaListRow();
+ // })
+ // { IsBackground = true }.Start();
+ //}
#endregion
- #region 鈻� 鍖哄煙鍒楄〃___________________________
+ //#region 鈻� 鍖哄煙鍒楄〃___________________________
- /// <summary>
- /// 鍒濆鍖栧尯鍩熷垪琛�
- /// </summary>
- private void InitAreaListRow()
- {
- bool hadShard = false;
- foreach (var room in Shared.Common.Room.Lists)
- {
- if (this.CheckCanShowRow(room) == false)
- {
- //妫�娴嬭兘鍚︽樉绀鸿鎴块棿
- continue;
- }
- hadShard = true;
- Application.RunOnMainThread(() =>
- {
- this.AddRoomRow(room);
- });
- }
- if (hadShard == false)
- {
- Application.RunOnMainThread(() =>
- {
- bodyFrameLayout.RemoveAll();
- //鍏ㄩ儴鍖哄煙鏃犲彲鍏变韩鐨勮澶�
- var btnMsg = new MsgViewControl(bodyFrameLayout.Width, false);
- btnMsg.Gravity = Gravity.CenterVertical;
- btnMsg.TextID = R.MyInternationalizationString.uNotShardDeviceInAllRoomMsg;
- bodyFrameLayout.AddChidren(btnMsg);
- });
- }
- }
+ ///// <summary>
+ ///// 鍒濆鍖栧尯鍩熷垪琛�
+ ///// </summary>
+ //private void InitAreaListRow()
+ //{
+ // bool hadShard = false;
+ // foreach (var room in Shared.Common.Room.Lists)
+ // {
+ // if (this.CheckCanShowRow(room) == false)
+ // {
+ // //妫�娴嬭兘鍚︽樉绀鸿鎴块棿
+ // continue;
+ // }
+ // hadShard = true;
+ // Application.RunOnMainThread(() =>
+ // {
+ // if (this.Parent != null)
+ // {
+ // this.AddRoomRow(room);
+ // }
+ // });
+ // }
+ // if (hadShard == false)
+ // {
+ // Application.RunOnMainThread(() =>
+ // {
+ // if (bodyFrameLayout != null)
+ // {
+ // bodyFrameLayout.RemoveAll();
+ // //鍏ㄩ儴鍖哄煙鏃犲彲鍏变韩鐨勮澶�
+ // var btnMsg = new MsgViewControl(bodyFrameLayout.Width, false);
+ // btnMsg.Gravity = Gravity.CenterVertical;
+ // btnMsg.TextID = R.MyInternationalizationString.uNotShardDeviceInAllRoomMsg;
+ // bodyFrameLayout.AddChidren(btnMsg);
+ // }
+ // });
+ // }
+ //}
- /// <summary>
- /// 娣诲姞鎴块棿琛�
- /// </summary>
- /// <param name="room"></param>
- private void AddRoomRow(Common.Room room)
- {
- var row = new StatuRowLayout(listView);
- //鎴块棿鍚�
- var btnName = new RowCenterView(false);
- btnName.Text = room.Name;
- row.AddChidren(btnName);
+ ///// <summary>
+ ///// 娣诲姞鎴块棿琛�
+ ///// </summary>
+ ///// <param name="room"></param>
+ //private void AddRoomRow(Common.Room room)
+ //{
+ // var row = new StatuRowLayout(listView);
+ // //鎴块棿鍚�
+ // var btnName = new RowCenterView(false);
+ // btnName.Text = room.Name;
+ // row.AddChidren(btnName);
- row.AddRightIconControl();
+ // row.AddRightArrow();
- //鍒嗕韩
- var btnShard = new RowEditorButton();
- btnShard.TextID = R.MyInternationalizationString.uShared;
- row.AddRightView(btnShard);
- btnShard.MouseUpEventHandler += (sender, e) =>
- {
- //纭畾鍏变韩璇ュ尯鍩燂紵
- string msg = Language.StringByID(R.MyInternationalizationString.uConfirmShardRoomContent);
- this.ShowConfirmMsg(msg, "DoSharedContentByRoom", room);
- };
+ // //鍒嗕韩
+ // var btnShard = new RowEditorButton();
+ // btnShard.TextID = R.MyInternationalizationString.uShared;
+ // row.AddRightView(btnShard);
+ // btnShard.MouseUpEventHandler += (sender, e) =>
+ // {
+ // //纭畾鍏变韩璇ュ尯鍩燂紵
+ // string msg = Language.StringByID(R.MyInternationalizationString.uConfirmShardRoomContent);
+ // this.ShowConfirmMsg(msg, "DoSharedContentByRoom", room);
+ // };
- row.MouseUpEvent += (sender, e) =>
- {
- var form = new ConfigureNewSharedMainForm();
- this.AddForm(form, room, memberResult, memberShardInfo);
- };
- }
+ // row.MouseUpEvent += (sender, e) =>
+ // {
+ // var form = new ConfigureNewSharedMainForm();
+ // form.AddForm(room, memberResult, memberShardInfo);
+ // };
+ //}
- /// <summary>
- /// 妫�娴嬭鎴块棿鑳藉惁鏄剧ず
- /// </summary>
- /// <param name="room"></param>
- /// <returns></returns>
- private bool CheckCanShowRow(Common.Room room)
- {
- if (room.DeviceUIList.Count == 0 && room.SceneUIList.Count == 0)
- {
- return false;
- }
- if (room.IsLove == true)
- {
- return false;
- }
- if (memberShardInfo.dicAllMemberShard.ContainsKey(room.FileName) == false)
- {
- //娌℃湁杩欎釜鎴块棿
- return true;
- }
- var listCheck = memberShardInfo.dicAllMemberShard[room.FileName];
- foreach (var deviceUi in room.DeviceUIList)
- {
- if (deviceUi.CommonDevice == null)
- {
- continue;
- }
- if (listCheck.Contains(deviceUi.CommonDevice.FilePath) == false)
- {
- //瀛樺湪鏈垎浜殑璁惧鐨勮瘽锛屾鎴块棿鍙互鏄剧ず
- return true;
- }
- }
- foreach (var sceneUi in room.SceneUIList)
- {
- if (sceneUi == null)
- {
- continue;
- }
- if (listCheck.Contains(sceneUi.FileName) == false)
- {
- //瀛樺湪鏈垎浜殑鍦烘櫙鐨勮瘽锛屾鎴块棿鍙互鏄剧ず
- return true;
- }
- }
- return false;
- }
+ ///// <summary>
+ ///// 妫�娴嬭鎴块棿鑳藉惁鏄剧ず
+ ///// </summary>
+ ///// <param name="room"></param>
+ ///// <returns></returns>
+ //private bool CheckCanShowRow(Common.Room room)
+ //{
+ // if (room.DeviceUIList.Count == 0 && room.SceneUIList.Count == 0)
+ // {
+ // return false;
+ // }
+ // if (room.IsLove == true)
+ // {
+ // return false;
+ // }
+ // if (memberShardInfo.dicAllMemberShard.ContainsKey(room.FileName) == false)
+ // {
+ // //娌℃湁杩欎釜鎴块棿
+ // return true;
+ // }
+ // var listCheck = memberShardInfo.dicAllMemberShard[room.FileName];
+ // foreach (var deviceUi in room.DeviceUIList)
+ // {
+ // if (deviceUi.CommonDevice == null)
+ // {
+ // continue;
+ // }
+ // if (listCheck.Contains(deviceUi.CommonDevice.FilePath) == false)
+ // {
+ // //瀛樺湪鏈垎浜殑璁惧鐨勮瘽锛屾鎴块棿鍙互鏄剧ず
+ // return true;
+ // }
+ // }
+ // foreach (var sceneUi in room.SceneUIList)
+ // {
+ // if (sceneUi == null)
+ // {
+ // continue;
+ // }
+ // if (listCheck.Contains(sceneUi.FileName) == false)
+ // {
+ // //瀛樺湪鏈垎浜殑鍦烘櫙鐨勮瘽锛屾鎴块棿鍙互鏄剧ず
+ // return true;
+ // }
+ // }
+ // return false;
+ //}
- #endregion
+ //#endregion
- #region 鈻� 鍒嗕韩鎸囧畾鍖哄煙_______________________
+ //#region 鈻� 鍒嗕韩鎸囧畾鍖哄煙_______________________
- /// <summary>
- /// 鎵ц鍒嗗垎浜寚瀹氬尯鍩�
- /// </summary>
- /// <param name="room">鎸囧畾瑕佸垎浜殑鎴块棿</param>
- public void DoSharedContentByRoom(Common.Room room)
- {
- if (memberShardInfo.dicAllMemberShard.ContainsKey(room.FileName) == false)
- {
- memberShardInfo.dicAllMemberShard[room.FileName] = new HashSet<string>();
- }
- //閲嶅妫�娴嬬敤
- var listCheck = memberShardInfo.dicAllMemberShard[room.FileName];
- //鑾峰彇鍏ㄩ儴璁惧
- var listDevice = new List<CommonDevice>();
- foreach (var deviceUi in room.DeviceUIList)
- {
- var device = deviceUi.CommonDevice;
- if (device == null || listCheck.Contains(device.FilePath) == true)
- {
- //寮傚父锛屾垨鑰呭凡缁忓垎浜簡鐨勶紝涓嶅啀鏄剧ず
- continue;
- }
- listDevice.Add(device);
- }
- //鑾峰彇鍏ㄩ儴鍦烘櫙
- var listScene = new List<Common.SceneUI>();
- foreach (var sceneUi in room.SceneUIList)
- {
- if (sceneUi == null || listCheck.Contains(sceneUi.FileName) == true)
- {
- //寮傚父锛屾垨鑰呭凡缁忓垎浜簡鐨勶紝涓嶅啀鏄剧ず
- continue;
- }
- listScene.Add(sceneUi);
- }
+ ///// <summary>
+ ///// 鎵ц鍒嗗垎浜寚瀹氬尯鍩�
+ ///// </summary>
+ ///// <param name="room">鎸囧畾瑕佸垎浜殑鎴块棿</param>
+ //public void DoSharedContentByRoom(Common.Room room)
+ //{
+ // if (memberShardInfo.dicAllMemberShard.ContainsKey(room.FileName) == false)
+ // {
+ // memberShardInfo.dicAllMemberShard[room.FileName] = new HashSet<string>();
+ // }
+ // //閲嶅妫�娴嬬敤
+ // var listCheck = memberShardInfo.dicAllMemberShard[room.FileName];
+ // //鑾峰彇鍏ㄩ儴璁惧
+ // var listDevice = new List<CommonDevice>();
+ // foreach (var deviceUi in room.DeviceUIList)
+ // {
+ // var device = deviceUi.CommonDevice;
+ // if (device == null || listCheck.Contains(device.FilePath) == true)
+ // {
+ // //寮傚父锛屾垨鑰呭凡缁忓垎浜簡鐨勶紝涓嶅啀鏄剧ず
+ // continue;
+ // }
+ // listDevice.Add(device);
+ // }
+ // //鑾峰彇鍏ㄩ儴鍦烘櫙
+ // var listScene = new List<Common.SceneUI>();
+ // foreach (var sceneUi in room.SceneUIList)
+ // {
+ // if (sceneUi == null || listCheck.Contains(sceneUi.FileName) == true)
+ // {
+ // //寮傚父锛屾垨鑰呭凡缁忓垎浜簡鐨勶紝涓嶅啀鏄剧ず
+ // continue;
+ // }
+ // listScene.Add(sceneUi);
+ // }
- new System.Threading.Thread(async () =>
- {
- //鎵ц涓婁紶
- var result = await HdlShardLogic.Current.DoUploadSharedContent(memberShardInfo, room, listDevice, listScene);
- if (result == true)
- {
- //鍒嗕韩鎴愬姛
- string msg = Language.StringByID(R.MyInternationalizationString.uShardSuccess);
- this.ShowTip(msg);
+ // new System.Threading.Thread(async () =>
+ // {
+ // //鎵ц涓婁紶
+ // var result = await HdlShardLogic.Current.DoUploadSharedContent(memberShardInfo, room, listDevice, listScene);
+ // if (result == true)
+ // {
+ // //鍒嗕韩鎴愬姛
+ // string msg = Language.StringByID(R.MyInternationalizationString.uShardSuccess);
+ // this.ShowMassage(msg);
- Application.RunOnMainThread(() =>
- {
- //閲嶆柊鍒锋柊鐣岄潰
- this.InitMiddleFrame();
- });
- }
- })
- { IsBackground = true }.Start();
- }
+ // Application.RunOnMainThread(() =>
+ // {
+ // if (this.Parent != null)
+ // {
+ // //閲嶆柊鍒锋柊鐣岄潰
+ // this.InitMiddleFrame();
+ // }
+ // });
+ // }
+ // })
+ // { IsBackground = true }.Start();
+ //}
- #endregion
+ //#endregion
- #region 鈻� 鐣岄潰閲嶆柊婵�娲讳簨浠禵__________________
+ //#region 鈻� 鐣岄潰閲嶆柊婵�娲讳簨浠禵__________________
- /// <summary>
- /// 鑷韩鐨勪笂灞傜晫闈㈠叧闂悗,瀹冭嚜韬浜庢渶涓婂眰鏃�,瑙﹀彂鐨勪簨浠�
- /// </summary>
- public override void FormActionAgainEvent()
- {
- //閲嶆柊鍒锋柊鐣岄潰
- this.InitMiddleFrame();
- }
+ ///// <summary>
+ ///// 鑷韩鐨勪笂灞傜晫闈㈠叧闂悗,瀹冭嚜韬浜庢渶涓婂眰鏃�,瑙﹀彂鐨勪簨浠�
+ ///// </summary>
+ //public override void FormActionAgainEvent()
+ //{
+ // //閲嶆柊鍒锋柊鐣岄潰
+ // this.InitMiddleFrame();
+ //}
- #endregion
+ //#endregion
- #region 鈻� 缁撴瀯浣揰____________________________
+ //#region 鈻� 缁撴瀯浣揰____________________________
- /// <summary>
- /// 鎺ユ敹鍒嗕韩鏁版嵁
- /// </summary>
- private class MemberShardInfoResult
- {
- /// <summary>
- /// 鏂囦欢鍚嶅瓧
- /// </summary>
- public string ShareName = string.Empty;
- /// <summary>
- /// 涓婚敭
- /// </summary>
- public string DistributedMark = string.Empty;
- }
+ ///// <summary>
+ ///// 鎺ユ敹鍒嗕韩鏁版嵁
+ ///// </summary>
+ //private class MemberShardInfoResult
+ //{
+ // /// <summary>
+ // /// 鏂囦欢鍚嶅瓧
+ // /// </summary>
+ // public string ShareName = string.Empty;
+ // /// <summary>
+ // /// 涓婚敭
+ // /// </summary>
+ // public string DistributedMark = string.Empty;
+ //}
- #endregion
+ //#endregion
}
}
--
Gitblit v1.8.0