2023年08月29日15:35:09

mac

2023-08-29 29160efe0f203c5e65dcf4e5a429ced6bde39187

2023年08月29日15:35:09

备份一下

 HDL-ON_Android/HDL-ON_Android.csproj

@@ -23,7 +23,7 @@
    <MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
    <AndroidEnableSGenConcurrent>true</AndroidEnableSGenConcurrent>
    <AndroidUseAapt2>true</AndroidUseAapt2>
    <AndroidSupportedAbis>armeabi-v7a</AndroidSupportedAbis>
    <AndroidSupportedAbis>arm64-v8a</AndroidSupportedAbis>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
    <DebugSymbols>True</DebugSymbols>
@@ -47,6 +47,7 @@
    <AndroidEnableMultiDex>false</AndroidEnableMultiDex>
    <AndroidUseAapt2>true</AndroidUseAapt2>
    <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
    <AndroidSupportedAbis>arm64-v8a;armeabi-v7a</AndroidSupportedAbis>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
    <DebugSymbols>True</DebugSymbols>

 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";


 HDL_ON/DAL/Server/NewAPI.cs

@@ -760,7 +760,7 @@
        /// <summary>
        /// 解绑住宅下的第三方设备
        /// </summary>
        public const string Api_Post_UnbindDeviceToHome = "/smart-open/open-platform/tripartite/unbindDeviceToHome";
        public const string Api_Post_UnbindDeviceToHome = "/home-wisdom/app/open/unbindDeviceToHome";
        
        #endregion


 HDL_ON/Entity/Function/Function.cs

@@ -108,6 +108,7 @@
        /// 获取属性当前状态
        /// </summary>
        /// <param name="key"></param>
        /// <param name="defaultValue">默认值</param>
        /// <returns></returns>
        public string GetAttrState(string key, string defaultValue = "0")
        {
@@ -120,7 +121,7 @@
            if (string.IsNullOrEmpty(attrState.state))
            {
                //二级查询keyValue值
                return GetOriginalState(key);
                return GetOriginalState(key, defaultValue);
            }
            return attrState.state;
        }
@@ -130,13 +131,14 @@
        /// 默认值：0
        /// </summary>
        /// <param name="key">语雀定义的属性值</param>
        /// <param name="defaultValue">默认值</param>
        /// <returns></returns>
        public string GetOriginalState(string key)
        public string GetOriginalState(string key, string defaultValue)
        {
            var originalState = status.Find((s) => s.key == key.ToString());
            if (originalState == null || string.IsNullOrEmpty(originalState.value))
            {
                return "0";
                return defaultValue;
            }
            return originalState.value;
        }

 HDL_ON/UI/UI2/FuntionControlView/HisenseTV /HisenseTvPage.cs

@@ -288,9 +288,11 @@

            });
            //信号源
            sourceFrameLayout.selectAction += (text) =>
            sourceFrameLayout.selectAction += (key) =>
            {
                string value = text.Replace(" ", "_");
                var p = new UI2.Intelligence.Automation.PublicInterface();
                var dic = p.GetHisenseSignalSourceDic();
                string value = p.GetValue(dic, key);
                ControlCommand(HisenseTVFunctionalAttributeConstant.signal, value);
            };


 HDL_ON/UI/UI2/FuntionControlView/HisenseTV /Send.cs

@@ -43,7 +43,8 @@
            var responsePackNew = UI.Music.SendMethod.Current.RequestServerhomeId(d, NewAPI.Api_Post_UnbindDeviceToHome, "删除海信电视");
            if (!this.DataChecking(responsePackNew, tipType))
            {
                action?.Invoke(false);
                //action?.Invoke(false);
                return;
            }
            action?.Invoke(true);
        }
@@ -51,13 +52,13 @@
        /// <summary>
        /// 发送控制命令
        /// </summary>
        /// <param name="function">当前设备</param>
        /// <param name="device">当前设备</param>
        /// <param name="dic">发送控制数据</param>
        public void SendControlCommand(Function function, Dictionary<string, string> dic,Action<bool> action)
        public void SendControlCommand(Function device, Dictionary<string, string> dic,Action<bool> action) 
        {
            new System.Threading.Thread(() =>
            {
                var result = DriverLayer.Control.Ins.SendWriteCommand(function, dic, false, 0);
                var result = DriverLayer.Control.Ins.SendWriteCommand(device, dic, false, 0);
                action?.Invoke(result);

            })