~wxr/OnPro.git - Gitblit

parent: cd4189a3 | 补丁 | 提交 | ignore whitespace

wxr

2023-06-14 76e6d851ef5a8d3a2a9a1f2a3f90b74dd31eae86

渐变时间修复发送

6个文件已删除

9个文件已修改

	DLL/Shared.Droid.JPush223.dll	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	DLL/Shared.Droid.dll	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	DLL/Shared.Droid0512.dll	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	DLL/Shared.Droid0524.dll	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	DLL/Shared.Droid230508.dll	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	DLL/Shared.IOS0524.dll	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	DLL/Shared.IOS0525.dll	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	HDL-ON_Android/Properties/AndroidManifest.xml	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	HDL_ON/DAL/Server/HttpUtil.cs	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	HDL_ON/UI/UI1-Login/LoginPage.cs	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPageBLL.cs	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	HDL_ON/UI/UI2/FuntionControlView/Light/RGBWPageBLL.cs	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	SiriIntents/Server/HttpUtil.cs	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 DLL/Shared.Droid.JPush223.dll

Binary files differ

 DLL/Shared.Droid.dll

Binary files differ

 DLL/Shared.Droid0512.dll

Binary files differ

 DLL/Shared.Droid0524.dll

Binary files differ

 DLL/Shared.Droid230508.dll

Binary files differ

 DLL/Shared.IOS0524.dll

Binary files differ

 DLL/Shared.IOS0525.dll

Binary files differ

 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" />
    <!--友盟-->

 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

 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),

 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();

                };

            }


 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();
                };
            }

 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();
                };
            }

 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();
                };
            }

 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

			@@ -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" />
			<!--友盟-->

			@@ -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

			@@ -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),

			@@ -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();
			};
			}

			@@ -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();
			};
			}

			@@ -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();
			};
			}

			@@ -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();
			};
			}

			@@ -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