From 61513acf37a1b97e0b1cf5342ff459c3c6fe83b4 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 26 九月 2023 16:36:39 +0800
Subject: [PATCH] 问题修复
---
OnPro/HDL-ON_iOS/Info.plist | 2
OnPro/.vs/HDL_APP_Project/xs/UserPrefs.xml | 197 +++++++++++++++++---------------
OnPro/HDL_ON/UI/MainPage.cs | 2
OnPro/HDL_ON/UI/UI1-Login/RegisterPageBLL.cs | 4
OnPro/HDL_ON/DAL/Server/HttpServerRequest.cs | 18 ++
OnPro/HDL_ON/DAL/Server/NewApiRes.cs | 2
OnPro/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs | 7 +
OnPro/HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/AboutOnPage.cs | 111 ++++++++++++++++++
8 files changed, 242 insertions(+), 101 deletions(-)
diff --git a/OnPro/.vs/HDL_APP_Project/xs/UserPrefs.xml b/OnPro/.vs/HDL_APP_Project/xs/UserPrefs.xml
index d2f56f9..5738633 100644
--- a/OnPro/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/OnPro/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,97 +1,6 @@
锘�<Properties StartupConfiguration="{09712674-2A38-407B-B1E2-560B2C352F9A}|Default">
- <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget" Xamarin.HotReload.WrongLinkerErrorInfoBar.HDL-ON__iOS.HideInfoBar="True" />
- <MonoDevelop.Ide.DebuggingService.PinnedWatches />
- <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/DAL/DriverLayer/CRC.cs">
- <Files>
- <File FileName="HDL_ON/UI/BindingResidence/BindingResidencePage.cs" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/DeliveryQrCodePage.cs" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/MyQRCodePage.cs" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/AddMemberScanPageBLL.cs" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/Transfer/TransferInputPage.cs" />
- <File FileName="HDL_ON/UI/MainPage.cs" />
- <File FileName="HDL_ON/UI/UI2/UserPage.cs" />
- <File FileName="HDL_ON/Common/R.cs" />
- <File FileName="HDL_ON/UI/UI1-Login/RegisterPageBLL.cs" />
- <File FileName="HDL_ON/UI/UI1-Login/RegisterPage.cs" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/AboutOnPage.cs" />
- <File FileName="HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs" />
- <File FileName="HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs" />
- <File FileName="HDL_ON/UI/UI2/3-Intelligence/Scene/SceneAddPage.cs" />
- <File FileName="HDL_ON/UI/UI2/3-Intelligence/Scene/NewSceneMenuListPage.cs" />
- <File FileName="HDL_ON/UI/UI2/1-HomePage/HomePage.cs" />
- <File FileName="HDL-ON_Android/Resources/xml/file_paths.xml" />
- <File FileName="HDL-ON_Android/Resources/values/ic_launcher_background.xml" />
- <File FileName="HDL-ON_Android/Resources/values/dimens.xml" />
- <File FileName="HDL-ON_Android/Resources/values/colors.xml" />
- <File FileName="HDL-ON_Android/Resources/values/styles.xml" />
- <File FileName="HDL-ON_Android/Other/JPush/JPushReceiver.cs" />
- <File FileName="HDL-ON_Android/Other/JPush/JPushOpenClickActivity.cs" />
- <File FileName="HDL-ON_Android/Other/JPush/JPushFirmBroadcast.cs" />
- <File FileName="HDL_ON/UI/UI1-Login/ForgetPasswordPageBLL.cs" />
- <File FileName="HDL_ON/DAL/Server/NewAPI.cs" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AirFreshRelayControlPage.cs" />
- <File FileName="HDL_ON/UI/UI0-Stan/Form/Base/EditorCommonForm.cs" />
- <File FileName="HDL_ON/UI/UI0-Stan/Form/DeviceFunctionCardCommonForm.cs" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPage.cs" />
- <File FileName="HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs" />
- <File FileName="HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs" />
- <File FileName="HDL_ON/Entity/Function/Function.cs" />
- <File FileName="HDL_ON/Entity/Function/InverterInfo.cs" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPageBLL.cs" />
- <File FileName="HDL_ON/UI/UI2/2-Classification/ClassificaitionPublicBLL.cs" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/FhControlPage.cs" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPageBLL.cs" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/Curtain/VenetianBlindsPageBLL.cs" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPageBLL.cs" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePageBLL.cs" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPageBLL.cs" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/Light/RGBWPageBLL.cs" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/Light/RelayPageBLL.cs" />
- <File FileName="HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainDreamPage.cs" />
- <File FileName="HDL_ON/Entity/DB_ResidenceData.cs" />
- <File FileName="HDL-ON_Android/Assets/Language.ini" />
- <File FileName="../../../../../../Library/Frameworks/Mono.framework/External/xbuild/Xamarin/Android/Xamarin.Android.Common.targets" />
- <File FileName="HDL-ON_Android/SplashActivity.cs" />
- <File FileName="HDL_ON/DAL/DriverLayer/Control.cs" />
- <File FileName="HDL-ON_iOS/Info.plist" />
- <File FileName="HDL-ON_iOS/Resources/Language.ini" />
- <File FileName="HDL_ON/DAL/Server/HttpServerRequest.cs" />
- <File FileName="HDL_ON/DAL/Server/HttpUtil.cs" />
- <File FileName="HDL_ON/UI/UI1-Login/LoginPageBLL.cs" />
- <File FileName="HDL_ON/Entity/MyEnum.cs" />
- <File FileName="HDL_ON/DAL/DriverLayer/Packet.cs" />
- <File FileName="HDL_ON/DAL/DriverLayer/UdpSocket.cs" />
- <File FileName="HDL_ON/DAL/DriverLayer/CRC.cs" Line="1" Column="1" />
- </Files>
- <Pads>
- <Pad Id="ProjectPad">
- <State name="__root__">
- <Node name="HDL_APP_Project">
- <Node name="HDL-ON_Android" selected="True">
- <Node name="References" expanded="True" />
- <Node name="Zxing" expanded="True" />
- </Node>
- <Node name="HDL_ON" expanded="True">
- <Node name="DAL" expanded="True">
- <Node name="DriverLayer" expanded="True" />
- </Node>
- <Node name="UI" expanded="True">
- <Node name="BindingResidence" expanded="True" />
- </Node>
- </Node>
- </Node>
- </State>
- </Pad>
- </Pads>
- </MonoDevelop.Ide.Workbench>
- <MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.3TG0221602005112" />
<MonoDevelop.MonoDroid LastDeploySdkVersion="13.2.1.2" />
- <MultiItemStartupConfigurations />
+ <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
<MonoDevelop.Ide.DebuggingService.Breakpoints>
<BreakpointStore>
<Breakpoint file="/Users/kaede/Desktop/Projcect/RongAn2/OnPro/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/GroupControl.cs" relfile="HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/GroupControl.cs" line="326" column="1" />
@@ -165,6 +74,106 @@
<Breakpoint file="/Users/kaede/Desktop/Projcect/RongAn2/OnPro/HDL_ON/DAL/Server/HttpServerRequest.cs" relfile="HDL_ON/DAL/Server/HttpServerRequest.cs" line="237" column="1" />
</BreakpointStore>
</MonoDevelop.Ide.DebuggingService.Breakpoints>
- <Xamarin.Addins.Core.Project ActiveDebugTarget="Android.3TG0221602005112" />
- <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
+ <MonoDevelop.Ide.DebuggingService.PinnedWatches />
+ <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/DAL/Server/HttpUtil.cs">
+ <Files>
+ <File FileName="HDL_ON/UI/BindingResidence/BindingResidencePage.cs" />
+ <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/DeliveryQrCodePage.cs" />
+ <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/MyQRCodePage.cs" />
+ <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/AddMemberScanPageBLL.cs" />
+ <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs" />
+ <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/Transfer/TransferInputPage.cs" />
+ <File FileName="HDL_ON/UI/MainPage.cs" />
+ <File FileName="HDL_ON/UI/UI2/UserPage.cs" Line="127" Column="17" />
+ <File FileName="HDL_ON/Common/R.cs" />
+ <File FileName="HDL_ON/UI/UI1-Login/RegisterPage.cs" Line="164" Column="27" />
+ <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/AboutOnPage.cs" />
+ <File FileName="HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs" Line="375" Column="55" />
+ <File FileName="HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs" Line="174" Column="9" />
+ <File FileName="HDL_ON/UI/UI2/3-Intelligence/Scene/SceneAddPage.cs" />
+ <File FileName="HDL_ON/UI/UI2/3-Intelligence/Scene/NewSceneMenuListPage.cs" />
+ <File FileName="HDL_ON/UI/UI2/1-HomePage/HomePage.cs" />
+ <File FileName="HDL-ON_Android/Resources/xml/file_paths.xml" />
+ <File FileName="HDL-ON_Android/Resources/values/ic_launcher_background.xml" />
+ <File FileName="HDL-ON_Android/Resources/values/dimens.xml" />
+ <File FileName="HDL-ON_Android/Resources/values/colors.xml" />
+ <File FileName="HDL-ON_Android/Resources/values/styles.xml" />
+ <File FileName="HDL-ON_Android/Other/JPush/JPushReceiver.cs" />
+ <File FileName="HDL-ON_Android/Other/JPush/JPushOpenClickActivity.cs" />
+ <File FileName="HDL-ON_Android/Other/JPush/JPushFirmBroadcast.cs" />
+ <File FileName="HDL_ON/UI/UI1-Login/ForgetPasswordPageBLL.cs" />
+ <File FileName="HDL_ON/DAL/Server/NewAPI.cs" Line="375" Column="29" />
+ <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs" />
+ <File FileName="HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AirFreshRelayControlPage.cs" />
+ <File FileName="HDL_ON/UI/UI0-Stan/Form/Base/EditorCommonForm.cs" />
+ <File FileName="HDL_ON/UI/UI0-Stan/Form/DeviceFunctionCardCommonForm.cs" />
+ <File FileName="HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPage.cs" />
+ <File FileName="HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs" />
+ <File FileName="HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs" />
+ <File FileName="HDL_ON/Entity/Function/Function.cs" />
+ <File FileName="HDL_ON/Entity/Function/InverterInfo.cs" />
+ <File FileName="HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPageBLL.cs" />
+ <File FileName="HDL_ON/UI/UI2/2-Classification/ClassificaitionPublicBLL.cs" />
+ <File FileName="HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/FhControlPage.cs" />
+ <File FileName="HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPageBLL.cs" />
+ <File FileName="HDL_ON/UI/UI2/FuntionControlView/Curtain/VenetianBlindsPageBLL.cs" />
+ <File FileName="HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPageBLL.cs" />
+ <File FileName="HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePageBLL.cs" />
+ <File FileName="HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs" />
+ <File FileName="HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs" />
+ <File FileName="HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPageBLL.cs" />
+ <File FileName="HDL_ON/UI/UI2/FuntionControlView/Light/RGBWPageBLL.cs" />
+ <File FileName="HDL_ON/UI/UI2/FuntionControlView/Light/RelayPageBLL.cs" />
+ <File FileName="HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs" />
+ <File FileName="HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainDreamPage.cs" />
+ <File FileName="HDL_ON/Entity/DB_ResidenceData.cs" />
+ <File FileName="HDL-ON_Android/Assets/Language.ini" />
+ <File FileName="../../../../../../Library/Frameworks/Mono.framework/External/xbuild/Xamarin/Android/Xamarin.Android.Common.targets" />
+ <File FileName="HDL-ON_Android/SplashActivity.cs" Line="350" Column="42" />
+ <File FileName="HDL_ON/DAL/DriverLayer/Control.cs" />
+ <File FileName="HDL-ON_iOS/Info.plist" />
+ <File FileName="HDL-ON_iOS/Resources/Language.ini" />
+ <File FileName="HDL_ON/DAL/Server/HttpServerRequest.cs" />
+ <File FileName="HDL_ON/DAL/Server/HttpUtil.cs" Line="23" Column="9" />
+ <File FileName="HDL_ON/UI/UI1-Login/LoginPageBLL.cs" />
+ <File FileName="HDL_ON/Entity/MyEnum.cs" />
+ <File FileName="HDL_ON/DAL/DriverLayer/Packet.cs" />
+ <File FileName="HDL_ON/DAL/DriverLayer/UdpSocket.cs" />
+ <File FileName="HDL_ON/DAL/DriverLayer/CRC.cs" />
+ <File FileName="HDL_ON/UI/UI1-Login/RegisterPageBLL.cs" Line="400" Column="66" />
+ <File FileName="HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs" Line="1" Column="1" />
+ <File FileName="HDL_ON/Common/HDLCommon.cs" Line="78" Column="23" />
+ <File FileName="HDL_ON/DAL/Server/NewApiRes.cs" Line="1248" Column="4" />
+ </Files>
+ <Pads>
+ <Pad Id="ProjectPad">
+ <State name="__root__">
+ <Node name="HDL_APP_Project">
+ <Node name="HDL-ON_Android" expanded="True" />
+ <Node name="HDL_ON">
+ <Node name="Common" expanded="True" />
+ <Node name="DAL" expanded="True">
+ <Node name="Server" expanded="True">
+ <Node name="HttpUtil.cs" selected="True" />
+ </Node>
+ </Node>
+ <Node name="UI">
+ <Node name="UI2">
+ <Node name="3-Intelligence" expanded="True">
+ <Node name="Automation" expanded="True" />
+ <Node name="Scene" expanded="True" />
+ </Node>
+ <Node name="FuntionControlView" expanded="True" />
+ </Node>
+ </Node>
+ </Node>
+ </Node>
+ </State>
+ </Pad>
+ </Pads>
+ </MonoDevelop.Ide.Workbench>
+ <MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.364c4b3158493098" Xamarin.HotReload.WrongLinkerErrorInfoBar.HDL-ON__Android.HideInfoBar="True" />
+ <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget" Xamarin.HotReload.WrongLinkerErrorInfoBar.HDL-ON__iOS.HideInfoBar="True" />
+ <Xamarin.Addins.Core.Project ActiveDebugTarget="Android.364c4b3158493098" />
+ <MultiItemStartupConfigurations />
</Properties>
\ No newline at end of file
diff --git a/OnPro/HDL-ON_iOS/Info.plist b/OnPro/HDL-ON_iOS/Info.plist
index da99ff4..f1df842 100644
--- a/OnPro/HDL-ON_iOS/Info.plist
+++ b/OnPro/HDL-ON_iOS/Info.plist
@@ -43,7 +43,7 @@
<key>NSLocalNetworkUsageDescription</key>
<string>APP wants to use local network access permissions for WiFi distribution.</string>
<key>NSLocationWhenInUseUsageDescription</key>
- <string>Use geographic location to provide services such as weather</string>
+ <string>Obtain the weather conditions of your current location through localization.</string>
<key>NSPhotoLibraryAddUsageDescription</key>
<string>App wants to access your photo library to set the background image of the room</string>
<key>NSPhotoLibraryUsageDescription</key>
diff --git a/OnPro/HDL_ON/DAL/Server/HttpServerRequest.cs b/OnPro/HDL_ON/DAL/Server/HttpServerRequest.cs
index 50280aa..dc4fd99 100644
--- a/OnPro/HDL_ON/DAL/Server/HttpServerRequest.cs
+++ b/OnPro/HDL_ON/DAL/Server/HttpServerRequest.cs
@@ -1454,6 +1454,22 @@
}
#endregion
+ #region 妫�娴嬫洿鏂�
+ public ResponsePackNew CheckAppVersion()
+ {
+ var requestObj = new AppVersionCheckObj();
+#if __IOS__
+ requestObj.releaseSystem = "IOS";
+#else
+ requestObj.releaseSystem = "Android";
+#endif
+ var requestJson = HttpUtil.GetSignRequestJson(requestObj);
+ return HttpUtil.RequestHttpsPost(NewAPI.API_POST_CheckAppVersion, requestJson);
+ }
+
+#endregion
+
+
#region 娉ㄩ攢璐﹀彿
/// <summary>
@@ -1464,7 +1480,7 @@
{
Dictionary<string, object> d = new Dictionary<string, object>();
d.Add("version", MainPage.VersionString);
- d.Add("appCode", "1588071238036582401");
+ d.Add("appCode", "1706565357768663041");
#if __IOS__
d.Add("releaseSystem", "IOS");
#else
diff --git a/OnPro/HDL_ON/DAL/Server/NewApiRes.cs b/OnPro/HDL_ON/DAL/Server/NewApiRes.cs
index 8a88c0b..ab6f1ee 100644
--- a/OnPro/HDL_ON/DAL/Server/NewApiRes.cs
+++ b/OnPro/HDL_ON/DAL/Server/NewApiRes.cs
@@ -1204,7 +1204,7 @@
///// </summary>
//public string appName = SoftwareType.ON_Plus.ToString();
- public string appCode = "1588071238036582401";
+ public string appCode = "1706565357768663041";
/// <summary>
/// IOS銆丄ndroid
/// </summary>
diff --git a/OnPro/HDL_ON/UI/MainPage.cs b/OnPro/HDL_ON/UI/MainPage.cs
index a463f49..655794f 100644
--- a/OnPro/HDL_ON/UI/MainPage.cs
+++ b/OnPro/HDL_ON/UI/MainPage.cs
@@ -27,7 +27,7 @@
/// <summary>
/// 鐗堟湰鍙�
/// </summary>
- public static string VersionString = "1.0";
+ public static string VersionString = "1.0.0";
///// <summary>
///// 瀹㈡埛绔被鍨�
///// </summary>
diff --git a/OnPro/HDL_ON/UI/UI1-Login/RegisterPageBLL.cs b/OnPro/HDL_ON/UI/UI1-Login/RegisterPageBLL.cs
index 58f4e71..3854574 100644
--- a/OnPro/HDL_ON/UI/UI1-Login/RegisterPageBLL.cs
+++ b/OnPro/HDL_ON/UI/UI1-Login/RegisterPageBLL.cs
@@ -397,7 +397,7 @@
if ((sender as Button).IsSelected)
{
//鍒ゆ柇鏄惁閫夋嫨浜嗘湇鍔″櫒锛岄�夋嫨浜嗘墠鑳藉彂閫侀獙璇佺爜
- if (CheckIfSelectServer() == false) return;
+ //if (CheckIfSelectServer() == false) return;
string account = etAccount.Text.Trim();
int time = 60;
@@ -550,7 +550,7 @@
if (btnRegister.IsSelected)
{
//鍒ゆ柇鏄惁閫夋嫨浜嗘湇鍔″櫒锛岄�夋嫨浜嗘墠鑳藉彂閫侀獙璇佺爜
- if (CheckIfSelectServer() == false) return;
+ //if (CheckIfSelectServer() == false) return;
//妫�娴嬭处鍙�
if (!CheckAccount()) return;
//妫�娴嬪瘑鐮�
diff --git a/OnPro/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs b/OnPro/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
index a46fc8b..dad4771 100644
--- a/OnPro/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
+++ b/OnPro/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
@@ -361,6 +361,13 @@
//2020-12-03 淇敼鍥剧墖鍔犺浇鏂规硶
ImageUtlis.Current.LoadLocalOrNetworkImages(room.backgroundImage, roomViewbg);
+ var btnRoomNameBg = new Button {
+ Height = Application.GetRealHeight(45),
+ BackgroundColor = 0x44000000,
+ };
+ roomView.AddChidren(btnRoomNameBg);
+ btnRoomNameBg.SetCornerWithSameRadius((uint)Application.GetRealWidth(12), HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerTopRight);
+
var btnFloorAndRoomName = new Button()
{
X = Application.GetRealWidth(16),
diff --git a/OnPro/HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/AboutOnPage.cs b/OnPro/HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/AboutOnPage.cs
index 36f880d..deb0ff1 100644
--- a/OnPro/HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/AboutOnPage.cs
+++ b/OnPro/HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/AboutOnPage.cs
@@ -28,6 +28,10 @@
/// Android 浜戠杩斿洖鍦板潃
/// </summary>
string newAppVersionUrl = "";
+ /// <summary>
+ /// 鐗堟湰鏇存柊ListCellView
+ /// </summary>
+ ListCellView versionUpdateView;
/// <summary>
///
@@ -93,11 +97,32 @@
};
bodyView.AddChidren(lineView);
+ #region 鐗堟湰鏇存柊
+ versionUpdateView = new ListCellView()
+ {
+ Y = lineView.Bottom,
+ };
+#if __ANDROID__
+ bodyView.AddChidren(versionUpdateView);
+ CheckIfNeedUpdateAsync(false);
+#endif
+ versionUpdateView.BtnTilte.TextID = StringId.VersionUpdate;
+ Action versionUpdateAction = () =>
+ {
+ OpenUrl();
+ };
+ versionUpdateView.GoAction = versionUpdateAction;
+ #endregion
+
#region 杞欢鏈嶅姟鍗忚
var serviceAgreementView = new ListCellView()
{
+#if __ANDROID__
+ Y = versionUpdateView.Bottom,
+#else
Y = lineView.Bottom,
+#endif
};
bodyView.AddChidren(serviceAgreementView);
serviceAgreementView.BtnTilte.TextID = StringId.UserAgreement;
@@ -107,7 +132,7 @@
new WebViewDialog().LoadPageWithdrawalConsent(titleStr, url);
};
serviceAgreementView.GoAction = serviceAgreementAction;
- #endregion
+#endregion
#region 鐢ㄦ埛淇℃伅淇濇姢鍗忚
var privacyPolicyView = new ListCellView()
@@ -143,5 +168,89 @@
}
}
+ /// <summary>
+聽聽聽聽聽聽聽聽/// 妫�娴嬫槸鍚﹂渶瑕佹洿鏂�
+聽聽聽聽聽聽聽聽/// Android绛夋帴鍙ｅ疄鐜�
+聽聽聽聽聽聽聽聽/// </summary>
+聽聽聽聽聽聽聽聽/// <returns></returns>
+聽聽聽聽聽聽聽聽void CheckIfNeedUpdateAsync(bool isTip = false)
+ {
+ new System.Threading.Thread(() =>
+ {
+ newAppVersion = CanUpdateAsync();
+ Application.RunOnMainThread(() =>
+ {
+ if (!string.IsNullOrEmpty(newAppVersion))
+ {
+聽聽聽聽聽聽聽聽聽聽聽聽聽聽聽聽聽聽聽聽聽聽聽聽//鍙戠幇鏂扮増鏈�
+聽聽聽聽聽聽聽聽聽聽聽聽聽聽聽聽聽聽聽聽聽聽聽聽versionUpdateView.BtnSubtitle.TextColor = CSS_Color.MainColor;
+ versionUpdateView.BtnSubtitle.Text = Language.StringByID(StringId.DiscoverNewVersion) + "(" + newAppVersion + ")";
+ }
+ else
+ {
+聽聽聽聽聽聽聽聽聽聽聽聽聽聽聽聽聽聽聽聽聽聽聽聽//宸茬粡鏄渶鏂扮増鏈�
+聽聽聽聽聽聽聽聽聽聽聽聽聽聽聽聽聽聽聽聽聽聽聽聽versionUpdateView.BtnSubtitle.TextColor = CSS_Color.PromptingColor1;
+ versionUpdateView.BtnSubtitle.Text = Language.StringByID(StringId.IsLatestVersion);
+ }
+ });
+
+ })
+ { IsBackground = true }.Start();
+ }
+
+ /// <summary>
+聽聽聽聽聽聽聽聽/// 妫�鏌ョ増鏈�
+聽聽聽聽聽聽聽聽/// </summary>
+聽聽聽聽聽聽聽聽/// <returns></returns>
+聽聽聽聽聽聽聽聽string CanUpdateAsync()
+聽聽聽聽聽聽聽聽{
+聽聽聽聽聽聽聽聽聽聽聽聽try
+聽聽聽聽聽聽聽聽聽聽聽聽{
+聽聽聽聽聽聽聽聽聽聽聽聽聽聽聽聽var versionResult = CheckAppVersion();
+聽聽聽聽聽聽聽聽聽聽聽聽聽聽聽聽if (versionResult == null)
+聽聽聽聽聽聽聽聽聽聽聽聽聽聽聽聽{
+聽聽聽聽聽聽聽聽聽聽聽聽聽聽聽聽聽聽聽聽return "";
+聽聽聽聽聽聽聽聽聽聽聽聽聽聽聽聽}
+聽聽聽聽聽聽聽聽聽聽聽聽聽聽聽聽var newVersion = versionResult.version;
+聽聽聽聽聽聽聽聽聽聽聽聽聽聽聽聽if (newVersion.CompareTo(MainPage.VersionString) > 0)
+聽聽聽聽聽聽聽聽聽聽聽聽聽聽聽聽{
+聽聽聽聽聽聽聽聽聽聽聽聽聽聽聽聽聽聽聽聽newAppVersionUrl = versionResult.packageUrl;
+聽聽聽聽聽聽聽聽聽聽聽聽聽聽聽聽聽聽聽聽return newVersion;
+聽聽聽聽聽聽聽聽聽聽聽聽聽聽聽聽}
+聽聽聽聽聽聽聽聽聽聽聽聽聽聽聽聽return "";
+聽聽聽聽聽聽聽聽聽聽聽聽}
+聽聽聽聽聽聽聽聽聽聽聽聽catch (Exception ex)
+聽聽聽聽聽聽聽聽聽聽聽聽{
+聽聽聽聽聽聽聽聽聽聽聽聽聽聽聽聽return "";
+聽聽聽聽聽聽聽聽聽聽聽聽}
+聽聽聽聽聽聽聽聽}
+
+ /// <summary>
+聽聽聽聽聽聽聽聽/// 妫�娴嬫柊鐗堟湰
+聽聽聽聽聽聽聽聽/// </summary>
+聽聽聽聽聽聽聽聽/// <returns>The https app version async.</returns>
+聽聽聽聽聽聽聽聽private AppVersionResNew CheckAppVersion()
+ {
+ try
+ {
+ var result = new HttpServerRequest().CheckAppVersion();
+ if (result.Code == StateCode.SUCCESS)
+ {
+ if (result.Data == null)
+ {
+ return null;
+ }
+
+ var responeData = Newtonsoft.Json.JsonConvert.DeserializeObject<AppVersionResNew>(result.Data.ToString());
+ return responeData;
+ }
+ return null;
+ }
+ catch (Exception ex)
+ {
+ return null;
+ }
+ }
+
}
}
--
Gitblit v1.8.0