From bfb3d0d4879dca8c59ff287c92f5113162f3a33a Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期二, 27 八月 2024 15:22:48 +0800
Subject: [PATCH] 代码备份
---
OnPro/HDL_ON/UI/MainPage.cs | 102 +++++---------------------------------------------
1 files changed, 11 insertions(+), 91 deletions(-)
diff --git a/OnPro/HDL_ON/UI/MainPage.cs b/OnPro/HDL_ON/UI/MainPage.cs
index 42455bb..084dd01 100644
--- a/OnPro/HDL_ON/UI/MainPage.cs
+++ b/OnPro/HDL_ON/UI/MainPage.cs
@@ -19,6 +19,7 @@
/// BasePageView
/// </summary>
public static PageLayout BasePageView { get; set; }
+
/// <summary>
/// 鐢ㄦ埛鎺у埗鐖跺鍣�
/// </summary>
@@ -26,11 +27,7 @@
/// <summary>
/// 鐗堟湰鍙�
/// </summary>
- public static string VersionString = "2.1.0";
- ///// <summary>
- ///// 瀹㈡埛绔被鍨�
- ///// </summary>
- //public static string ClientType = APIClientType.HDL_ON_PRO.ToString();
+ public static string VersionString = "1.0.1";
/// <summary>
///
@@ -75,13 +72,6 @@
/// </summary>
public static int CurPageIndex = 9999;
- ///// <summary>
- ///// 鍏徃浠ｇ爜
- ///// 棰勭暀绗笁鏂瑰畾鍒舵爣璁�
- ///// 0:HDL
- ///// </summary>
- //public static int Company = 0;
-
/// <summary>
/// 鍙虫粦鍚庨��鎻愮ず鎸夐挳
/// </summary>
@@ -118,11 +108,6 @@
SPK.AcIr,SPK.AcStandard,SPK.HvacAC,
SPK.FloorHeatStandard,SPK.HvacFloorHeat,
SPK.AirFreshStandard,SPK.HvacAirFresh,
- SPK.AirSwitch,
- SPK.PanelSocket,SPK.ElectricSocket,
- SPK.MechanicalArm,SPK.IpCam_Imou,
- SPK.GroupControl,
- //SPK.AvMusic,SPK.MusicStandard
};
@@ -137,16 +122,6 @@
if (_RoomNotSupportFunctionList == null)
{
_RoomNotSupportFunctionList = new List<string>();
- _RoomNotSupportFunctionList.Add(SPK.EnergyStandard);
- //_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.SensorLight);
- _RoomNotSupportFunctionList.AddRange(SPK.EnvironDeviceSpkList());
- //_RoomNotSupportFunctionList.AddRange(SPK.ArmSensorSpkList());
}
return _RoomNotSupportFunctionList;
}
@@ -157,20 +132,18 @@
try
{
Application.DesignWidth = 375;
- Application.DesignHeight = 667 + 20;
+ Application.DesignHeight = 667;
//璁剧疆璇█鐜 闃叉string杞� double鍑虹幇閫楀彿锛宼odouble寮傚父绛夐棶棰�
System.Globalization.CultureInfo.CurrentCulture = System.Globalization.CultureInfo.CreateSpecificCulture("zh-CN");
- 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);
+ //BaseView = Application.MainPage;
+ Application.MainPage.BackgroundColor = 0xFFF7F7F7;
+ BaseView = new FrameLayout()
+ {
+ Width = Application.GetRealWidth(376),
+ Height = Application.GetRealHeight(667),
+ };
+ Application.MainPage.AddChidren(BaseView);
Language.UpdateLanguage();
//#region 娴嬭瘯
//var ddd = new UI.test.TestDialog();
@@ -191,14 +164,6 @@
}
else
{
- //new System.Threading.Thread(() =>
- //{
- // var pm = new DAL.Server.HttpServerRequest();
- // pm.RefreshToken();//鍒锋柊Token
- // pm.GetHomePager();//鍒锋柊浣忓畢淇℃伅
- // pm.GetUserInfo();//鍒锋柊涓汉淇℃伅
- //})
- //{ IsBackground = true }.Start();
Common.ApiUtlis.Ins.DownloadData();
GoUserPage(false, true);
@@ -211,9 +176,6 @@
}
finally
{
- //Application.RunOnMainThread(() => {
- // Application.HideSoftInput();
- //});
}
try
@@ -231,36 +193,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>
@@ -517,18 +449,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>
--
Gitblit v1.8.0