~wxr/OnPro.git - Gitblit

parent: 3c08c6a1 | 补丁 | 提交 | ignore whitespace

wxr

2023-08-03 441cf789e035bac39b8e38672b54ac99c1bc31fb

色温灯调光条

5个文件已修改

	HDL-ON_Android/Properties/AndroidManifest.xml	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	HDL_ON/DAL/Server/HttpUtil.cs	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	HDL_ON/UI/MainPage.cs	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	SiriIntents/Server/HttpUtil.cs	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 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="2.0.0" package="com.hdl.onpro" xmlns:tools="http://schemas.android.com/tools" android:versionCode="202308021">
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="2.1.0" package="com.hdl.onpro" xmlns:tools="http://schemas.android.com/tools" android:versionCode="202308031">
    <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/MainPage.cs

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

 HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs

@@ -283,7 +283,7 @@
                    /// 开关按钮
                    /// </summary>
                    Button btnSwitch;
                    if (function.spk == SPK.LightRGB || function.spk == SPK.LightDimming)
                    if (function.spk == SPK.LightRGBW || function.spk == SPK.LightCCT || function.spk == SPK.LightRGB || function.spk == SPK.LightDimming)
                    {
                        btnSwitch = new Button()
                        {
@@ -497,6 +497,7 @@
                case SPK.LightDimming:
                case SPK.LightRGBW:
                case SPK.LightRGB:
                case SPK.LightCCT:
                    #region Dimmer
                    var btnDimmerMinValues = new Button()
                    {

 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="2.0.0" package="com.hdl.onpro" xmlns:tools="http://schemas.android.com/tools" android:versionCode="202308021">
			<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="2.1.0" package="com.hdl.onpro" xmlns:tools="http://schemas.android.com/tools" android:versionCode="202308031">
			<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

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

			@@ -283,7 +283,7 @@
			/// 开关按钮
			/// </summary>
			Button btnSwitch;
			if (function.spk == SPK.LightRGB \|\| function.spk == SPK.LightDimming)
			if (function.spk == SPK.LightRGBW \|\| function.spk == SPK.LightCCT \|\| function.spk == SPK.LightRGB \|\| function.spk == SPK.LightDimming)
			{
			btnSwitch = new Button()
			{
			@@ -497,6 +497,7 @@
			case SPK.LightDimming:
			case SPK.LightRGBW:
			case SPK.LightRGB:
			case SPK.LightCCT:
			#region Dimmer
			var btnDimmerMinValues = new Button()
			{

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