From 9bc0ea236cad9e5c86d0d6fe03eabb327b693096 Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期三, 11 九月 2024 18:03:16 +0800
Subject: [PATCH] Update SplashActivity.cs
---
HDL_ON/UI/MainPage.cs | 65 +++++++++++++++++++-------------
1 files changed, 38 insertions(+), 27 deletions(-)
diff --git a/HDL_ON/UI/MainPage.cs b/HDL_ON/UI/MainPage.cs
index 9183580..f9fb909 100644
--- a/HDL_ON/UI/MainPage.cs
+++ b/HDL_ON/UI/MainPage.cs
@@ -26,7 +26,7 @@
/// <summary>
/// 鐗堟湰鍙�
/// </summary>
- public static string VersionString = "2.1.3";
+ public static string VersionString = "2.6.0";
///// <summary>
///// 瀹㈡埛绔被鍨�
///// </summary>
@@ -116,7 +116,7 @@
SPK.LightCCT,SPK.LightDimming,SPK.LightSwitch,SPK.LightRGB,
SPK.CurtainRoller,SPK.CurtainSwitch,SPK.CurtainTrietex,SPK.CurtainDream,
SPK.AcIr,SPK.AcStandard,SPK.HvacAC,
- SPK.FloorHeatStandard,SPK.HvacFloorHeat,
+ SPK.FloorHeatStandard,SPK.HvacFloorHeat,SPK.HvacFloorHeatPanel,
SPK.AirFreshStandard,SPK.HvacAirFresh,
SPK.AirSwitch,
SPK.PanelSocket,SPK.ElectricSocket,
@@ -124,7 +124,8 @@
SPK.GroupControl,
SPK.AvMusic,
SPK.MusicStandard,
- SPK.ElectricalTvHisense
+ SPK.OtherCommon,
+
};
@@ -145,8 +146,12 @@
_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.Add(SPK.AcstParent);
+ _RoomNotSupportFunctionList.Add(SPK.AcstSub);
+ _RoomNotSupportFunctionList.Add(SPK.WaterHeaterJinmao);
+ _RoomNotSupportFunctionList.Add(SPK.InverterJinmao);
_RoomNotSupportFunctionList.AddRange(SPK.EnvironDeviceSpkList());
//_RoomNotSupportFunctionList.AddRange(SPK.ArmSensorSpkList());
}
@@ -490,11 +495,11 @@
UserBasePage.LoadPage();
BasePageView.PageIndex = 0;
- if (isFirstOpen)
- {
- //鍚姩瀵嗙爜楠岃瘉
- new AppUnlockPage().LoadPage(isFirstOpen);
- }
+ //if (isFirstOpen)
+ //{
+ // //鍚姩瀵嗙爜楠岃瘉
+ // new AppUnlockPage().LoadPage(isFirstOpen);
+ //}
//涓婚〉鍔犺浇瀹屾垚,鍥炶皟浜嬩欢
pageShowEvent?.Invoke();
pageShowEvent = null;
@@ -519,18 +524,18 @@
}).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");
- }
+// 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>
@@ -630,12 +635,10 @@
public static void Log(string msg)
{
#if DEBUG
- if (msg.Contains("鏀跺埌鏁版嵁")
- || msg.Contains("鍙戦��")
- || msg.Contains("鎺ユ敹鍒版帹閫�")
- || msg.Contains("api")
- || msg.Contains("璇诲彇鍔熻兘鐘舵��")
- //|| true
+ if (msg.Contains("鏀跺埌")
+ //|| msg.Contains("鍙戦��")
+ //|| msg.Contains("鎺ユ敹")
+ || true
)
Console.WriteLine(msg);
#endif
@@ -650,6 +653,14 @@
#if DEBUG
Console.WriteLine($"{tag}-->{msg}");
#endif
+ if (tag == "error")
+ {
+ new System.Threading.Thread(async () =>
+ {
+ await Common.AliyunLog.AliyunLogClient.PostLogs("鑷畾涔塃rror鏃ュ織", msg);
+ })
+ { IsBackground = true }.Start();
+ }
}
--
Gitblit v1.8.0