From 7d9cb645b9ec7dd949fde0ef60e4efb5dac17294 Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期三, 12 六月 2024 16:23:52 +0800
Subject: [PATCH] Update HDL_ON.projitems
---
HDL_ON/UI/MainPage.cs | 111 +++++++++++++++++++++++++++++++------------------------
1 files changed, 63 insertions(+), 48 deletions(-)
diff --git a/HDL_ON/UI/MainPage.cs b/HDL_ON/UI/MainPage.cs
index e18b5ce..b56522b 100644
--- a/HDL_ON/UI/MainPage.cs
+++ b/HDL_ON/UI/MainPage.cs
@@ -26,7 +26,7 @@
/// <summary>
/// 鐗堟湰鍙�
/// </summary>
- public static string VersionString = "1.9.0";
+ public static string VersionString = "2.4.6";
///// <summary>
///// 瀹㈡埛绔被鍨�
///// </summary>
@@ -122,7 +122,11 @@
SPK.PanelSocket,SPK.ElectricSocket,
SPK.MechanicalArm,SPK.IpCam_Imou,
SPK.GroupControl,
- SPK.AvMusic,SPK.MusicStandard
+ SPK.AvMusic,
+ SPK.MusicStandard,
+ SPK.ElectricalTvHisense,
+ SPK.OtherCommon,
+
};
@@ -141,8 +145,9 @@
//_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());
@@ -162,6 +167,14 @@
BaseView = Application.MainPage;
Application.MainPage.BackgroundColor = CSS_Color.MainBackgroundColor;
+ //Application.MainPage.BackgroundColor = 0xFFFF0000;// CSS_Color.MainBackgroundColor;
+ //BaseView = new FrameLayout()
+ //{
+ // Y = Application.GetRealHeight(20),
+ // Width = Application.GetRealWidth(376),
+ // Height = Application.GetRealHeight(667),
+ //};
+ //Application.MainPage.AddChidren(BaseView);
Language.UpdateLanguage();
//#region 娴嬭瘯
//var ddd = new UI.test.TestDialog();
@@ -222,36 +235,36 @@
}
-#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
+//#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>
@@ -508,18 +521,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>
@@ -619,9 +632,11 @@
public static void Log(string msg)
{
#if DEBUG
- //if (msg.Contains("鏀跺埌鏁版嵁")
- // || msg.Contains("鍙戦��")
- // )
+ if (msg.Contains("鏀跺埌")
+ //|| msg.Contains("鍙戦��")
+ //|| msg.Contains("鎺ユ敹")
+ || true
+ )
Console.WriteLine(msg);
#endif
}
--
Gitblit v1.8.0