Merge branch 'Dev-Branch' of http://59.41.255.150:6688/r/~wxr/OnPro into De...

wxr

2023-09-19 1830691fd179285d2df7f035e4f7f5a260e819c7

Merge branch 'Dev-Branch' of http://59.41.255.150:6688/r/~wxr/OnPro into Dev-Branch

 HDL-ON_Android/Assets/Phone/FunctionIcon/FunctionBg/AksFunctionBg.png

 HDL-ON_Android/HDL-ON_Android.csproj

@@ -402,6 +402,27 @@
    <AndroidAsset Include="Assets\Phone\LogicIcon\selectlocation.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\Light\ColorfulBar.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\groupControl_blue.png" />
    <AndroidAsset Include="Assets\h5\index.html" />
    <AndroidAsset Include="Assets\h5\static\index.63b34199.css" />
    <AndroidAsset Include="Assets\h5\static\images\coal-save-ic.png" />
    <AndroidAsset Include="Assets\h5\static\images\inverter-center.svg" />
    <AndroidAsset Include="Assets\h5\static\images\equal-plant-ic.png" />
    <AndroidAsset Include="Assets\h5\static\images\left-icon-unselect.png" />
    <AndroidAsset Include="Assets\h5\static\images\eidt.png" />
    <AndroidAsset Include="Assets\h5\static\images\switch-off.svg" />
    <AndroidAsset Include="Assets\h5\static\images\circle-ic.png" />
    <AndroidAsset Include="Assets\h5\static\images\inverter-center.png" />
    <AndroidAsset Include="Assets\h5\static\images\pan_ic.png" />
    <AndroidAsset Include="Assets\h5\static\images\right-icon-unselect.png" />
    <AndroidAsset Include="Assets\h5\static\images\up-icon-unselect.png" />
    <AndroidAsset Include="Assets\h5\static\images\switch-on.svg" />
    <AndroidAsset Include="Assets\h5\static\images\inverter-center.webp" />
    <AndroidAsset Include="Assets\h5\static\images\yinying.png" />
    <AndroidAsset Include="Assets\h5\static\images\down-icon-unselect.png" />
    <AndroidAsset Include="Assets\h5\static\images\co2-reduction-ic.png" />
    <AndroidAsset Include="Assets\h5\static\images\left-icon.png" />
    <AndroidAsset Include="Assets\h5\static\js\chunk-vendors.56c88730.js" />
    <AndroidAsset Include="Assets\h5\static\js\pages-inverter-index.e5e9499f.js" />
    <AndroidAsset Include="Assets\h5\static\js\pages-index-index~pages-inverter-index.0253e8cd.js" />
    <AndroidAsset Include="Assets\h5\static\img\inverter-center.18b181f4.png" />
    <AndroidAsset Include="Assets\h5\static\img\co2-reduction-ic.9c75228c.png" />
@@ -567,6 +588,8 @@
    <AndroidAsset Include="Assets\Phone\HisenseTv\yingliangjian.png" />
    <AndroidAsset Include="Assets\Phone\HisenseTv\electricaltvhisense.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\electricaltvhisense_blue.png" />
    <AndroidAsset Include="Assets\h5\static\js\index.31e0ba7a.js" />
    <AndroidAsset Include="Assets\h5\static\js\pages-index-index.25064587.js" />
    <AndroidAsset Include="Assets\Phone\HisenseTv\guan.png" />
    <AndroidAsset Include="Assets\Phone\HisenseTv\kai.png" />
    <AndroidAsset Include="Assets\Phone\HisenseTv\kaiguanSelected.png" />
@@ -575,30 +598,14 @@
    <AndroidAsset Include="Assets\Phone\HisenseTv\yingliangjiaSelected.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\IlluminationBg.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\IlluminationIcon.png" />
    <AndroidAsset Include="Assets\h5\static\js\pages-index-index~pages-inverter-index.0253e8cd.js" />
    <AndroidAsset Include="Assets\h5\static\img\inverter-center.18b181f4.png" />
    <AndroidAsset Include="Assets\h5\static\img\co2-reduction-ic.9c75228c.png" />
    <AndroidAsset Include="Assets\h5\static\img\equal-plant-ic.7ef6befa.png" />
    <AndroidAsset Include="Assets\h5\static\img\coal-save-ic.6c5fd125.png" />
    <AndroidAsset Include="Assets\h5\static\font\SourceHanSansCN-Normal.otf" />
    <AndroidAsset Include="Assets\Phone\Collection\GatewayOnlineTipIcon.png" />
    <AndroidAsset Include="Assets\h5\index.html" />
    <AndroidAsset Include="Assets\h5\static\index.63b34199.css" />
    <AndroidAsset Include="Assets\h5\static\images\coal-save-ic.png" />
    <AndroidAsset Include="Assets\h5\static\images\inverter-center.svg" />
    <AndroidAsset Include="Assets\h5\static\images\equal-plant-ic.png" />
    <AndroidAsset Include="Assets\h5\static\images\left-icon-unselect.png" />
    <AndroidAsset Include="Assets\h5\static\images\eidt.png" />
    <AndroidAsset Include="Assets\h5\static\images\switch-off.svg" />
    <AndroidAsset Include="Assets\h5\static\images\circle-ic.png" />
    <AndroidAsset Include="Assets\h5\static\images\inverter-center.png" />
    <AndroidAsset Include="Assets\h5\static\images\pan_ic.png" />
    <AndroidAsset Include="Assets\h5\static\images\right-icon-unselect.png" />
    <AndroidAsset Include="Assets\h5\static\images\up-icon-unselect.png" />
    <AndroidAsset Include="Assets\h5\static\images\switch-on.svg" />
    <AndroidAsset Include="Assets\h5\static\images\inverter-center.webp" />
    <AndroidAsset Include="Assets\h5\static\images\yinying.png" />
    <AndroidAsset Include="Assets\h5\static\images\down-icon-unselect.png" />
    <AndroidAsset Include="Assets\h5\static\images\co2-reduction-ic.png" />
    <AndroidAsset Include="Assets\h5\static\images\left-icon.png" />
    <AndroidAsset Include="Assets\h5\static\js\pages-index-index.a5a00a32.js" />
    <AndroidAsset Include="Assets\h5\static\js\index.3517131b.js" />
    <AndroidAsset Include="Assets\h5\static\js\chunk-vendors.56c88730.js" />
    <AndroidAsset Include="Assets\h5\static\js\pages-inverter-index.e5e9499f.js" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\FunctionBg\AksFunctionBg.png" />
  </ItemGroup>
  <ItemGroup>
    <AndroidResource Include="Resources\values\colors.xml" />

 HDL-ON_iOS/HDL-ON_iOS.csproj

@@ -1584,6 +1584,35 @@
      <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HorseRaceLampIcon.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\VideoDoorlockBatteryManagementBg.png" />
      <BundleResource Include="Resources\Phone\Classification\Room\HomePagebg.png" />
      <BundleResource Include="Resources\h5\index.html" />
      <BundleResource Include="Resources\h5\static\index.63b34199.css" />
      <BundleResource Include="Resources\h5\static\images\coal-save-ic.png" />
      <BundleResource Include="Resources\h5\static\images\inverter-center.svg" />
      <BundleResource Include="Resources\h5\static\images\equal-plant-ic.png" />
      <BundleResource Include="Resources\h5\static\images\left-icon-unselect.png" />
      <BundleResource Include="Resources\h5\static\images\eidt.png" />
      <BundleResource Include="Resources\h5\static\images\switch-off.svg" />
      <BundleResource Include="Resources\h5\static\images\circle-ic.png" />
      <BundleResource Include="Resources\h5\static\images\inverter-center.png" />
      <BundleResource Include="Resources\h5\static\images\pan_ic.png" />
      <BundleResource Include="Resources\h5\static\images\right-icon-unselect.png" />
      <BundleResource Include="Resources\h5\static\images\up-icon-unselect.png" />
      <BundleResource Include="Resources\h5\static\images\switch-on.svg" />
      <BundleResource Include="Resources\h5\static\images\inverter-center.webp" />
      <BundleResource Include="Resources\h5\static\images\yinying.png" />
      <BundleResource Include="Resources\h5\static\images\down-icon-unselect.png" />
      <BundleResource Include="Resources\h5\static\images\co2-reduction-ic.png" />
      <BundleResource Include="Resources\h5\static\images\left-icon.png" />
      <BundleResource Include="Resources\h5\static\js\chunk-vendors.56c88730.js" />
      <BundleResource Include="Resources\h5\static\js\pages-inverter-index.e5e9499f.js" />
      <BundleResource Include="Resources\h5\static\js\index.31e0ba7a.js" />
      <BundleResource Include="Resources\h5\static\js\pages-index-index.25064587.js" />
      <BundleResource Include="Resources\h5\static\js\pages-index-index~pages-inverter-index.0253e8cd.js" />
      <BundleResource Include="Resources\h5\static\img\inverter-center.18b181f4.png" />
      <BundleResource Include="Resources\h5\static\img\co2-reduction-ic.9c75228c.png" />
      <BundleResource Include="Resources\h5\static\img\equal-plant-ic.7ef6befa.png" />
      <BundleResource Include="Resources\h5\static\img\coal-save-ic.6c5fd125.png" />
      <BundleResource Include="Resources\h5\static\font\SourceHanSansCN-Normal.otf" />
      <BundleResource Include="Resources\Phone\HisenseTv\yingliangjian.png" />
      <BundleResource Include="Resources\Phone\HisenseTv\caidan.png" />
      <BundleResource Include="Resources\Phone\HisenseTv\offtvbj.png" />
@@ -1725,35 +1754,7 @@
      <BundleResource Include="Resources\Phone\FunctionIcon\EnvirSensor\IlluminationBg.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\EnvirSensor\IlluminationIcon.png" />
      <BundleResource Include="Resources\Phone\Collection\GatewayOnlineTipIcon.png" />
      <BundleResource Include="Resources\h5\index.html" />
      <BundleResource Include="Resources\h5\static\index.63b34199.css" />
      <BundleResource Include="Resources\h5\static\images\coal-save-ic.png" />
      <BundleResource Include="Resources\h5\static\images\inverter-center.svg" />
      <BundleResource Include="Resources\h5\static\images\equal-plant-ic.png" />
      <BundleResource Include="Resources\h5\static\images\left-icon-unselect.png" />
      <BundleResource Include="Resources\h5\static\images\eidt.png" />
      <BundleResource Include="Resources\h5\static\images\switch-off.svg" />
      <BundleResource Include="Resources\h5\static\images\circle-ic.png" />
      <BundleResource Include="Resources\h5\static\images\inverter-center.png" />
      <BundleResource Include="Resources\h5\static\images\pan_ic.png" />
      <BundleResource Include="Resources\h5\static\images\right-icon-unselect.png" />
      <BundleResource Include="Resources\h5\static\images\up-icon-unselect.png" />
      <BundleResource Include="Resources\h5\static\images\switch-on.svg" />
      <BundleResource Include="Resources\h5\static\images\inverter-center.webp" />
      <BundleResource Include="Resources\h5\static\images\yinying.png" />
      <BundleResource Include="Resources\h5\static\images\down-icon-unselect.png" />
      <BundleResource Include="Resources\h5\static\images\co2-reduction-ic.png" />
      <BundleResource Include="Resources\h5\static\images\left-icon.png" />
      <BundleResource Include="Resources\h5\static\js\pages-index-index.a5a00a32.js" />
      <BundleResource Include="Resources\h5\static\js\index.3517131b.js" />
      <BundleResource Include="Resources\h5\static\js\chunk-vendors.56c88730.js" />
      <BundleResource Include="Resources\h5\static\js\pages-inverter-index.e5e9499f.js" />
      <BundleResource Include="Resources\h5\static\js\pages-index-index~pages-inverter-index.0253e8cd.js" />
      <BundleResource Include="Resources\h5\static\img\inverter-center.18b181f4.png" />
      <BundleResource Include="Resources\h5\static\img\co2-reduction-ic.9c75228c.png" />
      <BundleResource Include="Resources\h5\static\img\equal-plant-ic.7ef6befa.png" />
      <BundleResource Include="Resources\h5\static\img\coal-save-ic.6c5fd125.png" />
      <BundleResource Include="Resources\h5\static\font\SourceHanSansCN-Normal.otf" />
      <BundleResource Include="Resources\Phone\FunctionIcon\FunctionBg\AksFunctionBg.png" />
    </ItemGroup>
    <ItemGroup>
      <ITunesArtwork Include="iTunesArtwork" />

 HDL-ON_iOS/Resources/Phone/FunctionIcon/FunctionBg/AksFunctionBg.png

 HDL_ON/UI/UI2/1-HomePage/HomePage.cs

@@ -1524,7 +1524,7 @@
                else if (function.spk == SPK.AvZkAiks)
                {
                    //为了去掉开关按钮
                    //btnIcon.SelectedImagePath = $"FunctionIcon/Icon/HomeIcon/{function.IconName}_blue.png";
                    btnIcon.UnSelectedImagePath = "AksIcon/yingyinzhongkong1.png";
                }
                //else if (function.spk == SPK.GroupControl)
                //{

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

@@ -1221,6 +1221,8 @@
                        };
                        break;
                    case ShowFunction.Aks:

                        btnFunctionViewBg.UnSelectedImagePath = "FunctionIcon/FunctionBg/AksFunctionBg.png";
                        //埃克斯影音中控
                        btnName.TextID = StringId.jiatingyingyuan;
                        btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>

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

@@ -5,6 +5,7 @@
using HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock;
using Newtonsoft.Json;


namespace HDL_ON.UI.UI2.Intelligence.Automation
{
    public class ConditionDeviceFunList : FrameLayout
@@ -60,6 +61,7 @@

        public void Show(Entity.Function device, int index, bool edit)
        {

            this.function = device;
            this.mEdit = edit;
            this.mIndex = index;
@@ -1321,9 +1323,7 @@
                                    tag += "_";
                                    array[i] = face.userName;
                                }
                                string jsonString = JsonConvert.SerializeObject(array).ToString();


                                seleTxet = Newtonsoft.Json.JsonConvert.SerializeObject(array);
                                //数据封装<高胜说萤石那边是推送用户名>
                                AddDictionary("open_user",seleTxet, "string", "[]"); 
                                //界面显示选中值

 HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/ButtonFramLayout.cs

@@ -154,7 +154,6 @@

                //弹起来还原背景颜色
            };
            this.Tag = "Cancel";
            btnImage.Tag = this.Tag;
            btnName.Tag = this.Tag;