wxr
2023-07-20 ee736e5d594e973e63e85647caa03cf635c8867f
增加视频门锁电池管理说明页面
2个文件已添加
9个文件已修改
171 ■■■■■ 已修改文件
HDL-ON_Android/Assets/Language.ini 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_Android/Assets/Phone/FunctionIcon/DoorLock/VideoDoorlockBatteryManagementBg.png 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_Android/HDL-ON_Android.csproj 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_iOS/HDL-ON_iOS.csproj 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_iOS/Resources/Language.ini 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/VideoDoorlockBatteryManagementBg.png 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/Common/R.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/2-Classification/FunctionPage.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneFunctionInfoPage.cs 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/FuntionControlView/Light/ColorfulInfoPage.cs 68 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorlockBatteryManagementPage.cs 79 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_Android/Assets/Language.ini
@@ -664,6 +664,7 @@
677=High 
678=Current user data has been cleared, about to return to the previous page.
679=Group control
680=Colorful switch
@@ -2002,6 +2003,7 @@
677=高
678=当前用户数据已清空,即将返回上一页。
679=群控
680=炫彩开关
@@ -3339,6 +3341,7 @@
677=High 
678=Current user data has been cleared, about to return to the previous page.
679=Group control
680=Colorful switch
@@ -4672,6 +4675,7 @@
677=High 
678=Current user data has been cleared, about to return to the previous page.
679=Group control
680=Colorful switch
@@ -5994,6 +5998,7 @@
677=High 
678=Current user data has been cleared, about to return to the previous page.
679=Group control
680=Colorful switch
HDL-ON_Android/Assets/Phone/FunctionIcon/DoorLock/VideoDoorlockBatteryManagementBg.png
HDL-ON_Android/HDL-ON_Android.csproj
@@ -455,6 +455,7 @@
    <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\DoorlockHelpImage3.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\DoorlockHelpImage4.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HorseRaceLampIcon.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\VideoDoorlockBatteryManagementBg.png" />
  </ItemGroup>
  <ItemGroup>
    <AndroidResource Include="Resources\values\colors.xml" />
HDL-ON_iOS/HDL-ON_iOS.csproj
@@ -1615,6 +1615,7 @@
      <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\DoorlockHelpImage3.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\DoorlockHelpImage4.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HorseRaceLampIcon.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\VideoDoorlockBatteryManagementBg.png" />
    </ItemGroup>
    <ItemGroup>
      <ITunesArtwork Include="iTunesArtwork" />
HDL-ON_iOS/Resources/Language.ini
@@ -664,6 +664,7 @@
677=High 
678=Current user data has been cleared, about to return to the previous page.
679=Group control
680=Colorful switch
@@ -2002,6 +2003,7 @@
677=高
678=当前用户数据已清空,即将返回上一页。
679=群控
680=炫彩开关
@@ -3339,6 +3341,7 @@
677=High 
678=Current user data has been cleared, about to return to the previous page.
679=Group control
680=Colorful switch
@@ -4672,6 +4675,7 @@
677=High 
678=Current user data has been cleared, about to return to the previous page.
679=Group control
680=Colorful switch
@@ -5994,6 +5998,7 @@
677=High 
678=Current user data has been cleared, about to return to the previous page.
679=Group control
680=Colorful switch
HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/VideoDoorlockBatteryManagementBg.png
HDL_ON/Common/R.cs
@@ -6,6 +6,10 @@
    {
        /// <summary>
        /// 炫彩开关
        /// </summary>
        public const int ColorfulSwitch = 680;
        /// <summary>
        /// 群控
        /// </summary>
        public const int GroupControl = 679;
HDL_ON/UI/UI2/2-Classification/FunctionPage.cs
@@ -164,7 +164,7 @@
            if (titleId == StringId.Lights)
            {
                functionList.AddRange(FunctionList.List.groupControls);
                //functionList.AddRange(FunctionList.List.groupControls);
                functionList.AddRange(FunctionList.List.GetLightList());
            }
            else if(titleId == StringId.HorseRaceLamp)
HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneFunctionInfoPage.cs
@@ -2053,6 +2053,7 @@
        void UpdataFunctionRow()
        {
            contentView.RemoveAll();
            for (var i =0;i< functionRowList.Count; i++)
            {
                try
@@ -2064,6 +2065,11 @@
                        {
                            if (view.Tag != null)
                            {
                                if (view.Tag.ToString() == FunctionAttributeKey.OnOff)
                                {
                                    contentView.AddChidren(view);
                                }
                                if (isOnStatus)
                                {
                                    if (view.Tag.ToString() != FunctionAttributeKey.OnOff)
HDL_ON/UI/UI2/FuntionControlView/Light/ColorfulInfoPage.cs
@@ -41,6 +41,74 @@
            };
            bodyView.AddChidren(contentView);
            #region 炫彩开关
            contentView.AddChidren(new Button
            {
                Height = Application.GetRealHeight(10),
                BackgroundColor = CSS_Color.BackgroundColor,
            });
            var viewSwitch = new FrameLayout()
            {
                Height = Application.GetRealHeight(50),
                BackgroundColor = CSS_Color.MainBackgroundColor,
            };
            contentView.AddChidren(viewSwitch);
            var btnSwitchText = new Button()
            {
                X = Application.GetRealWidth(16),
                TextAlignment = TextAlignment.CenterLeft,
                TextColor = CSS_Color.FirstLevelTitleColor,
                TextSize = CSS_FontSize.SubheadingFontSize,
                TextID = StringId.ColorfulFunction,
            };
            viewSwitch.AddChidren(btnSwitchText);
            var btnColorfulSwitch = new Button()
            {
                X = Application.GetRealWidth(314),
                Gravity = Gravity.CenterVertical,
                Width = Application.GetMinRealAverage(48),
                Height = Application.GetMinRealAverage(36),
                UnSelectedImagePath = "Public/Switch.png",
                SelectedImagePath = "Public/SwitchOn.png",
                IsSelected = function.GetAttrState(FunctionAttributeKey.Colorful) == "on"
            };
            viewSwitch.AddChidren(btnColorfulSwitch);
            btnColorfulSwitch.MouseUpEventHandler = (sender, e) => {
                btnColorfulSwitch.IsSelected = !btnColorfulSwitch.IsSelected;
                new System.Threading.Thread(() =>
                {
                    try
                    {
                        var controlColorfulState = btnColorfulSwitch.IsSelected ? "on" : "off";
                        function.SetAttrState(FunctionAttributeKey.Colorful, controlColorfulState);
                        var d = new Dictionary<string, string>();
                        d.Add(FunctionAttributeKey.Colorful, controlColorfulState);
                        if (controlColorfulState == "on")
                        {
                            var color = function.GetAttrState(FunctionAttributeKey.ColorfulBegin).Split(",");
                            var sendColorString = color[0] + "," + color[1] + "," + color[2];
                            d.Add(FunctionAttributeKey.ColorfulBegin, sendColorString);
                            color = function.GetAttrState(FunctionAttributeKey.ColorfulEnd).Split(",");
                            sendColorString = color[0] + "," + color[1] + "," + color[2];
                            d.Add(FunctionAttributeKey.ColorfulEnd, sendColorString);
                            d.Add(FunctionAttributeKey.ColorfulTime, function.GetAttrState(FunctionAttributeKey.ColorfulTime));
                        }
                        Control.Ins.SendWriteCommand(function, d);
                    }
                    catch (Exception ex)
                    {
                        MainPage.Log($"控制炫彩开关异常:{ex.Message}");
                    }
                })
                { IsBackground = true }.Start();
            };
            #endregion
            #region 起始颜色
            var startView = new FrameLayout()
            {
HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorlockBatteryManagementPage.cs
@@ -19,19 +19,88 @@
            new TopViewDiv(bodyView, Language.StringByID(StringId.AudioSetup)).LoadTopView();
            bodyView.BackgroundColor = CSS_Color.MainBackgroundColor;
            var btn = new Button()
            var view1 = new FrameLayout()
            {
                Width = Application.GetRealWidth(343),
                Y = Application.GetRealHeight(64),
                Height = Application.GetRealHeight(276),
                BackgroundColor = CSS_Color.MainBackgroundColor,
                BackgroundImagePath = "FunctionIcon/Doorlock/VideoDoorlockBatteryManagementBg.png"
            };
            bodyView.AddChidren(view1);
            var btnTitle1 = new Button()
            {
                Width = Application.GetRealWidth(200),
                X = Application.GetRealWidth(16),
                Y = Application.GetRealHeight(64 + 24),
                Y = Application.GetRealHeight(16),
                IsMoreLines = true,
                TextAlignment = TextAlignment.TopLeft,
                TextSize = CSS_FontSize.TextFontSize,
                TextSize = CSS_FontSize.HeadlineFontSize,
                TextColor = CSS_Color.FirstLevelTitleColor,
                Text = "门锁电源",
            };
            bodyView.AddChidren(btn);
            view1.AddChidren(btnTitle1);
            var btnMsg1 = new Button()
            {
                X = Application.GetRealWidth(16),
                Y = Application.GetRealHeight(57),
                Width = Application.GetRealWidth(213),
                Height = Application.GetRealHeight(200),
                TextAlignment = TextAlignment.TopLeft,
                TextColor = CSS_Color.FirstLevelTitleColor,
                TextSize = CSS_FontSize.TextFontSize,
                IsMoreLines = true,
                Text = "打开室内面板电池盖,取出锂电池进行充电。\r\n请使用 5V2A 适配器对锂电池进行充电。"
            };
            view1.AddChidren(btnMsg1);
            var view2 = new FrameLayout()
            {
                Y = Application.GetRealHeight(8) + view1.Bottom,
                BackgroundColor = CSS_Color.MainBackgroundColor,
                Height = Application.GetRealHeight(170)
            };
            bodyView.AddChidren(view2);
            var btnTitle2 = new Button()
            {
                Width = Application.GetRealWidth(200),
                X = Application.GetRealWidth(16),
                Y = Application.GetRealHeight(16),
                IsMoreLines = true,
                TextAlignment = TextAlignment.TopLeft,
                TextSize = CSS_FontSize.HeadlineFontSize,
                TextColor = CSS_Color.FirstLevelTitleColor,
                Text = "低电量说明",
            };
            view2.AddChidren(btnTitle2);
            var btnMsg2 = new Button()
            {
                X = Application.GetRealWidth(16),
                Y = Application.GetRealHeight(57),
                Width = Application.GetRealWidth(213),
                Height = Application.GetRealHeight(110),
                TextAlignment = TextAlignment.TopLeft,
                TextColor = CSS_Color.FirstLevelTitleColor,
                TextSize = CSS_FontSize.TextFontSize,
                IsMoreLines = true,
                Text = "设备电量低时将自动关闭检测唤醒功能,人脸识别开锁为手动触发。\r\n 当电量低于极限值时,为保证应急开锁,设备将自动离线并仅支持开锁功能。"
            };
            view2.AddChidren(btnMsg2);
            if (Language.CurrentLanguage != "Chinese")
            {
                btnTitle1.Text = "Door lock power supply";
                btnMsg1.Text = "Open the indoor panel battery cover and remove the lithium battery for charging.\r\n" +
                    "Please use a 5V2A adapter to charge the lithium battery.";
                btnTitle2.Text = "Low battery description";
                btnMsg2.Text = "When the device's battery is low, the detection and wake-up function will be automatically turned off, and the facial recognition unlock will be manually triggered.\r\n" +
                    "When the battery level drops below the limit value, to ensure emergency unlocking, the device will automatically go offline and only support unlocking function.";
            }
        }