From e4ff4b4f64015836f109999b3421e7e6bd39982a Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 31 七月 2023 14:19:26 +0800
Subject: [PATCH] Merge branch 'Dev-Branch' of http://59.41.255.150:6688/r/~wxr/OnPro into Dev-Branch
---
HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/DeviceListPage.cs | 356 ++++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 293 insertions(+), 63 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/DeviceListPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/DeviceListPage.cs
index e98e1f7..7bc7270 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/DeviceListPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/DeviceListPage.cs
@@ -3,10 +3,16 @@
using HDL_ON.DAL.Server;
using HDL_ON.Entity;
using HDL_ON.UI.CSS;
+using HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock;
+#if __Android__
+using Java.Interop;
+using Android.Content;
+using Hdl.Onpro;
+#endif
using Shared;
namespace HDL_ON.UI
{
- public class DeviceListPage : FrameLayout
+ public class DeviceListPage : FrameLayout
{
FrameLayout bodyView;
VerticalRefreshLayout contentView;
@@ -54,7 +60,8 @@
{
var waitPage = new Loading();
waitPage.Start();
- new System.Threading.Thread(() => {
+ new System.Threading.Thread(() =>
+ {
try
{
var pm = new HttpServerRequest();
@@ -72,7 +79,7 @@
}
else
{
- var tipView = new EmptyTipView(Language.StringByID(StringId.NotAddedAnyDevices),160)
+ var tipView = new EmptyTipView(Language.StringByID(StringId.NotAddedAnyDevices), 160)
{
Gravity = Gravity.CenterHorizontal,
};
@@ -91,7 +98,8 @@
}
finally
{
- Application.RunOnMainThread(() => {
+ Application.RunOnMainThread(() =>
+ {
if (waitPage != null)
{
waitPage.RemoveFromParent();
@@ -108,6 +116,10 @@
bool isFrist = true;
foreach (var device in deviceList)
{
+ //if (!this.CheckSupportDevice(device))
+ //{
+ // continue;
+ //}
var row = new RowLayout()
{
Height = Application.GetRealHeight(50),
@@ -115,63 +127,6 @@
LineColor = 0x00000000,
};
contentView.AddChidren(row);
- if(device.spk == SPK.IpCam_Imou)
- {
- var btnDel = new Button()
- {
- TextColor = CSS_Color.MainBackgroundColor,
- BackgroundColor = CSS_Color.WarningColor,
- TextID = StringId.Del,
- TextAlignment = TextAlignment.Center,
- };
- row.AddRightView(btnDel);
-
- btnDel.MouseUpEventHandler = (sender, e) => {
- Action action = () => {
- var waitPage = new Loading();
- this.AddChidren(waitPage);
- waitPage.Start("");
- new System.Threading.Thread(() =>
- {
- try
- {
- var http = new HttpServerRequest();
- var result = http.Delete3tyDevice( device.deviceId);
- if (result.Code == StateCode.SUCCESS)
- {
- Application.RunOnMainThread(() =>
- {
- Load3tyBrandDeviceList();
- });
- }
- else
- {
- Application.RunOnMainThread(() =>
- {
- new PublicAssmebly().TipMsgAutoClose(Language.StringByID(StringId.OperationFailed)+$"({result.Code})", true);
- });
- }
- }catch (Exception ex)
- {
- MainPage.Log($"鍒犻櫎绗笁鏂硅澶囧け璐�:{ex.Message}");
- }
- finally
- {
- Application.RunOnMainThread(() =>
- {
- if(waitPage!= null)
- {
- waitPage.RemoveFromParent();
- waitPage = null;
- }
- });
- }
- })
- { IsBackground = true }.Start();
- };
- new PublicAssmebly().TipOptionMsg(StringId.Tip, Language.StringByID(StringId.AreYouSureToDeleteThisDevice), action);
- };
- }
if (isFrist)
{
@@ -220,7 +175,8 @@
};
row.AddChidren(btnName);
- btnName.MouseUpEventHandler = (sender, e) => {
+ btnName.MouseUpEventHandler = (sender, e) =>
+ {
switch (device.spk)
{
case SPK.IrModule:
@@ -240,6 +196,7 @@
};
break;
case SPK.SensorEnvironment:
+ case SPK.SensorEnvironmentHailin:
case SPK.SensorEnvironment2:
case SPK.SensorEnvironment3:
var smPage1 = new SensorEnvironmentManagerPage();
@@ -249,9 +206,176 @@
contentView.BeginHeaderRefreshing();
};
break;
+ case SPK.VideoDoorLock:
+ {
+ CommonMethod.Current.MainThread(() =>
+ {
+ //钀ょ煶瑙嗛闂ㄩ攣
+ var form = new VideoDoorLockPage(device, btnName, new Button(), CommonMethod.Comerom.sanfan, () =>
+ {
+ row.RemoveFromParent();
+ });
+ MainPage.BasePageView.AddChidren(form);
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ form.Show();
+ });
+ }
+ break;
}
};
+
+
+
+ if (device.spk == SPK.IpCam_Imou)
+ {
+ var btnDel = new Button()
+ {
+ TextColor = CSS_Color.MainBackgroundColor,
+ BackgroundColor = CSS_Color.WarningColor,
+ TextID = StringId.Del,
+ TextAlignment = TextAlignment.Center,
+ };
+ row.AddRightView(btnDel);
+
+ btnDel.MouseUpEventHandler = (sender, e) =>
+ {
+ Action action = () =>
+ {
+ var waitPage = new Loading();
+ this.AddChidren(waitPage);
+ waitPage.Start("");
+ new System.Threading.Thread(() =>
+ {
+ try
+ {
+ var http = new HttpServerRequest();
+ var result = http.Delete3tyDevice(device.deviceId);
+ if (result.Code == StateCode.SUCCESS)
+ {
+ Application.RunOnMainThread(() =>
+ {
+ Load3tyBrandDeviceList();
+ });
+ }
+ else
+ {
+ Application.RunOnMainThread(() =>
+ {
+ new PublicAssmebly().TipMsgAutoClose(Language.StringByID(StringId.OperationFailed) + $"({result.Code})", true);
+ });
+ }
+ }
+ catch (Exception ex)
+ {
+ MainPage.Log($"鍒犻櫎绗笁鏂硅澶囧け璐�:{ex.Message}");
+ }
+ finally
+ {
+ Application.RunOnMainThread(() =>
+ {
+ if (waitPage != null)
+ {
+ waitPage.RemoveFromParent();
+ waitPage = null;
+ }
+ });
+ }
+ })
+ { IsBackground = true }.Start();
+ };
+ new PublicAssmebly().TipOptionMsg(StringId.Tip, Language.StringByID(StringId.AreYouSureToDeleteThisDevice), action);
+ };
+
+ var btnEdit = new Button()
+ {
+ Width = Application.GetRealWidth(150),
+ };
+ row.AddChidren(btnEdit);
+ btnEdit.MouseUpEventHandler = (sender, e) =>
+ {
+ Action<string> callBack = (str) =>
+ {
+ if (string.IsNullOrEmpty(str))
+ {
+ new Tip()
+ {
+ CloseTime = 1,
+ Text = Language.StringByID(StringId.NameCannotBeEmpty),
+ Direction = AMPopTipDirection.None,
+ }.Show(bodyView);
+ return;
+ }
+ if (str == device.name)
+ {
+ return;
+ }
+ var waitPage = new Loading();
+ bodyView.AddChidren(waitPage);
+ waitPage.Start(Language.StringByID(StringId.PleaseWait));
+ new System.Threading.Thread(() =>
+ {
+ try
+ {
+ var resultObj = new HttpServerRequest().UpdataDevcieName(device, str);
+ if (resultObj.Code == StateCode.SUCCESS)
+ {
+ device.name = str;
+ var deviceNew = FunctionList.List.GetIpCamImouList().Find((obj) => obj.deviceId == device.deviceId);
+ if (deviceNew != null)
+ {
+ deviceNew.name = str;
+ }
+ Application.RunOnMainThread(() =>
+ {
+ btnName.Text = str;
+ });
+ }
+ else
+ {
+ //澶辫触鎻愮ず
+ IMessageCommon.Current.ShowErrorInfoAlter(resultObj.Code);
+ }
+ }
+ catch (Exception ex)
+ {
+ MainPage.Log($"update 3ty device name error : {ex.Message}");
+ }
+ finally
+ {
+ Application.RunOnMainThread(() =>
+ {
+ if (waitPage != null)
+ {
+ waitPage.RemoveFromParent();
+ waitPage = null;
+ }
+ });
+ }
+ })
+ { IsBackground = true }.Start();
+ };
+ new PublicAssmebly().LoadDialog_EditParater(StringId.ChangeName, device.name, callBack, StringId.NameCannotBeEmpty, 0, new List<string>());
+ };
+ }
+
}
+
+ }
+
+ /// <summary>
+ /// 妫�鏌ユ槸鍚︽敮鎸�
+ /// </summary>
+ /// <param name="function"></param>
+ /// <returns></returns>
+ bool CheckSupportDevice(Function function)
+ {
+
+ if (function == null) return false;
+ if (function.spk == SPK.VideoDoorLock)
+ {
+ return false;
+ }
+ return true;
}
@@ -265,5 +389,111 @@
{
public List<Function> list = new List<Function>();
}
-
+
+
+
+#if __Android__
+
+ //[Android.Content.BroadcastReceiver(Enabled = true, Exported = false)]
+ //public class ImouReceiver : Android.Content.BroadcastReceiver
+ //{
+ // public override void OnReceive(Context context, Intent intent)
+ // {
+ // if (intent != null)
+ // {
+ // string action = intent.Action;
+ // if (action == "hdlUserDeviceBind")
+ // {
+ // string value = intent.GetStringExtra("data");
+ // }
+ // }
+ // }
+ //}
+
+ public class AddLcCam : Java.Lang.Object, Com.CallBack.IAddCamera
+ {
+
+ public Action backAction;
+
+ //public IntPtr Handle => throw new NotImplementedException();
+
+ //public int JniIdentityHashCode => throw new NotImplementedException();
+
+ //public JniObjectReference PeerReference => throw new NotImplementedException();
+
+ //public JniPeerMembers JniPeerMembers => throw new NotImplementedException();
+
+ //public JniManagedPeerStates JniManagedPeerState => throw new NotImplementedException();
+
+ public void Back()
+ {
+ backAction?.Invoke();
+ }
+
+ public void Dispose()
+ {
+ }
+
+ public void Disposed()
+ {
+ }
+
+ public void DisposeUnlessReferenced()
+ {
+ }
+
+ public void Finalized()
+ {
+ }
+
+ public void OnError(string p0)
+ {
+ }
+
+ public void SetJniIdentityHashCode(int value)
+ {
+ }
+
+ public void SetJniManagedPeerState(JniManagedPeerStates value)
+ {
+ }
+
+ public void SetPeerReference(JniObjectReference reference)
+ {
+ }
+
+ public void Success(string p0)
+ {
+ }
+
+ public void UnregisterFromRuntime()
+ {
+ }
+ }
+
+ public class BindDeviceFeedback : Java.Lang.Object, Hdl.Onpro.IRegisterDeviceFeedback
+ {
+ public Action<string,string> tipAction;
+
+ public void Feedback(string method, string msg)
+ {
+ tipAction?.Invoke(method, msg);
+ }
+ }
+
+#else
+ public class AddLcCam
+ {
+ public Action backAction;
+
+ public void Back()
+ {
+ backAction?.Invoke();
+ }
+ }
+#endif
+
+
+
+
}
--
Gitblit v1.8.0