From 88c408e49689961d3eb3496c6e89c60e230a92f3 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 29 九月 2022 13:12:32 +0800
Subject: [PATCH] iOS光伏数据更新闪退修复
---
HDL_ON/UI/MainPage.cs | 45 ++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 44 insertions(+), 1 deletions(-)
diff --git a/HDL_ON/UI/MainPage.cs b/HDL_ON/UI/MainPage.cs
index eb5fa78..66ae421 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>
@@ -262,6 +262,7 @@
BaseView.AddChidren(BtnBackIcon);
backView.MouseMoveEventHandler = (sender, e) =>
{
+
if (BasePageView.ChildrenCount <= 1)
{
return;
@@ -291,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);
@@ -305,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);
--
Gitblit v1.8.0