2022年11月04日16:26:44

wjc

2022-11-04 94d6591af7870ba0f1f7797310c07581d6fcd0b4

2022年11月04日16:26:44

自动化输出目标支持机械手

 HDL-ON_Android/Assets/Language.ini

@@ -1108,6 +1108,7 @@
7161=Warning tone
7162=Face to open the door
7163=Video call
7164=Manipulator



@@ -2317,6 +2318,7 @@
7161=提示音
7162=人脸开门
7163=视频通话呼叫
7164=机械手


 

 HDL-ON_iOS/Resources/Language.ini

@@ -1108,6 +1108,7 @@
7161=Warning tone
7162=Face to open the door
7163=Video call
7164=Manipulator



@@ -2317,6 +2318,7 @@
7161=提示音
7162=人脸开门
7163=视频通话呼叫
7164=机械手


 

 HDL_ON/Common/R.cs

@@ -3001,7 +3001,11 @@
        /// <summary>
        /// 视频通话呼叫
        /// </summary>
        public const int shipintonghuahujiao = 7163; 
        public const int shipintonghuahujiao = 7163;
        /// <summary>
        /// 机械手
        /// </summary>
        public const int jixieshou = 7164;




 HDL_ON/Entity/Function/Function.cs

@@ -1321,7 +1321,10 @@
        /// 通用开关
        /// </summary>
        public const string OtherCommon = "other.common";

        /// <summary>
        /// 机械手
        /// </summary>
        public const string MechanicalArm = "electrical.mechanical_arm";
        /// <summary>
        /// 空调科技系统（绿建）
        /// 总控

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

@@ -30,7 +30,7 @@
            VerticalScrolViewLayout vv = new VerticalScrolViewLayout
            {
                Y = funAllAreaView.frameLayout.Bottom,
                Height = Application.GetRealHeight(667 - 64 - 50 * funCount - 8),
                Height = Application.GetRealHeight(667 - 64 - 50 * funCount - 8-50),
            };
            viewLayout.AddChidren(vv);
            if (!MainView.IsGatewayType)

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

@@ -922,11 +922,14 @@
                            //区别不同设备，显示不同设备状态
                            switch (device.spk)
                            {
                               
                                case SPK.AirSwitch:
                                case SPK.LightSwitch:
                                //插座
                                case SPK.PanelSocket:
                                case SPK.ElectricSocket:
                                //机械手
                                case SPK.MechanicalArm:
                                    {//开关

                                        foreach (var dic in dicList)
@@ -1435,6 +1438,8 @@
                //开关灯光
                case SPK.AirSwitch:
                case SPK.LightSwitch:
                    //机械手
                case SPK.MechanicalArm:
                    {
                        foreach (var dic in dicList)
                        {
@@ -2189,6 +2194,7 @@
                            //区别不同设备，显示不同设备状态
                            switch (device.spk)
                            {
                                case SPK.MechanicalArm:
                                case SPK.AirSwitch:
                                case SPK.LightSwitch:
                                    {//开关灯

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

@@ -11,7 +11,7 @@
        /// <summary>
        /// 定义一个静态对象
        /// </summary> 
        private static LogicMethod s_Current = null;   
        private static LogicMethod s_Current = null;
        /// <summary>
        /// 获取静态对象
        /// </summary>
@@ -147,9 +147,9 @@
        /// <returns></returns>
        public List<HDL_ON.Entity.Room> GetGatewayRoomList()
        {
            return   HDL_ON.Entity.SpatialInfo.CurrentSpatial.RoomList;
            return HDL_ON.Entity.SpatialInfo.CurrentSpatial.RoomList;

            

        }
        /// <summary>
        /// 获取网关房间列表
@@ -187,7 +187,7 @@
            var list2 = this.GetVideoDeviceList();
            list.AddRange(list1);
            list.AddRange(list2);
            GetTestDevice(ref list, true);
            this.GetTestDevice(ref list, false);
            return list;
        }
        /// <summary>
@@ -197,15 +197,17 @@
        public List<HDL_ON.Entity.Function> GetVideoDeviceList()
        {
            var functionList = new List<Function>();
            foreach (var videoDevice in FunctionList.List.videoIntercom) {
            foreach (var videoDevice in FunctionList.List.videoIntercom)
            {
                Function function = new Function();
                function.spk = videoDevice.spk;
                function.name = videoDevice.deviceName;
                function.deviceId = videoDevice.deviceId;
                function.online = videoDevice.status== "online";
                function.online = videoDevice.status == "online";
                function.sid = videoDevice.sid;
                var video = functionList.Find((o) => o.deviceId == function.deviceId);
                if (video == null) {
                if (video == null)
                {
                    functionList.Add(function);
                }

@@ -352,6 +354,11 @@
            string strPath = "";
            switch (functionType)
            {
                case SPK.MechanicalArm:
                    {
                        strPath = "LogicIcon/lightloguc.png";
                    }
                    break;
                case SPK.doorgate:
                    {
                        strPath = "VideoIcon/keshiduijiang.png";
@@ -456,6 +463,7 @@
        {
            List<string> deviceStrTypeList = new List<string>();
            deviceStrTypeList.Clear();
           
            ///灯光类
            var lightjosn = deviceList.Find((device) =>
            device.spk == SPK.LightSwitch
@@ -553,6 +561,13 @@
            {
                deviceStrTypeList.Add(Language.StringByID(StringId.VideoIntercom));
            }
            ///机械手类
            var MechanicalArm = deviceList.Find((device) =>
            device.spk == SPK.MechanicalArm);
            if (MechanicalArm != null)
            {
                deviceStrTypeList.Add(Language.StringByID(StringId.jixieshou));
            }
            return deviceStrTypeList;

        }
@@ -564,6 +579,7 @@
        public List<string> GetDeviceTypeFunctionList(string deviceType)
        {
            List<string> functionTypeList = new List<string>();
          
            ///灯光类
            if (deviceType == Language.StringByID(StringId.Lights))
            {
@@ -650,6 +666,10 @@
            else if (deviceType == Language.StringByID(StringId.VideoIntercom))
            {
                functionTypeList.Add(SPK.doorgate);
            }  ///机械手类
            else  if (deviceType == Language.StringByID(StringId.jixieshou))
            {
                functionTypeList.Add(SPK.MechanicalArm);
            }
            else
            {
@@ -702,6 +722,7 @@
                functionTypeList.Add(SPK.MusicStandard);
                functionTypeList.Add(SPK.AvMusic);
                functionTypeList.Add(SPK.doorgate);
                functionTypeList.Add(SPK.MechanicalArm);

            }

@@ -757,7 +778,7 @@
                        deviceTypeList.Add(SPK.HvacCac);
                        deviceTypeList.Add(SPK.SensorHelp);
                        deviceTypeList.Add(SPK.DoorLock);
                        deviceTypeList.Add(SPK.doorgate); 
                        deviceTypeList.Add(SPK.doorgate);

                    }
                    break;
@@ -780,6 +801,7 @@
                        deviceTypeList.Add(SPK.CurtainDream);
                        deviceTypeList.Add(SPK.MusicStandard);
                        deviceTypeList.Add(SPK.AvMusic);
                        deviceTypeList.Add(SPK.MechanicalArm);
                    }
                    break;
            }
@@ -816,11 +838,11 @@
        /// <returns></returns>
        public List<Entity.Function> GetFunctionDeviceList(Entity.Room room, string str)
        {
            List<string> functionTypeList = GetSupportEquipment(str);
            List<string> functionTypeList = this.GetSupportEquipment(str);
            //返回房间设备列表
            var roomDeviceList = GetRoomDevice(room);
            var roomDeviceList = this.GetRoomDevice(room);
            //返回最终支持显示出来的设备列表
            var list = GetShowDeviceList(functionTypeList, roomDeviceList);
            var list =this.GetShowDeviceList(functionTypeList, roomDeviceList);
            return list;
        }
        /// <summary>
@@ -1044,7 +1066,7 @@
                            //定义一个局部变量
                            string direction = string.Empty;
                            //两点距离小于配置距离<既自动化配置输入条件地理围栏半径>,说明进入区域
                            if (r*1000< radius)
                            if (r * 1000 < radius)
                            {
                                //到达某地
                                direction = "arrive";
@@ -1103,6 +1125,9 @@
                      new Entity.Function { sid = "1234567896", name = "毫米波传感器", spk = Entity.SPK.SenesorMegahealth },
                        new Entity.Function { sid = "1234567897", name = "毫米波传感器1", spk = Entity.SPK.SenesorMegahealth2 },
                       new Entity.Function { sid = "1234567899", name = "门磁传感器", spk = Entity.SPK.SensorDoorWindow },
                        new Entity.Function { sid = "12345678991234", name = "HDL机械手", spk = Entity.SPK.MechanicalArm },
                          new Entity.Function { sid = "123456789912345", name = "海曼机械手", spk = Entity.SPK.MechanicalArm },
                              new Entity.Function { sid = "12345678991234566", name = "海曼机械手", spk = Entity.SPK.MechanicalArm },
            };
                foreach (var function in functions)
                {

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

@@ -55,12 +55,15 @@
            #region  编辑设备状态
            switch (device.spk)
            {

                //开关灯光 
                case SPK.AirSwitch:
                case SPK.LightSwitch:
                //插座
                case SPK.PanelSocket:
                case SPK.ElectricSocket:
                //机械手
                case SPK.MechanicalArm:
                    {
                        #region 界面
                        ///开关