| HDL_ON/Common/HDLCommon.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/DAL/Server/NewAPI.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/UI2/1-HomePage/MessageCenterPage.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/UI2/2-Classification/ClassificationPage.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/VideoDoorLockListPage.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorLockPage.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
HDL_ON/Common/HDLCommon.cs
@@ -304,9 +304,9 @@ } else if (jpushMessageInfo.messageType.Contains(PushMessageType.HDL_INTERPHONE.ToString())) { if (string.IsNullOrEmpty(jpushMessageInfo.expantContent)) return; //字段兼容问题，只能直接取值了 var json = Newtonsoft.Json.Linq.JObject.Parse(jpushMessageInfo.expantContent); try @@ -389,8 +389,18 @@ } else if (jpushMessageInfo.messageType.Contains(PushMessageType.DOOR_BELL.ToString())) { /////视频门锁 HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock.CommonMethod.Current.SkipRTVActivity(); 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); } catch { } } } } @@ -565,7 +575,7 @@ //防止多次弹窗处理 if (alarmPushConfirmDialog == null) if (alarmPushConfirmDialog == null) { alarmPushConfirmDialog = new ConfirmDialog(isAlarm); alarmPushConfirmDialog.ShowDialog(Language.StringByID(StringId.Tip), jpushMessageInfo.Content, goAction, cancelAction, StringId.Cancel, StringId.LookOver); HDL_ON/DAL/Server/NewAPI.cs
@@ -469,7 +469,7 @@ /// <summary> /// 删除设备（萤石视频门锁） /// </summary> public const string Api_Post_DeleteDevice = "home-wisdom/platform/yingshi/child/deleteDevice"; public const string Api_Post_DeleteDevice = "/home-wisdom/platform/yingshi/child/deleteDevice"; /// <summary> /// 电池详情（萤石视频门锁） /// </summary> HDL_ON/UI/UI2/1-HomePage/MessageCenterPage.cs
@@ -832,6 +832,7 @@ { if (bodyView != null) { //Utlis.WriteLine("GetPushMessageAction M收到推送"); GetPushMessageList(showMesType); } HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
@@ -619,7 +619,7 @@ }; contentPageView.AddChidren(functionsPageView); FrameLayout functionContentView; FrameLayout functionContentView; functionContentView = new FrameLayout() { Y = Application.GetRealHeight(16), @@ -748,7 +748,7 @@ case ShowFunction.VideoDoorLock: functionCount = FunctionList.List.GetVideoDoorLockList().Count; #if DEBUG functionCount = 1; //functionCount = 1; #endif functionOnCount = 1; break; @@ -1157,7 +1157,7 @@ btnFunctionViewBg.MouseUpEventHandler = (sender, e) => { var list = HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock.CommonMethod.Current.GetVideoDoorLockList(); var form = new UI2.FuntionControlView.VideoDoorLock.VideoDoorLockListPage(); var form = new UI2.FuntionControlView.VideoDoorLock.VideoDoorLockListPage(null); form.AddForm(list); }; break; HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs
@@ -44,7 +44,10 @@ /// <summary> /// 跳转到Android(实时视频)那边去 /// </summary> public void SkipRTVActivity() /// <param name="deviceSerial">设备序列号</param> /// <param name="deviceId">设备id(云端上deviceId)</param> /// <param name="spk">设备spk(云雀上定义好的)</param> public void SkipRTVActivity(string deviceSerial, string deviceId, string spk) { Video.View.ShowDialog.Currnet.ClickBox(Language.StringByID(StringId.laizimenlinghujiao), (dialog) => { @@ -53,7 +56,10 @@ { dialog.Close(); }); //jumpToEZRealPlayActivity(Shared.Application.Activity, deviceId, deviceSerial, deviceType) #if __IOS__ #else #endif //jumpToEZRealPlayActivity(Shared.Application.Activity, deviceId, deviceSerial, spk) } /// <summary> /// 跳转到Android(历史记录)那边去 HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/ObjectClass.cs
@@ -3,8 +3,8 @@ { public class ObjectClass { } /// <summary> /// 用户信息(萤石视频门锁) @@ -52,5 +52,31 @@ public string name = string.Empty; } /// <summary> /// 推送内容对象 /// </summary> public class ExpantContent { /// <summary> /// 设备序列号 /// </summary> public string devSerial = string.Empty; /// <summary> /// 设备id /// </summary> public string deviceId = string.Empty; /// <summary> /// 不知道是啥 /// </summary> public string interphoneTypeEnum = string.Empty; /// <summary> /// 不知道是啥 /// </summary> public string subToken = string.Empty; /// <summary> /// 云雀上定义的设备spk /// </summary> public string spk = string.Empty; } } HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideDoorLockSend.cs
@@ -45,8 +45,8 @@ Dictionary<string, object> d = new Dictionary<string, object>(); d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id); d.Add("deviceSerial", function.sid);//等同门锁序列号 d.Add("platform", 1);//平台 var responsePackNew = UI.Music.SendMethod.Current.RequestServerhomeId(d, NewAPI.Api_Post_DeleteDevice, "删除萤石门锁设备"); d.Add("platform", 1);//平台 var responsePackNew = UI.Music.SendMethod.Current.RequestServerhomeId(d, NewAPI.Api_Post_DeleteDevice, "删除萤石门锁设备"); if (!this.DataChecking(responsePackNew)) { return; @@ -54,7 +54,7 @@ if (function != null) { action?.Invoke(false); action?.Invoke(true); } } catch (Exception s) @@ -75,7 +75,7 @@ Dictionary<string, object> d = new Dictionary<string, object>(); d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id); d.Add("deviceId", function.deviceId); var responsePackNew = UI.Music.SendMethod.Current.RequestServerhomeId(d, NewAPI.Api_Post_Lockstatus, "删除萤石视频门锁状态"); var responsePackNew = UI.Music.SendMethod.Current.RequestServerhomeId(d, NewAPI.Api_Post_Lockstatus, "获取萤石视频门锁状态"); if (!this.DataChecking(responsePackNew)) { return new VideoDoorLockInfo(); HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorLockListPage.cs
@@ -27,10 +27,20 @@ /// 列表控件 /// </summary> private VerticalListControl listView = null; /// <summary> /// 删除设备后需要更新界面的回调 /// </summary> public Action action; #endregion #region ■ 初始化_____________________________ public VideoDoorLockListPage(Action action) { this.action = action; } /// <summary> /// 画面显示(底层会固定调用此方法，借以完成画面创建) @@ -41,8 +51,6 @@ this.listDevice.AddRange(i_listDevice); //智能门锁 base.SetTitleText(Language.StringByID(StringId.shipinmensuo)); //初始化头部历史记录控件 //this.InitTopHistoryControl(); //初始化中部信息 this.InitMiddleFrame(); @@ -173,13 +181,11 @@ { var form = new VideoDoorLockPage(i_device, btnName, btnRoom, CommonMethod.Comerom.function,()=> { this.CloseForm(); this.action?.Invoke(); }); MainPage.BasePageView.AddChidren(form); MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1; form.Show(); //var form = new VideoDoorLockPage(); //form.AddForm(i_device, new Button(), btnName, btnRoom); }; //底部再加个间距 @@ -190,35 +196,6 @@ #endregion public void SkipViewPage(CommonMethod.Comerom comerom) { //var form = new VideoDoorLockPage(i_device, btnName, btnRoom, Comerom.function); //MainPage.BasePageView.AddChidren(form); //MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1; //form.Show(); } #region ■ 初始化头部历史记录图标_____________ /// <summary> /// 初始化头部历史记录控件 /// </summary> private void InitTopHistoryControl() { //历史记录图标 var btnIcon = new IconViewControl(28); btnIcon.X = Application.GetRealWidth(337); btnIcon.Y = Application.GetRealHeight(9); btnIcon.UnSelectedImagePath = "FunctionIcon/DoorLock/History.png"; topFrameLayout.AddChidren(btnIcon); btnIcon.ButtonClickEvent += (sender, e) => { var form = new DoorLockHistoryInfoPage(); form.AddForm(this.listDevice); }; } #endregion #region ■ 设备状态推送_______________________ @@ -238,8 +215,6 @@ #endregion #region ■ 一般方法___________________________ #endregion } } HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorLockPage.cs
@@ -6,6 +6,7 @@ using HDL_ON.Entity; using HDL_ON.DriverLayer; using HDL_ON.UI.Music; using HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock; namespace HDL_ON.UI { @@ -39,6 +40,10 @@ /// 区域 /// </summary> private Button btnCurrDeviceRoom; /// <summary> /// 电量父控件 /// </summary> private FrameLayout cellFrame; /// <summary> /// 电量 /// </summary> @@ -164,11 +169,7 @@ }; whiteFl.AddChidren(btnCurrDeviceName); btnCurrDeviceName.Width = btnCurrDeviceName.GetTextWidth(); if (btnCurrDeviceName.GetTextWidth() > btnCollectIcon.X) { btnCurrDeviceName.Width = btnCollectIcon.X; } btnCurrDeviceRoom = new Button { TextSize = TextSize.Text12, @@ -181,9 +182,8 @@ TextAlignment = TextAlignment.CenterLeft, }; whiteFl.AddChidren(btnCurrDeviceRoom); btnCurrDeviceRoom.Width = btnCurrDeviceRoom.GetTextWidth(); var cellFrame = new FrameLayout cellFrame = new FrameLayout { X = btnCurrDeviceRoom.Right + Application.GetRealWidth(20), Y = btnCurrDeviceName.Bottom + Application.GetRealHeight(5), @@ -191,8 +191,6 @@ Height = Application.GetRealHeight(16), }; whiteFl.AddChidren(cellFrame); cellDiyArcSeekBar = new DiyArcSeekBar { @@ -221,9 +219,6 @@ cellFrame.AddChidren(btnCell); //门锁状态 btnDoorLockIcon = new Button { @@ -235,6 +230,9 @@ SelectedImagePath = "FunctionIcon/DoorLock/UnLocking.png", }; whiteFl.AddChidren(btnDoorLockIcon); this.CalculatedPosition();//重新计算宽度 int heightY = btnDoorLockIcon.Bottom + Application.GetRealHeight(70); //实时视频 rtvFL = new CustomFrameLayout(CustomFrameLayout.widthFrameLayout, CustomFrameLayout.heightFrameLayout); @@ -264,6 +262,8 @@ pswFL.GetImageButton().UnSelectedImagePath = "FunctionIcon/DoorLock/OneOpenLock.png"; pswFL.GetTextButton().TextID = StringId.linshimima1; #endregion @@ -278,7 +278,7 @@ { RemoveFromParent(); }; //设置 this.topView.clickSetBtn.MouseUpEventHandler += (sender, e) => @@ -295,19 +295,10 @@ ////刷新显示 this.btnDeviceName.Text = this.device.name; this.btnRoomName.Text = this.device.GetRoomListName(); this.topView.topNameBtn.Text = this.device.name; this.btnCurrDeviceName.Text = this.device.name; this.btnCurrDeviceRoom.Text = this.device.GetRoomListName(); this.CalculatedPosition();//重新计算宽度 ////从新计算宽度 //this.btnDeviceName.Text = btnDeviceName.Text; //this.btnDeviceName.Width = this.btnDeviceName.GetTextWidth(); //this.btnRoomName.Text = btnRoomName.Text; //this.btnRoomName.Width = this.btnRoomName.GetTextWidth(); ////回调事件 //this.SettionFinishEvent?.Invoke(); }, () => { //解绑设备后 @@ -327,12 +318,16 @@ //实时视频 this.rtvFL.SetClickListener((fl, btnStateImage, btnStateText) => { CommonMethod.Current.SkipRTVActivity(this.device.sid,this.device.deviceId,this.device.spk); }); //临时密码 this.pswFL.SetClickListener((fl, btnStateImage, btnStateText) => { }); this.pswFL.SetClickListener((fl, btnStateImage, btnStateText) => { CommonMethod.Current.SkipPSWActivity(); }); //历史记录 this.recordFL.SetClickListener((fl, btnStateImage, btnStateText) => { }); this.recordFL.SetClickListener((fl, btnStateImage, btnStateText) => { CommonMethod.Current.SkipRecordActivity(); }); } @@ -349,7 +344,7 @@ try { var videoDoorLockInfo = UI2.FuntionControlView.VideoDoorLock.VideDoorLockSend.Current.GetVideoDoorLockState(this.device); var cellInfo =UI2.FuntionControlView.VideoDoorLock.VideDoorLockSend.Current.GetCellValue(this.device); var cellInfo = UI2.FuntionControlView.VideoDoorLock.VideDoorLockSend.Current.GetCellValue(this.device); Application.RunOnMainThread(() => { //this.cellDiyArcSeekBar.Progress = i; @@ -367,8 +362,29 @@ }); } }) { IsBackground = true }.Start() ; { IsBackground = true }.Start(); } /// <summary> /// 重新计算宽度(设备名称,房间控件) /// </summary> private void CalculatedPosition() { this.btnCurrDeviceName.Width = this.btnCurrDeviceName.GetTextWidth(); if (this.btnCurrDeviceName.GetTextWidth() > this.btnCollectIcon.X) { //重新计算宽度 this.btnCurrDeviceName.Width = this.btnCollectIcon.X + Application.GetRealWidth(-10); } this.btnCurrDeviceRoom.Width = this.btnCurrDeviceRoom.GetTextWidth(); if (this.btnCurrDeviceRoom.GetTextWidth() > this.btnCollectIcon.X) { //重新计算宽度 this.btnCurrDeviceRoom.Width = this.btnCollectIcon.X + Application.GetRealWidth(-20 - 10); } this.cellFrame.X = this.btnCurrDeviceRoom.Right + Application.GetRealWidth(20); } } /// <summary> /// 自己弄一个FrameLayout @@ -405,7 +421,7 @@ TextID = StringId.dangqianmenweiguan, TextSize = TextSize.Text12, TextColor = MusicColor.TextCancelColor, TextAlignment=TextAlignment.Center, TextAlignment = TextAlignment.Center, Gravity = Gravity.CenterHorizontal, Name = "btnStateText" }; @@ -492,6 +508,6 @@ } }
