| HDL-ON_Android/Assets/Language.ini | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL-ON_Android/Properties/AndroidManifest.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL-ON_iOS/Resources/Language.ini | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/Common/R.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/DAL/Server/HttpServerRequest.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/UI2/FuntionControlView/Video/WanderingAlarmPage.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
HDL-ON_Android/Assets/Language.ini
@@ -528,6 +528,7 @@ 540=In Alarm 541=Monitoring 542=Wandering alarm 543=Get more 1000=Room Humidity @@ -1683,6 +1684,7 @@ 540=报警中 541=监控中 542=徘徊报警 543=获取更多 1000=室内湿度 1001=童锁 @@ -2816,7 +2818,7 @@ 540=Нормальный 541=Monitoring 542=Wandering alarm 543=Get more 1000=Влажность в Помещении @@ -3972,7 +3974,7 @@ 540=En alarma 541=Monitoring 542=Wandering alarm 543=Get more 1000=Humedad de ambiente 1001=V-chip HDL-ON_Android/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.5.6" package="com.hdl.onpro" xmlns:tools="http://schemas.android.com/tools" android:versionCode="202205161"> <manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.5.6" package="com.hdl.onpro" xmlns:tools="http://schemas.android.com/tools" android:versionCode="202205181"> <uses-sdk android:minSdkVersion="28" android:targetSdkVersion="28" /> <!--友盟--> <!--<uses-sdk android:minSdkVersion="8"></uses-sdk>--> HDL-ON_iOS/Resources/Language.ini
@@ -528,6 +528,7 @@ 540=In Alarm 541=Monitoring 542=Wandering alarm 543=Get more 1000=Room Humidity @@ -1683,6 +1684,7 @@ 540=报警中 541=监控中 542=徘徊报警 543=获取更多 1000=室内湿度 1001=童锁 @@ -2816,7 +2818,7 @@ 540=Нормальный 541=Monitoring 542=Wandering alarm 543=Get more 1000=Влажность в Помещении @@ -3972,7 +3974,7 @@ 540=En alarma 541=Monitoring 542=Wandering alarm 543=Get more 1000=Humedad de ambiente 1001=V-chip HDL_ON/Common/R.cs
@@ -6,6 +6,10 @@ { /// <summary> /// 获取更多 /// </summary> public const int GetMore = 543; /// <summary> /// 徘徊报警 /// </summary> public const int WanderingAlarm = 542; HDL_ON/DAL/Server/HttpServerRequest.cs
@@ -2626,12 +2626,14 @@ /// </summary> /// <param name="deviceId"></param> /// <returns></returns> public ResponsePackNew GetAlarmRecords(string deviceId,string alarmType = "PROWLER_ALARM") public ResponsePackNew GetAlarmRecords(string deviceId, int pageSize, int pageNo, string alarmType = "PROWLER_ALARM") { Dictionary<string, object> d = new Dictionary<string, object>(); d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id); d.Add("deviceId", deviceId); d.Add("alarmType", alarmType); d.Add("pageSize", pageSize); d.Add("pageNo", pageNo); var requestJson = HttpUtil.GetSignRequestJson(d); var pack = HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_ALARM_RECORDS, requestJson); return pack; HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs
@@ -585,7 +585,7 @@ /// <summary> /// 加载提示弹窗 /// 获取门禁二维码 /// </summary> public void ChooseVideoShowQRCode() { @@ -730,58 +730,59 @@ /// </summary> public void ChooseAlarmShow() { Dialog dialog = new Dialog() { BackgroundColor = CSS_Color.DialogTransparentColor1, }; FrameLayout dialogView = new FrameLayout(); dialog.AddChidren(dialogView); dialogView.MouseUpEventHandler = (sender, e) => { dialog.Close(); }; var contentView = new FrameLayout() { Gravity = Gravity.Center, Width = Application.GetRealWidth(270), Height = Application.GetRealHeight(280), BackgroundColor = CSS_Color.MainBackgroundColor, BorderColor = 0x00000000, BorderWidth = 0, Radius = (uint)Application.GetMinRealAverage(10), }; dialogView.AddChidren(contentView); var btnTitle = new Button() { Height = Application.GetRealHeight(64), TextAlignment = TextAlignment.Center, TextColor = CSS_Color.FirstLevelTitleColor, TextID = StringId.menjinerweima, TextSize = CSS_FontSize.SubheadingFontSize, }; contentView.AddChidren(btnTitle); var listView = new VerticalScrolViewLayout() { Gravity = Gravity.CenterHorizontal, Y = Application.GetRealHeight(70), Width = Application.GetRealWidth(230), Height = Application.GetRealHeight(200), }; contentView.AddChidren(listView); if (ximoVideoList.Count == 1) { var wanderingAlarmPage = new WanderingAlarmPage(); var wanderingAlarmPage = new WanderingAlarmPage(ximoVideoList[0].deviceId); MainPage.BasePageView.AddChidren(wanderingAlarmPage); wanderingAlarmPage.LoadPage(ximoVideoList[0].deviceId); wanderingAlarmPage.LoadPage(); MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1; } else { Dialog dialog = new Dialog() { BackgroundColor = CSS_Color.DialogTransparentColor1, }; FrameLayout dialogView = new FrameLayout(); dialog.AddChidren(dialogView); dialogView.MouseUpEventHandler = (sender, e) => { dialog.Close(); }; var contentView = new FrameLayout() { Gravity = Gravity.Center, Width = Application.GetRealWidth(270), Height = Application.GetRealHeight(280), BackgroundColor = CSS_Color.MainBackgroundColor, BorderColor = 0x00000000, BorderWidth = 0, Radius = (uint)Application.GetMinRealAverage(10), }; dialogView.AddChidren(contentView); var btnTitle = new Button() { Height = Application.GetRealHeight(64), TextAlignment = TextAlignment.Center, TextColor = CSS_Color.FirstLevelTitleColor, TextID = StringId.WanderingAlarm, TextSize = CSS_FontSize.SubheadingFontSize, }; contentView.AddChidren(btnTitle); var listView = new VerticalScrolViewLayout() { Gravity = Gravity.CenterHorizontal, Y = Application.GetRealHeight(70), Width = Application.GetRealWidth(230), Height = Application.GetRealHeight(200), }; contentView.AddChidren(listView); foreach (var v in ximoVideoList) { @@ -806,16 +807,16 @@ { var wanderingAlarmPage = new WanderingAlarmPage(); var wanderingAlarmPage = new WanderingAlarmPage(v.deviceId); MainPage.BasePageView.AddChidren(wanderingAlarmPage); wanderingAlarmPage.LoadPage(v.deviceId); wanderingAlarmPage.LoadPage(); MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1; dialog.Close(); }; } dialog.Show(); } dialog.Show(); }
@@ -8,14 +8,16 @@ public class WanderingAlarmPage : FrameLayout { FrameLayout bodyView; public WanderingAlarmPage() string deviceId; public WanderingAlarmPage(string deviceId) { bodyView = this; this.deviceId = deviceId; } VerticalScrolViewLayout contentView; public void LoadPage(string deviceId) public void LoadPage() { bodyView.BackgroundColor = CSS_Color.MainBackgroundColor; new TopViewDiv(bodyView, Language.StringByID(StringId.WanderingAlarm)).LoadTopView(); @@ -44,18 +46,29 @@ }; bodyView.AddChidren(contentView); LoadCloudData(20, 1); } /// <summary> /// 读取云端数据 /// </summary> void LoadCloudData(int pageCount,int pageNo) { Loading loading = new Loading(); bodyView.AddChidren(loading); loading.Start(""); new System.Threading.Thread(()=> { new System.Threading.Thread(() => { try { HttpServerRequest http = new HttpServerRequest(); var pack = http.GetAlarmRecords(deviceId); var pack = http.GetAlarmRecords(deviceId, pageCount,pageNo); if (pack.Code == StateCode.SUCCESS) { var obj = Newtonsoft.Json.JsonConvert.DeserializeObject<AlarmRecordInfoPack>(pack.Data.ToString()); LoadSceneGallery(obj); Application.RunOnMainThread(() => { LoadSceneGallery(obj); }); } } catch (Exception ex) @@ -73,8 +86,11 @@ } }); } }) { IsBackground = true }.Start(); }) { IsBackground = true }.Start(); } /// <summary> /// 加载场景图库 /// </summary> @@ -84,77 +100,104 @@ { Height = Application.GetRealWidth(128), }; Application.RunOnMainThread(() => new System.Threading.Thread(() => { for (int i = 0; i < pack.list.Count; i++) { var item = pack.list[i]; var imageBytes = ImageUtlis.Current.DownImageByImageUrl(item.alarmImg); var sceneImageView = new ImageView() Application.RunOnMainThread(() => { Width = Application.GetRealWidth(172), Height = Application.GetRealHeight(90), Radius = (uint)Application.GetRealWidth(12), ImageBytes = imageBytes }; var btnTime = new Button() { Width = Application.GetRealHeight(160), Height = Application.GetRealHeight(41), Y = Application.GetRealHeight(90), Text = Utlis.UnixToDateTimeMS(item.alarmTime).ToString(), TextColor = CSS_Color.FirstLevelTitleColor, TextAlignment = TextAlignment.Center }; if (i % 2 == 0) { sceneImageRow = new FrameLayout() var sceneImageView = new ImageView() { Height = Application.GetRealHeight(90 + 53), Width = Application.GetRealWidth(172), Height = Application.GetRealHeight(90), Radius = (uint)Application.GetRealWidth(12), ImageBytes = imageBytes }; contentView.AddChidren(sceneImageRow); sceneImageView.X = Application.GetRealWidth(10); sceneImageRow.AddChidren(sceneImageView); btnTime.X = Application.GetRealWidth(10); sceneImageRow.AddChidren(btnTime); } else { sceneImageView.X = Application.GetRealWidth(194); sceneImageRow.AddChidren(sceneImageView); btnTime.X = Application.GetRealWidth(194); sceneImageRow.AddChidren(btnTime); } sceneImageView.MouseUpEventHandler = (sender, e) => { Dialog dialog = new Dialog(); FrameLayout dialogContentView = new FrameLayout(); dialog.AddChidren(dialogContentView); dialogContentView.MouseUpEventHandler = (sender2, e2) => var btnTime = new Button() { dialog.Close(); Width = Application.GetRealHeight(160), Height = Application.GetRealHeight(41), Y = Application.GetRealHeight(90), Text = Utlis.UnixToDateTimeMS(item.alarmTime).ToString(), TextColor = CSS_Color.FirstLevelTitleColor, TextAlignment = TextAlignment.Center }; ImageView btnImage = new ImageView() if (i % 2 == 0) { Gravity = Gravity.Center, Height = Application.GetRealHeight(211), ImageBytes = sceneImageView.ImageBytes, sceneImageRow = new FrameLayout() { Height = Application.GetRealHeight(90 + 53), }; contentView.AddChidren(sceneImageRow); sceneImageView.X = Application.GetRealWidth(10); sceneImageRow.AddChidren(sceneImageView); btnTime.X = Application.GetRealWidth(10); sceneImageRow.AddChidren(btnTime); } else { sceneImageView.X = Application.GetRealWidth(194); sceneImageRow.AddChidren(sceneImageView); btnTime.X = Application.GetRealWidth(194); sceneImageRow.AddChidren(btnTime); } sceneImageView.MouseUpEventHandler = (sender, e) => { Dialog dialog = new Dialog(); FrameLayout dialogContentView = new FrameLayout(); dialog.AddChidren(dialogContentView); dialogContentView.MouseUpEventHandler = (sender2, e2) => { dialog.Close(); }; ImageView btnImage = new ImageView() { Gravity = Gravity.Center, Height = Application.GetRealHeight(211), ImageBytes = sceneImageView.ImageBytes, }; dialogContentView.AddChidren(btnImage); dialog.Show(); }; dialogContentView.AddChidren(btnImage); dialog.Show(); }; System.Threading.Thread.Sleep(200); }); System.Threading.Thread.Sleep(50); } }); } Application.RunOnMainThread(() => { if (pack.totalPage > pack.pageNo) { var btnLoadMore = new Button() { TextAlignment = TextAlignment.Center, TextID = StringId.GetMore, Height = Application.GetRealHeight(60), TextSize = CSS_FontSize.SubheadingFontSize, TextColor = CSS_Color.FirstLevelTitleColor, }; contentView.AddChidren(btnLoadMore); btnLoadMore.MouseUpEventHandler = (sender, e) => { LoadCloudData(20, pack.pageNo + 1); btnLoadMore.RemoveFromParent(); }; } }); }) { IsBackground = true }.Start(); } }
