From 1293fea19c6a2b558986856e301d5218c1979692 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 27 十一月 2020 14:08:43 +0800
Subject: [PATCH] Revert "20201127 接受bus数据修改完成，搜索网关、一端口修改完成"
---
HDL_ON/Common/HDLCommon.cs | 242 ++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 200 insertions(+), 42 deletions(-)
diff --git a/HDL_ON/Common/HDLCommon.cs b/HDL_ON/Common/HDLCommon.cs
index 43e137d..0bd5640 100644
--- a/HDL_ON/Common/HDLCommon.cs
+++ b/HDL_ON/Common/HDLCommon.cs
@@ -3,7 +3,6 @@
using HDL_ON;
using HDL_ON.UI.CSS;
using HDL_ON.DAL.Server;
-using HDL_ON.UI;
namespace HDL_ON
{
@@ -74,16 +73,18 @@
/// </summary>
public void CheckIfNeedForceUpdate()
{
+ // //return;
System.Threading.Tasks.Task.Run(() =>
{
try
{
var requestObj = new ForceUpdateObj()
{
- LanguageType = Utlis.GetPostLanguageType()
+
+
};
-#if __IOS__
- requestObj.DeviceType = PhoneDeviceType.IOS.ToString();
+#if Android
+ requestObj.DeviceType = 1;
#endif
var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(requestObj);
var revertObj = HttpUtil.RequestHttpsPost(NewAPI.API_POST_CheckAppVersion, requestJson);
@@ -114,6 +115,17 @@
});
+
+ //ForceUpdateInfo mForceUpdateInfo = new ForceUpdateInfo () {
+ // IsNeedForceUpdate = true,
+ // AndroidUrl = "https://shouji.baidu.com/software/26667787.html",
+ // AndroidUrl_En = "https://shouji.baidu.com/software/26667787.html",
+ // IosUrl = "https://apps.apple.com/cn/app/hdl-on/id1029839624",
+ // ReasonStr = "1.鍙戠幇鏂扮増鏈珹pp,褰撳墠鐗堟湰宸插仠鐢�,椹笂鏇存柊!\n2.璇蜂笅杞藉拰瀹夎鏂扮増鏈�!",
+ // ReasonStr_En = "1. Discover the new version of the App, the current version is disabled, update now! \n2. Please download and install the new version!"
+ //};
+
+ //ShowForceUpdateDialog (mForceUpdateInfo);
}
/// <summary>
@@ -122,63 +134,209 @@
/// </summary>
public void ShowForceUpdateDialog(ForceUpdateInfo mForceUpdateInfo)
{
- // 1.1 娌℃湁鏇存柊 杩斿洖
+
+ //if (!mForceUpdateInfo.IsNeedForceUpdate) return;
+
if (mForceUpdateInfo.UpdateType == 0) return;
- // 1.2 鏈夋柊鐗堟湰浣嗘槸蹇界暐杩� 杩斿洖
+
if (mForceUpdateInfo.UpdateType == 1 && (UserInfo.Current.IgnoreUpdateVersion == mForceUpdateInfo.NewVersion)) return;
- // 2.1 鏈夋柊鐗堟湰娌℃湁蹇界暐杩� 鎻愮ず鏇存柊
+
+ Dialog dialog = new Dialog();
+
+ FrameLayout dialogBodyView = new FrameLayout()
+ {
+ Gravity = Gravity.Center,
+ Width = Application.GetRealWidth(500),
+ Height = Application.GetRealHeight(500),
+ BackgroundColor = 0xFF000000,
+ Radius = (uint)Application.GetRealWidth(10),
+ //BorderColor = SkinStyle.Current.Transparent,
+ BorderWidth = 0,
+ };
+ dialog.AddChidren(dialogBodyView);
+
+ Button btnTitle = new Button()
+ {
+ Height = Application.GetRealHeight(80),
+ BackgroundColor = 0x00000000,
+ TextAlignment = TextAlignment.Center,
+ TextID = StringId.Tip,
+ TextColor = 0xFFFFFFFF
+ };
+ dialogBodyView.AddChidren(btnTitle);
+
+
+ FrameLayout centerView = new FrameLayout()
+ {
+ Y = Application.GetRealHeight(80),
+ Height = Application.GetRealHeight(340),
+ BackgroundColor = 0xFFFFFFFF,
+ };
+ dialogBodyView.AddChidren(centerView);
+
+ Button btnMessage = new Button()
+ {
+ Gravity = Gravity.CenterHorizontal,
+ Y = Application.GetRealHeight(20),
+ Width = Application.GetRealWidth(400),
+ //Height = Application.GetRealHeight (300),
+ //Text = mForceUpdateInfo.ReasonStr,
+ TextAlignment = TextAlignment.TopLeft,
+ //TextColor = SkinStyle.Current.TextColor,
+ IsMoreLines = true
+ };
+ centerView.AddChidren(btnMessage);
+
+
+ FrameLayout bottomView = new FrameLayout()
+ {
+ Y = Application.GetRealHeight(420),
+ Height = Application.GetRealHeight(80),
+ BackgroundColor = 0xFFFFFFFF,
+
+ };
+ dialogBodyView.AddChidren(bottomView);
+
+ var mAndroidUrl = mForceUpdateInfo.AndroidUrl;
+ if (Language.CurrentLanguage == "Chinese")
+ {
+ btnMessage.Text = mForceUpdateInfo.ReasonStr;
+
+ }
+ else
+ {
+ btnMessage.Text = mForceUpdateInfo.ReasonStr_En;
+ mAndroidUrl = mForceUpdateInfo.AndroidUrl_En;
+ }
+
+
if (mForceUpdateInfo.UpdateType == 1)
{
- Action okAction = () =>
+ #region 鎻愮ず鏇存柊
+ Button btnNext = new Button()
{
- if (string.IsNullOrEmpty(mForceUpdateInfo.NewVersionUrl)) return;
-
- HDLUtils.OpenUrl(mForceUpdateInfo.NewVersionUrl);
+ Width = Application.GetRealWidth(249),
+ TextID = StringId.Ignore,
+ TextAlignment = TextAlignment.Center,
+ TextColor = 0xFFFFFFFF,
+ BackgroundColor = 0xFF000000,
+ //Text = "蹇界暐"
+ };
+ bottomView.AddChidren(btnNext);
+ btnNext.MouseUpEventHandler += (sender2, e2) =>
+ {
+ //UserConfig.Instance.IfIgnoreUpdate = true;
+ UserInfo.Current.IgnoreUpdateVersion = mForceUpdateInfo.NewVersion;
+ UserInfo.Current.SaveUserInfo();
+ dialog.Close();
};
- Action cancelAction = () =>
+ Button btnSave = new Button()
{
- //UserInfo.Current.IgnoreUpdateVersion = mForceUpdateInfo.NewVersion;
- //UserInfo.Current.SaveUserInfo();
+ X = btnNext.Right + 1,
+ Width = Application.GetRealWidth(250),
+ TextID = StringId.Update,
+ TextAlignment = TextAlignment.Center,
+ TextColor = 0xFFFFFFFF,
+ BackgroundColor = 0xFF000000,
+ //Text = "鏇存柊"
+ };
+ bottomView.AddChidren(btnSave);
+
+ btnSave.MouseUpEventHandler += (sender2, e2) =>
+ {
+ dialog.Close();
+ try
+ {
+
+#if __IOS__
+ HDLUtils.OpenUrl(mForceUpdateInfo.IosUrl);
+ //UIApplication.SharedApplication.OpenUrl (new Foundation.NSUrl ("https://apps.apple.com/cn/app/hdl-on/id1029839624"));
+
+#elif Android
+ HDLUtils.OpenUrl(mAndroidUrl);
+ SharedMethod.SharedMethod.OpenUrl (mAndroidUrl);
+ //SharedMethod.SharedMethod.OpenUrl ("https://shouji.baidu.com/software/26667787.html");
+
+#endif
+ }
+ catch
+ {
+ //璺宠浆涓嬭浇鍦板潃澶辫触
+ Utlis.WriteLine("open url error");
+ }
};
- //1鎻愮ず鏇存柊
- var dialog = new UpdateTipDialog();
- var tipStr = Language.StringByID(StringId.VersionNumber) + mForceUpdateInfo.NewVersion;
- dialog.ShowUpdateDialog(Language.StringByID(StringId.DiscoverNewVersion), tipStr, mForceUpdateInfo.ReasonStr, okAction, cancelAction);
+ #endregion
}
- else if (mForceUpdateInfo.UpdateType == 2) //2.2 闇�瑕佸己鍒舵洿鏂�
+ else if (mForceUpdateInfo.UpdateType == 2)
{
- //2寮哄埗鏇存柊
- //"1.鍙戠幇鏂扮増鏈珹pp,褰撳墠鐗堟湰宸插仠鐢�,椹笂鏇存柊!\n2.璇蜂笅杞藉拰瀹夎鏂扮増鏈�!....."
- Action okAction = () =>
+ #region 寮哄埗鏇存柊
+ Button btnSave = new Button()
{
- if (string.IsNullOrEmpty(mForceUpdateInfo.NewVersionUrl)) {
- Utlis.ShowTip(Language.StringByID(StringId.DataExceptionPleaseTryAgain));
- return;
- };
+ Width = Application.GetRealWidth(500),
+ TextID = StringId.Confirm,
+ TextAlignment = TextAlignment.Center,
+ TextColor = 0xFFFFFFFF,
+ BackgroundColor = 0xFF000000,
+ };
+ bottomView.AddChidren(btnSave);
- HDLUtils.OpenUrl(mForceUpdateInfo.NewVersionUrl);
- };
-
- //1鎻愮ず鏇存柊
- var dialog = new UpdateTipDialog();
- var tipStr = Language.StringByID(StringId.VersionNumber) + mForceUpdateInfo.NewVersion;
- dialog.ShowForcedUpdateDialog(Language.StringByID(StringId.DiscoverNewVersion), tipStr, mForceUpdateInfo.ReasonStr, okAction);
- }
- else //3. 鍙渶鎻愮ず
- {
- //3鎻愮ず閫氱煡
- Action okAction = () =>
+ //var mAndroidUrl = mForceUpdateInfo.AndroidUrl;
+ //if (Language.CurrentLanguage == "Chinese") {
+ // btnMessage.Text = mForceUpdateInfo.ReasonStr;
+
+ //} else {
+ // btnMessage.Text = mForceUpdateInfo.ReasonStr_En;
+ // mAndroidUrl = mForceUpdateInfo.AndroidUrl_En;
+ //}
+
+ btnSave.MouseUpEventHandler += (sender2, e2) =>
{
-
+ try
+ {
+
+#if __IOS__
+ HDLUtils.OpenUrl(mForceUpdateInfo.IosUrl);
+ //UIApplication.SharedApplication.OpenUrl (new Foundation.NSUrl ("https://apps.apple.com/cn/app/hdl-on/id1029839624"));
+
+#elif Android
+ HDLUtils.OpenUrl(mAndroidUrl);
+ //SharedMethod.SharedMethod.OpenUrl ("https://shouji.baidu.com/software/26667787.html");
+
+#endif
+ }
+ catch
+ {
+ //璺宠浆涓嬭浇鍦板潃澶辫触
+ Utlis.WriteLine("open url error");
+ }
};
- var dialog = new UpdateTipDialog();
- dialog.ShowTipDialog(Language.StringByID(StringId.Tip), mForceUpdateInfo.ReasonStr, okAction);
+ #endregion
}
+ else
+ {
+ #region 鎻愮ず閫氱煡
+ Button btnSave = new Button()
+ {
+ Width = Application.GetRealWidth(500),
+ TextID = StringId.Close,
+ TextAlignment = TextAlignment.Center,
+ TextColor = 0xFFFFFFFF,
+ BackgroundColor = 0xFF000000,
+ };
+ bottomView.AddChidren(btnSave);
+
+ btnSave.MouseUpEventHandler += (sender2, e2) =>
+ {
+ dialog.Close();
+ };
+ #endregion
+ }
+ dialog.Show();
+
}
-
#endregion
}
}
--
Gitblit v1.8.0