2023年09月26日14:59:01

mac

2023-09-26 841e7972869b6e967d06da0d91186cd69f1d4eb5

2023年09月26日14:59:01

备份代码

 HDL-ON_Android/Assets/Phone/LogicIcon/ganjiedian.png

 HDL-ON_Android/HDL-ON_Android.csproj

@@ -606,6 +606,7 @@
    <AndroidAsset Include="Assets\h5\static\font\SourceHanSansCN-Normal.otf" />
    <AndroidAsset Include="Assets\Phone\Collection\GatewayOnlineTipIcon.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\FunctionBg\AksFunctionBg.png" />
    <AndroidAsset Include="Assets\Phone\LogicIcon\ganjiedian.png" />
  </ItemGroup>
  <ItemGroup>
    <AndroidResource Include="Resources\values\colors.xml" />

 HDL-ON_iOS/HDL-ON_iOS.csproj

@@ -1755,6 +1755,7 @@
      <BundleResource Include="Resources\Phone\FunctionIcon\EnvirSensor\IlluminationIcon.png" />
      <BundleResource Include="Resources\Phone\Collection\GatewayOnlineTipIcon.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\FunctionBg\AksFunctionBg.png" />
      <BundleResource Include="Resources\Phone\LogicIcon\ganjiedian.png" />
    </ItemGroup>
    <ItemGroup>
      <ITunesArtwork Include="iTunesArtwork" />

 HDL-ON_iOS/Resources/Phone/LogicIcon/ganjiedian.png

 HDL_ON/Common/Utlis.cs

@@ -42,7 +42,7 @@
                }
            }
            string text = tag + "======" + url + "\r\n" + content;
            Console.WriteLine(text);
            //Console.WriteLine(text);
#endif
        }


 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/UI/UI2/3-Intelligence/Automation/LogicMethod.cs

@@ -361,7 +361,7 @@
            }
            else if (SPK.SensorPm10 == device.spk
                || SPK.SensorPirHold == device.spk
                || SPK.SensorLight == device.spk)
               )
            {
                return "LogicIcon/sensor.png";
            }
@@ -370,7 +370,15 @@
            {
                return "FunctionIcon/DoorLock/DoorLock.png";
            }

            else if (SPK.SensorDryContact == device.spk
                || SPK.SensorDryContact2 == device.spk)
            {
                return "LogicIcon/ganjiedian.png";
            }
            else if (SPK.SensorLight == device.spk)
            {
                return "LogicIcon/lightloguc.png";
            }
            //LogicIcon/heatlogic.png"
            return $"FunctionIcon/Icon/{device.IconName}.png";

@@ -1223,7 +1231,7 @@
                //模拟设备
                var functions = new List<Function> {
                 new Entity.Function { sid = "1234567890", name = "光照传感器", spk = Entity.SPK.SensorLight },
                  new Entity.Function { sid = "1234567891", name = "插座", spk = Entity.SPK.PanelSocket },
                  new Entity.Function { sid = "1234567891", name = "干节点", spk = Entity.SPK.SensorDryContact },
                   new Entity.Function { sid = "1234567892", name = "紧急求助传感器", spk = Entity.SPK.SensorHelp },
                    //new Entity.Function { sid = "12345678933456", name = "门锁", spk = Entity.SPK.DoorLock },
                    //  new Entity.Function { sid = "1234567895444", name = "视频门锁", spk = Entity.SPK.VideoDoorLock },

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

@@ -1,11 +1,92 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Reflection;
using Shared;
namespace HDL_ON.UI.UI2.Intelligence.Automation
{
    public class PublicInterface
    {

        /// <summary>
        /// 单选择
        /// </summary>
        /// <param name="frame">显示在哪个界面的父控件</param>
        /// <param name="list">显示数据源</param>
        /// <param name="titleText"></param>
        /// <param name="stateText">之前状态文本</param>
        /// <param name="action">返回值</param>
        /// <param name="textSize">显示文本字体大小</param>
        public void SingleSelectionShow(FrameLayout frame, List<FuntionControlView.Aks.Entity.RemoteControlEntity> list, string titleText, string stateText, Action<int> action, int textSize = LogicView.TextSize.text14)
        {
            if (list == null)
            {
                return;
            }
            FrameLayout frameLayout = new FrameLayout
            {
                BackgroundColor = CSS.CSS_Color.viewTrans60lucence,
            };
            frame.AddChidren(frameLayout);

            LogicView.DateView view = new LogicView.DateView();
            view.btnTitle.Text = titleText;
            view.FLayoutView(frameLayout, list.Count);
            view.btnCancel.MouseUpEventHandler += (sender, e) =>
            {
                //移除fLayout界面
                frameLayout.RemoveFromParent();
            };
            ///定义一个Btn记录选中状态
            Button checkBtn = new Button
            {
                Tag = "unknown",
            };
            for (int i = 0; i < list.Count; i++)
            {
                FuntionControlView.Aks.Entity.RemoteControlEntity remoteControl = list[i];
                LogicView.CheckView checkView = new LogicView.CheckView();
                checkView.frameLayout.Y = Application.GetRealHeight(56 + 50 * i);
                checkView.btnText.TextSize = textSize;
                view.frameLayout.AddChidren(checkView.FLayoutView());
                checkView.btnText.Text = remoteControl.name;
                checkView.btnClick.Tag = i;//标记

                if (stateText == remoteControl.name)
                {
                    //显示之前的选中状态
                    checkBtn.IsSelected = false;
                    checkView.btnCheckIcon.IsSelected = true;
                    checkBtn = checkView.btnCheckIcon;
                    checkBtn.Tag = checkView.btnClick.Tag.ToString();
                }
                //点击事件
                checkView.btnClick.MouseUpEventHandler += (sender1, e1) =>
                {
                    checkBtn.IsSelected = false;
                    checkView.btnCheckIcon.IsSelected = true;
                    checkBtn = checkView.btnCheckIcon;
                    checkBtn.Tag = checkView.btnClick.Tag.ToString();
                };

            }
            view.btnConfirm.MouseUpEventHandler += (sender1, e1) =>
            {
                if (checkBtn.Tag.ToString() == "unknown")
                {
                    return;
                }
                var index = int.Parse(checkBtn.Tag.ToString());
                if (index > list.Count)
                {
                    index = 0;
                }
                action(index);
                //移除fLayout界面
                frameLayout.RemoveFromParent();
            };

        }
        /// <summary>
        /// 单选择
        /// </summary>

 HDL_ON/UI/UI2/FuntionControlView/Aks/AksPage.cs

@@ -10,6 +10,7 @@
using HDL_ON.UI.UI2.Intelligence.Automation;
using System.Linq;
using HDL_ON.UI.UI2.FuntionControlView.Aks.Entity;
using System.Reflection;

namespace HDL_ON.UI.UI2.FuntionControlView.Aks
{
@@ -64,6 +65,10 @@
        /// 记录当前设备
        /// </summary>
        public IntType currnetIntType= IntType.none;
        /// <summary>
        /// 记录当前选择的索引值
        /// </summary>
        public int indexValue = -1;

        

@@ -196,16 +201,19 @@

                        if (this.remoteControlList.Count > 0)
                        {
                            if (string.IsNullOrEmpty(this.GetValueString(IntType.Player)))
                            {
                                //默认取第一位
                                this.SwitchUI((IntType)this.remoteControlList[0].type);
                            }
                            else
                            if (this.isExistType(IntType.Player))
                            {
                                //有播放类型遥控器优先显示
                                this.SwitchUI(IntType.Player);
                            }
                            else
                            {
                                //默认取第一位
                                this.indexValue = 0;
                                var type = (IntType)this.remoteControlList[this.indexValue].type;
                                this.SwitchUI(type);
                            }
                           
                        }

                    });
@@ -213,14 +221,15 @@
            });
        }
        /// <summary>
        /// 切换界面(1 = 播放器,2 = 功放,3 = 电视,4 = 机顶盒,5 = 投影仪,6 = 万能遥控器)
        /// 界面显示(1 = 播放器,2 = 功放,3 = 电视,4 = 机顶盒,5 = 投影仪,6 = 万能遥控器)
        /// </summary>
        private void SwitchUI(IntType type)
        {
            if (this.currnetIntType == type)
            {
                return;
            }
            //if (this.currnetIntType == type)
            //{
            //    //去掉判断类型,因为可能存在多个同类型
            //    return;
            //}
            if (IntType.none == type)
            {
                return;
@@ -230,12 +239,12 @@
                return;
            }
            this.vv.RemoveAll();
            this.currnetIntType = type;
            var remoteContro = this.remoteControlList[this.indexValue];
            switch (type)
            {
                case IntType.Player:
                    {
                        MusicPage musicPage = new MusicPage(GetRemoteControl((int)IntType.Player),this.sequencerList);
                        MusicPage musicPage = new MusicPage(remoteContro, this.sequencerList);
                        this.vv.AddChidren(musicPage);
                        musicPage.Show();
                        musicPage.action += (deviceType) =>
@@ -246,7 +255,7 @@
                    break;
                case IntType.HiFi:
                    {
                        GfPage gfPage = new GfPage(GetRemoteControl((int)IntType.HiFi), this.sequencerList);
                        GfPage gfPage = new GfPage(remoteContro, this.sequencerList);
                        this.vv.AddChidren(gfPage);
                        gfPage.Show();
                        gfPage.action += (deviceType) =>
@@ -259,7 +268,7 @@
                case IntType.TV:
                    {

                        TvPage tvPage = new TvPage(GetRemoteControl((int)IntType.TV), this.sequencerList);
                        TvPage tvPage = new TvPage(remoteContro, this.sequencerList);
                        this.vv.AddChidren(tvPage);
                        tvPage.Show();
                        tvPage.action += (deviceType) =>
@@ -270,7 +279,7 @@
                    break;
                case IntType.STB:
                    {
                        JdhPage jdhPage = new JdhPage(GetRemoteControl((int)IntType.STB), this.sequencerList);
                        JdhPage jdhPage = new JdhPage(remoteContro, this.sequencerList);
                        this.vv.AddChidren(jdhPage);
                        jdhPage.Show();
                        jdhPage.action += (deviceType) =>
@@ -281,7 +290,7 @@
                    break;
                case IntType.Projector:
                    {
                        TyyPage tyyPage = new TyyPage(GetRemoteControl((int)IntType.Projector), this.sequencerList);
                        TyyPage tyyPage = new TyyPage(remoteContro, this.sequencerList);
                        this.vv.AddChidren(tyyPage);
                        tyyPage.Show();
                        tyyPage.action += (deviceType) =>
@@ -293,7 +302,7 @@
                case IntType.Control:
                    {

                        YkqPage ykqPage = new YkqPage(GetRemoteControl((int)IntType.Control), this.sequencerList);
                        YkqPage ykqPage = new YkqPage(remoteContro, this.sequencerList);
                        this.vv.AddChidren(ykqPage);
                        ykqPage.Show();
                        ykqPage.action += (deviceType) =>
@@ -308,43 +317,29 @@

        }
        /// <summary>
        /// 选中类型弹框(1 = 播放器,2 = 功放,3 = 电视,4 = 机顶盒,5 = 投影仪,6 = 万能遥控器)
        /// 界面切换(1 = 播放器,2 = 功放,3 = 电视,4 = 机顶盒,5 = 投影仪,6 = 万能遥控器)
        /// </summary>
        private void SelectedType()
        {
            var deviceTypeList = GetTypeDictionary().Values.ToList();
            var deviceTypeList = GetRemoteControlList();
            ///之前的状态文本
            string ccurrnetDeviceStr= this.GetValueString(this.currnetIntType);
            string ccurrnetDeviceStr = "";
            if (indexValue!=-1&& indexValue< deviceTypeList.Count) {
                ccurrnetDeviceStr= deviceTypeList[indexValue].name;
            }
            PublicInterface conditionView = new PublicInterface();
            conditionView.SingleSelectionShow(this, deviceTypeList, "设备选择", ccurrnetDeviceStr
               , (valueStr) =>
               , (index) =>
               {
                   //界面显示选中值
                   var intType = this.GetKeyIntType(valueStr);
                   this.SwitchUI(intType);
                   var remoteControl = deviceTypeList[index];
                   this.indexValue = index;
                   this.currnetIntType = (IntType)remoteControl.type;
                   this.SwitchUI((IntType)remoteControl.type);

               });
        }

        /// <summary>
        /// 查找遥控器
        /// </summary>
        /// <param name="type">(1 = 播放器,2 = 功放,3 = 电视,4 = 机顶盒,5 = 投影仪,6 = 万能遥控器)</param>
        /// <returns>不会为null</returns>
        private RemoteControlEntity GetRemoteControl(int type)
        {
            if (this.remoteControlList == null || this.remoteControlList.Count == 0)
            {
                return new RemoteControlEntity();
            }
            var re = this.remoteControlList.Find((o) => o.type == type);
            if (re == null)
            {
                re = new RemoteControlEntity();
            }
            //re.deviceId = this.device.deviceId;
            return re;
        }
       


        public enum IntType
@@ -380,92 +375,39 @@
        }

        /// <summary>
        /// 初始化字典
        /// 获取遥控器列表
        /// </summary>
        /// <returns></returns>
        private Dictionary<IntType, string> GetTypeDictionary()
        private List<RemoteControlEntity> GetRemoteControlList()
        {
            if (this.remoteControlList == null || this.remoteControlList.Count == 0)
            {
                return new Dictionary<IntType, string>();
                return new List<RemoteControlEntity>();
            }
            var dic = new Dictionary<IntType, string>();
            foreach (var o in this.remoteControlList)
            {
                switch (o.type)
                {
                    case (int)IntType.Player:
                        {
                            dic.Add(IntType.Player, Language.StringByID(StringId.bofangqi));
            return this.remoteControlList;
                        }
                        break;
                    case (int)IntType.HiFi:
                        {
                            dic.Add(IntType.HiFi, Language.StringByID(StringId.gongfan));
                        }
                        break;
                    case (int)IntType.TV:
                        {
                            dic.Add(IntType.TV, Language.StringByID(StringId.dianshi));
                        }
                        break;

                    case (int)IntType.STB:
                        {
                            dic.Add(IntType.STB, Language.StringByID(StringId.jidinghe));
                        }
                        break;
                    case (int)IntType.Projector:
                        {
                            dic.Add(IntType.Projector, Language.StringByID(StringId.touyingyi));
                        }
                        break;
                    case (int)IntType.Control:
                        {
                            dic.Add(IntType.Control, Language.StringByID(StringId.xuniyaokongqi));
                        }
                        break;
                }
            }
            return dic;
        }
        /// <summary>
        /// 获取设备类型
        /// 是否存在类型
        /// </summary>
        /// <param name="value">(1 = 播放器,2 = 功放,3 = 电视,4 = 机顶盒,5 = 投影仪,6 = 万能遥控器)</param>
        /// <param name="type">(1 = 播放器,2 = 功放,3 = 电视,4 = 机顶盒,5 = 投影仪,6 = 万能遥控器)</param>
        /// <returns></returns>
        private IntType GetKeyIntType(string value)
        private bool isExistType(IntType type)  
        {
            var dic = this.GetTypeDictionary();
            foreach (var d in dic)
          
            var remoteControls = this.GetRemoteControlList();
            for (int i = 0; i < remoteControls.Count; i++)
            {
                if (d.Value == value)
                var re = remoteControls[i];
                if ((IntType)re.type == type)
                {
                    return d.Key;
                }
            }
            return IntType.none;
        }
        /// <summary>
        /// 获取设备名称
        /// </summary>
        /// <param name="key">(1 = 播放器,2 = 功放,3 = 电视,4 = 机顶盒,5 = 投影仪,6 = 万能遥控器)</param>
        /// <returns></returns>
        private string GetValueString(IntType key)
        {
            var dic = this.GetTypeDictionary();
            foreach (var d in dic)
            {
                if (d.Key == key)
                {
                    return d.Value;
                }
            }
            return "";
                    this.indexValue = i;
                    return true;
        }


        
            }
            return false;
        }


    }

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

@@ -95,6 +95,7 @@
            TextColor = MusicColor.TextColor,
            TextAlignment = TextAlignment.CenterRight,
            Gravity = Gravity.CenterVertical,
            Padding=new Padding(0,0,0,0),
            IsMoreLines = true,
        };


 HDL_ON/UI/UI2/FuntionControlView/Aks/Entity/RemoteControlEntity.cs

 HDL_ON/UI/UI2/FuntionControlView/Aks/GfPage.cs

@@ -86,7 +86,7 @@
                TextAlignment = TextAlignment.CenterLeft,
                TextColor = MusicColor.TextColor,
                TextSize = TextSize.Text16,
                TextID = StringId.gongfan,
                Text= this.remoteControl.name,
                IsBold = true,
            };
            this.AddChidren(btnTitle);
@@ -111,7 +111,7 @@
            typeMultiFramLayout = new TypeMultiFramLayout();
            typeMultiFramLayout.multiFramLayout.Gravity = Gravity.Center;
            typeMultiFramLayout.AddView(cornerBottomFram);
            typeMultiFramLayout.btnBottonRightName.TextID = StringId.gongfan;
            typeMultiFramLayout.btnBottonRightName.Text = this.remoteControl.name;

            this.AdjustRealHeight(16);
        }

 HDL_ON/UI/UI2/FuntionControlView/Aks/JdhPage.cs

@@ -136,7 +136,7 @@
                TextAlignment = TextAlignment.CenterLeft,
                TextColor = MusicColor.TextColor,
                TextSize = TextSize.Text16,
                TextID = StringId.jidinghe,
                Text= this.remoteControl.name,
                IsBold = true,
            };
            this.AddChidren(btnTitle);
@@ -176,6 +176,7 @@
                SelectedTextColor = MusicColor.MusicTxet14SelectedColor,
                TextSize = TextSize.Text16,
                TextID = StringId.pindao,
                Padding = new Padding(0, 0, 0, 0),
            };
            leftLayout.AddChidren(leftBtnTitle);

@@ -218,6 +219,7 @@
                SelectedTextColor = MusicColor.MusicTxet14SelectedColor,
                TextSize = TextSize.Text16,
                TextID = StringId.kongzhi,
                Padding = new Padding(0, 0, 0, 0),
            };
            rightLayout.AddChidren(rightBtnTitle);

@@ -269,7 +271,7 @@
            typeMultiFramLayout = new TypeMultiFramLayout();
            typeMultiFramLayout.multiFramLayout.Y = menuFram.Bottom + Application.GetRealHeight(32);
            typeMultiFramLayout.AddView(cornerBottomFram);
            typeMultiFramLayout.btnBottonRightName.TextID = StringId.jidinghe;
            typeMultiFramLayout.btnBottonRightName.Text=this.remoteControl.name;

            //初始值
            leftBtnTitle.IsSelected = true;

 HDL_ON/UI/UI2/FuntionControlView/Aks/MusicPage.cs

@@ -124,6 +124,7 @@
                TextSize = TextSize.Text16,
                //TextID = StringId.bofangqi,
                Text = this.remoteControl.name,
                Padding = new Padding(0, 0, 0, 0),
                IsBold=true,
            };
            this.AddChidren(btnTitle);

 HDL_ON/UI/UI2/FuntionControlView/Aks/TvPage.cs

@@ -140,7 +140,7 @@
                TextAlignment = TextAlignment.CenterLeft,
                TextColor = MusicColor.TextColor,
                TextSize = TextSize.Text16,
                TextID = StringId.dianshi,
                Text= this.remoteControl.name,
                IsBold = true,
            };
            this.AddChidren(btnTitle);
@@ -180,6 +180,7 @@
                SelectedTextColor = MusicColor.MusicTxet14SelectedColor,
                TextSize = TextSize.Text16,
                TextID = StringId.pindao,
                Padding = new Padding(0, 0, 0, 0),
            };
            leftLayout.AddChidren(leftBtnTitle);

@@ -222,6 +223,7 @@
                SelectedTextColor = MusicColor.MusicTxet14SelectedColor,
                TextSize = TextSize.Text16,
                TextID = StringId.kongzhi,
                Padding = new Padding(0, 0, 0, 0),
            };
            rightLayout.AddChidren(rightBtnTitle);

@@ -273,7 +275,7 @@
            typeMultiFramLayout = new TypeMultiFramLayout();
            typeMultiFramLayout.multiFramLayout.Y = menuFram.Bottom + Application.GetRealHeight(32);
            typeMultiFramLayout.AddView(cornerBottomFram);
            typeMultiFramLayout.btnBottonRightName.TextID = StringId.dianshi;
            typeMultiFramLayout.btnBottonRightName.Text = this.remoteControl.name;

            //初始值
            leftBtnTitle.IsSelected = true;

 HDL_ON/UI/UI2/FuntionControlView/Aks/TyyPage.cs

@@ -123,7 +123,7 @@
                TextAlignment = TextAlignment.CenterLeft,
                TextColor = MusicColor.TextColor,
                TextSize = TextSize.Text16,
                TextID = StringId.touyingyi,
                Text= this.remoteControl.name,
                IsBold = true,
            };
            this.AddChidren(btnTitle);
@@ -150,7 +150,7 @@
            typeMultiFramLayout = new TypeMultiFramLayout();
            typeMultiFramLayout.multiFramLayout.Y = menuFram.Bottom + Application.GetRealHeight(32);
            typeMultiFramLayout.AddView(cornerBottomFram);
            typeMultiFramLayout.btnBottonRightName.TextID = StringId.touyingyi;
            typeMultiFramLayout.btnBottonRightName.Text = this.remoteControl.name;

            this.AdjustRealHeight(16);
        }

 HDL_ON/UI/UI2/FuntionControlView/Aks/YkqPage.cs

@@ -387,7 +387,7 @@
                TextAlignment = TextAlignment.CenterLeft,
                TextColor = MusicColor.TextColor,
                TextSize = TextSize.Text16,
                TextID = StringId.xuniyaokongqi,
                Text= this.remoteControl.name,
                IsBold = true,
            };
            this.AddChidren(btnTitle);
@@ -1084,7 +1084,7 @@
            typeMultiFramLayout = new TypeMultiFramLayout();
            typeMultiFramLayout.multiFramLayout.Y = Application.GetRealHeight(16);
            typeMultiFramLayout.AddView(cornerBottomFram);
            typeMultiFramLayout.btnBottonRightName.TextID = StringId.xuniyaokongqi;
            typeMultiFramLayout.btnBottonRightName.Text = this.remoteControl.name;

            this.AdjustRealHeight(16);
        }