From 19b4abbebede2255b8d9f286105c7bf41d254429 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 29 十二月 2023 09:44:58 +0800
Subject: [PATCH] 金路备份
---
HDL_ON/UI/MainPage.cs | 66 +++++---------------------------
1 files changed, 11 insertions(+), 55 deletions(-)
diff --git a/HDL_ON/UI/MainPage.cs b/HDL_ON/UI/MainPage.cs
index 76549d3..246accc 100644
--- a/HDL_ON/UI/MainPage.cs
+++ b/HDL_ON/UI/MainPage.cs
@@ -26,11 +26,7 @@
/// <summary>
/// 鐗堟湰鍙�
/// </summary>
- public static string VersionString = "2.1.2";
- ///// <summary>
- ///// 瀹㈡埛绔被鍨�
- ///// </summary>
- //public static string ClientType = APIClientType.HDL_ON_PRO.ToString();
+ public static string VersionString = "1.0.0";
/// <summary>
///
@@ -122,7 +118,11 @@
SPK.PanelSocket,SPK.ElectricSocket,
SPK.MechanicalArm,SPK.IpCam_Imou,
SPK.GroupControl,
- //SPK.AvMusic,SPK.MusicStandard
+ SPK.AvMusic,
+ SPK.MusicStandard,
+ SPK.ElectricalTvHisense,
+ SPK.OtherCommon,
+
};
@@ -143,7 +143,7 @@
_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());
@@ -231,36 +231,6 @@
}
-//#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>
@@ -515,20 +485,6 @@
});
}
}).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>
@@ -628,10 +584,10 @@
public static void Log(string msg)
{
#if DEBUG
- if (msg.Contains("鏀跺埌鏁版嵁")
- || msg.Contains("鍙戦��")
- || msg.Contains("璇诲彇鍔熻兘鐘舵��")
- //|| true
+ if (msg.Contains("鏀跺埌")
+ //|| msg.Contains("鍙戦��")
+ //|| msg.Contains("鎺ユ敹")
+ || true
)
Console.WriteLine(msg);
#endif
--
Gitblit v1.8.0