2023年03月28日11:52:02

wjc

2023-03-28 a9d1161b1df96e7ddad566335989a1444e433ef5

2023年03月28日11:52:02

 HDL-ON_Android/Assets/Language.ini

@@ -1122,6 +1122,21 @@
7167=main switch
7168=PM10

8501=Video door lock
8502=Electric quantity
8503=The door is now closed
8504=The door is not closed
8505=RVC
8506=One click to open the lock
8507=Temporary password
8508=History
8509=Fluorite video door lock
8510=Call from the doorbell
8511=User Education 
  






@@ -2348,6 +2363,26 @@
7168=PM10


8501=视频门锁
8502=电量
8503=当前门已关
8504=当前门未关
8505=实时视频
8506=一键开锁
8507=临时密码
8508=历史记录
8509=萤石视频门锁
8510=来自“门铃”呼叫
8511=用户人员










 
9000=请使用新的手机账号登录APP

 HDL-ON_Android/Assets/Phone/FunctionIcon/DoorLock/History.png

Binary files differ

 HDL-ON_iOS/Resources/Language.ini

@@ -1122,6 +1122,19 @@
7167=main switch
7168=PM10

8501=Video door lock
8502=Electric quantity
8503=The door is now closed
8504=The door is not closed
8505=RVC
8506=One click to open the lock
8507=Temporary password
8508=History
8509=Fluorite video door lock
8510=Call from the doorbell
8511=User Education 





@@ -2348,6 +2361,18 @@
7167=总控开关
7168=PM10

8501=视频门锁
8502=电量
8503=当前门已关
8504=当前门未关
8505=实时视频
8506=一键开锁
8507=临时密码
8508=历史记录
8509=萤石视频门锁
8510=来自“门铃”呼叫
8511=用户人员



 

 HDL_ON/Common/HDLCommon.cs

@@ -386,6 +386,21 @@
                    {
                        ShowAlarmPushMessage(jpushMessageInfo, false);
                    }
                    else if (jpushMessageInfo.messageType.Contains(PushMessageType.DOOR_BELL.ToString()))
                    {
                        try
                        {
                            if (string.IsNullOrEmpty(jpushMessageInfo.expantContent)) return;
                            var expantContent = Newtonsoft.Json.JsonConvert.DeserializeObject<UI.UI2.FuntionControlView.VideoDoorLock.ExpantContent>(jpushMessageInfo.expantContent);
                            if (expantContent == null)
                            {
                                return;
                            }
                            ///视频门锁
                            HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock.CommonMethod.Current.SkipRTVActivity(expantContent.devSerial, expantContent.deviceId,expantContent.spk,true);
                        }
                        catch { }
                    }
                }
            }
            catch (Exception EX)

 HDL_ON/Common/R.cs

@@ -3062,7 +3062,59 @@
        /// <summary>
        /// PM210
        /// </summary>
        public const int pm10= 7168;
        public const int pm10 = 7168;

        /// <summary>
        /// 视频门锁
        /// </summary>
        public const int shipinmensuo = 8501;
        /// <summary>
        /// 电量
        /// </summary>
        public const int dianliang = 8502;
        /// <summary>
        /// 当前门已关
        /// </summary>
        public const int dangqianmenyiguan = 8503;
        /// <summary>
        /// 当前门未关
        /// </summary>
        public const int dangqianmenweiguan = 8504;
        /// <summary>
        /// 实时视频
        /// </summary>
        public const int shishishipin = 8505;
        /// <summary>
        /// 一键开锁
        /// </summary>
        public const int yijiankaisuo = 8506;
        /// <summary>
        /// 临时密码
        /// </summary>
        public const int linshimima1 = 8507;
        /// <summary>
        /// 历史记录
        /// </summary>
        public const int lishijilu = 8508;
        /// <summary>
        /// 萤石视频门锁
        /// </summary>
        public const int yingshishipinmensuo = 8509;
        /// <summary>
        /// 来自“门铃”呼叫
        /// </summary>
        public const int laizimenlinghujiao = 8510;
        /// <summary>
        /// 用户人员
        /// </summary>
        public const int yonghurenyuan = 8511;











 HDL_ON/DAL/Server/NewAPI.cs

@@ -462,6 +462,46 @@
        /// 设备消息规则配置
        /// </summary>
        public const string Api_Post_DeviceMessageRulesSet = "/home-wisdom/app/device/deviceMessageRulesSet";

        #endregion

        #region Kaede -- 萤石视频门锁接口____________________________
        /// <summary>
        /// 删除设备（萤石视频门锁）
        /// </summary>
        public const string Api_Post_DeleteDevice = "/home-wisdom/platform/yingshi/child/deleteDevice";
        /// <summary>
        /// 电池详情（萤石视频门锁）
        /// </summary>
        public const string Api_Post_Details = "/home-wisdom/platform/yingshi/lock/battery/details";
        /// <summary>
        /// 门锁用户列表（萤石视频门锁）
        /// </summary>
        public const string Api_Post_UserList = "/home-wisdom/platform/yingshi/lock/user/list";
        /// <summary>
        /// 门锁状态（萤石视频门锁）
        /// </summary>
        public const string Api_Post_Lockstatus = "/home-wisdom/platform/yingshi/lock/status";
        /// <summary>
        /// 获取报警列表（萤石视频门锁）
        /// </summary>
        public const string Api_Post_Records = "/home-wisdom/platform/yingshi/alarm/records";
        /// <summary>
        /// 删除报警记录（萤石视频门锁）
        /// </summary>
        public const string Api_Post_AlarmDelet= "/home-wisdom/platform/yingshi/alarm/delete";
        /// <summary>
        /// 远程开锁（萤石视频门锁）
        /// </summary>
        public const string Api_Post_OpenDoor = "/home-wisdom/platform/yingshi/lock/remote/open/door";
        /// <summary>
        /// 获取门锁型号列表（萤石视频门锁）
        /// </summary>
        public const string Api_Post_Models = "/home-wisdom/platform/yingshi/lock/models";




        #endregion

        #region Kaede -- 场景接口____________________________

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

@@ -618,7 +618,25 @@
                        }
                    }
                    break;
                    
                //萤石视频门锁
                case SPK.VideoDoorLock:
                    {
                        LogicView.FunTypeView view1 = new LogicView.FunTypeView();
                        view1.btnText.TextID=StringId.yonghurenyuan;
                        view1.btnText.Name = Language.StringByID(StringId.shipinmensuo);
                        fLayout.AddChidren(view1.FLayoutView());
                        view1.btnClick.MouseUpEventHandler += (sender, e) =>
                        {
                            this.identifier = "open_door";//开锁事件
                            this.VideoDoorLockAction(this, device, view1.btnState);
                        };
                        if (edit)
                        {
                            this.GetEditState(device, index, view1.btnState,null, null, null);
                        }
                    }
                    break;

            }
            #region  保存
            ///保存View
@@ -669,6 +687,12 @@
                        inputDevice.condition = new List<Dictionary<string, string>>();
                    }
                }
                else if (device.spk == SPK.VideoDoorLock)
                {
                    ////萤石视频门锁
                    inputDevice.condition_type = "9";
                    inputDevice.identifier = this.identifier;
                }


                if (edit)

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

@@ -92,11 +92,12 @@
            //日出/日落/正午点击事件
            timeSpecialView.btnClick.MouseUpEventHandler += (sen, e) =>
            {
                if (string.IsNullOrEmpty( Entity.DB_ResidenceData.Instance.CurrentRegion.homeAddress))//.longitude == 0 && Entity.DB_ResidenceData.Instance.CurrentRegion.latitude == 0)
                {
                    new PublicAssmebly().TipMsg(StringId.tip, StringId.GatewayLocationInformationIsNotConfigured);
                    return;
                }
                
                //if (string.IsNullOrEmpty( Entity.DB_ResidenceData.Instance.CurrentRegion.homeAddress))//.longitude == 0 && Entity.DB_ResidenceData.Instance.CurrentRegion.latitude == 0)
                //{
                //    new PublicAssmebly().TipMsg(StringId.tip, StringId.GatewayLocationInformationIsNotConfigured);
                //    return;
                //}
                SpeciaTime speciaTime = new SpeciaTime();
                MainPage.BasePageView.AddChidren(speciaTime);
                speciaTime.Show();

 HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/AddDevciePage.cs

@@ -421,6 +421,11 @@
                                this.RemoveFromParent();
                            };
                            break;
                        case SPK.VideoDoorLock: {
                                //跳转到android那边去
                                HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock.CommonMethod.Current.SkipAddDeviceActivity(SPK.VideoDoorLock);
                            }
                            break;
                    }
                };
            }

 HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirSend.cs

@@ -291,10 +291,10 @@
        /// <returns></returns>
        public static ResponsePackNew RequestServerhomeId(object o, string api_Url, int mTimeout = 20)
        {
            MainPage.Log("红外宝请求数据:"+api_Url+"\r\n"+o.ToString());
            MainPage.Log("红外宝->发送数据:"+api_Url+"\r\n"+o.ToString());
            var requestJson = HttpUtil.GetSignRequestJson(o);
            var responsePackNew=  HttpUtil.RequestHttpsPostFroHome(api_Url, requestJson, mTimeout);
            MainPage.Log("回复红外宝请求数据:" + "\r\n"+ Newtonsoft.Json.JsonConvert.SerializeObject(responsePackNew));
            MainPage.Log("红外宝->回复数据:" + "\r\n"+ Newtonsoft.Json.JsonConvert.SerializeObject(responsePackNew));
            return responsePackNew;

        }