灯光延时

wxr

2023-05-06 f8343a2e765eefe10c8a0d6bdd6db65b0cf0321c

灯光延时

 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.2" package="com.hdl.onpro" xmlns:tools="http://schemas.android.com/tools" android:versionCode="202304281">
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.7.3" package="com.hdl.onpro" xmlns:tools="http://schemas.android.com/tools" android:versionCode="202305031">
    <uses-sdk android:minSdkVersion="26" android:targetSdkVersion="29" />
    <!--友盟-->
    <!--<uses-sdk android:minSdkVersion="8"></uses-sdk>-->

 HDL-ON_iOS/AppDelegate.cs

@@ -290,7 +290,7 @@
            Console.WriteLine("111111111111");
            SetCurrentLanguage();
            //Shared.Application.FontSize = 12;
            //Bugly.Bugly.StartWithAppId("b58fb35436");
            Bugly.Bugly.StartWithAppId("b58fb35436");
            //取消EditText默认密码输入方式
            //Shared.Application.IsEditTextContentTypePassword = false;
            //默认使用苹方字体
@@ -497,6 +497,10 @@

            MainPage.IsEnterBackground = false;
            HDL_ON.DriverLayer.UdpSocket._BusSocket.Start();
            //重连mqtt防止mqtt进入假死状态 2023-05-03 22:55:12 wxr
            HDL_ON.DAL.Mqtt.MqttClient.InitState();


            new AppUnlockPage().LoadPage();
            UIApplication.SharedApplication.ApplicationIconBadgeNumber = 0;
            HDL_ON.DriverLayer.Control.Ins.SearchLoaclGateway();

 HDL-ON_iOS/Info.plist

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

 HDL-ON_iOS/ViewController.cs

@@ -62,6 +62,8 @@
                }
            }) { IsBackground = true }.Start();

            

        }
        public override UIStatusBarStyle PreferredStatusBarStyle()
        {

 HDL_ON/UI/MainPage.cs

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

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

@@ -248,6 +248,7 @@
                    function.trait_on_off.curValue = btnSwitch.IsSelected ? "on" : "off";

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

                    d.Add(FunctionAttributeKey.OnOff, function.trait_on_off.curValue.ToString());

                    d.Add(FunctionAttributeKey.FadeTime, barFadeTime.Progress.ToString());
                    //if (btnSwitch.IsSelected)

                    //{

                    //    d.Add(FunctionAttributeKey.Brightness, function.lastBrightness.ToString());


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

@@ -179,6 +179,7 @@
                    function.trait_on_off.curValue = btnSwitch.IsSelected ? "on" : "off";
                    System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
                    d.Add(FunctionAttributeKey.OnOff, function.trait_on_off.curValue.ToString());
                    d.Add(FunctionAttributeKey.FadeTime, barFadeTime.Progress.ToString());
                    //if (btnSwitch.IsSelected)
                    //{
                    //    if(function.lastBrightness == 0)

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

@@ -305,6 +305,8 @@
                    function.trait_on_off.curValue = btnSwitch.IsSelected ? "on" : "off";
                    System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
                    d.Add(FunctionAttributeKey.OnOff, function.trait_on_off.curValue.ToString());
                    d.Add(FunctionAttributeKey.FadeTime, barFadeTime.Progress.ToString());

                    if (btnSwitch.IsSelected)
                    {
                        if(function.lastBrightness == 0)

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

@@ -307,6 +307,7 @@
                    function.trait_on_off.curValue = btnSwitch.IsSelected ? "on" : "off";
                    System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
                    d.Add(FunctionAttributeKey.OnOff, function.trait_on_off.curValue.ToString());
                    d.Add(FunctionAttributeKey.FadeTime, barFadeTime.Progress.ToString());
                    if (btnSwitch.IsSelected)
                    {
                        if (function.lastBrightness == 0)