Merge branch 'wxr-2.0' into Dev-Branch

wxr

2023-09-06 fdbcb1f7463cb766f90bd29dd715485ba9d88524

Merge branch 'wxr-2.0' into Dev-Branch

 DLL/Linphone/Android/Shared.Droid.HDLLinphone.dll

Binary files differ

 DLL/Linphone/Android/Shared.Droid.HDLLinphone1.dll

Binary files differ

 DLL/Linphone/iOS/Shared.IOS.HDLLinphoneSDK.dll

Binary files differ

 HDL-ON_Android/Assets/Phone/Collection/GatewayOnlineTipIcon.png

 HDL-ON_Android/HDL-ON_Android.csproj

@@ -598,6 +598,13 @@
    <AndroidAsset Include="Assets\Phone\HisenseTv\yingliangjiaSelected.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\IlluminationBg.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\IlluminationIcon.png" />
    <AndroidAsset Include="Assets\h5\static\js\pages-index-index~pages-inverter-index.0253e8cd.js" />
    <AndroidAsset Include="Assets\h5\static\img\inverter-center.18b181f4.png" />
    <AndroidAsset Include="Assets\h5\static\img\co2-reduction-ic.9c75228c.png" />
    <AndroidAsset Include="Assets\h5\static\img\equal-plant-ic.7ef6befa.png" />
    <AndroidAsset Include="Assets\h5\static\img\coal-save-ic.6c5fd125.png" />
    <AndroidAsset Include="Assets\h5\static\font\SourceHanSansCN-Normal.otf" />
    <AndroidAsset Include="Assets\Phone\Collection\GatewayOnlineTipIcon.png" />
  </ItemGroup>
  <ItemGroup>
    <AndroidResource Include="Resources\values\colors.xml" />

 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="2.1.2" package="com.hdl.onpro" xmlns:tools="http://schemas.android.com/tools" android:versionCode="202308171">
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="2.1.3" package="com.hdl.onpro" xmlns:tools="http://schemas.android.com/tools" android:versionCode="202309061">
    <uses-sdk android:minSdkVersion="26" android:targetSdkVersion="29" />
    <uses-permission android:name="android.permission.RECEIVE_SMS" />
    <!--友盟-->

 HDL-ON_Android/Resources/Resource.designer.cs

@@ -15,7 +15,7 @@
{
    
    
    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "13.2.0.99")]
    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "13.2.1.111")]
    public partial class Resource
    {
        

 HDL-ON_iOS/HDL-ON_iOS.csproj

@@ -1752,6 +1752,7 @@
      <BundleResource Include="Resources\Phone\HisenseTv\yingliangjiaSelected.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\EnvirSensor\IlluminationBg.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\EnvirSensor\IlluminationIcon.png" />
      <BundleResource Include="Resources\Phone\Collection\GatewayOnlineTipIcon.png" />
    </ItemGroup>
    <ItemGroup>
      <ITunesArtwork Include="iTunesArtwork" />

 HDL-ON_iOS/Info.plist

@@ -11,7 +11,7 @@
    <key>CFBundleName</key>
    <string>On Pro</string>
    <key>CFBundleShortVersionString</key>
    <string>2.1.2</string>
    <string>2.1.3</string>
    <key>CFBundleURLTypes</key>
    <array>
        <dict>
@@ -36,7 +36,7 @@
        </dict>
    </array>
    <key>CFBundleVersion</key>
    <string>2.1.2</string>
    <string>2.1.3</string>
    <key>LSApplicationQueriesSchemes</key>
    <array>
        <string>weixinULAPI</string>

 HDL-ON_iOS/Resources/Phone/Collection/GatewayOnlineTipIcon.png

 HDL_ON/DAL/DriverLayer/Control.cs

@@ -732,8 +732,18 @@
                }
                else
                {
                    var pm = new DAL.Server.HttpServerRequest();
                    var pack = pm.RefreshDeviceStatus(new List<string>() { function.deviceId });
                    var pm = new HttpServerRequest();
                    try
                    {
                        pm.RefreshDeviceStatus(new List<string>() { function.deviceId });
                    }catch(Exception ex)
                    {
                        MainPage.Log($"远程读取设备状态异常:{ex.Message}");
                    }
                    finally
                    {
                        pm = null;
                    }
                }
            }
        }
@@ -1312,16 +1322,6 @@
                        }
                        MainPage.Log(localFunction.name);

                        if (Ins.GatewayOnline_Local && isCloudData)//本地链接，除了涂鸦设备数据之外的云端数据不处理
                        {
                            if (!SPK.Get3tySpk(SPK.BrandType.All3tyBrand).Contains(localFunction.spk) && !SPK.MusicSpkList().Contains(localFunction.spk))
                            {
                                //MainPage.Log($"A协议更新状态:本地链接，除了涂鸦设备数据之外的云端数据不处理........");

                                return;
                            }
                        }

                        //if (SPK.MusicSpkList().Contains(localFunction.spk))
                        //{
                        //    if (updateTemp.status.Count < 3)
@@ -1342,6 +1342,11 @@
                        {
                            localFunction.online = updateTemp.online;
                        }
                        if (SPK.LightSpkList().Contains(localFunction.spk))
                        {
                            localFunction.updateTime = DateTime.Now;
                        }
                       

                        //更新界面状态
                        switch (localFunction.spk)
@@ -1606,6 +1611,7 @@
                                break;
                        }

                        
                        HomePage.UpdataFunctionStates(localFunction);
                        RoomPage.UpdataStates(localFunction);
                        FunctionPage.UpdataStates(localFunction);

 HDL_ON/DAL/Mqtt/MqttClient.cs

@@ -553,7 +553,7 @@
                                {
                                    var bytes = Securitys.EncryptionService.AesDecryptPayload(e.ApplicationMessage.Payload, tuyaEncryptKey);
                                    var revString = Encoding.UTF8.GetString(bytes);
                                    MainPage.Log($"mqtt 状态更新:{revString}");
                                    //MainPage.Log($"mqtt 状态更新:{revString}");
                                    Control.Ins.UpdataFunctionStatus(revString, null, true);
                                    //Control.Ins.MsgInfoList.Add($"mqtt 状态更新:{revString}");
                                    //Control.Ins.MsgInfoList.Add(revString + "\r\n");

 HDL_ON/DAL/Server/HttpServerRequest.cs

@@ -3649,7 +3649,6 @@
            var pack = HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_GetGroupControlInfos, requestJson);
            return pack;
        }

        /// <summary>
        /// 获取群控详情
        /// </summary>

 HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs

@@ -454,7 +454,13 @@

#if __IOS__

            if (mHDLCallVideoInfo.spk == "door.gate")
            {
                Shared.IOS.HDLLinphoneSDK.HDLLinPhoneSDK.Instance().CallHDLSRWithUserName(mHDLCallVideoInfo.DeviceSipAccount, mHDLCallVideoInfo.DeviceName);   
            }else{
            Shared.IOS.HDLLinphoneSDK.HDLLinPhoneSDK.Instance().CallWithUserName(mHDLCallVideoInfo.DeviceSipAccount, mHDLCallVideoInfo.DeviceName);
            }
            

#else
            //1.先呼叫设备

 HDL_ON/Entity/Function/Function.cs

@@ -1060,6 +1060,11 @@
        /// 更新时间
        /// </summary>
        public DateTime refreshTime = DateTime.MinValue;
        /// <summary>
        /// 最后更新状态的时间
        /// </summary>
        [Newtonsoft.Json.JsonIgnore]
        public DateTime updateTime = DateTime.MinValue;

        /// <summary>
        /// 获取本地控制数据

 HDL_ON/UI/MainPage.cs

@@ -26,7 +26,7 @@
        /// <summary>
        /// 版本号
        /// </summary>
        public static string VersionString = "2.1.2";
        public static string VersionString = "2.1.3";
        ///// <summary>
        ///// 客户端类型
        ///// </summary>
@@ -634,7 +634,8 @@
                || msg.Contains("发送")
                || msg.Contains("接收到推送")
                   || msg.Contains("api")

                || msg.Contains("读取功能状态")
                //|| true
                )
                Console.WriteLine(msg);
#endif

 HDL_ON/UI/UI1-Login/LoginPage.cs

@@ -311,7 +311,6 @@
                    //etAccount.Text = "18244942707";
                    //etAccount.Text = "13143792049";
                    etAccount.Text = "18688414428";//天河3楼
                    //etAccount.Text = "18244942707";
                    //etAccount.Text = "13418062953";
                    etAccount.Text = "13138683659";
                    //etAccount.Text = "15217626103";
@@ -326,6 +325,7 @@
                    etAccount.Text = "pjh@hdlchina.com.cn";
                    //etAccount.Text = "12345678904";//2.0 测试  萤石
                    etAccount.Text = "18316672920";
                    etAccount.Text = "18244942707";
                }
                else
                {

 HDL_ON/UI/UI2/1-HomePage/HomePage.cs

@@ -30,7 +30,7 @@
        /// <summary>
        /// 连接状态提示
        /// </summary>
        Button btnLinkStateTip;
        FrameLayout divLinkStateTip;
        /// <summary>
        /// 安防状态图标
        /// </summary>
@@ -213,69 +213,35 @@
                    IsBold = true
                };
                topView.AddChidren(btnResidenceName);
                btnLinkStateTip = new Button()

                divLinkStateTip = new FrameLayout()
                {
                    //X = Application.GetRealWidth(16),
                    Y = btnResidenceName.Bottom,
                    Height = Application.GetRealWidth(14),
                    //BackgroundColor = CSS_Color.LinkTipFail,
                    TextAlignment = TextAlignment.Center,
                    Y = Application.GetRealHeight(113) - Application.GetRealWidth(24),
                    Height = Application.GetRealWidth(24),
                    BackgroundColor = 0xFFFF4747,
                    Visible = false,
                };
                topView.AddChidren(divLinkStateTip);
                Button btnLinkStateIcon = new Button()
                {
                    X = Application.GetRealWidth(16),
                    Gravity = Gravity.CenterVertical,
                    Width = Application.GetRealWidth(20),
                    Height = Application.GetRealWidth(20),
                    UnSelectedImagePath = "Collection/GatewayOnlineTipIcon.png"
                };
                divLinkStateTip.AddChidren(btnLinkStateIcon);

                var btnLinkStateTip = new Button()
                {
                    X = btnLinkStateIcon.Right + Application.GetRealWidth(4),
                    TextAlignment = TextAlignment.CenterLeft,
                    TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
                    TextColor = CSS_Color.MainBackgroundColor,
                    TextID = StringId.NetworkAnomaly,
                };
                topView.AddChidren(btnLinkStateTip);
                //btnLinkStateTip.Width = btnLinkStateTip.GetTextWidth();
                divLinkStateTip.AddChidren(btnLinkStateTip);
                //更新链接状态icon颜色


#if DEBUG
                int ddd = 0;
                btnResidenceName.MouseUpEventHandler = (sender, e) =>
                {
                    //827a98c98da7469b8bc19bb6a3c7651906
                    //St_00009073b431d8b2490c9df0c5cb0e73
                    //Com.Hdl.HdlToLc.InitData(Shared.Application.Activity,false, "827a98c98da7469b8bc19bb6a3c7651906");
                    //Com.Hdl.HdlToLc.OpenActivity();
                    //new System.Threading.Thread(() =>
                    //{
                    //    var http = new HttpServerRequest();
                    //    var pack = http.GetLcSubAccountToken();
                    //    if (pack.Code == StateCode.SUCCESS)
                    //    {
                    //        if(pack.Data == null || string.IsNullOrEmpty(pack.Data.ToString()))
                    //        {
                    //            Application.RunOnMainThread(() =>
                    //            {
                    //                new PublicAssmebly().TipMsg(Language.StringByID(StringId.Tip), Language.StringByID(StringId.huoqushujushibao));
                    //            });
                    //        }
                    //        Com.Utils.HdlToLcUtils.Instance.HomeId = DB_ResidenceData.Instance.CurrentRegion.id;
                    //        Com.Utils.HdlToLcUtils.Instance.Token = UserInfo.Current.AccessToken;
                    //        Com.Utils.HdlToLcUtils.Instance.SubAccessToken = pack.Data.ToString();
                    //        Application.RunOnMainThread(() =>
                    //        {
                    //            //Com.Utils.HdlToLcUtils.Instance.OpenActivity();
                    //            //Com.Utils.HdlToLcUtils.Instance.Play()
                    //            var backTemp = new AddLcCam();
                    //            backTemp.backAction = () =>
                    //            {
                    //                //Load3tyBrandDeviceList();
                    //            };
                    //            Com.Utils.HdlToLcUtils.Instance.AddCamera(backTemp);
                    //        });
                    //    }
                    //    else
                    //    {
                    //        Application.RunOnMainThread(() =>
                    //        {
                    //            new PublicAssmebly().TipMsg(Language.StringByID(StringId.Tip), Language.StringByID(StringId.huoqushujushibao) + $"({pack.Code})");
                    //        });
                    //    }
                    //})
                    //{ IsBackground = true }.Start();
                };
#endif

                environmentalView = new FrameLayout()
                {
                    Y = Application.GetRealHeight(1) + btnResidenceName.Bottom,

 HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs

@@ -269,15 +269,15 @@

            if (!Control.Ins.GatewayOnline_Local && !Control.Ins.GatewayOnline_Cloud)
            {
                bodyView.btnLinkStateTip.BackgroundColor = CSS.CSS_Color.LinkTipFail;
                bodyView.btnLinkStateTip.TextID = StringId.NetworkAnomaly;
                bodyView.environmentalView.Y = Application.GetRealHeight(8) + btnResidenceName.Bottom;
                bodyView.divLinkStateTip.Visible = true;
            }
            //else if ()
            //{
            //    bodyView.divLinkStateTip.Visible = true;
            //}
            else
            {
                bodyView.btnLinkStateTip.BackgroundColor = 0x00000000;
                bodyView.btnLinkStateTip.Text = "";
                bodyView.environmentalView.Y = Application.GetRealHeight(1) + btnResidenceName.Bottom;
                bodyView.divLinkStateTip.Visible = false;
            }
        }

@@ -351,11 +351,17 @@
            }
        }

        object lockObj = new object();

        /// <summary>
        /// 更新显示状态
        /// </summary>
        public static void UpdataFunctionStates(Function function)
        {
            if(bodyView == null)
            {
                return;
            }
            Application.RunOnMainThread(() =>
            {
                try

 HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs

@@ -89,14 +89,14 @@
            #region top
            FrameLayout topView = new FrameLayout()
            {
                Height = Application.GetRealHeight(64),
                Height = Application.GetRealHeight(74),
                BackgroundColor = CSS_Color.TopViewColor,
            };
            bodyView.AddChidren(topView);

            btnRoomTilte = new Button()
            {
                Y = Application.GetRealHeight(30),
                Y = Application.GetRealHeight(40),
                Width = Application.GetRealWidth(170),
                Height = Application.GetRealHeight(25),
                TextAlignment = TextAlignment.CenterRight,
@@ -111,7 +111,7 @@
            btnFuncTitle = new Button()
            {
                X = Application.GetRealWidth(209),
                Y = Application.GetRealHeight(30),
                Y = Application.GetRealHeight(40),
                Width = Application.GetRealWidth(170),
                Height = Application.GetRealHeight(25),
                TextAlignment = TextAlignment.CenterLeft,
@@ -125,8 +125,8 @@

            contentPageView = new PageLayout()
            {
                Y = Application.GetRealHeight(64),
                Height = Application.GetRealHeight(667 - 64 - 49 + 30),
                Y = Application.GetRealHeight(74),
                Height = Application.GetRealHeight(667 - 74 - 49 + 30),
                BackgroundColor = CSS_Color.MainBackgroundColor,
                IsShowPoint = false
            };

 HDL_ON/UI/UI2/2-Classification/FunctionPageBLL.cs

@@ -4,14 +4,86 @@
{
    public partial class FunctionPage
    {
        System.Threading.Thread updateUiThread;
        object lockObj = new object();
        /// <summary>
        /// 更新功能列表界面功能状态
        /// </summary>
        /// <param name="function"></param>
        public static void UpdataStates(Function function)
        {
            try
            {
                if (bodyView == null)
                {
                    return;
                }
                //if (SPK.LightSpkList().Contains(function.spk))
                //{

                //    {
                //        var localFunction = FunctionList.List.GetLightList().Find((obj) => obj.sid == function.sid);
                //        {
                //            if (localFunction != null)
                //            {
                //                if (bodyView.updateUiThread == null)
                //                {
                //                    bodyView.updateUiThread = new System.Threading.Thread(() =>
                //                    {
                //                        lock (bodyView.lockObj)
                //                        {
                //                            if (bodyView.updateUiThread == null)
                //                            {
                //                                MainPage.Log("线程被置空了！！");
                //                                return;
                //                            }
                //                            try
                //                            {
                //                                while (true)
                //                                {
                //                                    System.Threading.Thread.Sleep(1500);
                //                                    if (bodyView == null)
                //                                    {
                //                                        return;
                //                                    }
                //                                    if (DateTime.Now.AddMilliseconds(-1500) > localFunction.updateTime)
                //                                    {
                //                                        MainPage.Log("没有新数据，更新UI");
                //                                        break;
                //                                    }
                //                                    else
                //                                    {
                //                                        MainPage.Log("有新数据，继续等待");
                //                                    }
                //                                }
                //                                new ClassificaitionPublicBLL().UpdataStates(localFunction, bodyView, functionListView);
                //                            }
                //                            catch (Exception ex)
                //                            {
                //                                MainPage.Log("FunctionPage UpdateStates error 2 :" + ex.Message);
                //                            }
                //                            finally
                //                            {
                //                                //bodyView.updateUiThread = null;
                //                            }
                //                        }
                //                    });
                //                    bodyView.updateUiThread.IsBackground = true;
                //                    bodyView.updateUiThread.Start();
                //                }
                //            }
                //        }
                //    }
                //}
                //else
                {
            new ClassificaitionPublicBLL().UpdataStates(function, bodyView, functionListView);
        }
            }catch(Exception ex)
            {
                MainPage.Log("FunctionPage UpdateStates error " + ex.Message);
            }
        }

        public static void UpdataOnline(Function function)
        {

 HDL_ON/UI/UI2/2-Classification/RoomPageBLL.cs

@@ -6,14 +6,94 @@
{
    public partial class RoomPage
    {
        System.Threading.Thread updateUiThread;
        object lockObj = new object();
        /// <summary>
        /// 更新功能状态
        /// </summary>
        /// <param name="function"></param>
        public static void UpdataStates(Function function)
        {

            try
            {
                if (bodyView == null)
                {
                    return;
                }
                //if (SPK.LightSpkList().Contains(function.spk))
                //{
                //    {
                //        var localFunction = FunctionList.List.GetLightList().Find((obj) => obj.sid == function.sid);
                //        {
                //            if (localFunction != null)
                //            {
                //                if (bodyView.updateUiThread == null)
                //                {
                //                    bodyView.updateUiThread = new System.Threading.Thread(() =>
                //                    {
                //                        lock (bodyView.lockObj)
                //                        {
                //                            try
                //                            {
                //                                while (true)
                //                                {
                //                                    try
                //                                    {
                //                                        System.Threading.Thread.Sleep(1500);
                //                                        if (bodyView == null)
                //                                        {
                //                                            return;
                //                                        }
                //                                        if (bodyView.updateUiThread == null)
                //                                        {
                //                                            return;
                //                                        }
                //                                        if (DateTime.Now.AddMilliseconds(-1500) > localFunction.updateTime)
                //                                        {
                //                                            MainPage.Log("没有新数据，更新UI");
                //                                            break;
                //                                        }
                //                                        else
                //                                        {
                //                                            MainPage.Log("有新数据，继续等待");
                //                                        }
                //                                    }
                //                                    catch (Exception ex)
                //                                    {
                //                                        MainPage.Log("线程异常:" + ex.Message);
                //                                    }
                //                                }
                //                                new ClassificaitionPublicBLL().UpdataStates(function, bodyView, functionListView, room);
                //                            }
                //                            catch (Exception ex)
                //                            {
                //                                MainPage.Log("FunctionPage UpdateStates error 2 :" + ex.Message);
                //                            }
                //                            finally
                //                            {
                //                                //bodyView.updateUiThread = null;
                //                            }
                //                        }
                //                    });
                //                    bodyView.updateUiThread.IsBackground = true;
                //                    bodyView.updateUiThread.Start();
                //                }
                //            }
                //        }
                //    }
                //}
                //else
                {
            new ClassificaitionPublicBLL().UpdataStates(function, bodyView, functionListView,room);
        }
            }
            catch (Exception ex)
            {
                MainPage.Log("FunctionPage UpdateStates error " + ex.Message);
            }

        }
        public static void UpdataOnline(Function function)
        {
            new ClassificaitionPublicBLL().UpdataOnlineStatus(function, bodyView, functionListView);

 HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs

@@ -76,7 +76,7 @@
            #region top
            topView = new FrameLayout()
            {
                Height = Application.GetRealHeight(64),
                Height = Application.GetRealHeight(74),
                BackgroundColor = CSS_Color.TopViewColor,
            };
            bodyView.AddChidren(topView);
@@ -122,7 +122,7 @@

                    btnSceneTilte = new Button()
                    {
                        Y = Application.GetRealHeight(30),
                        Y = Application.GetRealHeight(40),
                        //Width = Application.GetRealWidth(170),
                        Height = Application.GetRealHeight(25),
                        TextAlignment = TextAlignment.Center,
@@ -143,7 +143,7 @@
                {
                    btnAutomationTitle = new Button()
                    {
                        Y = Application.GetRealHeight(30),
                        Y = Application.GetRealHeight(40),
                        Gravity = Gravity.CenterHorizontal,
                        Height = Application.GetRealHeight(25),
                        TextAlignment = TextAlignment.Center,
@@ -162,7 +162,7 @@

                    btnSceneTilte = new Button()
                    {
                        Y = Application.GetRealHeight(30),
                        Y = Application.GetRealHeight(40),
                        Width = otherWidth,
                        Height = Application.GetRealHeight(25),
                        TextAlignment = TextAlignment.CenterRight,
@@ -178,7 +178,7 @@
                    btnSecurityTitle = new Button()
                    {
                        X = btnAutomationTitle.Right,
                        Y = Application.GetRealHeight(30),
                        Y = Application.GetRealHeight(40),
                        Width = otherWidth,
                        Height = Application.GetRealHeight(25),
                        TextAlignment = TextAlignment.CenterLeft,
@@ -193,7 +193,7 @@
                {
                    btnSceneTilte = new Button()
                    {
                        Y = Application.GetRealHeight(30),
                        Y = Application.GetRealHeight(40),
                        Width = Application.GetRealWidth(170),
                        Height = Application.GetRealHeight(25),
                        TextAlignment = TextAlignment.CenterRight,
@@ -208,7 +208,7 @@
                    btnAutomationTitle = new Button()
                    {
                        X = Application.GetRealWidth(209),
                        Y = Application.GetRealHeight(30),
                        Y = Application.GetRealHeight(40),
                        Width = Application.GetRealWidth(170),
                        Height = Application.GetRealHeight(25),
                        TextAlignment = TextAlignment.CenterLeft,
@@ -223,7 +223,7 @@
            btnAddIconBg = new Button()
            {
                X = Application.GetRealWidth(337),
                Y = Application.GetRealHeight(29),
                Y = Application.GetRealHeight(39),
                Width = Application.GetMinRealAverage(28),
                Height = Application.GetMinRealAverage(28),
                UnSelectedImagePath = "Public/AddIcon.png",
@@ -240,8 +240,8 @@

            contentPageView = new PageLayout()
            {
                Y = Application.GetRealHeight(64),
                Height = Application.GetRealHeight(667 - 64 - 49 + 30),
                Y = Application.GetRealHeight(74),
                Height = Application.GetRealHeight(667 - 74 - 49 + 30),
                BackgroundColor = CSS_Color.BackgroundColor,
                IsShowPoint = false
            };
@@ -399,6 +399,8 @@
                    var rowView = new FrameLayout();
                    new System.Threading.Thread(() =>
                    {
                        try
                        {
                        foreach (var scene in listScene)
                        {
                            if(scene == null)
@@ -431,6 +433,17 @@
                                index++;
                            });
                        }
                        }catch(Exception ex)
                        {
                            MainPage.Log($"加载场景列表异常：{ex.Message}");
                        }
                        finally
                        {
                            Application.RunOnMainThread(() =>
                            {
                                sceneFunctionView.AddChidren(new Button { Height = Application.GetRealHeight(30) });
                            });
                        }
                    })
                    { IsBackground = true }.Start();
                }
@@ -439,8 +452,6 @@
            {
                MainPage.Log("homepage erorr : " + ex.Message);
            }
            sceneFunctionView.AddChidren(new Button { Height = Application.GetRealHeight(30) });

        }

        /// <summary>

 HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneFunctionInfoPage.cs

@@ -79,13 +79,13 @@

            if (sceneFunction.localFunction.spk == SPK.LightRGB || sceneFunction.localFunction.spk == SPK.GroupControl)
            {
                //var colorfulStatus = sceneFunction.status.Find((obj) => obj.key == FunctionAttributeKey.Colorful);
                //if (colorfulStatus != null)
                //{
                //    isColorful = true;
                //    LoadColorfulRow(colorfulStatus);
                //    isColorful = colorfulStatus.value == "on";
                //}
                var colorfulStatus = sceneFunction.status.Find((obj) => obj.key == FunctionAttributeKey.Colorful);
                if (colorfulStatus != null)
                {
                    isColorful = true;
                    LoadColorfulRow(colorfulStatus);
                    isColorful = colorfulStatus.value == "on";
                }
            }
            foreach (var attr in sceneFunction.status)
            {

 HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/AddGroupControlPage.cs

@@ -441,11 +441,16 @@
                                MainPage.Log($"新增群控转换数据异常:{ex.Message}");
                            }
                        }
                        var waitPage = new Loading();
                        bodyView.AddChidren(waitPage);
                        waitPage.Start("");
                        new Thread(() =>
                        {
                        try
                        {
                            groupControl.type = groupControlType.type;
                            groupControl.sid = groupControl.NewGroupControlSid();
                            var pack = Common.ApiUtlis.Ins.HttpRequest.AddGroupControl(new List<GroupControl>() { groupControl });
                                var pack = ApiUtlis.Ins.HttpRequest.AddGroupControl(new List<GroupControl>() { groupControl });
                            if (pack != null)
                            {
                                if (pack.Code == StateCode.SUCCESS)
@@ -461,21 +466,43 @@
                                    {
                                        MainPage.Log($"添加群控异常，转译返回数据失败:{ex.Message}");
                                    }
                                        Application.RunOnMainThread(() =>
                                        {
                                    addActon?.Invoke(groupControl);
                                    this.RemoveFromParent();
                                        });
                                }
                                else
                                {
                                    IMessageCommon.Current.ShowErrorInfoAlter(pack.Code);
                                }
                            }

                        }
                        catch (Exception ex)
                        {
                            MainPage.Log($"新增群控异常:{ex.Message}");
                        }
                            finally
                            {
                                Application.RunOnMainThread(() => {
                                    try
                                    {
                                        waitPage.Hide();
                                        waitPage = null;
                                    }
                                    catch { }
                                });
                            }
                        })
                        { IsBackground = true }.Start();
                    }
                    else
                    {
                        var waitPage = new Loading();
                        bodyView.AddChidren(waitPage);
                        waitPage.Start("");
                        new Thread(() =>
                    {
                        try
                        {
@@ -504,7 +531,7 @@
                                }
                            }

                            var pack = Common.ApiUtlis.Ins.HttpRequest.EditGroupControl(new List<GroupControl>() { groupControl });
                                var pack = ApiUtlis.Ins.HttpRequest.EditGroupControl(new List<GroupControl>() { groupControl });
                            if (pack != null)
                            {
                                if (pack.Code == StateCode.SUCCESS)
@@ -514,8 +541,11 @@
                                    {
                                        temp = groupControl;
                                    }
                                        Application.RunOnMainThread(() =>
                                        {
                                    addActon?.Invoke(temp);
                                    this.RemoveFromParent();
                                        });
                                }
                                else
                                {
@@ -527,6 +557,21 @@
                        {
                            MainPage.Log($"编辑群控异常:{ex.Message}");
                        }
                            finally
                            {
                                Application.RunOnMainThread(() =>
                                {
                                    try
                                    {
                                        waitPage.Hide();
                                        waitPage = null;
                                    }
                                    catch { }
                                });

                            }
                        })
                        { IsBackground = true }.Start();

                    }
                }

 HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPageBLL.cs

@@ -8,10 +8,46 @@
    public partial class ColorTureLampPage

    {

        /// <summary>

        /// 通知更新界面的时间
        /// </summary>
        DateTime notiyUpdateTime = DateTime.MinValue;
        System.Threading.Thread updateUiThread;
        object lockObj = new object();

        /// <summary>

        /// 更新功能状态

        /// </summary>

        public static void UpdataStatus(Function updataTemp)

        {

            if(bodyView == null)
            {
                return;
            }
            lock (bodyView.lockObj)
            {
                MainPage.Log($"收到更新" + DateTime.Now.Ticks);
                bodyView.notiyUpdateTime = DateTime.Now;
                if (bodyView.updateUiThread == null)
                {
                    bodyView.updateUiThread = new System.Threading.Thread(() =>
                    {
                        while (true)
                        {
                            System.Threading.Thread.Sleep(1500);
                            if (bodyView == null)
                            {
                                return;
                            }
                            if (DateTime.Now.AddMilliseconds(-1500) > bodyView.notiyUpdateTime)
                            {
                                MainPage.Log("没有新数据，更新UI");
                                break;
                            }
                            else
                            {
                                MainPage.Log("有新数据，继续等待");
                            }
                        }

            Application.RunOnMainThread(() =>

            {

                try

@@ -51,7 +87,18 @@
                {

                    MainPage.Log($"{bodyView.GetType().Name } UpdataStates error : {ex.Message}");

                }

                            finally
                            {
                                bodyView.updateUiThread = null;
                            }

            });


                        bodyView.updateUiThread.IsBackground = true;
                        bodyView.updateUiThread.Start();
                    });
                }
            }
        }



        void LoadEventList()

@@ -196,20 +243,20 @@
                        d.Add(FunctionAttributeKey.Brightness, e.ToString());

                        Control.Ins.SendWriteCommand(function, d);

                    }

                    else

                    {

                        if (350 < (DateTime.Now - function.refreshTime).TotalMilliseconds)

                        {

                            function.refreshTime = DateTime.Now;

                            new System.Threading.Thread(() =>

                            {

                                System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();

                                d.Add(FunctionAttributeKey.Brightness, e.ToString());

                                Control.Ins.SendWriteCommand(function, d);

                            })

                            { IsBackground = true }.Start();

                        }

                    }

                    //else

                    //{

                    //    if (350 < (DateTime.Now - function.refreshTime).TotalMilliseconds)

                    //    {

                    //        function.refreshTime = DateTime.Now;

                    //        new System.Threading.Thread(() =>

                    //        {

                    //            System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();

                    //            d.Add(FunctionAttributeKey.Brightness, e.ToString());

                    //            Control.Ins.SendWriteCommand(function, d);

                    //        })

                    //        { IsBackground = true }.Start();

                    //    }

                    //}





                    btnBrightnessText.Y = ((100 - dimmerBar.Progress) * Application.GetRealHeight(222 - 16) / 100) + Application.GetRealWidth(80);


 HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs

@@ -8,12 +8,48 @@
    public partial class DimmerPage
    {
        /// <summary>
        /// 通知更新界面的时间
        /// </summary>
        DateTime notiyUpdateTime = DateTime.MinValue;
        System.Threading.Thread updateUiThread;
        object lockObj = new object();
        
        /// <summary>
        /// 更新功能状态
        /// </summary>
        public static void UpdataStates(Function updataTemp)
        {
            Application.RunOnMainThread((() =>
            if (bodyView == null)
            {
                return;
            }
            lock (bodyView.lockObj)
            {
                MainPage.Log($"收到更新" + DateTime.Now.Ticks);
                bodyView.notiyUpdateTime = DateTime.Now;
                if (bodyView.updateUiThread == null)
                {
                    bodyView.updateUiThread = new System.Threading.Thread(() =>
                    {
                        while (true)
                        {
                            System.Threading.Thread.Sleep(1500);
                            if (bodyView == null)
                            {
                                return;
                            }
                            if (DateTime.Now.AddMilliseconds(-1500) > bodyView.notiyUpdateTime)
                            {
                                MainPage.Log("没有新数据，更新UI");
                                break;
                            }
                            else
                            {
                                MainPage.Log("有新数据，继续等待");
                            }
                        }

                        Application.RunOnMainThread(() =>{
                try
                {
                    if (bodyView == null)
@@ -41,7 +77,18 @@
                {
                    MainPage.Log($"{bodyView.GetType().Name } UpdataStates error : {ex.Message}");
                }
            }));
                            finally
                            {
                                bodyView.updateUiThread = null;
                            }
                        });


                        bodyView.updateUiThread.IsBackground = true;
                        bodyView.updateUiThread.Start();
                    });
                }
            }
        }

        void LoadEventList()
@@ -117,7 +164,6 @@
                //20201223 删除滑动发送命令，防止控件跳动
                dimmerBar.OnProgressChangedEvent = (sender, e) =>
                {
                   
                    if (!btnSwitch.IsSelected)
                    {
                        dimmerBar.SetProgressBarColors(CSS_Color.AuxiliaryColor1, CSS_Color.AuxiliaryColor1);
@@ -132,20 +178,20 @@
                        d.Add(FunctionAttributeKey.Brightness, e.ToString());
                        Control.Ins.SendWriteCommand(function, d);
                    }
                    else
                    {
                        if (350 < (DateTime.Now - function.refreshTime).TotalMilliseconds)
                        {
                            function.refreshTime = DateTime.Now;
                            new System.Threading.Thread(() =>
                            {
                                System.Collections.Generic.Dictionary<string, string> dic = new System.Collections.Generic.Dictionary<string, string>();
                                dic.Add(FunctionAttributeKey.Brightness, e.ToString());
                                Control.Ins.SendWriteCommand(function, dic);
                            })
                            { IsBackground = true }.Start();
                        }
                    }
                    //else
                    //{
                    //    if (350 < (DateTime.Now - function.refreshTime).TotalMilliseconds)
                    //    {
                    //        function.refreshTime = DateTime.Now;
                    //        new System.Threading.Thread(() =>
                    //        {
                    //            System.Collections.Generic.Dictionary<string, string> dic = new System.Collections.Generic.Dictionary<string, string>();
                    //            dic.Add(FunctionAttributeKey.Brightness, e.ToString());
                    //            Control.Ins.SendWriteCommand(function, dic);
                    //        })
                    //        { IsBackground = true }.Start();
                    //    }
                    //}
                    btnBrightnessText.Y = ((100 - dimmerBar.Progress) * Application.GetRealHeight(288 - 16 - 16) / 100) + Application.GetRealWidth(40);
                    btnBrightnessText.Text = dimmerBar.Progress + "%";
                };

 HDL_ON/UI/UI2/FuntionControlView/Light/GroupControlPage_V2.cs

@@ -349,6 +349,7 @@

            dimmerBar.OnProgressChangedEvent = (sender, e) =>
            {
                return;
                if (e == 0 && lastBrightness != 0)
                {
                    lastBrightness = 0;
@@ -443,6 +444,7 @@

            dimmerBar.OnProgressChangedEvent = (sender, e) =>
            {
                return;
                if (e == 0 && lastBrightness != 0)
                {
                    lastBrightness = 0;
@@ -764,6 +766,7 @@

            dimmerBar.OnProgressChangedEvent = (sender, e) =>
            {
                return;
                if (e == 0 && lastBrightness != 0)
                {
                    lastBrightness = 0;

 HDL_ON/UI/UI2/FuntionControlView/Light/RGBPage.cs

@@ -455,11 +455,12 @@
            new TopViewDiv(bodyView, Language.StringByID(StringId.Lights)).LoadTopView_FunctionTop(function, actionRefresh);
            new System.Threading.Thread(() =>
            {
                DriverLayer.Control.Ins.SendReadCommand(function);
                Control.Ins.SendReadCommand(function);
            })
            { IsBackground = true }.Start();

            new System.Threading.Thread(() => {
            new System.Threading.Thread(() =>
            {
                while (true)
                {
                    System.Threading.Thread.Sleep(1000);
@@ -473,7 +474,8 @@
                    }
                    else
                    {
                        DriverLayer.Control.Ins.SendReadCommand(function);
                        System.Threading.Thread.Sleep(1000);
                        Control.Ins.SendReadCommand(function);
                        curDimmerStatus = true;
                    }
                }

 HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs

@@ -7,10 +7,52 @@
    public partial class RGBPage
    {
        /// <summary>
        /// 通知更新界面的时间
        /// </summary>
        DateTime notiyUpdateTime = DateTime.MinValue;
        System.Threading.Thread updateUiThread;
        object lockObj = new object();

        public override void RemoveFromParent()
        {
            bodyView = null;
            base.RemoveFromParent();
        }
        /// <summary>
        /// 更新功能状态
        /// </summary>
        public static void UpdataStates(Function updateTemp)
        {
            if(bodyView == null)
            {
                return;
            }
            lock (bodyView.lockObj)
            {
                MainPage.Log($"收到更新"+ DateTime.Now.Ticks);
                bodyView.notiyUpdateTime = DateTime.Now;
                if (bodyView.updateUiThread == null)
                {
                    bodyView.updateUiThread = new System.Threading.Thread(() =>
                    {
                        while (true)
                        {
                            System.Threading.Thread.Sleep(1500);
                            if(bodyView == null)
                            {
                                return;
                            }
                            if (DateTime.Now.AddMilliseconds(-1500) > bodyView.notiyUpdateTime)
                            {
                                MainPage.Log("没有新数据，更新UI");
                                break;
                            }
                            else
                            {
                                MainPage.Log("有新数据，继续等待");
                            }
                        }

            Application.RunOnMainThread((() =>
            {
                try
@@ -68,7 +110,8 @@
                                    bodyView.btnColorfulSwitch.IsSelected = colorfulState.curValue.ToString() == "on";
                                }
                            }
                        }catch(Exception ex)
                                    }
                                    catch (Exception ex)
                        {
                            MainPage.Log($"更新RGB 炫彩开关状态异常:{ex.Message}");
                        }
@@ -78,7 +121,18 @@
                {
                    MainPage.Log($"{bodyView.GetType().Name } UpdataStates error : {ex.Message}");
                }
                            finally
                            {
                                bodyView.updateUiThread = null;
                            }
            }));

                    });
                    bodyView.updateUiThread.IsBackground = true;
                    bodyView.updateUiThread.Start();
                }
            }

        }


@@ -263,25 +317,25 @@
                        d.Add(FunctionAttributeKey.Brightness, e.ToString());
                        Control.Ins.SendWriteCommand(function, d);
                    }
                    else
                    {
                        if (350 < (DateTime.Now - function.refreshTime).TotalMilliseconds)
                        {
                            function.refreshTime = DateTime.Now;
                            new System.Threading.Thread(() =>
                            {
                                //Control.Send(CommandType_A.write, function);
                                System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
                                d.Add(FunctionAttributeKey.Brightness, e.ToString());
                                Control.Ins.SendWriteCommand(function, d);
                            })
                            { IsBackground = true }.Start();
                        }
                        else
                        {
                            MainPage.Log("skip dimmer control!!");
                        }
                    }
                    //else
                    //{
                    //    if (350 < (DateTime.Now - function.refreshTime).TotalMilliseconds)
                    //    {
                    //        function.refreshTime = DateTime.Now;
                    //        new System.Threading.Thread(() =>
                    //        {
                    //            //Control.Send(CommandType_A.write, function);
                    //            System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
                    //            d.Add(FunctionAttributeKey.Brightness, e.ToString());
                    //            Control.Ins.SendWriteCommand(function, d);
                    //        })
                    //        { IsBackground = true }.Start();
                    //    }
                    //    else
                    //    {
                    //        MainPage.Log("skip dimmer control!!");
                    //    }
                    //}
                };
            }
        }

 HDL_ON/UI/UI2/FuntionControlView/Light/RGBWPageBLL.cs

@@ -7,11 +7,46 @@
    public partial class RGBWPage
    {
        /// <summary>
        /// 通知更新界面的时间
        /// </summary>
        DateTime notiyUpdateTime = DateTime.MinValue;
        System.Threading.Thread updateUiThread;
        object lockObj = new object();
        /// <summary>
        /// 更新功能状态
        /// </summary>
        public static void UpdataStates(Function updateTemp)
        {
            Application.RunOnMainThread((() =>
            if (bodyView == null)
            {
                return;
            }
            lock (bodyView.lockObj)
            {
                MainPage.Log($"收到更新" + DateTime.Now.Ticks);
                bodyView.notiyUpdateTime = DateTime.Now;
                if (bodyView.updateUiThread == null)
                {
                    bodyView.updateUiThread = new System.Threading.Thread(() =>
                    {
                        while (true)
                        {
                            System.Threading.Thread.Sleep(1500);
                            if (bodyView == null)
                            {
                                return;
                            }
                            if (DateTime.Now.AddMilliseconds(-1500) > bodyView.notiyUpdateTime)
                            {
                                MainPage.Log("没有新数据，更新UI");
                                break;
                            }
                            else
                            {
                                MainPage.Log("有新数据，继续等待");
                            }
                        }
                        Application.RunOnMainThread(() =>
            {
                try
                {
@@ -64,7 +99,18 @@
                {
                    MainPage.Log($"{bodyView.GetType().Name } UpdataStates error : {ex.Message}");
                }
            }));
                            finally
                            {
                                bodyView.updateUiThread = null;
                            }
                        });


                        bodyView.updateUiThread.IsBackground = true;
                        bodyView.updateUiThread.Start();
                    });
                }
            }
        }


@@ -256,25 +302,25 @@
                        d.Add(FunctionAttributeKey.Brightness, e.ToString());
                        Control.Ins.SendWriteCommand(function, d);
                    }
                    else
                    {
                        if (350 < (DateTime.Now - function.refreshTime).TotalMilliseconds)
                        {
                            function.refreshTime = DateTime.Now;
                            new System.Threading.Thread(() =>
                            {
                                //Control.Send(CommandType_A.write, function);
                                System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
                                d.Add(FunctionAttributeKey.Brightness, e.ToString());
                                Control.Ins.SendWriteCommand(function, d);
                            })
                            { IsBackground = true }.Start();
                        }
                        else
                        {
                            MainPage.Log("skip dimmer control!!");
                        }
                    }
                    //else
                    //{
                    //    if (350 < (DateTime.Now - function.refreshTime).TotalMilliseconds)
                    //    {
                    //        function.refreshTime = DateTime.Now;
                    //        new System.Threading.Thread(() =>
                    //        {
                    //            //Control.Send(CommandType_A.write, function);
                    //            System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
                    //            d.Add(FunctionAttributeKey.Brightness, e.ToString());
                    //            Control.Ins.SendWriteCommand(function, d);
                    //        })
                    //        { IsBackground = true }.Start();
                    //    }
                    //    else
                    //    {
                    //        MainPage.Log("skip dimmer control!!");
                    //    }
                    //}
                };
            }
        }

 SiriIntents/Server/HttpUtil.cs

@@ -16,8 +16,8 @@
        /// 固定域名,正式环境
        /// 公共域名就近解析
        /// </summary>
        public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";
        //public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";
        //public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";
        public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";
        const string APP_KEY = "HDL-HOME-APP-TEST";
        const string SECRET_KEY = "WeJ8TY88vbakCcnvH8G1tDUqzLWY8yss";
        //public const string GlobalRequestHttpsHost = "http://59.41.255.150:7777";//mmmm