From 54fe169adac638bc556a49796fcbd0ff49596df6 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期五, 05 三月 2021 10:41:22 +0800
Subject: [PATCH] 使用token测试验证
---
HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs | 41 ++++++++++++++++++++++++++++++++++-------
1 files changed, 34 insertions(+), 7 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
index 32f68a6..02640b2 100644
--- a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
@@ -490,8 +490,11 @@
case ShowFunction.SecurityMonitoring:
break;
case ShowFunction.Sensor:
+ functionCount = FunctionList.List.sensorsArm.Count;
+ //functionOnCount = FunctionList.List.aCs.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
break;
case ShowFunction.VideoIntercom:
+ functionCount = 1;
break;
}
@@ -548,7 +551,8 @@
};
functionView.AddChidren(btnName);
- if (item != ShowFunction.Environmental && functionCount != 0)
+ if (item != ShowFunction.Environmental && item != ShowFunction.Sensor && item != ShowFunction.VideoIntercom
+ && functionCount != 0)
{
Button btnFunctionCount = new Button()
{
@@ -613,7 +617,7 @@
LoadEvent_SwitchFunction(btnLightPower, item, functionView);
};
functionPageTitleId = StringId.Lights;
-
+
#endregion
break;
case ShowFunction.AC:
@@ -764,15 +768,38 @@
break;
case ShowFunction.Sensor:
btnName.TextID = StringId.Sensor;
-
+ functionPageTitleId = StringId.Sensor;
break;
case ShowFunction.VideoIntercom:
btnName.TextID = StringId.VideoIntercom;
+ btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
+ {
+#if __IOS__
+ EZSDK.IOS.EZSDK.Go2EZvizMonitor();
+#else //瀹夊崜鎽勫儚澶�
+ ((BaseActivity)Shared.Application.Activity).SetCamera(b =>
+ {
+ if (b)
+ {
+ Android.Content.Intent intent = new Android.Content.Intent();
+ var bundle = new Android.OS.Bundle();
+ //浼犻�抧ame鍙傛暟涓簍inyphp
+ //bundle.PutString("Token", ezChileAccessToken.accessToken);
+ bundle.PutString("Token", "ra.aamy8d1gabcnrz0jbbj4gjkpcpy55g0s-8z529x82uz-0jzly2o-g30muwagq");
+ bundle.PutString("HdlToken", UserInfo.Current.LoginTokenString);
+ intent.PutExtras(bundle);
+ intent.SetComponent(new Android.Content.ComponentName(Shared.Application.Activity, "com.videogo.MainActivity"));
+ Shared.Application.Activity.StartActivity(intent);
+ }
+ });
+
+#endif
+ };
break;
}
//鐣岄潰璺宠浆--闊充箰璺宠浆鑷繁鐨勭晫闈�--鐜璺宠浆鑷繁鐨勭晫闈�
- if (item != ShowFunction.Music && item != ShowFunction.Environmental)
+ if (item != ShowFunction.Music && item != ShowFunction.Environmental && item != ShowFunction.VideoIntercom)
{
btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
{
@@ -791,10 +818,10 @@
s1View.Height = s2View.Height = functionContentView.Height = functionContentViewHeight+ Application.GetRealWidth(40);
}
- #endregion
+#endregion
}
- #region 鍒囨崲妤煎眰
+#region 鍒囨崲妤煎眰
/// <summary>
/// 妤煎眰鏄剧ず鍒囨崲
/// </summary>
@@ -951,6 +978,6 @@
{
}
- #endregion
+#endregion
}
}
\ No newline at end of file
--
Gitblit v1.8.0