发布版本1.5.9

wxr

2022-07-26 30be50a4ba76c11a50a1819ad95adff6de206ffa

发布版本1.5.9

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

 HDL-ON_iOS/Info.plist

@@ -100,9 +100,9 @@
    <key>UIStatusBarStyle</key>
    <string>UIStatusBarStyleLightContent</string>
    <key>CFBundleShortVersionString</key>
    <string>1.5.902207251</string>
    <string>1.5.902207252</string>
    <key>CFBundleVersion</key>
    <string>1.5.907251</string>
    <string>1.5.907252</string>
    <key>NSLocationWhenInUseUsageDescription</key>
    <string>Use geographic location to provide services such as weather</string>
    <key>NSAppleMusicUsageDescription</key>

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

@@ -248,14 +248,14 @@
                    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());

                    //if (btnSwitch.IsSelected)

                    //{

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

                    //}

                    //else

                    //{

                    //    function.lastBrightness = Convert.ToInt32(function.GetAttrState(FunctionAttributeKey.Brightness));

                    //}

                    if (btnSwitch.IsSelected)

                    {

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

                    }

                    else

                    {

                        function.lastBrightness = Convert.ToInt32(function.GetAttrState(FunctionAttributeKey.Brightness));

                    }

                    Control.Ins.SendWriteCommand(function, d);

                })

                { IsBackground = true }.Start();


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

@@ -179,18 +179,18 @@
                    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());
                    //if (btnSwitch.IsSelected)
                    //{
                    //    if(function.lastBrightness == 0)
                    //    {
                    //        function.lastBrightness = 100;
                    //    }
                    //    d.Add(FunctionAttributeKey.Brightness, function.lastBrightness.ToString());
                    //}
                    //else
                    //{
                    //    function.lastBrightness = Convert.ToInt32( function.GetAttrState(FunctionAttributeKey.Brightness));
                    //}
                    if (btnSwitch.IsSelected)
                    {
                        if (function.lastBrightness == 0)
                        {
                            function.lastBrightness = 100;
                        }
                        d.Add(FunctionAttributeKey.Brightness, function.lastBrightness.ToString());
                    }
                    else
                    {
                        function.lastBrightness = Convert.ToInt32(function.GetAttrState(FunctionAttributeKey.Brightness));
                    }
                    Control.Ins.SendWriteCommand(function, d);
                })
                { IsBackground = true }.Start();