From 064501c0cbf8643cfb2bdb2c295055189cf3287f Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 21 十二月 2020 19:42:53 +0800
Subject: [PATCH] Merge branch 'CJL' into NewFilePath
---
HDL_ON/UI/UI2/3-Intelligence/Scene/SceneAddPage.cs | 1
HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs | 1
HDL_ON/UI/UI2/2-Classification/RoomPage.cs | 14 ++
HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs | 9 +
HDL_ON/UI/UI0-Public/Widget/WebViewDialog.cs | 8 +
HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/AddRoom/AddRoomPage.cs | 1
HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditPage.cs | 11 +
HDL_ON/UI/UI2/2-Classification/RoomPageBLL.cs | 2
HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/ComplaintsPage.cs | 42 +++---
HDL_ON/DAL/Server/NewAPI.cs | 6 +
HDL_ON/DAL/Server/NewApiRes.cs | 12 ++
HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomsManagementPageBLL.cs | 6
HDL_ON/DAL/Server/HttpUtil.cs | 1
HDL_ON/UI/UI0-Public/OperationSuccessPromptPage.cs | 2
HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/FunctionIntroductionPage.cs | 196 +++++++++++++++++++++++++------
HDL_ON/UI/UI2/4-PersonalCenter/MyQRCodePage.cs | 2
HDL_ON/UI/UI2/4-PersonalCenter/GetSupport/GetSupportPage.cs | 2
HDL_ON/UI/MainPage.cs | 2
HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditPageBLL.cs | 3
HDL_ON/UI/UI0-Public/Widget/UpdateTipDialog.cs | 12 +
HDL_ON/UI/UI2/1-HomePage/MessageCenterPage.cs | 10 +
21 files changed, 262 insertions(+), 81 deletions(-)
diff --git a/HDL_ON/DAL/Server/HttpUtil.cs b/HDL_ON/DAL/Server/HttpUtil.cs
index 50e7713..d6422ae 100644
--- a/HDL_ON/DAL/Server/HttpUtil.cs
+++ b/HDL_ON/DAL/Server/HttpUtil.cs
@@ -39,6 +39,7 @@
#region **********缃戠粶璇锋眰灏佽**********
/// <summary>
/// 鍥哄畾鍩熷悕,姝ｅ紡鐜
+ /// 鍏叡鍩熷悕灏辫繎瑙ｆ瀽
/// </summary>
//public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";
public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";
diff --git a/HDL_ON/DAL/Server/NewAPI.cs b/HDL_ON/DAL/Server/NewAPI.cs
old mode 100755
new mode 100644
index 748694e..efdd854
--- a/HDL_ON/DAL/Server/NewAPI.cs
+++ b/HDL_ON/DAL/Server/NewAPI.cs
@@ -75,6 +75,10 @@
public const string API_POST_Member_UnbindWithAccount = "/smart-footstone/member/memberInfo/unbindWithAccount";
#endregion
+ /// <summary>
+ /// 鏌ヨ鍔熻兘浠嬬粛鍒楄〃
+ /// </summary>
+ public const string API_POST_FunctionIntroductionList = "/home-wisdom/app/functionIntroduction/list";
#endregion
#region 鈻� HomeCluster -- 浣忓畢绠＄悊鎺ュ彛___________________________
@@ -294,6 +298,8 @@
//public const string API_POST_GetAppVersion = "/smart-footstone/app/getAppVersion";
#endregion
+
+
#region 鈻� -- 鎴块棿鍦烘櫙鑳屾櫙鍥剧墖涓婁紶涓嬭浇鎺ュ彛___________________________
/// <summary>
/// 涓婁紶鍥剧墖
diff --git a/HDL_ON/DAL/Server/NewApiRes.cs b/HDL_ON/DAL/Server/NewApiRes.cs
index e145110..6792f46 100644
--- a/HDL_ON/DAL/Server/NewApiRes.cs
+++ b/HDL_ON/DAL/Server/NewApiRes.cs
@@ -1123,6 +1123,18 @@
public string Id;
}
+ /// <summary>
+ /// AppNameObj
+ /// </summary>
+ [System.Serializable]
+ public class AppNameObj
+ {
+ /// <summary>
+ /// 杞欢鏉ユ簮锛孍voyo銆丱N銆丱N_Plus
+ /// </summary>
+ public string appName = SoftwareType.ON_Plus.ToString();
+ }
+
#region APP鐗堟湰妫�娴�
/// <summary>
/// AppVersionCheckObj
diff --git a/HDL_ON/UI/MainPage.cs b/HDL_ON/UI/MainPage.cs
index a5240ca..a9a1860 100644
--- a/HDL_ON/UI/MainPage.cs
+++ b/HDL_ON/UI/MainPage.cs
@@ -26,7 +26,7 @@
/// <summary>
/// 鐗堟湰鍙�
/// </summary>
- public static string VersionString = "1.0.0924";
+ public static string VersionString = "1.0.0124";
///// <summary>
///// 瀹㈡埛绔被鍨�
///// </summary>
diff --git a/HDL_ON/UI/UI0-Public/OperationSuccessPromptPage.cs b/HDL_ON/UI/UI0-Public/OperationSuccessPromptPage.cs
old mode 100755
new mode 100644
index 7c0c2de..f9d4f33
--- a/HDL_ON/UI/UI0-Public/OperationSuccessPromptPage.cs
+++ b/HDL_ON/UI/UI0-Public/OperationSuccessPromptPage.cs
@@ -103,7 +103,7 @@
X = btnCheckIcon.Right,
Y = Application.GetRealHeight(350),
Width = Application.GetRealWidth(220),
- Height = Application.GetRealHeight(32),
+ Height = Application.GetRealWidth(32),
TextAlignment = TextAlignment.CenterLeft,
Text = msg,
TextColor = CSS_Color.FirstLevelTitleColor,
diff --git a/HDL_ON/UI/UI0-Public/Widget/UpdateTipDialog.cs b/HDL_ON/UI/UI0-Public/Widget/UpdateTipDialog.cs
old mode 100755
new mode 100644
index 21d8ff3..5689c26
--- a/HDL_ON/UI/UI0-Public/Widget/UpdateTipDialog.cs
+++ b/HDL_ON/UI/UI0-Public/Widget/UpdateTipDialog.cs
@@ -79,7 +79,7 @@
TextButton btnMes = new TextButton()
{
- Gravity = Gravity.CenterHorizontal,
+ //Gravity = Gravity.CenterHorizontal,
Width = mesView.Width,
//Height = mesView.Height,
Height = Application.GetRealWidth(20),
@@ -93,8 +93,14 @@
mesView.AddChidren(btnMes);
//鍔ㄦ�佽绠楅珮搴�
var needHeight = btnMes.GetMoreLineNeedHeight();
+ if(needHeight < mesView.Height)
+ {
+ needHeight = mesView.Height;
+ }
btnMes.IsMoreLines = true;
btnMes.Height = needHeight;
+ //mesView.AddChidren(btnMes);
+
Button btnLine = new Button()
{
@@ -125,7 +131,7 @@
X = contentView.Width - Width144,
Y = btnLine.Y,
Width = Width144,
- Height = Application.GetRealHeight(44),
+ Height = Application.GetRealHeight(45),
TextAlignment = TextAlignment.Center,
TextSize = CSS_FontSize.SubheadingFontSize,
TextColor = CSS_Color.MainBackgroundColor,
@@ -155,7 +161,7 @@
{
Y = btnLine.Y,
Width = contentView.Width,
- Height = Application.GetRealHeight(44),
+ Height = Application.GetRealHeight(45),
TextAlignment = TextAlignment.Center,
TextSize = CSS_FontSize.SubheadingFontSize,
TextColor = CSS_Color.MainBackgroundColor,
diff --git a/HDL_ON/UI/UI0-Public/Widget/WebViewDialog.cs b/HDL_ON/UI/UI0-Public/Widget/WebViewDialog.cs
old mode 100755
new mode 100644
index 926ef73..c49dcbf
--- a/HDL_ON/UI/UI0-Public/Widget/WebViewDialog.cs
+++ b/HDL_ON/UI/UI0-Public/Widget/WebViewDialog.cs
@@ -43,8 +43,12 @@
};
bodyView.AddChidren(webView);
- //鍔犺浇缃戝潃
- webView.LoadRequest(url);
+ if (!string.IsNullOrEmpty(url))
+ {
+ //鍔犺浇缃戝潃
+ webView.LoadRequest(url);
+ }
+
this.Show();
}
}
diff --git a/HDL_ON/UI/UI2/1-HomePage/MessageCenterPage.cs b/HDL_ON/UI/UI2/1-HomePage/MessageCenterPage.cs
old mode 100755
new mode 100644
index d61b913..b743deb
--- a/HDL_ON/UI/UI2/1-HomePage/MessageCenterPage.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/MessageCenterPage.cs
@@ -464,7 +464,15 @@
void GetPushMessageList(int queryType = 0)
{
bodyScrolView.RemoveAll();
- PushMessageInfoList.Clear();
+ if(PushMessageInfoList == null)
+ {
+ PushMessageInfoList = new List<PushMessageInfo>();
+ }
+ else
+ {
+ PushMessageInfoList.Clear();
+ }
+
YearMark = "";//鏍囪娓呯┖
if (string.IsNullOrEmpty(OnAppConfig.Instance.PushId))
{
diff --git a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
index c6a88dc..27685d0 100644
--- a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
@@ -373,7 +373,14 @@
roomView.RemoveFromParent();
};
- var view = new RoomPage(room, ReloadRoomName, deleteAction);
+ //鎴块棿鑳屾櫙鍥句慨鏀逛簨浠跺洖璋�
+ Action modifyImageAction = () =>
+ {
+ //roomViewbg.ImagePath = room.backgroundImage;
+ ImageUtlis.Current.LoadLocalOrNetworkImages(room.backgroundImage, roomViewbg);
+ };
+
+ var view = new RoomPage(room, ReloadRoomName, deleteAction, modifyImageAction);
MainPage.BasePageView.AddChidren(view);
view.LoadPage();
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
diff --git a/HDL_ON/UI/UI2/2-Classification/RoomPage.cs b/HDL_ON/UI/UI2/2-Classification/RoomPage.cs
old mode 100755
new mode 100644
index df76e35..ae0c8cc
--- a/HDL_ON/UI/UI2/2-Classification/RoomPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/RoomPage.cs
@@ -27,10 +27,21 @@
/// 鍒犻櫎鎴块棿浜嬩欢
/// </summary>
Action deleteAction;
+ /// <summary>
+ /// 鍥剧墖淇敼浜嬩欢
+ /// </summary>
+ Action modifyImageAction;
#endregion
- public RoomPage(Room r, Action rrn, Action delAction)
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="r"></param>
+ /// <param name="rrn">缂栬緫浜嬩欢</param>
+ /// <param name="delAction">鍒犻櫎浜嬩欢鍥炶皟</param>
+ /// <param name="modifyImageAction">鎴块棿鑳屾櫙鍥句慨鏀逛簨浠跺洖璋�</param>
+ public RoomPage(Room r, Action rrn, Action delAction, Action modifyImageAction)
{
bodyView = this;
room = r;
@@ -40,6 +51,7 @@
};
ReloadRoomName = rrn;
deleteAction = delAction;
+ this.modifyImageAction = modifyImageAction;
}
/// <summary>
/// 閲嶈浇鐣岄潰
diff --git a/HDL_ON/UI/UI2/2-Classification/RoomPageBLL.cs b/HDL_ON/UI/UI2/2-Classification/RoomPageBLL.cs
old mode 100755
new mode 100644
index 6686309..3e9cd4e
--- a/HDL_ON/UI/UI2/2-Classification/RoomPageBLL.cs
+++ b/HDL_ON/UI/UI2/2-Classification/RoomPageBLL.cs
@@ -40,7 +40,7 @@
deleteAction?.Invoke();
};
- var skipPage = new RoomEditPage(room, editBackAction, delAction);
+ var skipPage = new RoomEditPage(room, editBackAction, delAction, this.modifyImageAction);
MainPage.BasePageView.AddChidren(skipPage);
skipPage.LoadPage();
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneAddPage.cs b/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneAddPage.cs
index c479b08..3c61ae1 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneAddPage.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneAddPage.cs
@@ -765,6 +765,7 @@
pictureOptionView.Parent.RemoveFromParent();
Action<string> action = (obj) => {
scene.ImagePath = obj;
+ addSceneImageView.ImageBytes = null;//瑙ｅ喅鏈塈mageBytes涓嶅姞杞絀magePath
addSceneImageView.ImagePath = scene.ImagePath;
};
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs b/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs
index 37dae93..6753198 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs
@@ -794,6 +794,7 @@
pictureOptionView.Parent.RemoveFromParent();
Action<string> action = (obj) => {
scene.ImagePath = obj;
+ addSceneImageView.ImageBytes = null;//瑙ｅ喅鏈塈mageBytes涓嶅姞杞絀magePath
addSceneImageView.ImagePath = scene.ImagePath;
scene.EditScene();
};
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/ComplaintsPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/ComplaintsPage.cs
old mode 100755
new mode 100644
index 3ea9a33..a1e1540
--- a/HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/ComplaintsPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/ComplaintsPage.cs
@@ -10,36 +10,32 @@
/// </summary>
public class ComplaintsPage : FrameLayout
{
+ /// <summary>
+ ///
+ /// </summary>
FrameLayout bodyView;
/// <summary>
- /// 褰撳墠
+ ///
/// </summary>
- VerticalScrolViewLayout bodyScrolView;
-
public ComplaintsPage()
{
bodyView = this;
BackgroundColor = CSS_Color.MainBackgroundColor;
}
+ /// <summary>
+ ///
+ /// </summary>
public void LoadPage()
{
new TopViewDiv(bodyView, Language.StringByID(StringId.Complaints)).LoadTopView();
-
- int bodyY = Application.GetRealHeight(64);
- bodyScrolView = new VerticalScrolViewLayout()
- {
- Y = bodyY,
- Height = bodyView.Height - bodyY,
- BackgroundColor = CSS_Color.MainBackgroundColor,
- };
#region 鎶曡瘔鑱旂郴
FrameLayout phoneRow = new FrameLayout()
{
Y = Application.GetRealHeight(64),
- Height = Application.GetRealHeight(50),
+ Height = Application.GetRealWidth(50),
};
bodyView.AddChidren(phoneRow);
@@ -69,10 +65,10 @@
/// </summary>
var btnImage = new Button()
{
- X = Application.GetRealWidth(339),
+ X = Application.GetRealWidth(343),
Gravity = Gravity.CenterVertical,
- Width = Application.GetMinRealAverage(16),
- Height = Application.GetMinRealAverage(16),
+ Width = Application.GetRealWidth(16),
+ Height = Application.GetRealWidth(16),
UnSelectedImagePath = "Public/Right.png",
};
phoneRow.AddChidren(btnImage);
@@ -92,7 +88,7 @@
FrameLayout emailRow = new FrameLayout()
{
Y = phoneRow.Bottom,
- Height = Application.GetRealHeight(54),
+ Height = Application.GetRealWidth(54),
};
bodyView.AddChidren(emailRow);
@@ -110,8 +106,8 @@
Button btnEmailText = new Button()
{
X = btnEmailTitle.Right,
- Y = Application.GetRealHeight(8),
- Height = Application.GetRealHeight(20),
+ Y = Application.GetRealWidth(8),
+ Height = Application.GetRealWidth(20),
Width = Application.GetRealWidth(266),
TextAlignment = TextAlignment.CenterLeft,
TextSize = CSS_FontSize.TextFontSize,
@@ -123,8 +119,8 @@
Button btnEmailTipText = new Button()
{
X = btnEmailTitle.Right,
- Y = btnEmailText.Bottom + Application.GetRealHeight(4),
- Height = Application.GetRealHeight(20),
+ Y = btnEmailText.Bottom + Application.GetRealWidth(4),
+ Height = Application.GetRealWidth(20),
Width = Application.GetRealWidth(266),
TextAlignment = TextAlignment.TopLeft,
TextSize = CSS_FontSize.PromptFontSize_SecondaryLevel,
@@ -137,10 +133,10 @@
/// </summary>
var btnImage2 = new Button()
{
- X = Application.GetRealWidth(339),
+ X = Application.GetRealWidth(343),
Gravity = Gravity.CenterVertical,
- Width = Application.GetMinRealAverage(16),
- Height = Application.GetMinRealAverage(16),
+ Width = Application.GetRealWidth(16),
+ Height = Application.GetRealWidth(16),
UnSelectedImagePath = "Public/Right.png",
};
emailRow.AddChidren(btnImage2);
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/FunctionIntroductionPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/FunctionIntroductionPage.cs
old mode 100755
new mode 100644
index c0eccff..77b4435
--- a/HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/FunctionIntroductionPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/FunctionIntroductionPage.cs
@@ -2,6 +2,8 @@
using Shared;
using HDL_ON.UI.CSS;
using System.Collections.Generic;
+using System.Threading;
+using HDL_ON.DAL.Server;
namespace HDL_ON.UI
{
@@ -22,13 +24,23 @@
/// <summary>
/// 鍐呭涓虹┖鎻愮ずView
/// </summary>
- EmptyTipView emptyTipView;
+ FrameLayout emptyTipView;
+ /// <summary>
+ /// 鍔熻兘浠嬬粛List
+ /// </summary>
+ List<APPFunctionURLInfo> functionURLInfoList = new List<APPFunctionURLInfo>();
+ /// <summary>
+ ///
+ /// </summary>
public FunctionIntroductionPage()
{
bodyView = this;
}
+ /// <summary>
+ ///
+ /// </summary>
public void LoadPage()
{
new TopViewDiv(bodyView, Language.StringByID(StringId.FunctionIntroduced)).LoadTopView();
@@ -42,9 +54,9 @@
};
bodyView.AddChidren(bodyScrolView);
- AddEmptyTipView();
-
- //TestLoad();
+ //AddEmptyTipView();
+ //
+ GetFunctionIntroductionList();
}
/// <summary>
@@ -52,22 +64,29 @@
/// </summary>
void AddEmptyTipView()
{
- emptyTipView = new EmptyTipView()
+ emptyTipView = new FrameLayout()
+ {
+ Height = bodyScrolView.Height,
+ Width = bodyScrolView.Width,
+ };
+ bodyScrolView.AddChidren(emptyTipView);
+
+ var tipView = new EmptyTipView()
{
Gravity = Gravity.Center
};
- bodyView.AddChidren(emptyTipView);
+ emptyTipView.AddChidren(tipView);
}
/// <summary>
- /// 鍔犺浇鍖哄煙閫夋嫨RowView
+ /// 鍔犺浇鍔熻兘浠嬬粛鍒楄〃鏌ヨ
/// </summary>
/// <param name="VerticalScrolViewMiddle"></param>
void AddRowView(VerticalScrolViewLayout VerticalScrolViewMiddle, APPFunctionURLInfo functionInfo)
{
var rowView = new FrameLayout()
{
- Height = Application.GetRealHeight(54),
+ Height = Application.GetRealWidth(54),
};
VerticalScrolViewMiddle.AddChidren(rowView);
@@ -75,9 +94,9 @@
var btnTilte = new Button()
{
X = Application.GetRealWidth(16),
- Y = Application.GetRealHeight(8),
+ Y = Application.GetRealWidth(8),
Width = Application.GetRealWidth(320),
- Height = Application.GetRealHeight(20),
+ Height = Application.GetRealWidth(20),
TextAlignment = TextAlignment.CenterLeft,
TextColor = CSS_Color.FirstLevelTitleColor,
TextSize = CSS_FontSize.TextFontSize,
@@ -89,13 +108,13 @@
var btnSubtitle = new Button()
{
X = Application.GetRealWidth(16),
- Y = btnTilte.Bottom + Application.GetRealHeight(4),
+ Y = btnTilte.Bottom + Application.GetRealWidth(4),
Width = Application.GetRealWidth(320),
- Height = Application.GetRealHeight(14),
+ Height = Application.GetRealWidth(14),
TextAlignment = TextAlignment.CenterLeft,
TextColor = CSS_Color.PromptingColor1,
TextSize = CSS_FontSize.PromptFontSize_SecondaryLevel,
- Text = functionInfo.CreateTime
+ //Text = functionInfo.CreateTime
};
rowView.AddChidren(btnSubtitle);
@@ -104,8 +123,8 @@
{
X = Application.GetRealWidth(343),
Gravity = Gravity.CenterVertical,
- Width = Application.GetMinRealAverage(16),
- Height = Application.GetMinRealAverage(16),
+ Width = Application.GetRealWidth(16),
+ Height = Application.GetRealWidth(16),
UnSelectedImagePath = "Public/Right.png",
};
@@ -122,42 +141,137 @@
btnTilte.MouseUpEventHandler = eventHandler;
btnSubtitle.MouseUpEventHandler = eventHandler;
btnGo.MouseUpEventHandler = eventHandler;
+
+ if (Language.CurrentLanguage == "Chinese")
+ {
+ btnSubtitle.Text = Utlis.UnixToDateTimeWithFormatMS(functionInfo.CreateTime, "MM鏈坉d鏃�");
+ }
+ else
+ {
+ btnSubtitle.Text = Utlis.UnixToDateTimeWithFormatMS(functionInfo.CreateTime, "MM/dd");
+ }
+
}
- #region 娴嬭瘯
- List<APPFunctionURLInfo> list = new List<APPFunctionURLInfo>();
/// <summary>
- ///
+ /// 鍔熻兘浠嬬粛鍒楄〃鏌ヨ
/// </summary>
- void TestLoad()
+ void GetFunctionIntroductionList()
{
- list.Add(new APPFunctionURLInfo()
+ bodyScrolView.RemoveAll();
+ if (functionURLInfoList == null)
{
- Title = "HDL ON PRO 1.0.10 涓昏鏇存柊",
- CreateTime = "11鏈�26",
- Url = Constant.URL_PRIVACYPOLICY,
- });
-
- list.Add(new APPFunctionURLInfo()
+ functionURLInfoList = new List<APPFunctionURLInfo>();
+ }
+ else
{
- Title = "HDL ON PRO 1.0.09 涓昏鏇存柊",
- CreateTime = "10鏈�26",
- Url = Constant.URL_PRIVACYPOLICY,
- });
+ functionURLInfoList.Clear();
+ }
- list.Add(new APPFunctionURLInfo()
+ var waitPage = new Loading();
+ bodyView.AddChidren(waitPage);
+ waitPage.Start(Language.StringByID(StringId.PleaseWait));
+
+ new Thread(() =>
{
- Title = "HDL ON PRO 1.0.08 涓昏鏇存柊",
- CreateTime = "09鏈�26",
- Url = Constant.URL_PRIVACYPOLICY,
- });
+ try
+ {
- foreach (var info in list)
+ Dictionary<string, object> AppName = new Dictionary<string, object>();
+ //ON_Plus 2
+ AppName.Add("appName", 2);
+
+ var requestJson = HttpUtil.GetSignRequestJson(AppName);
+
+ var result = HttpUtil.RequestHttpsPost(NewAPI.API_POST_FunctionIntroductionList, requestJson);
+ if (result.Code == StateCode.SUCCESS)
+ {
+ functionURLInfoList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<APPFunctionURLInfo>>(result.Data.ToString());
+ Application.RunOnMainThread(() =>
+ {
+ if (functionURLInfoList != null && functionURLInfoList.Count > 0)
+ {
+ //鍔犺浇鍒锋柊List
+ LoadAPPFunctionURLInfoView(functionURLInfoList);
+ }
+ else
+ {
+ AddEmptyTipView();
+ }
+ });
+ }
+ else
+ {
+ Application.RunOnMainThread(() =>
+ {
+ AddEmptyTipView();
+ });
+ IMessageCommon.Current.ShowErrorInfoAlter(result.Code);
+ }
+ }
+ catch (Exception ex)
+ {
+ }
+ finally
+ {
+ Application.RunOnMainThread(() =>
+ {
+ if (waitPage != null)
+ {
+ waitPage.RemoveFromParent();
+ waitPage = null;
+ }
+ });
+ }
+ })
+ { IsBackground = true }.Start();
+ }
+
+ /// <summary>
+ /// 鍔犺浇鍔熻兘浠嬬粛CellView
+ /// </summary>
+ void LoadAPPFunctionURLInfoView(List<APPFunctionURLInfo> mList)
+ {
+ foreach (var info in mList)
{
AddRowView(bodyScrolView, info);
}
}
- #endregion
+
+ //#region 娴嬭瘯
+ //List<APPFunctionURLInfo> list = new List<APPFunctionURLInfo>();
+ ///// <summary>
+ /////
+ ///// </summary>
+ //void TestLoad()
+ //{
+ // list.Add(new APPFunctionURLInfo()
+ // {
+ // Title = "HDL ON PRO 1.0.10 涓昏鏇存柊",
+ // CreateTime = "11鏈�26",
+ // Url = Constant.URL_PRIVACYPOLICY,
+ // });
+
+ // list.Add(new APPFunctionURLInfo()
+ // {
+ // Title = "HDL ON PRO 1.0.09 涓昏鏇存柊",
+ // CreateTime = "10鏈�26",
+ // Url = Constant.URL_PRIVACYPOLICY,
+ // });
+
+ // list.Add(new APPFunctionURLInfo()
+ // {
+ // Title = "HDL ON PRO 1.0.08 涓昏鏇存柊",
+ // CreateTime = "09鏈�26",
+ // Url = Constant.URL_PRIVACYPOLICY,
+ // });
+
+ // foreach (var info in list)
+ // {
+ // AddRowView(bodyScrolView, info);
+ // }
+ //}
+ //#endregion
}
@@ -168,15 +282,15 @@
public class APPFunctionURLInfo
{
/// <summary>
- ///
+ /// 鍔熻兘浠嬬粛鏍囬
/// </summary>
public string Title;
/// <summary>
- ///
+ /// 鍔熻兘浠嬬粛鍙戝竷浜嬩欢
/// </summary>
- public string CreateTime;
+ public long CreateTime;
/// <summary>
- ///
+ /// 鍔熻兘浠嬬粛瀵瑰簲鐨凥TML鍦板潃
/// </summary>
public string Url;
}
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/GetSupport/GetSupportPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/GetSupport/GetSupportPage.cs
old mode 100755
new mode 100644
index c7fd8cf..a7065a3
--- a/HDL_ON/UI/UI2/4-PersonalCenter/GetSupport/GetSupportPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/GetSupport/GetSupportPage.cs
@@ -60,7 +60,7 @@
FrameLayout emailRow = new FrameLayout()
{
- Y = Application.GetRealHeight(114),
+ Y = phoneRow.Bottom,
Height = Application.GetRealWidth(50),
};
bodyView.AddChidren(emailRow);
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/MyQRCodePage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/MyQRCodePage.cs
index b9cdfb0..d133c7a 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/MyQRCodePage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/MyQRCodePage.cs
@@ -20,7 +20,7 @@
/// <summary>
///
/// </summary>
- /// <param name="isStartCheckResidenceThread">鏄惁寮�鍚綇瀹呯洃鍚嚎绋�</param>
+ /// <param name="isStartCheckResidenceThread">鏄惁寮�鍚綇瀹呯洃鍚嚎绋嬶紝娌℃湁浣忓畢鐨勬椂鍊欏埆浜烘壂鐮佹坊鍔犱綘涓烘垚鍛樼殑鏃跺�欒皟鐢�</param>
public void LoadPage(bool isStartCheckResidenceThread = false)
{
bodyView.BackgroundColor = CSS_Color.BackgroundColor;
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/AddRoom/AddRoomPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/AddRoom/AddRoomPage.cs
old mode 100755
new mode 100644
index fccf6c8..802a739
--- a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/AddRoom/AddRoomPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/AddRoom/AddRoomPage.cs
@@ -644,6 +644,7 @@
pictureOptionView.Parent.RemoveFromParent();
Action<string> action = (obj) => {
room.backgroundImage = obj;
+ btnRoomBg.ImageBytes = null;//瑙ｅ喅鏈塈mageBytes涓嶅姞杞絀magePath
btnRoomBg.ImagePath = room.backgroundImage;
};
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditPage.cs
old mode 100755
new mode 100644
index a43c157..77b552f
--- a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditPage.cs
@@ -139,20 +139,25 @@
/// 2020-12-02 瑙ｅ喅鍒犻櫎鎴块棿鍚庯紝鐣岄潰涓嶅埛鏂板垹闄ゆ埧闂撮棶棰�
/// </summary>
Action deleteAction;
+ /// <summary>
+ /// 鍥剧墖淇敼浜嬩欢
+ /// </summary>
+ Action modifyImageAction;
/// <summary>
///
/// </summary>
/// <param name="r"></param>
- /// <param name="tId"></param>
/// <param name="action"></param>
- /// <param name="delAction">鍒犻櫎鎴块棿浜嬩欢</param>
- public RoomEditPage(Room r, Action action, Action delAction)
+ /// <param name="delAction">鎴块棿鍒犻櫎浜嬩欢</param>
+ /// <param name="modifyImageAction">鎴块棿鑳屾櫙鍥句慨鏀逛簨浠跺洖璋�</param>
+ public RoomEditPage(Room r, Action action, Action delAction, Action modifyImageAction)
{
bodyView = this;
room = r;
backAction = action;
this.deleteAction = delAction;
+ this.modifyImageAction = modifyImageAction;
}
public void LoadPage()
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditPageBLL.cs b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditPageBLL.cs
old mode 100755
new mode 100644
index 4b4d2fe..dc3836b
--- a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditPageBLL.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditPageBLL.cs
@@ -253,8 +253,10 @@
Action<string> action = (obj) =>
{
room.backgroundImage = obj;
+ btnRoomBg.ImageBytes = null;//瑙ｅ喅鏈塈mageBytes涓嶅姞杞絀magePath
btnRoomBg.ImagePath = room.backgroundImage;
room.SaveRoomData();
+ modifyImageAction?.Invoke();
};
var galleryPage = new RoomGalleryPage(room.backgroundImage, action);
@@ -282,6 +284,7 @@
//2020-12-03 闇�瑕佽鏈�鏂扮殑鍥剧墖璺緞鍚屾鍒颁簯绔�
room.backgroundImage = imageUrl;
room.SaveRoomData();
+ modifyImageAction?.Invoke();
};
//涓婁紶鍥剧墖鍒颁簯绔�
UploadImage(selectImagePath, btnRoomBg, room, uploadSuccessAction);
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomsManagementPageBLL.cs b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomsManagementPageBLL.cs
old mode 100755
new mode 100644
index dec1a64..b7d50e8
--- a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomsManagementPageBLL.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomsManagementPageBLL.cs
@@ -62,7 +62,11 @@
roomRow.RemoveFromParent();
};
- var skipPage = new RoomEditPage(r, editBackAction, deleteAction);
+ Action modifyImageAction = () => {
+ ImageUtlis.Current.LoadLocalOrNetworkImages(r.backgroundImage, btnBg);
+ };
+
+ var skipPage = new RoomEditPage(r, editBackAction, deleteAction, modifyImageAction);
MainPage.BasePageView.AddChidren(skipPage);
skipPage.LoadPage();
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
--
Gitblit v1.8.0