| HDL-ON_Android/Assets/Language.ini | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL-ON_Android/Resources/Resource.designer.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL-ON_iOS/Resources/Language.ini | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/Common/R.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/Entity/Function/Function.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPage.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/ObjectClass.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideDoorLockSend.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorLockPage.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| ys/Jars/hdl_ezvizsdk.aar | 补丁 | 查看 | 原始文档 | blame | 历史 |
HDL-ON_Android/Assets/Language.ini
@@ -1149,7 +1149,10 @@ 8508=History 8509=Fluorite video door lock 8510=Call from the doorbell 8511=User Education 8511=User Education 8512=Serial number 8513=Model @@ -2407,6 +2410,10 @@ 8509=萤石视频门锁 8510=来自“门铃”呼叫 8511=用户人员 8512=序列号 8513=型号
Diff too large HDL-ON_iOS/Resources/Language.ini
@@ -1142,7 +1142,9 @@ 8508=History 8509=Fluorite video door lock 8510=Call from the doorbell 8511=User Education 8511=User Education 8512=Serial number 8513=Model @@ -2392,7 +2394,8 @@ 8509=萤石视频门锁 8510=来自“门铃”呼叫 8511=用户人员 8512=序列号 8513=模式
@@ -3168,6 +3168,16 @@ /// 用户人员 /// </summary> public const int yonghurenyuan = 8511; /// <summary> /// 序列号 /// </summary> public const int xuliehao = 8512; /// <summary> /// 型号 /// </summary> public const int xinghao = 8513;
@@ -277,6 +277,10 @@ /// </summary> public string extDevId = string.Empty; /// <summary> /// 物理设备(模块)型号 /// </summary> public string omodel =string.Empty; /// <summary> /// 设备spk /// </summary> public string spk = ""; HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPage.cs
@@ -197,7 +197,7 @@ #endregion } #region 共享 //var sharedView = new FrameLayout() //{ // Height = Application.GetRealHeight(55), @@ -236,8 +236,9 @@ // }); #endregion #region 删除设备行 #region 删除设备行 序列号 型号 //删除设备行 delView = new FrameLayout() { Height = Application.GetRealHeight(55), @@ -276,9 +277,87 @@ }; delView.AddChidren(delRightBtn); //序列号 var serialView = new FrameLayout() { Height = Application.GetRealHeight(55), BackgroundColor = CSS_Color.MainBackgroundColor, }; if (this.function.spk == SPK.VideoDoorLock) { contentView.AddChidren(serialView); } var serialLineBtn = new Button() { Gravity = Gravity.CenterHorizontal, BackgroundColor = CSS_Color.DividingLineColor, Width = Application.GetRealWidth(343), Height = Application.GetRealHeight(1) }; serialView.AddChidren(serialLineBtn); var serialTextBtn = new Button() { X = Application.GetRealWidth(16), Width = Application.GetRealWidth(160), TextAlignment = TextAlignment.CenterLeft, TextColor = CSS_Color.FirstLevelTitleColor, TextSize = CSS_FontSize.SubheadingFontSize, TextID = StringId.xuliehao, }; serialView.AddChidren(serialTextBtn); var serialValuesBtn = new Button() { X = Application.GetRealWidth(86), Width = Application.GetRealWidth(237), TextAlignment = TextAlignment.CenterRight, TextColor = CSS_Color.PromptingColor1, TextSize = CSS_FontSize.TextFontSize, Text = this.function.sid, }; serialView.AddChidren(serialValuesBtn); //型号 var modelView = new FrameLayout() { Height = Application.GetRealHeight(55), BackgroundColor = CSS_Color.MainBackgroundColor, }; if (this.function.spk == SPK.VideoDoorLock) { contentView.AddChidren(modelView); } var modelLineBtn = new Button() { Gravity = Gravity.CenterHorizontal, BackgroundColor = CSS_Color.DividingLineColor, Width = Application.GetRealWidth(343), Height = Application.GetRealHeight(1) }; modelView.AddChidren(modelLineBtn); var modelTextBtn = new Button() { X = Application.GetRealWidth(16), Width = Application.GetRealWidth(160), TextAlignment = TextAlignment.CenterLeft, TextColor = CSS_Color.FirstLevelTitleColor, TextSize = CSS_FontSize.SubheadingFontSize, TextID=StringId.xinghao, }; modelView.AddChidren(modelTextBtn); var modelValuesBtn = new Button() { X = Application.GetRealWidth(86), Width = Application.GetRealWidth(237), TextAlignment = TextAlignment.CenterRight, TextColor = CSS_Color.PromptingColor1, TextSize = CSS_FontSize.TextFontSize, Text = this.function.omodel, }; modelView.AddChidren(modelValuesBtn); #endregion #if stage2 #region 添加到桌面 HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs
@@ -3,8 +3,8 @@ using System.Collections.Generic; using Shared; using HDL_ON.DAL.Server; using Foundation; #if __IOS__ using Foundation; #else using Com.Videogo.Hdl; #endif @@ -51,37 +51,44 @@ this.InitializationAndroidData((isEzChildAccessToken) => { this.MainThread(() => this.SunThread(() => { #if __IOS__ //跳转添加萤石设备 ezsdkDelegate = new IosIHdlInterface(); ezsdkDelegate.mAction += (serials) => var list = this.GetVideoDoorLockLockModelsList("notAllowedConfigNetworkModels"); this.MainThread(() => { this.GetYingshiDeviceList(serials); }; EZSDK.IOS.EZSDK.SharedInstance().Delegate = ezsdkDelegate; NSObject[] nSObject = new NSObject[1]; nSObject[0] = new NSString("DP1"); EZSDK.IOS.EZSDK.SharedInstance().ConnectTipModels = nSObject; EZSDK.IOS.EZSDK.SharedInstance().AddEzvizMonitorWithDeviceType(spk); #if __IOS__ //跳转添加萤石设备 ezsdkDelegate = new IosIHdlInterface(); ezsdkDelegate.mAction += (serials) => { this.GetYingshiDeviceList(serials); }; EZSDK.IOS.EZSDK.SharedInstance().Delegate = ezsdkDelegate; NSObject[] nSObject = new NSObject[list.Count]; for (int i = 0; i < list.Count; i++) { string strValue = list[i]; nSObject[i] = new NSString(strValue); } EZSDK.IOS.EZSDK.SharedInstance().ConnectTipModels = nSObject; EZSDK.IOS.EZSDK.SharedInstance().AddEzvizMonitorWithDeviceType(spk); #else HDLEzvizSdk.Instance.JumpToEZScanActivity(Application.Activity,spk); HDLEzvizSdk.SetAddCallback(new AndroidIHdlInterface((isBool, serials) => { if (isBool) HDLEzvizSdk.Instance.JumpToEZScanActivity(Application.Activity, spk,list); HDLEzvizSdk.SetAddCallback(new AndroidIHdlInterface((isBool, serials) => { this.GetYingshiDeviceList(serials); } if (isBool) { this.GetYingshiDeviceList(serials); } })); })); #endif }); }); }); @@ -279,9 +286,9 @@ /// 获取【门锁型号】列表 /// </summary> /// <returns>返回结果不会为null</returns> public List<string> GetVideoDoorLockLockModelsList() public List<string> GetVideoDoorLockLockModelsList(string mode = "lockModels") { return VideDoorLockSend.Current.GetVideoDoorLockLockModelsList(); return VideDoorLockSend.Current.GetVideoDoorLockLockModelsList(mode); } /// <summary> /// 门锁推送 HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/ObjectClass.cs
@@ -73,6 +73,10 @@ /// 型号列表 /// </summary> public List<string> lockModels = new List<string>(); /// <summary> /// 型号列表 /// </summary> public List<string> notAllowedConfigNetworkModels = new List<string>(); } /// <summary> /// 推送内容对象 HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideDoorLockSend.cs
@@ -171,7 +171,7 @@ /// </summary> /// <param name="tipType">是否需要提示,默认提示</param> /// <returns>返回结果不会为null</returns> public List<string> GetVideoDoorLockLockModelsList(TipType tipType = TipType.flicker) public List<string> GetVideoDoorLockLockModelsList(string mode,TipType tipType = TipType.flicker) { var responsePackNew = UI.Music.SendMethod.Current.RequestServerhomeId(new object { }, NewAPI.Api_Post_Lock_Models, "获取萤石门锁型号列表"); if (!this.DataChecking(responsePackNew, tipType)) @@ -183,7 +183,12 @@ { return new LockModels().lockModels; } return lockModels.lockModels; if ( mode =="lockModels") { return lockModels.lockModels; } else { return lockModels.notAllowedConfigNetworkModels; } } /// <summary> HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorLockPage.cs
@@ -216,15 +216,17 @@ }; cellFrame.AddChidren(btnCell); #if __IOS__ //btnCell.Padding = new Padding(0,0,0,0); btnCell.Width += 5; cellFrame.Width += 5; #else #endif //门锁状态 btnDoorLockIcon = new Button //门锁状态 btnDoorLockIcon = new Button { X = Application.GetRealWidth(65), Y = Application.GetRealHeight(108), @@ -377,7 +379,7 @@ private void CalculatedPosition() { this.btnCurrDeviceName.Width = this.btnCurrDeviceName.GetTextWidth(); this.btnCurrDeviceName.Width += 10; this.btnCurrDeviceName.Width += 10; if (this.btnCurrDeviceName.GetTextWidth() > this.btnCollectIcon.X) { //重新计算宽度 ys/Jars/hdl_ezvizsdk.aarBinary files differ
