From e12a799460d514261d9317d42008448f0ea470ee Mon Sep 17 00:00:00 2001 From: wxr <464027401@qq.com> Date: 星期五, 17 三月 2023 14:35:48 +0800 Subject: [PATCH] 场景配置优化 --- HDL-ON_Android/Properties/AndroidManifest.xml | 2 +- HDL_ON/Entity/Function/Function.cs | 2 +- HDL_ON/DAL/Server/HttpServerRequest.cs | 12 ++++++++++++ 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/HDL-ON_Android/Properties/AndroidManifest.xml b/HDL-ON_Android/Properties/AndroidManifest.xml index 351099b..60e9e18 100644 --- a/HDL-ON_Android/Properties/AndroidManifest.xml +++ b/HDL-ON_Android/Properties/AndroidManifest.xml @@ -1,5 +1,5 @@ 锘�<?xml version="1.0" encoding="utf-8"?> -<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.7" package="com.hdl.onpro" xmlns:tools="http://schemas.android.com/tools" android:versionCode="202303061"> +<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.7" package="com.hdl.onpro" xmlns:tools="http://schemas.android.com/tools" android:versionCode="202303171"> <uses-sdk android:minSdkVersion="26" android:targetSdkVersion="29" /> <!--鍙嬬洘--> <!--<uses-sdk android:minSdkVersion="8"></uses-sdk>--> diff --git a/HDL_ON/DAL/Server/HttpServerRequest.cs b/HDL_ON/DAL/Server/HttpServerRequest.cs index 7d4034e..585b717 100644 --- a/HDL_ON/DAL/Server/HttpServerRequest.cs +++ b/HDL_ON/DAL/Server/HttpServerRequest.cs @@ -544,6 +544,14 @@ var homeList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<RegionInfoRes>>(resultObj.Data.ToString()); if (homeList == null || homeList.Count == 0) { + if (DB_ResidenceData.Instance.CurrentRegion.id != "") + { + DB_ResidenceData.Instance.CurrentRegion = null; + Shared.Application.RunOnMainThread(() => + { + MainPage.GoUserPage(false); + }); + } } else { @@ -564,6 +572,10 @@ } if (UserInfo.Current.regionList.Count == 0) { + Shared.Application.RunOnMainThread(() => + { + MainPage.GoUserPage(false); + }); return "null"; } //-------濡傛灉璐﹀彿鏄娆$櫥褰� diff --git a/HDL_ON/Entity/Function/Function.cs b/HDL_ON/Entity/Function/Function.cs index dc0d526..0ce3348 100644 --- a/HDL_ON/Entity/Function/Function.cs +++ b/HDL_ON/Entity/Function/Function.cs @@ -751,7 +751,7 @@ foreach (var attr in attributes) { //绐楀笜鍚屾椂鍙戦�佸紑鍏宠窡鐧惧垎姣斾細鏈夐棶棰橈紝 - if(spk == SPK.CurtainRoller || spk == SPK.CurtainTrietex) + if(spk == SPK.CurtainRoller || spk == SPK.CurtainTrietex || spk == SPK.CurtainDream) { if (attr.key == FunctionAttributeKey.OnOff) { -- Gitblit v1.8.0