From d76b0e40e5bb127fd33aa1f7842447a1df0628d5 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期日, 30 七月 2023 22:16:34 +0800
Subject: [PATCH] Update PublicAssmeblyBLL.cs
---
HDL_ON/UI/MainPage.cs | 170 +++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 124 insertions(+), 46 deletions(-)
diff --git a/HDL_ON/UI/MainPage.cs b/HDL_ON/UI/MainPage.cs
index 75da649..e2ce48b 100644
--- a/HDL_ON/UI/MainPage.cs
+++ b/HDL_ON/UI/MainPage.cs
@@ -26,7 +26,7 @@
/// <summary>
/// 鐗堟湰鍙�
/// </summary>
- public static string VersionString = "1.7.3";
+ public static string VersionString = "2.0.0";
///// <summary>
///// 瀹㈡埛绔被鍨�
///// </summary>
@@ -121,6 +121,8 @@
SPK.AirSwitch,
SPK.PanelSocket,SPK.ElectricSocket,
SPK.MechanicalArm,SPK.IpCam_Imou,
+ SPK.GroupControl,
+ //SPK.AvMusic,SPK.MusicStandard
};
@@ -136,11 +138,12 @@
{
_RoomNotSupportFunctionList = new List<string>();
_RoomNotSupportFunctionList.Add(SPK.EnergyStandard);
- _RoomNotSupportFunctionList.Add(SPK.MusicStandard);
- _RoomNotSupportFunctionList.Add(SPK.AvMusic);
+ //_RoomNotSupportFunctionList.Add(SPK.MusicStandard);
+ //_RoomNotSupportFunctionList.Add(SPK.AvMusic);
_RoomNotSupportFunctionList.Add(SPK.AirSwitch);
+ _RoomNotSupportFunctionList.Add(SPK.AirSwitchP3);
_RoomNotSupportFunctionList.Add(SPK.ElectricEnergy);
- _RoomNotSupportFunctionList.Add(SPK.OtherCommon);
+ //_RoomNotSupportFunctionList.Add(SPK.OtherCommon);
_RoomNotSupportFunctionList.Add(SPK.SensorLight);
_RoomNotSupportFunctionList.AddRange(SPK.EnvironDeviceSpkList());
//_RoomNotSupportFunctionList.AddRange(SPK.ArmSensorSpkList());
@@ -204,6 +207,52 @@
// Application.HideSoftInput();
//});
}
+
+ try
+ {
+ CommonClass.excptionAction = (obj) =>
+ {
+ Application.RunOnMainThread(() =>
+ {
+ Stan.HdlMessageLogic.Current.ShowAppProgramIsError(obj);
+ });
+ };
+ }
+ catch (Exception ex)
+ {
+
+ }
+
+#if __ANDROID__
+ new System.Threading.Thread(async () =>
+ {
+ int i = 10;
+ while (i < 10) {
+ try
+ {
+ var location_android = await HDL_ON_Android.LocationUtils.GetCurrentLocationAsync();
+ if (location_android != null)
+ {
+ MainPage.cityInfo.lat = location_android.Latitude.ToString();
+ MainPage.cityInfo.lon = location_android.Longitude.ToString();
+ new HDL_ON.DAL.Server.HttpServerRequest().GetCityWeatherInfo(MainPage.cityInfo.lon.Replace(",", "."), MainPage.cityInfo.lat.ToString().Replace(",", "."));
+ i = 100;
+ Application.RunOnMainThread(() => {
+ HomePage.LoadEvent_RefreshAir();
+ });
+ }
+ else
+ {
+ i++;
+ }
+ } catch (Exception ex)
+ {
+ Log($"缁忕含搴﹁幏鍙栧紓甯�: {ex.Message}");
+ }
+ }
+ })
+ { IsBackground = true }.Start();
+#endif
}
/// <summary>
@@ -408,7 +457,8 @@
addResidencePage.LoadView();
return;
}
- new System.Threading.Thread(async () =>
+
+ new System.Threading.Thread(() =>
{
try
{
@@ -458,6 +508,19 @@
}
}).Start();
+
+ try
+ {
+#if __ANDROID__
+ Com.Chteam.Agent.BuglyAgentHelper.SetUserId(UserInfo.Current.AccountString);
+#else
+ Bugly.Bugly.SetUserIdentifier(UserInfo.Current.AccountString);
+#endif
+ }
+ catch (Exception ex)
+ {
+ MainPage.Log("Bugly error");
+ }
}
/// <summary>
@@ -469,72 +532,82 @@
public static int LoadEvent_BackAction()
{
int result = 0;
+
Application.RunOnMainThread(() =>
{
- if (Inverter.Ins.H5Page.Parent != null)
+ try
{
- if (Inverter.Ins.PageIndex != "1")
+ if (Inverter.Ins.H5Page.Parent != null)
{
- 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;
- var view = BasePageView.GetChildren(index);
- if (view.GetType() == typeof(Loading))
- {
- var loading = view as Loading;
- if (loading.CurStatus == false)//鏈変竴浜涚瓑寰呯晫闈㈤殣钘忎簡锛屼絾鏄病鏈夌Щ闄ゅ埌锛岄渶瑕佸厛绉婚櫎
+ if (Inverter.Ins.PageIndex != "1")
{
- loading.RemoveFromParent();
- result = LoadEvent_BackAction();
+ 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
{
- result = 1;//姝ｅ湪绛夊緟鏌愪簺鎿嶄綔
+ Inverter.Ins.PageIndex = "1";
}
+ }
+
+
+ if (BasePageView == null || BasePageView.ChildrenCount <= 1)
+ {
+ result = 2;//鏃犳硶鍐嶅悗閫�锛屽彲浠ユ墽琛岄��鍒版闈�
}
else
{
- if (view != null)
+ if (BasePageView.ChildrenCount > 1)
{
- if (view.Tag != null)
+ int index = BasePageView.ChildrenCount - 1;
+ var view = BasePageView.GetChildren(index);
+ if (view.GetType() == typeof(Loading))
{
- if (view.Tag.ToString() != "unlockpage")
+ var loading = view as Loading;
+ if (loading.CurStatus == false)//鏈変竴浜涚瓑寰呯晫闈㈤殣钘忎簡锛屼絾鏄病鏈夌Щ闄ゅ埌锛岄渶瑕佸厛绉婚櫎
{
- view.RemoveFromParent();
+ loading.RemoveFromParent();
+ result = LoadEvent_BackAction();
}
else
{
- result = 2;
+ result = 1;//姝ｅ湪绛夊緟鏌愪簺鎿嶄綔
}
}
else
{
- view.RemoveFromParent();
+ if (view != null)
+ {
+ if (view.Tag != null)
+ {
+ if (view.Tag.ToString() != "unlockpage")
+ {
+ view.RemoveFromParent();
+ }
+ else
+ {
+ result = 2;
+ }
+ }
+ else
+ {
+ view.RemoveFromParent();
+ }
+ }
}
}
+ else
+ {
+ result = 2;//鏃犳硶鍐嶅悗閫�锛屽彲浠ユ墽琛岄��鍒版闈�
+ }
}
- }
- else
+ }catch(Exception ex)
{
- result = 2;//鏃犳硶鍐嶅悗閫�锛屽彲浠ユ墽琛岄��鍒版闈�
+ MainPage.Log($"鍔犺浇瀹夊崜鍚庨��寮傚父:{ex.Message}");
}
});
return result;
@@ -547,7 +620,12 @@
public static void Log(string msg)
{
#if DEBUG
- Console.WriteLine(msg);
+ if (msg.Contains("鏀跺埌鏁版嵁")
+ || msg.Contains("鍙戦��")
+ || msg.Contains("鎺ユ敹鍒版帹閫�")
+
+ )
+ Console.WriteLine(msg);
#endif
}
--
Gitblit v1.8.0