2023年08月31日19:00:14

mac

2023-08-31 38ee59a8404c1fa9385649f9690c8d671a5d95de

2023年08月31日19:00:14

备份代码

 HDL-ON_Android/Assets/Language.ini

@@ -1225,6 +1225,9 @@
7170=Human presence detection
7171=continue
7172=Rgb color plate
7173=Illuminance
7174=Exceed
7175=Under

8501=Video door lock
8502=Electric quantity
@@ -2620,6 +2623,12 @@
7170=人体存在检测
7171=持续
7172=RGB色盘
7173=照明度
7174=照明度高于
7175=照明度低于


  



@@ -4003,6 +4012,9 @@
7170=Human presence detection
7171=continue
7172=Rgb color plate
7173=Illuminance
7174=Exceed
7175=Under

8501=Video door lock
8502=Electric quantity
@@ -5379,6 +5391,9 @@
7170=Human presence detection
7171=continue
7172=Rgb color plate
7173=Illuminance
7174=Exceed
7175=Under

8501=Video door lock
8502=Electric quantity
@@ -6761,6 +6776,9 @@
7170=Human presence detection
7171=continue
7172=Rgb color plate
7173=Illuminance
7174=Exceed
7175=Under

8501=Video door lock
8502=Electric quantity

 HDL-ON_iOS/HDL-ON_iOS.csproj

@@ -25,10 +25,11 @@
        <MtouchArch>x86_64</MtouchArch>
        <MtouchLink>Full</MtouchLink>
        <MtouchDebug>true</MtouchDebug>
        <CodesignKey>Apple Development: xuebiao huang (4P32GXQWWK)</CodesignKey>
        <CodesignKey>iPhone Developer</CodesignKey>
        <MtouchExtraArgs>-gcc_flags="-dead_strip -ObjC"</MtouchExtraArgs>
        <CodesignProvision>OnPro2307291-Dev</CodesignProvision>
        <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
        <MtouchI18n>cjk</MtouchI18n>
    </PropertyGroup>
    <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhoneSimulator' ">
        <DebugType>none</DebugType>
@@ -51,7 +52,7 @@
        <ErrorReport>prompt</ErrorReport>
        <WarningLevel>4</WarningLevel>
        <MtouchArch>ARM64</MtouchArch>
        <CodesignKey>iPhone Developer</CodesignKey>
        <CodesignKey>Apple Development: xuebiao huang (4P32GXQWWK)</CodesignKey>
        <MtouchDebug>true</MtouchDebug>
        <MtouchI18n>cjk</MtouchI18n>
        <MtouchLink>SdkOnly</MtouchLink>
@@ -59,7 +60,7 @@
        <MtouchEnableSGenConc>false</MtouchEnableSGenConc>
<CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<CodesignProvision>自动</CodesignProvision>
<CodesignProvision>OnPro2307291-Dev</CodesignProvision>
    </PropertyGroup>
    <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
        <DebugType>none</DebugType>

 HDL-ON_iOS/Resources/Language.ini

@@ -1225,6 +1225,9 @@
7170=Human presence detection
7171=continue
7172=Rgb color plate
7173=Illuminance
7174=Exceed
7175=Under

8501=Video door lock
8502=Electric quantity
@@ -2620,6 +2623,9 @@
7170=人体存在检测
7171=持续
7172=RGB色盘
7173=照明度
7174=照明度高于
7175=照明度低于



@@ -4003,6 +4009,9 @@
7170=Human presence detection
7171=continue
7172=Rgb color plate
7173=Illuminance
7174=Exceed
7175=Under

8501=Video door lock
8502=Electric quantity
@@ -5379,6 +5388,9 @@
7170=Human presence detection
7171=continue
7172=Rgb color plate
7173=Illuminance
7174=Exceed
7175=Under

8501=Video door lock
8502=Electric quantity
@@ -6761,6 +6773,9 @@
7170=Human presence detection
7171=continue
7172=Rgb color plate
7173=Illuminance
7174=Exceed
7175=Under

8501=Video door lock
8502=Electric quantity

 HDL_ON/Common/R.cs

@@ -3527,7 +3527,18 @@
        /// RGB色盘
        /// </summary>
        public const int rgbsepan = 7172;
       
        /// <summary>
        /// 照明度
        /// </summary>
        public const int zhaomingdu = 7173;
        /// <summary>
        /// 照明度高于
        /// </summary>
        public const int zhaomingdugaoyu = 7174;
        /// <summary>
        /// 照明度低于
        /// </summary>
        public const int zhaomingdudiyu = 7175;




 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/Entity/Function/Function.cs

@@ -2194,6 +2194,7 @@
            spkList.Add(SensorEnvironment2);
            spkList.Add(SensorEnvironment3);
            spkList.Add(SensorHcho);
            spkList.Add(SensorLight);
            return spkList;
        }
        /// <summary>
@@ -2210,6 +2211,7 @@
            spkList.Add(SensorTVOC);
            spkList.Add(SensorHumidity);
            spkList.Add(SensorHcho);
            spkList.Add(SensorLight);
            return spkList;
        }

@@ -2223,6 +2225,7 @@
            spkList.Add(SensorEnvironment); spkList.Add(SensorEnvironmentHailin);
            spkList.Add(SensorEnvironment2);
            spkList.Add(SensorEnvironment3);
         
            return spkList;
        }


 HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs

@@ -573,6 +573,26 @@
                        };
                    }
                    break;
                //照度传感器
                case SPK.SensorLight:
                    {

                        ///照度传感器
                        LogicView.FunTypeView illuminanceView = new LogicView.FunTypeView();
                        illuminanceView.btnText.TextID = StringId.zhaomingdu;
                        fLayout.AddChidren(illuminanceView.FLayoutView());

                        ///点击事件
                        illuminanceView.btnClick.MouseUpEventHandler += (sender, e) =>
                        {
                            new PublicInterface { }.ViewZuHe(this, StringId.zhaomingdugaoyu, StringId.zhaomingdudiyu, (intText, view) =>
                            {
                                InputBoxAction(device, intText, index, edit);
                            });

                        };
                    }
                    break;
                //甲醛
                case SPK.SensorHcho:
                    {
@@ -1060,6 +1080,7 @@
        {
            if (edit)
            {
                this.function = device;
                Input inputs = Logic.currlogic.input[index];
                //清除之前旧数据
                dicSateteList.Clear();
@@ -1069,44 +1090,63 @@
                    dicSateteList.AddRange(inputs.condition);
                }
            }
            int max = 100;
            if (device.spk == SPK.SensorLight)
            {
                //照明传感器
                max =int.MaxValue;
            }

            new LogicView.TipPopView { }.InputBox(textInt, stateValue, (value) =>
            {
                string keyValue = "20";
                string key = "20"; 
                string data_type = "integer";
                string comparator = "=";
                switch (textInt)
                {
                    case StringId.wendugaoyu:
                        {
                            keyValue = "temperature";
                            key = "temperature";
                            comparator = ">";
                            data_type = "float";
                        }
                        break;
                    case StringId.wendudiyu:
                        {
                            keyValue = "temperature";
                            key = "temperature";
                            comparator = "<";
                            data_type = "float";
                        }
                        break;
                    case StringId.shidugaoyu:
                        {
                            keyValue = "humidity";
                            key = "humidity";
                            comparator = ">";
                        }
                        break;
                    case StringId.shidudiyu:
                        {
                            keyValue = "humidity";
                            key = "humidity";
                            comparator = "<";
                        }
                        break;
                    case StringId.zhaomingdugaoyu:
                        {
                            key = "illuminance";
                            comparator = ">";
                        }
                        break;
                    case StringId.zhaomingdudiyu:
                        {
                            key = "illuminance";
                            comparator = "<";
                        }
                        break;
                }
                selectedState = device.spk + "_" + value;
                AddDictionary(keyValue, value, data_type, comparator);
                AddDictionary(key, value, data_type, comparator);
                SaveInput(device,index, edit);
            });
            },1,max);
        }
        /// PM2.5,Co2,Tvoc设置值
        /// </summary>
@@ -1503,6 +1543,10 @@
        /// <returns></returns>
        private bool CheckSpk()
        {
            if (this.function == null)
            {
                return false;
            }
            if (this.function.spk == SPK.VideoDoorLock ||
               this.function.spk == SPK.doorgate
                )
@@ -1511,7 +1555,7 @@
            }
            return false;

        } 
        }
        /// <summary>
        /// 判断dictionaryB是否完整包含另一个dictionaryA
        /// </summary>

 HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs

@@ -400,6 +400,13 @@
                                        inputView.btnState.Text = str;
                                    }
                                    break;
                                case SPK.SensorLight:
                                    {
                                        string str = this.GetText(dicList, "illuminance");
                                        inputView.btnState.Text = str;

                                    }
                                    break;
                                case SPK.DoorLock:
                                    {
                                        string value = this.GetValue(dicList);
@@ -750,6 +757,7 @@
                                if (device.spk == SPK.SensorEnvironment || device.spk == SPK.SensorEnvironmentHailin
                                || device.spk == SPK.SensorEnvironment2
                                || device.spk == SPK.SensorEnvironment3
                                || device.spk == SPK.SensorLight
                                )
                                {
                                    ///当前的索引值数据对象
@@ -764,6 +772,20 @@
                                        switch (key)
                                        {

                                            case "illuminance":
                                                {
                                                    int titleInt = 0;
                                                    if (comparator == ">")
                                                    {
                                                        titleInt = StringId.zhaomingdugaoyu;
                                                    }
                                                    else if (comparator == "<")
                                                    {
                                                        titleInt = StringId.zhaomingdudiyu;
                                                    }
                                                    ConditionDeviceFunList.Current.InputBoxAction(device, titleInt, indexVulae, true, stateValue);
                                                }
                                                break;
                                            case "temperature":
                                                {
                                                    int titleInt = 0;
@@ -2907,6 +2929,19 @@
                switch (key)
                {

                    case "illuminance":
                        {
                            if (comparator == ">")
                            {
                                strtext = ">" + value;
                            }
                            else if (comparator == "<")
                            {
                                strtext = "<" + value;
                            }

                        }
                        break;
                    case "temperature":
                        {
                            if (comparator == ">")

 HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs

@@ -359,7 +359,9 @@
            {
                return "MusicIcon/localMusic.png";
            }
            else if (SPK.SensorPm10 == device.spk || SPK.SensorPirHold == device.spk)
            else if (SPK.SensorPm10 == device.spk
                || SPK.SensorPirHold == device.spk
                || SPK.SensorLight == device.spk)
            {
                return "LogicIcon/sensor.png";
            }
@@ -368,6 +370,7 @@
            {
                return "FunctionIcon/DoorLock/DoorLock.png";
            }

            //LogicIcon/heatlogic.png"
            return $"FunctionIcon/Icon/{device.IconName}.png";

@@ -576,6 +579,7 @@
                          || device.spk == SPK.SensorHelp
                          || device.spk == SPK.SensorPm10
                          || device.spk == SPK.SensorPirHold
                          || device.spk == SPK.SensorLight
            );
            if (sensor != null)
            {
@@ -707,6 +711,7 @@
                functionTypeList.Add(SPK.SensorHelp);
                functionTypeList.Add(SPK.SensorPm10);
                functionTypeList.Add(SPK.SensorPirHold);
                functionTypeList.Add(SPK.SensorLight);


            }
@@ -810,6 +815,7 @@
                functionTypeList.Add(SPK.AcIr);
                functionTypeList.Add(SPK.SensorPirHold);
                functionTypeList.Add(SPK.ElectricalTvHisense);
                functionTypeList.Add(SPK.SensorLight);

            }

@@ -874,6 +880,7 @@
                        deviceTypeList.Add(SPK.VideoDoorLock);
                        deviceTypeList.Add(SPK.AcIr);
                        deviceTypeList.Add(SPK.SensorPirHold);
                        deviceTypeList.Add(SPK.SensorLight);

                    }
                    break;
@@ -1215,7 +1222,7 @@
            {
                //模拟设备
                var functions = new List<Function> {
                 //new Entity.Function { sid = "1234567890", name = "超声波传感器", spk = Entity.SPK.SensorUtrasonic },
                 new Entity.Function { sid = "1234567890", name = "照明传感器", spk = Entity.SPK.SensorLight },
                 // new Entity.Function { sid = "1234567891", name = "温度传感器", spk = Entity.SPK.SensorTemperature },
                 //  new Entity.Function { sid = "1234567892", name = "湿度传感器", spk = Entity.SPK.SensorHumidity },
                    //new Entity.Function { sid = "12345678933456", name = "门锁", spk = Entity.SPK.DoorLock },