From 627093aca723d4bfb971b97c828e8b3a22dbda78 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期五, 17 七月 2020 17:26:19 +0800
Subject: [PATCH] 2020-07-17-1
---
ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceListMainForm.cs | 307 +++++++++++++++++++++++++++++++++++++-------------
1 files changed, 224 insertions(+), 83 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceListMainForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceListMainForm.cs
index 4bd8639..a4417a0 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceListMainForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceListMainForm.cs
@@ -1,4 +1,5 @@
锘縰sing Shared.Common;
+using Shared.Phone.UserCenter.SmartSound;
using System;
using System.Collections.Generic;
using System.Text;
@@ -12,7 +13,10 @@
public class DeviceListMainForm : EditorCommonForm
{
#region 鈻� 鍙橀噺澹版槑___________________________
-
+ /// <summary>
+ /// 鏅鸿兘闊崇
+ /// </summary>
+ private MySmartSoundControl smmartSoundView = null;
/// <summary>
/// 缃戝叧鎺т欢
/// </summary>
@@ -29,10 +33,6 @@
/// 琛屾帶浠剁殑淇℃伅(Keys锛歁ac鍦板潃)
/// </summary>
private Dictionary<string, DeviceObjRowInfo> dicRowInfo = new Dictionary<string, DeviceObjRowInfo>();
- /// <summary>
- /// 閲嶆柊鑾峰彇璁惧鐨勫湪绾跨姸鎬�
- /// </summary>
- private bool reGetDeviceOnlineStatu = false;
/// <summary>
/// 褰撳墠姝ｅ湪鎿嶄綔鐨勮澶囧璞ac鍦板潃(璁惧淇℃伅缂栬緫鐣岄潰鐢�)
/// </summary>
@@ -65,18 +65,43 @@
//鍒濆鍖栦腑閮ㄦ帶浠�
this.InitMiddleFrame();
+
+ //寮�鍚紶鎰熷櫒鎶ヨ鐩戣
+ this.StartCheckDeviceAlarm();
+ //娣诲姞鎺ユ敹璁惧鍦ㄧ嚎涓婃姤鐨勭洃鍚�
+ HdlGatewayReceiveLogic.Current.AddAttributeEvent("DeviceListFormReceivePushOnline", ReceiveComandDiv.A璁惧鍦ㄧ嚎涓婃姤, (report) =>
+ {
+ HdlThreadLogic.Current.RunMain(() =>
+ {
+ //鎺ュ彈璁惧鐘舵��
+ this.ReceiveDeviceStatu(report);
+
+ }, ShowErrorMode.NO);
+ });
+ //寮�鍚娴嬬綉鍏冲湪绾跨姸鎬佺殑绾跨▼
+ HdlGatewayLogic.Current.StartCheckGatewayOnlineThread(this);
}
/// <summary>
/// 鍒濆鍖栦腑閮ㄦ帶浠�(澶栭儴鍙互璋冪敤)
/// </summary>
- /// <param name="i_reGetDeviceOnlineStatu">閲嶆柊鑾峰彇璁惧鐨勫湪绾跨姸鎬�</param>
- public void InitMiddleFrame(bool i_reGetDeviceOnlineStatu = true)
+ public void InitMiddleFrame()
{
- this.reGetDeviceOnlineStatu = i_reGetDeviceOnlineStatu;
//娓呯┖bodyFrame
this.ClearBodyFrame();
+ smmartSoundView = new MySmartSoundControl();
+ bodyFrameLayout.AddChidren(smmartSoundView);
+ smmartSoundView.InitControl();
+ //褰撳墠涓嶆槸铏氭嫙浣忓畢鐨勮瘽
+ if (Config.Instance.Home.IsVirtually == false)
+ {
+ smmartSoundView.ButtonClickEvent += (sernder, e) =>
+ {
+ var form = new SmartSoundListForm();
+ form.AddForm();
+ };
+ }
//鍒濆鍖栫綉鍏宠鎺т欢
GatewayResourse.NowSelectGatewayId = GatewayResourse.AppOldSelectGatewayId;
var nowGateway = HdlGatewayLogic.Current.GetLocalGateway(GatewayResourse.AppOldSelectGatewayId);
@@ -125,6 +150,9 @@
frame.AddChidren(listView);
listView.BeginHeaderRefreshingAction += () =>
{
+ //鍒锋柊璁惧鐨勮瘽,涓婚〉闇�瑕侀噸鏂板埛鏂�
+ UserView.UserPage.Instance.RefreshForm = true;
+
HdlThreadLogic.Current.RunThread(() =>
{
//涓嬫媺鍒锋柊
@@ -220,7 +248,7 @@
//鎻愮ず鏂扮増鏈�
var btnNew = new InformationTipView(rowMenu.btnIcon);
btnNew.Visible = false;
- rowMenu.frameTable.AddChidren(btnNew, ChidrenBindMode.BindEventOnly);
+ rowMenu.frameTable.AddChidren(btnNew, ChidrenBindMode.BindEvent);
rowMenu.AddTag("btnNew", btnNew);
//妫�娴嬭澶囨槸鍚︽嫢鏈夊畾浣嶇殑鍔熻兘
@@ -305,17 +333,35 @@
var listDevice = Common.LocalDevice.Current.GetDevicesByMac(deviceMac);
if (isShow == true)
{
- //灞曞紑妯″紡鏃讹紝鎵╁ぇ渚濇嵁涓�:瀹冩湁鍑犱釜瀛愭帶浠�
- heightValue = (listDevice.Count + 1) * (ControlCommonResourse.ListViewRowHeight + rowInfo.frameTable.rowSpace);
- //鏍囬鑷繁灏辨槸涓�涓瓙鎺т欢
- if (rowInfo.frameTable.ChildrenCount == 1)
+ //鑾峰彇杩欎竴鍫嗚澶囨椂灞炰簬浠�涔堢被鍨嬬殑
+ var deviceEnumInfo = Common.LocalDevice.Current.GetMyDeviceEnumInfo(listDevice);
+ if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_SimpleMultifunction)
{
- //鑾峰彇杩欎竴鍫嗚澶囨椂灞炰簬浠�涔堢被鍨嬬殑
- var deviceEnumInfo = Common.LocalDevice.Current.GetMyDeviceEnumInfo(listDevice);
- foreach (CommonDevice info in listDevice)
+ var listTemp = Common.LocalDevice.Current.GetMutilfunctionPanelByMac(listDevice);
+ //灞曞紑妯″紡鏃讹紝鎵╁ぇ渚濇嵁涓�:瀹冩湁鍑犱釜瀛愭帶浠�
+ heightValue = (listTemp.Count + 1) * (ControlCommonResourse.ListViewRowHeight + rowInfo.frameTable.rowSpace);
+ //鏍囬鑷繁灏辨槸涓�涓瓙鎺т欢
+ if (rowInfo.frameTable.ChildrenCount == 1)
{
- //鍔犺浇瀹冪殑鍒楄〃
- this.AddDeviceDetailRow(rowInfo.frameTable, info, deviceEnumInfo);
+ foreach (CommonDevice info in listTemp)
+ {
+ //鍔犺浇瀹冪殑鍒楄〃
+ this.AddDeviceDetailRow(rowInfo.frameTable, info, deviceEnumInfo);
+ }
+ }
+ }
+ else
+ {
+ //灞曞紑妯″紡鏃讹紝鎵╁ぇ渚濇嵁涓�:瀹冩湁鍑犱釜瀛愭帶浠�
+ heightValue = (listDevice.Count + 1) * (ControlCommonResourse.ListViewRowHeight + rowInfo.frameTable.rowSpace);
+ //鏍囬鑷繁灏辨槸涓�涓瓙鎺т欢
+ if (rowInfo.frameTable.ChildrenCount == 1)
+ {
+ foreach (CommonDevice info in listDevice)
+ {
+ //鍔犺浇瀹冪殑鍒楄〃
+ this.AddDeviceDetailRow(rowInfo.frameTable, info, deviceEnumInfo);
+ }
}
}
}
@@ -348,8 +394,7 @@
//鍙崇澶�
rowDevice.frameTable.AddRightArrow();
//鍦ㄧ嚎鐘舵��
- rowDevice.isOnline = device.IsOnline == 1;
-
+ rowDevice.IsOnline = rowInfo.MenuRow.IsOnline;
//淇濆瓨鎺т欢
string maikey = Common.LocalDevice.Current.GetDeviceMainKeys(device);
rowInfo.dicDetailRow[maikey] = rowDevice;
@@ -470,7 +515,7 @@
{
//鏂规偊闈㈡澘鐨勫姛鑳介厤缃�
var form = new DevicePanel.PanelFangyueFunctionSettionForm();
- form.AddForm(device);
+ form.AddForm(device, deviceEnumInfo);
}
else
{
@@ -614,7 +659,7 @@
if (HdlGatewayLogic.Current.GetRealGateway(ref realWay, nowGateway) == true)
{
//閲嶆柊璁剧疆浣忓畢ID(杩欎釜搴旇鏄笉缁忚繃APP,鐩存帴鎶婄綉鍏虫仮澶嶄簡鍑哄巶璁剧疆)
- if (HdlGatewayLogic.Current.HomeIdIsEmpty(realWay.getGatewayBaseInfo.HomeId) == true)
+ if (HdlGatewayLogic.Current.HomeIdIsEmpty(realWay.HomeId) == true)
{
//鏄剧ず杩涘害鏉�
ProgressBar.Show();
@@ -646,7 +691,7 @@
if (result != -1)
{
//閲嶆柊鍒锋柊鐣岄潰
- this.InitMiddleFrame(false);
+ this.InitMiddleFrame();
}
});
}
@@ -676,9 +721,10 @@
if (this.gatewayViewRow != null && this.gatewayViewRow.zbGatewayId == selectGwId)
{
bool online = HdlGatewayLogic.Current.CheckGatewayOnlineByFlag(zbGateway);
- this.gatewayViewRow.RefreshControl();
- //寮�鍚澶囧湪绾跨嚎绋�
- this.StartDeviceListControlThread(online);
+ //鍒锋柊鎺т欢鍦ㄧ嚎鐘舵��
+ this.gatewayViewRow?.RefreshOnlineStatu();
+ //鏍规嵁缃戝叧鍦ㄧ嚎鐘舵�佸埛鏂拌澶囧湪绾跨姸鎬�
+ this.RefreshDeviceOnlineStatuByGatewayOnline(online);
}
});
});
@@ -689,17 +735,25 @@
/// </summary>
/// <param name="gateWay">缃戝叧瀵硅薄</param>
/// <param name="online">鍦ㄧ嚎鐘舵�佸彉鏇村悗鐨勭姸鎬�</param>
- public override void GatewayOnlinePush(ZbGateway gateWay, bool online)
+ /// <param name="hadGwOnline">2020.05.25杩藉姞:姝や綇瀹呮槸鍚︽嫢鏈夌綉鍏冲湪绾�</param>
+ public override void GatewayOnlinePush(ZbGateway gateWay, bool online, bool hadGwOnline)
{
if (this.gatewayViewRow == null)
{
return;
}
- if (HdlGatewayLogic.Current.GetGatewayId(gateWay) == this.gatewayViewRow.zbGatewayId)
+ if (gateWay.GwId == this.gatewayViewRow.zbGatewayId)
{
Application.RunOnMainThread(() =>
{
- this.gatewayViewRow?.RefreshControl();
+ //鐩稿悓鐨勭姸鎬�,涓嶉渶瑕佸啀娆″埛鏂�
+ if (this.gatewayViewRow.isOnline != online)
+ {
+ //鏍规嵁缃戝叧鍦ㄧ嚎鐘舵�佸埛鏂拌澶囧湪绾跨姸鎬�
+ this.RefreshDeviceOnlineStatuByGatewayOnline(online);
+ }
+ //鍒锋柊鎺т欢鍦ㄧ嚎鐘舵��
+ this.gatewayViewRow?.RefreshOnlineStatu();
});
}
}
@@ -709,52 +763,43 @@
#region 鈻� 璁惧鍦ㄧ嚎妫�娴媉______________________
/// <summary>
- /// 寮�鍚澶囧湪绾跨嚎绋�
+ /// 鏍规嵁缃戝叧鍦ㄧ嚎鐘舵�佸埛鏂拌澶囧湪绾跨姸鎬�
/// </summary>
/// <param name="gatewayOnline">缃戝叧鐨勫湪绾跨姸鎬�</param>
- private void StartDeviceListControlThread(bool gatewayOnline)
+ private void RefreshDeviceOnlineStatuByGatewayOnline(bool gatewayOnline)
{
if (gatewayOnline == false)
{
//璁剧疆鍏ㄩ儴璁惧绂荤嚎
this.SetAllDeviceOffLine();
- return;
}
- //寮�鍚紶鎰熷櫒鎶ヨ鐩戣
- this.StartCheckDeviceAlarm();
- //寮�鍚澶囧湪绾跨洃娴�
- this.StartCheckDeviceOnline();
+ else
+ {
+ //鍒锋柊璁惧鍦ㄧ嚎鐘舵��
+ this.RefreshDeviceOnlineStatu();
+ }
}
/// <summary>
- /// 寮�鍚澶囧湪绾跨洃娴�
+ /// 鍒锋柊璁惧鍦ㄧ嚎鐘舵��
/// </summary>
- private void StartCheckDeviceOnline()
+ private void RefreshDeviceOnlineStatu()
{
- //澶栭儴璋冪敤鐨勮瘽,涓嶅啀閲嶆柊鑾峰彇璁惧鐘舵��
- if (this.reGetDeviceOnlineStatu == false)
- {
- return;
- }
-
- //娣诲姞鎺ユ敹璁惧鍦ㄧ嚎涓婃姤鐨勭洃鍚�
- HdlGatewayReceiveLogic.Current.AddAttributeEvent("DeviceListFormReceivePushOnline", ReceiveComandDiv.A璁惧鍦ㄧ嚎涓婃姤, this.ReceiveDeviceStatu);
-
string gwId = GatewayResourse.NowSelectGatewayId;
HdlThreadLogic.Current.RunThread(() =>
{
+ System.Threading.Thread.Sleep(2000);
//杩欓噷涓昏鍙槸鑾峰彇鍦ㄧ嚎鐘舵��
- var zbway = HdlGatewayLogic.Current.GetLocalGateway(gwId);
- int statu = 0;
- var list = LocalDevice.Current.GetDeviceListFromGateway(zbway, ref statu, false, ShowErrorMode.NO);
- if (statu != -1)
+ var list = LocalDevice.Current.GetDeviceOnlineList(gwId);
+ HdlThreadLogic.Current.RunMain(() =>
{
for (int i = 0; i < list.Count; i++)
{
//璁剧疆璁惧鍦ㄧ嚎鐘舵��
this.ReceiveDeviceStatu(list[i]);
}
- }
+
+ }, ShowErrorMode.NO);
});
}
@@ -779,29 +824,22 @@
if (localDevice != null)
{
//鍦ㄧ嚎鐘舵�佷竴鏍风殑璇濓紝涓嶉渶瑕佸埛鏂�
- if (localDevice.IsOnline == device.IsOnline)
+ if (localDevice.IsOnline != device.IsOnline)
{
- return;
+ //淇濆瓨鐘舵��
+ localDevice.IsOnline = device.IsOnline;
+ localDevice.ReSave();
}
- //淇濆瓨鐘舵��
- localDevice.IsOnline = device.IsOnline;
- localDevice.ReSave();
}
- HdlThreadLogic.Current.RunMain(() =>
+ rowInfo.MenuRow.IsOnline = Common.LocalDevice.Current.CheckDeviceIsOnline(device);
+ if (rowInfo.dicDetailRow != null)
{
- if (rowInfo != null)
+ foreach (var detailRow in rowInfo.dicDetailRow.Values)
{
- rowInfo.MenuRow.isOnline = device.IsOnline == 1;
- if (rowInfo.dicDetailRow != null)
- {
- foreach (var detailRow in rowInfo.dicDetailRow.Values)
- {
- detailRow.isOnline = rowInfo.MenuRow.isOnline;
- }
- }
+ detailRow.IsOnline = rowInfo.MenuRow.IsOnline;
}
- });
+ }
}
/// <summary>
@@ -809,17 +847,20 @@
/// </summary>
private void SetAllDeviceOffLine()
{
- lock (dicRowInfo)
+ foreach (var rowInfo in this.dicRowInfo.Values)
{
- foreach (var rowInfo in this.dicRowInfo.Values)
+ //鑿滃崟
+ if (rowInfo.MenuRow != null)
{
- Application.RunOnMainThread(() =>
+ rowInfo.MenuRow.IsOnline = false;
+ }
+ //鏄庣粏
+ if (rowInfo.dicDetailRow != null)
+ {
+ foreach (var detailRow in rowInfo.dicDetailRow.Values)
{
- if (rowInfo.MenuRow != null)
- {
- rowInfo.MenuRow.isOnline = false;
- }
- });
+ detailRow.IsOnline = false;
+ }
}
}
}
@@ -905,7 +946,7 @@
#region 鈻� 瀹炵幇澶栭儴璋冪敤_______________________
/// <summary>
- /// 娣诲姞鏂扮殑璁惧鍒扮晫闈㈡甯冧腑
+ /// 娣诲姞鏂扮殑璁惧鍒扮晫闈㈡甯冧腑(澶栭儴璋冪敤)
/// </summary>
/// <param name="deviceAddr">璁惧Mac鍦板潃</param>
public void AddDeviceToFormTable(string deviceAddr)
@@ -933,6 +974,30 @@
//鍒涘缓鏂扮殑琛�
this.AddDeviceMenuRow(deviceAddr);
+
+ //璁板綍褰撳墠鐨勬鍦ㄦ搷浣滅殑璁惧鐨凪ac鍦板潃
+ this.nowActionDeviceMac = deviceAddr;
+ }
+ }
+
+ /// <summary>
+ /// 鍒锋柊鎸囧畾璁惧琛岀殑淇℃伅(澶栭儴璋冪敤)
+ /// </summary>
+ /// <param name="deviceAddr">璁惧Mac鍦板潃</param>
+ public void RefreshDeviceRow(string deviceAddr)
+ {
+ if (this.dicRowInfo.ContainsKey(deviceAddr) == true)
+ {
+ var row = this.dicRowInfo[deviceAddr];
+ row.MenuRow?.RefreshControlInfo(true);
+ //鏄庣粏
+ if (row.dicDetailRow != null)
+ {
+ foreach (var detailRow in row.dicDetailRow.Values)
+ {
+ detailRow.RefreshControlInfo();
+ }
+ }
}
}
@@ -1082,6 +1147,10 @@
/// 缃戝叧鍚嶅瓧鎺т欢
/// </summary>
private NormalViewControl btnName = null;
+ /// <summary>
+ /// 鍦ㄧ嚎鐘舵��
+ /// </summary>
+ public bool isOnline = false;
/// <summary>
/// 鑷畾涔夌綉鍏虫帶浠�
@@ -1092,9 +1161,10 @@
this.UseClickStatu = false;
if (i_zbGateway != null)
{
- this.zbGatewayId = HdlGatewayLogic.Current.GetGatewayId(i_zbGateway);
+ this.zbGatewayId = i_zbGateway.GwId;
}
this.BackgroundColor = UserCenterColor.Current.White;
+ this.Y = Application.GetRealHeight(174);
this.Height = Application.GetRealHeight(173);
}
@@ -1124,7 +1194,9 @@
if (zbway != null)
{
btnName.Text = HdlGatewayLogic.Current.GetGatewayName(zbway);
- if (HdlGatewayLogic.Current.CheckGatewayOnlineByFlag(zbway) == false)
+ //鍦ㄧ嚎鐘舵��
+ this.isOnline = HdlGatewayLogic.Current.CheckGatewayOnlineByFlag(zbway);
+ if (this.isOnline == false)
{
btnName.TextColor = UserCenterColor.Current.TextGrayColor1;
}
@@ -1176,17 +1248,86 @@
return;
}
btnName.Text = HdlGatewayLogic.Current.GetGatewayName(zbway);
- if (HdlGatewayLogic.Current.CheckGatewayOnlineByFlag(zbway) == false)
+ //鍒锋柊鎺т欢鍦ㄧ嚎鐘舵��
+ this.RefreshOnlineStatu();
+ }
+
+ /// <summary>
+ /// 鍒锋柊鎺т欢鍦ㄧ嚎鐘舵��
+ /// </summary>
+ public void RefreshOnlineStatu()
+ {
+ //鑾峰彇鏈湴缃戝叧瀵硅薄
+ ZbGateway zbway = HdlGatewayLogic.Current.GetLocalGateway(zbGatewayId);
+ if (zbway == null)
{
- btnName.TextColor = UserCenterColor.Current.TextGrayColor1;
+ return;
}
- else
+ //鍦ㄧ嚎鐘舵��
+ bool statu = HdlGatewayLogic.Current.CheckGatewayOnlineByFlag(zbway);
+ if (this.isOnline != statu)
{
- btnName.TextColor = UserCenterColor.Current.TextColor1;
+ this.isOnline = statu;
+ if (this.isOnline == false)
+ {
+ btnName.TextColor = UserCenterColor.Current.TextGrayColor1;
+ }
+ else
+ {
+ btnName.TextColor = UserCenterColor.Current.TextColor1;
+ }
}
}
}
+ #endregion
+ #region 鈻� 鑷畾涔夋櫤鑳介煶绠辨帶浠禵____________________
+
+ /// <summary>
+ /// 鑷畾涔夌綉鍏虫帶浠�
+ /// </summary>
+ private class MySmartSoundControl : FrameRowControl
+ {
+
+ /// <summary>
+ /// 缃戝叧鍚嶅瓧鎺т欢
+ /// </summary>
+ private NormalViewControl btnName = null;
+
+ /// <summary>
+ /// 鑷畾闊崇鍏虫帶浠�
+ /// </summary>
+ public MySmartSoundControl()
+ {
+ this.UseClickStatu = false;
+ this.BackgroundColor = UserCenterColor.Current.White;
+ this.Height = Application.GetRealHeight(173);
+
+ //this.InitControl();
+ }
+
+
+ /// <summary>
+ /// 鍒濆鍖栨帶浠�
+ /// </summary>
+ public void InitControl()
+ {
+ //鍥炬爣
+ var btnIcon = this.AddLeftIcon(81);
+ btnIcon.UnSelectedImagePath = "SmartSound/SoundIcon.png";
+
+ //鏄剧ず鏂囨湰
+ btnName = this.AddLeftCaption(string.Empty, 700);
+ btnName.Height = Application.GetRealHeight(60);
+ btnName.TextSize = 15;
+ btnName.Y = Application.GetRealHeight(57);
+ btnName.Text = "灏忓害灏忓害";
+
+ this.AddRightArrow();
+ this.AddMostRightView("", 300, false).Name = "smartSoundLayout";
+ this.AddBottomLine();
+ }
+ }
#endregion
}
}
--
Gitblit v1.8.0