From 30be50a4ba76c11a50a1819ad95adff6de206ffa Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 26 七月 2022 09:42:08 +0800
Subject: [PATCH] 发布版本1.5.9
---
HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPageBLL.cs | 16 ++++++++--------
HDL-ON_Android/Properties/AndroidManifest.xml | 2 +-
HDL-ON_iOS/Info.plist | 4 ++--
HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs | 24 ++++++++++++------------
4 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/HDL-ON_Android/Properties/AndroidManifest.xml b/HDL-ON_Android/Properties/AndroidManifest.xml
index b353484..96a61f9 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.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>-->
diff --git a/HDL-ON_iOS/Info.plist b/HDL-ON_iOS/Info.plist
index 076ab47..4a77d8b 100644
--- a/HDL-ON_iOS/Info.plist
+++ b/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>
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPageBLL.cs
index d8f0ce3..97304ad 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPageBLL.cs
+++ b/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();
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs
index 1feca67..7f395fe 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs
+++ b/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();
--
Gitblit v1.8.0