From 4b378188ce972df432b23d9cb73babb6cc0679c6 Mon Sep 17 00:00:00 2001 From: 黄学彪 <hxb@hdlchina.com.cn> Date: 星期五, 17 一月 2020 14:56:15 +0800 Subject: [PATCH] 合并代码 ver.10086 --- ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindTargetsPage.cs | 70 ++++++++++++++++++++++++++++------ 1 files changed, 57 insertions(+), 13 deletions(-) diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindTargetsPage.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindTargetsPage.cs index 3ea1cc6..8e3b0f0 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 () => @@ -1062,7 +1103,10 @@ } } - //鑾峰彇鎸夐敭鏀寔鐨勫ぇ绫� + /// <summary> + /// 鑾峰彇鎸夐敭鏀寔鐨勫ぇ绫� + /// </summary> + /// <returns></returns> private async System.Threading.Tasks.Task<List<int>> GetTypeMode() { if (typeModeList != null) -- Gitblit v1.8.0