From 8bdaa9078e89f2db165c27de9d4d87cb0a05e18b Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 09 二月 2023 14:44:00 +0800
Subject: [PATCH] 修复全视通安卓版本无法监控的问题

---
 HDL_ON/UI/UI2/3-Intelligence/Automation/FunTpye.cs |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/FunTpye.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/FunTpye.cs
index e826f65..85ff3c3 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/FunTpye.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/FunTpye.cs
@@ -244,12 +244,20 @@
             var typeFunctionList = LogicMethod.Current.GetDeviceTypeFunctionList(UserInfo.Current.logicselectedFunction);
             ///鑾峰彇璁惧鍗曚釜灏忕被鍒楄〃锛堜緥濡傦細鐏厜1,鐏厜2...锛�
             var lists = LogicMethod.Current.GetShowDeviceList(typeFunctionList, deviceList);
+            if (string.IsNullOrEmpty(UserInfo.Current.logicselectedRoom.roomName))
+            {
+                UserInfo.Current.logicselectedRoom.roomName = Language.StringByID(StringId.allAreas);
+            }
             ///鎴块棿鍚嶇О
             funAllAreaView.btnText1.Text = UserInfo.Current.logicselectedRoom.roomName;
+            if (string.IsNullOrEmpty(UserInfo.Current.logicselectedFunction))
+            {
+                UserInfo.Current.logicselectedFunction = Language.StringByID(StringId.allFun);
+            }
             ///璁惧澶х被鍚嶇О<鐏厜绫汇�傘�傘�傘�傘��>
             funAllAreaView.btnText2.Text = UserInfo.Current.logicselectedFunction;
             this.LoadingDeviceListView(vv, lists);
-
+            
         }
         /// <summary>
         /// 鏄剧ず璁惧鐨刅iew

--
Gitblit v1.8.0