From bbd6b592a6b883e013ff1e0a574976ceba5009ea Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 27 十月 2022 09:11:33 +0800
Subject: [PATCH] Merge branch 'dev--wxr'
---
HDL_ON/UI/MainPage.cs | 88 +++++++++++++++++++++++++++++++++++++++++--
1 files changed, 83 insertions(+), 5 deletions(-)
diff --git a/HDL_ON/UI/MainPage.cs b/HDL_ON/UI/MainPage.cs
index 573664e..b1d3435 100644
--- a/HDL_ON/UI/MainPage.cs
+++ b/HDL_ON/UI/MainPage.cs
@@ -26,7 +26,7 @@
/// <summary>
/// 鐗堟湰鍙�
/// </summary>
- public static string VersionString = "1.6.0";
+ public static string VersionString = "1.6.1";
///// <summary>
///// 瀹㈡埛绔被鍨�
///// </summary>
@@ -36,6 +36,11 @@
///
/// </summary>
public static Entity.CityInfo cityInfo = new Entity.CityInfo();
+ /// <summary>
+ /// 鍩庡競澶╂皵淇℃伅antion
+ /// </summary>
+ public static Action CityWeatherAction = null;
+
/// <summary>
/// 澶╂皵鍒锋柊action
/// </summary>
@@ -130,6 +135,7 @@
_RoomNotSupportFunctionList.Add(SPK.AvMusic);
_RoomNotSupportFunctionList.Add(SPK.AirSwitch);
_RoomNotSupportFunctionList.Add(SPK.ElectricEnergy);
+ _RoomNotSupportFunctionList.Add(SPK.OtherCommon);
_RoomNotSupportFunctionList.AddRange(SPK.EnvironDeviceSpkList());
//_RoomNotSupportFunctionList.AddRange(SPK.ArmSensorSpkList());
}
@@ -256,6 +262,7 @@
BaseView.AddChidren(BtnBackIcon);
backView.MouseMoveEventHandler = (sender, e) =>
{
+
if (BasePageView.ChildrenCount <= 1)
{
return;
@@ -285,6 +292,26 @@
};
backView.MouseUpEventHandler = (sender, e) =>
{
+
+ if (Inverter.Ins.H5Page.Parent != null)
+ {
+ if (Inverter.Ins.PageIndex != "1")
+ {
+ Inverter.Ins.PageIndex = "1";
+ var status = new Dictionary<string, object> { ["method"] = "backPrePage", ["data"] = "" };
+ Inverter.Ins.H5Page.CallJS($"nativeToJs(\'{Newtonsoft.Json.JsonConvert.SerializeObject(status)}\')");
+ MainPage.Log($"up{e.X}");
+ StartX = 0;
+ BtnBackIcon.X = -Application.GetRealWidth(100);
+ return;
+ }
+ else
+ {
+ Inverter.Ins.PageIndex = "1";
+ }
+ }
+
+
MainPage.Log($"up{e.X}");
StartX = 0;
BtnBackIcon.X = -Application.GetRealWidth(100);
@@ -299,6 +326,28 @@
};
backView.MouseUpOutsideEventHandler = (sender, e) =>
{
+ if (Inverter.Ins.H5Page.Parent != null)
+ {
+ if (Inverter.Ins.PageIndex != "1")
+ {
+ Inverter.Ins.PageIndex = "1";
+ List<AlinkStatusData> ddd = new List<AlinkStatusData>();
+ //var status = new Dictionary<string, object> { ["method"] = "status", ["data"] = ddd };
+ //var ddd3 = Newtonsoft.Json.JsonConvert.SerializeObject(status);
+ var status = new Dictionary<string, object> { ["method"] = "backPrePage", ["data"] = "" };
+ Inverter.Ins.H5Page.CallJS($"nativeToJs(\'{Newtonsoft.Json.JsonConvert.SerializeObject(status)}\')");
+ MainPage.Log($"up{e.X}");
+ StartX = 0;
+ BtnBackIcon.X = -Application.GetRealWidth(100);
+ return;
+ }
+ else
+ {
+ Inverter.Ins.PageIndex = "1";
+ }
+ }
+
+
MainPage.Log($"up{e.X}");
StartX = 0;
BtnBackIcon.X = -Application.GetRealWidth(100);
@@ -402,10 +451,28 @@
int result = 0;
Application.RunOnMainThread(() =>
{
+ if (Inverter.Ins.H5Page.Parent != null)
+ {
+ if (Inverter.Ins.PageIndex != "1")
+ {
+ Inverter.Ins.PageIndex = "1";
+ var status = new Dictionary<string, object> { ["method"] = "backPrePage", ["data"] = "" };
+ Inverter.Ins.H5Page.CallJS($"nativeToJs(\'{Newtonsoft.Json.JsonConvert.SerializeObject(status)}\')");
+ StartX = 0;
+ BtnBackIcon.X = -Application.GetRealWidth(100);
+ return;
+ }
+ else
+ {
+ Inverter.Ins.PageIndex = "1";
+ }
+ }
+
+
if (BasePageView == null || BasePageView.ChildrenCount <= 1)
{
result = 2;//鏃犳硶鍐嶅悗閫�锛屽彲浠ユ墽琛岄��鍒版闈�
- }
+ }
if (BasePageView.ChildrenCount > 1)
{
int index = BasePageView.ChildrenCount - 1;
@@ -414,14 +481,14 @@
{
var loading = view as Loading;
if (loading.CurStatus == false)//鏈変竴浜涚瓑寰呯晫闈㈤殣钘忎簡锛屼絾鏄病鏈夌Щ闄ゅ埌锛岄渶瑕佸厛绉婚櫎
- {
+ {
loading.RemoveFromParent();
result = LoadEvent_BackAction();
}
else
{
result = 1;//姝ｅ湪绛夊緟鏌愪簺鎿嶄綔
- }
+ }
}
else
{
@@ -448,7 +515,7 @@
else
{
result = 2;//鏃犳硶鍐嶅悗閫�锛屽彲浠ユ墽琛岄��鍒版闈�
- }
+ }
});
return result;
}
@@ -465,6 +532,17 @@
}
+ /// <summary>
+ /// 鑷畾涔夋棩蹇楄緭鍑�
+ /// </summary>
+ public static void Log(string tag,string msg)
+ {
+#if DEBUG
+ Console.WriteLine($"{tag}-->{msg}");
+#endif
+ }
+
+
}
}
\ No newline at end of file
--
Gitblit v1.8.0