跳动优化

wxr

2022-06-27 1f5d37fbca31293eff043f4a051be6f6876cea09

跳动优化

 HDL-ON_Android/Properties/AndroidManifest.xml

@@ -88,7 +88,9 @@
    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
    <uses-permission android:name="android.permission.READ_LOGS" />
    <!-- 极光推送结束 -->
    <application android:allowBackup="true" android:debuggable="false" android:icon="@drawable/Icon" android:networkSecurityConfig="@xml/network_security_config" android:largeHeap="true" android:label="On Pro">
    <application android:allowBackup="true" android:debuggable="false" android:icon="@drawable/Icon"
        android:requestLegacyExternalStorage="true"
        android:networkSecurityConfig="@xml/network_security_config" android:largeHeap="true" android:label="On Pro">
        <!--/扫描二维码activity-->
        <!--<activity
            android:name="com.journeyapps.barcodescanner.CaptureActivity"

 HDL-ON_iOS/Info.plist

@@ -100,9 +100,9 @@
    <key>UIStatusBarStyle</key>
    <string>UIStatusBarStyleLightContent</string>
    <key>CFBundleShortVersionString</key>
    <string>1.5.502206231</string>
    <string>1.5.502206241</string>
    <key>CFBundleVersion</key>
    <string>1.5.506231</string>
    <string>1.5.506241</string>
    <key>NSLocationWhenInUseUsageDescription</key>
    <string>Use geographic location to provide services such as weather</string>
    <key>NSAppleMusicUsageDescription</key>

 HDL_ON/Entity/Function/Function.cs

@@ -1196,14 +1196,19 @@

        public string loopId;
    }

    /// <summary>
    /// Tag 功能SPK
    /// </summary>
    public static class SPK
    {
        /// <summary>
        /// 门锁
        /// </summary>
        public const string DoorLock = "security.door";

        /// <summary>
        /// 门锁spk列表
        /// </summary>
        /// <returns></returns>
        public static List<string> GetDoorLockSPKList()
        {
            var list = new List<string>();
@@ -1267,6 +1272,10 @@
        /// （卷帘）
        /// </summary>
        public const string CurtainRoller = "curtain.roller";
        /// <summary>
        /// 梦幻帘
        /// </summary>
        public const string CurtainDream = "curtain.dream";

        /// <summary>
        /// 窗帘spk列表
@@ -1279,6 +1288,7 @@
            spkList.Add(CurtainSwitch);
            spkList.Add(CurtainShades);
            spkList.Add(CurtainTrietex);
            spkList.Add(CurtainDream);
            return spkList;
        }
        #endregion

 HDL_ON/UI/MainPage.cs

@@ -26,7 +26,7 @@
    /// <summary>
    /// 版本号
    /// </summary>
    public static string VersionString = "1.5.7";
    public static string VersionString = "1.5.81";
    ///// <summary>
    ///// 客户端类型
    ///// </summary>

 HDL_ON/UI/UI2/4-PersonalCenter/FaceManagement/FacePassagePage.cs

@@ -573,7 +573,9 @@
                })
                { IsBackground = true }.Start();
            }
            catch { }
            catch (Exception ex) {
                MainPage.Log(ex.Message);
            }
        }



 HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPage.cs

@@ -84,6 +84,15 @@
        public FloorHeatingPage(Function func)
        {
            bodyView = this;
            var tempAttr = func.GetAttribute(FunctionAttributeKey.SetTemp);
            if (tempAttr != null)
            {
                if(tempAttr.min == 0 && tempAttr.max == 0)
                {
                    tempAttr.min = 16;
                    tempAttr.max = 30;
                }
            }
            function = func;
        }


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

@@ -349,6 +349,28 @@
            {

                DriverLayer.Control.Ins.SendReadCommand(function);

            })

            { IsBackground = true }.Start();

            new System.Threading.Thread(() => {
                while (true)
                {
                    System.Threading.Thread.Sleep(500);
                    System.Threading.Thread.Sleep(500);
                    if (curDimmerStatus)
                    {
                        continue;
                    }
                    if (onDimmerBar)
                    {
                        onDimmerBar = false;
                        continue;
                    }
                    else
                    {
                        DriverLayer.Control.Ins.SendReadCommand(function);
                    }
                }
            })
            { IsBackground = true }.Start();

        }




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

@@ -137,6 +137,7 @@
            };

        }



        bool curDimmerStatus = false;

        /// <summary>

        /// 灯光调光事件

        /// </summary>

@@ -154,7 +155,8 @@
                //    }.Show(MainPage.BaseView);
                //    return;
                //}

                onDimmerBar = false;

                //onDimmerBar = false;

                    curDimmerStatus = false;
                function.SetAttrState(FunctionAttributeKey.Brightness, dimmerBar.Progress);

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

                d.Add(FunctionAttributeKey.Brightness, dimmerBar.Progress.ToString());

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

@@ -262,9 +262,35 @@
                DriverLayer.Control.Ins.SendReadCommand(function);
            })
            { IsBackground = true }.Start();


            new System.Threading.Thread(() => {
                while (true)
                {
                    System.Threading.Thread.Sleep(500);
                    if (curDimmerStatus)
                    {
                        continue;
                    }
                    if ( onDimmerBar)
                    {
                        onDimmerBar = false;
                        continue;
                    }
                    else
                    {
                        DriverLayer.Control.Ins.SendReadCommand(function);
                    }
                }
            })
            { IsBackground = true }.Start();

        }



    }


    
}

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

@@ -21,13 +21,13 @@
                    if (updataTemp.spk == bodyView.function.spk && updataTemp.sid == bodyView.function.sid)
                    {
                        bodyView.btnBrightnessText.Text = updataTemp.GetAttrState(FunctionAttributeKey.Brightness) + "%";
                        bodyView.btnBrightnessText.Y = ((100 - Convert.ToInt32( updataTemp.GetAttrState(FunctionAttributeKey.Brightness))) * Application.GetRealHeight(288 - 16 - 16) / 100) + Application.GetRealWidth(40);
                        if (updataTemp.trait_on_off.curValue.ToString() == "on")
                        {
                            bodyView.dimmerBar.SetProgressBarColors(CSS_Color.AuxiliaryColor1, CSS_Color.AuxiliaryColor1);
                            if (!bodyView.onDimmerBar)
                            {
                                bodyView.dimmerBar.Progress = Convert.ToInt32(updataTemp.GetAttrState(FunctionAttributeKey.Brightness));
                                bodyView.btnBrightnessText.Y = ((100 - Convert.ToInt32(updataTemp.GetAttrState(FunctionAttributeKey.Brightness))) * Application.GetRealHeight(288 - 16 - 16) / 100) + Application.GetRealWidth(40);
                            }
                        }
                        else
@@ -83,6 +83,8 @@
            };
        }

        bool curDimmerStatus = false;

        /// <summary>
        /// 灯光调光事件
        /// </summary>
@@ -92,12 +94,13 @@
            {
                dimmerBar.OnStartTrackingTouchEvent = (sender, e) =>
                {
                    onDimmerBar = true;
                    curDimmerStatus = onDimmerBar = true;
                    dimmerBar.SetProgressBarColors(CSS_Color.AuxiliaryColor1, CSS_Color.AuxiliaryColor1);
                };
                dimmerBar.OnStopTrackingTouchEvent = (sender, e) =>
                {
                    onDimmerBar = false;

                    curDimmerStatus = false;
                    function.SetAttrState(FunctionAttributeKey.Brightness, dimmerBar.Progress);
                    System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
                    d.Add(FunctionAttributeKey.Brightness, dimmerBar.Progress.ToString());
@@ -133,9 +136,9 @@
                            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);
                                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();
                        }