From ed2d2c9b9e9bca8cd97136b738c2624193dd9d92 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期日, 09 十月 2022 11:48:34 +0800
Subject: [PATCH] 百叶帘，编辑场景数据显示异常，光伏功能安卓系统返回上一次
---
HDL_ON/UI/MainPage.cs | 26 ++++++++++++++++++++++----
1 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/HDL_ON/UI/MainPage.cs b/HDL_ON/UI/MainPage.cs
index 66ae421..b1d3435 100644
--- a/HDL_ON/UI/MainPage.cs
+++ b/HDL_ON/UI/MainPage.cs
@@ -451,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;
@@ -463,14 +481,14 @@
{
var loading = view as Loading;
if (loading.CurStatus == false)//鏈変竴浜涚瓑寰呯晫闈㈤殣钘忎簡锛屼絾鏄病鏈夌Щ闄ゅ埌锛岄渶瑕佸厛绉婚櫎
- {
+ {
loading.RemoveFromParent();
result = LoadEvent_BackAction();
}
else
{
result = 1;//姝ｅ湪绛夊緟鏌愪簺鎿嶄綔
- }
+ }
}
else
{
@@ -497,7 +515,7 @@
else
{
result = 2;//鏃犳硶鍐嶅悗閫�锛屽彲浠ユ墽琛岄��鍒版闈�
- }
+ }
});
return result;
}
--
Gitblit v1.8.0