From 76e6d851ef5a8d3a2a9a1f2a3f90b74dd31eae86 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 14 六月 2023 20:32:35 +0800
Subject: [PATCH] 渐变时间修复发送
---
HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPageBLL.cs | 5 ++++-
/dev/null | 0
HDL-ON_Android/Properties/AndroidManifest.xml | 2 +-
HDL_ON/DAL/Server/HttpUtil.cs | 4 ++--
HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs | 3 +++
HDL_ON/UI/UI2/FuntionControlView/Light/RGBWPageBLL.cs | 3 +++
HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs | 3 +++
HDL_ON/UI/UI1-Login/LoginPage.cs | 8 ++++++++
DLL/Shared.Droid.dll | 0
SiriIntents/Server/HttpUtil.cs | 4 ++--
10 files changed, 26 insertions(+), 6 deletions(-)
diff --git a/DLL/Shared.Droid.JPush223.dll b/DLL/Shared.Droid.JPush223.dll
deleted file mode 100644
index e45eb53..0000000
--- a/DLL/Shared.Droid.JPush223.dll
+++ /dev/null
Binary files differ
diff --git a/DLL/Shared.Droid.dll b/DLL/Shared.Droid.dll
index 9644e79..6cfb8ad 100644
--- a/DLL/Shared.Droid.dll
+++ b/DLL/Shared.Droid.dll
Binary files differ
diff --git a/DLL/Shared.Droid0512.dll b/DLL/Shared.Droid0512.dll
deleted file mode 100644
index dcfb70c..0000000
--- a/DLL/Shared.Droid0512.dll
+++ /dev/null
Binary files differ
diff --git a/DLL/Shared.Droid0524.dll b/DLL/Shared.Droid0524.dll
deleted file mode 100644
index de703bc..0000000
--- a/DLL/Shared.Droid0524.dll
+++ /dev/null
Binary files differ
diff --git a/DLL/Shared.Droid230508.dll b/DLL/Shared.Droid230508.dll
deleted file mode 100644
index 2219ca6..0000000
--- a/DLL/Shared.Droid230508.dll
+++ /dev/null
Binary files differ
diff --git a/DLL/Shared.IOS0524.dll b/DLL/Shared.IOS0524.dll
deleted file mode 100644
index d191e8c..0000000
--- a/DLL/Shared.IOS0524.dll
+++ /dev/null
Binary files differ
diff --git a/DLL/Shared.IOS0525.dll b/DLL/Shared.IOS0525.dll
deleted file mode 100644
index 217278a..0000000
--- a/DLL/Shared.IOS0525.dll
+++ /dev/null
Binary files differ
diff --git a/HDL-ON_Android/Properties/AndroidManifest.xml b/HDL-ON_Android/Properties/AndroidManifest.xml
index 3d9ee18..613322d 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.8.0" package="com.hdl.onpro" xmlns:tools="http://schemas.android.com/tools" android:versionCode="202306051">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.8.0" package="com.hdl.onpro" xmlns:tools="http://schemas.android.com/tools" android:versionCode="202306152">
<uses-sdk android:minSdkVersion="26" android:targetSdkVersion="29" />
<uses-permission android:name="android.permission.RECEIVE_SMS" />
<!--鍙嬬洘-->
diff --git a/HDL_ON/DAL/Server/HttpUtil.cs b/HDL_ON/DAL/Server/HttpUtil.cs
index 62b4b3f..211486b 100644
--- a/HDL_ON/DAL/Server/HttpUtil.cs
+++ b/HDL_ON/DAL/Server/HttpUtil.cs
@@ -18,8 +18,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
diff --git a/HDL_ON/UI/UI1-Login/LoginPage.cs b/HDL_ON/UI/UI1-Login/LoginPage.cs
index 0eda5db..a109e0c 100644
--- a/HDL_ON/UI/UI1-Login/LoginPage.cs
+++ b/HDL_ON/UI/UI1-Login/LoginPage.cs
@@ -41,8 +41,14 @@
{
if (etPassword.Foucs)
{
+
new Thread(() =>
{
+ Thread.Sleep(100);
+ if (this.Y < 0)
+ {
+ return;
+ }
for (var i = 0; i < 10; i++)
{
Application.RunOnMainThread(() =>
@@ -246,6 +252,8 @@
#if __Android__
OnAppConfig.Instance.isAgreePrivacyPolicy = true;
#endif
+ this.BackgroundColor = CSS_Color.MainBackgroundColor;
+
var btnIcon = new Button()
{
X = Application.GetRealWidth(28),
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPageBLL.cs
index bdfc709..3aff8a7 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPageBLL.cs
@@ -78,7 +78,10 @@
{
barFadeTime.OnStopTrackingTouchEvent = (sender, e) =>
{
- function.SetAttrState(FunctionAttributeKey.FadeTime, e.ToString());
+ function.SetAttrState(FunctionAttributeKey.FadeTime, e.ToString());
+ var d = new System.Collections.Generic.Dictionary<string, string>();
+ d.Add(FunctionAttributeKey.FadeTime, e.ToString());
+ Control.Ins.SendWriteCommand(function, d);
function.SaveFunctionFile();
};
}
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs
index 1fd9624..5e700b2 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs
@@ -67,6 +67,9 @@
barFadeTime.OnStopTrackingTouchEvent = (sender, e) =>
{
function.SetAttrState(FunctionAttributeKey.FadeTime, e.ToString());
+ var d = new System.Collections.Generic.Dictionary<string, string>();
+ d.Add(FunctionAttributeKey.FadeTime, e.ToString());
+ Control.Ins.SendWriteCommand(function, d);
function.SaveFunctionFile();
};
}
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs
index 697f09c..1bfa385 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs
@@ -287,6 +287,9 @@
barFadeTime.OnStopTrackingTouchEvent = (sender, e) =>
{
function.SetAttrState(FunctionAttributeKey.FadeTime, e.ToString());
+ var d = new System.Collections.Generic.Dictionary<string, string>();
+ d.Add(FunctionAttributeKey.FadeTime, e.ToString());
+ Control.Ins.SendWriteCommand(function, d);
function.SaveFunctionFile();
};
}
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/RGBWPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/RGBWPageBLL.cs
index e12b753..4d0bc00 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/RGBWPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Light/RGBWPageBLL.cs
@@ -288,6 +288,9 @@
barFadeTime.OnStopTrackingTouchEvent = (sender, e) =>
{
function.SetAttrState(FunctionAttributeKey.FadeTime, e.ToString());
+ var d = new System.Collections.Generic.Dictionary<string, string>();
+ d.Add(FunctionAttributeKey.FadeTime, e.ToString());
+ Control.Ins.SendWriteCommand(function, d);
function.SaveFunctionFile();
};
}
diff --git a/SiriIntents/Server/HttpUtil.cs b/SiriIntents/Server/HttpUtil.cs
index dc7aca0..8d4483c 100644
--- a/SiriIntents/Server/HttpUtil.cs
+++ b/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
--
Gitblit v1.8.0