blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
wjc
2022-11-25 e44926acb6ab99ea0d5baf758773a0f383e441a9 
 HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs


@@ -140,7 +140,7 @@


                            //用sid找到设备；


                            var device = LogicMethod.Current.GetDevice(inputCondition.sid);


                            //用设备的functionType类型找到对应图标；


                            inputView.btnIcon.UnSelectedImagePath = LogicMethod.Current.GetIconPath(device.spk);


                            inputView.btnIcon.UnSelectedImagePath = LogicMethod.Current.GetDeviceIconPath(device);


                            //显示设备名称


                            inputView.btnText.Text = device.name;


                            //改变设备名称显示控件宽度


@@ -417,6 +417,15 @@


                                            var FaceItem = this.GetFaceItem(userId, device.deviceId);


                                            inputView.btnState.Text = FaceItem.userName;


                                        }


                                    }


                                    break;


                                case SPK.IpCam_Imou:


                                    {


                                        if (inputCondition.identifier == "door_caipcam_region_alram_eventll_cloud_event")


                                        {


                                            inputView.btnState.Text = Language.StringByID(StringId.quyuruqingaojing);


                                        }


                                        


                                    }


                                    break;


                            }


@@ -914,7 +923,7 @@


                            //用sid找到设备；


                            var device = LogicMethod.Current.GetDevice(outputTarget.sid);


                            //用设备的functionType类型找到对应图标；


                            targetView.btnIcon.UnSelectedImagePath = LogicMethod.Current.GetIconPath(device.spk);


                            targetView.btnIcon.UnSelectedImagePath = LogicMethod.Current.GetDeviceIconPath(device);


                            //显示设备名称


                            targetView.btnText.Text = device.name;


                            //改变设备名称显示控件宽度


@@ -2106,6 +2115,7 @@


                        button2.Text = this.GetFaceItem(value, device.deviceId).userName;


                    }


                    break;


              


            }


        }


        /// <summary>


@@ -2399,7 +2409,9 @@


        /// <returns></returns>


        private string GetTimeText(string strTimeValue)


        {


            var timeValue = int.Parse(strTimeValue);


            //因为调试软件上传为空过;


            string intTimeValue = string.IsNullOrEmpty(strTimeValue) ? "0" : strTimeValue;


            var timeValue = int.Parse(intTimeValue);


            string state = "";


            var minutes = timeValue / 60;


            var seconds = timeValue % 60;