From c8c33200e43f05136eca9fc8ff4942f8def31cc6 Mon Sep 17 00:00:00 2001 From: JLChen <551775569@qq.com> Date: 星期三, 18 八月 2021 10:45:40 +0800 Subject: [PATCH] 2021-08-18 1.完善Android对接LinphoneSDK 2.完善SIP相关接口对接 --- HDL_ON/UI/MainPage.cs | 28 +++++++++++++++++++++++++--- 1 files changed, 25 insertions(+), 3 deletions(-) diff --git a/HDL_ON/UI/MainPage.cs b/HDL_ON/UI/MainPage.cs index cc24670..223ecbc 100644 --- a/HDL_ON/UI/MainPage.cs +++ b/HDL_ON/UI/MainPage.cs @@ -1,6 +1,7 @@ 锘縰sing System; using System.Collections.Generic; using HDL_ON.DAL; +using HDL_ON.Entity; using HDL_ON.UI; using HDL_ON.UI.CSS; using Shared; @@ -24,7 +25,7 @@ /// <summary> /// 鐗堟湰鍙� /// </summary> - public static string VersionString = "1.2.0629"; + public static string VersionString = "1.2.0721"; ///// <summary> ///// 瀹㈡埛绔被鍨� ///// </summary> @@ -98,6 +99,26 @@ } } + /// <summary> + /// 鍦烘櫙鏀寔鐨勫姛鑳藉垪琛� + /// </summary> + public static List<string> SceneSupportFunctionList = new List<string> { + SPK.LightCCT,SPK.LightDimming,SPK.LightSwitch,SPK.LightRGB, + SPK.CurtainRoller,SPK.CurtainSwitch,SPK.CurtainTrietex, + SPK.AcIr,SPK.AcStandard, + SPK.FloorHeatStandard, + + }; + /// <summary> + /// 鎴块棿鍔熻兘鍒楄〃涓嶅姞杞界殑鍔熻兘鍒楄〃 + /// </summary> + public static List<string> RoomNotSupportFunctionList = new List<string> + { + SPK.EnergyStandard, + SPK.MusicStandard, + }; + + public static void Show() { @@ -138,7 +159,7 @@ //}) //{ IsBackground = true }.Start(); Common.ApiUtlis.Ins.DownloadData(); - + GoUserPage(false,true); } } @@ -174,7 +195,7 @@ /// <param name="isFirstOpen">濡傛灉鏄涓�娆″惎鍔� 妫�娴嬫牎楠屽瘑鐮�</param> /// <param name="pageShowEvent">涓婚〉鏄剧ず涔嬪悗瑙﹀彂鐨勪簨浠�(娌℃湁浣忓畢鐨勮瘽,鍒欎笉浼氳Е鍙�)</param> public static void GoUserPage(bool downloadData , bool isFirstOpen = false, Action pageShowEvent = null) - { + { BaseView.RemoveAll(); #region 鍚庨��浜嬩欢 BasePageView = new PageLayout(); @@ -335,6 +356,7 @@ { if (downloadData) { + DB_ResidenceData.Instance.EixtAccount(); ///鍒濆鍖朼pp鏁版嵁 Common.ApiUtlis.Ins.DownloadData(); }; -- Gitblit v1.8.0