From efad979b6fae76fb37a4de7e94e6bac0a85cb72c Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期二, 30 十一月 2021 13:14:28 +0800
Subject: [PATCH] 2021-11-30 1.修复乐橙Android，没调用拒接接口问题。
---
HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditPage.cs | 164 ++++++++++++++++++++++++++++++------------------------
1 files changed, 92 insertions(+), 72 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditPage.cs
index 5dcb436..51e8ba0 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditPage.cs
@@ -5,6 +5,12 @@
namespace HDL_ON.UI
{
+
+ /*
+ 鏃堕棿锛�20200915
+ 鍒犻櫎鍒嗕韩鎿嶄綔锛屽垎浜搷浣滃彧鍦ㄦ垚鍛樼鐞嗙晫闈㈠疄鐜�
+ */
+
public partial class RoomEditPage : FrameLayout
{
#region 鎺т欢鍒楄〃
@@ -60,22 +66,22 @@
/// 鎴块棿妤煎眰淇敼璺宠浆鎸夐挳
/// </summary>
Button btnFloorRight;
- /// <summary>
- /// 鍒嗕韩row
- /// </summary>
- FrameLayout sharedView;
- /// <summary>
- /// 鍒嗕韩鏍囬
- /// </summary>
- Button btnSharedTitle;
- /// <summary>
- /// 鍒嗕韩鐨勪俊鎭�
- /// </summary>
- Button btnSharedInfo;
- /// <summary>
- /// 鍒嗕韩淇℃伅璺宠浆鎸夐挳
- /// </summary>
- Button btnSharedRight;
+ ///// <summary>
+ ///// 鍒嗕韩row
+ ///// </summary>
+ //FrameLayout sharedView;
+ ///// <summary>
+ ///// 鍒嗕韩鏍囬
+ ///// </summary>
+ //Button btnSharedTitle;
+ ///// <summary>
+ ///// 鍒嗕韩鐨勪俊鎭�
+ ///// </summary>
+ //Button btnSharedInfo;
+ ///// <summary>
+ ///// 鍒嗕韩淇℃伅璺宠浆鎸夐挳
+ ///// </summary>
+ //Button btnSharedRight;
/// <summary>
/// 鍔熻兘绠＄悊鍖哄煙
/// </summary>
@@ -125,34 +131,44 @@
#endregion
Room room;
- int pageTitleId;
int rowCount = 1;
Action backAction;
- public RoomEditPage(Room r, int tId,Action action)
+ /// <summary>
+ /// 鍒犻櫎鎴块棿浜嬩欢
+ /// 2020-12-02 瑙ｅ喅鍒犻櫎鎴块棿鍚庯紝鐣岄潰涓嶅埛鏂板垹闄ゆ埧闂撮棶棰�
+ /// </summary>
+ Action deleteAction;
+ /// <summary>
+ /// 鍥剧墖淇敼浜嬩欢
+ /// </summary>
+ Action modifyImageAction;
+
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="r"></param>
+ /// <param name="action"></param>
+ /// <param name="delAction">鎴块棿鍒犻櫎浜嬩欢</param>
+ /// <param name="modifyImageAction">鎴块棿鑳屾櫙鍥句慨鏀逛簨浠跺洖璋�</param>
+ public RoomEditPage(Room r, Action action, Action delAction, Action modifyImageAction)
{
bodyView = this;
room = r;
- pageTitleId = tId;
backAction = action;
+ this.deleteAction = delAction;
+ this.modifyImageAction = modifyImageAction;
}
public void LoadPage()
{
bodyView.BackgroundColor = CSS_Color.BackgroundColor;
- if (pageTitleId == StringId.AddRoom)
- {
- new TopViewDiv(bodyView, Language.StringByID(pageTitleId)).LoadTopView();
- }
- else
- {
- new TopViewDiv(bodyView, Language.StringByID(pageTitleId)).LoadTopView(backAction);
- }
+ new TopViewDiv(bodyView, Language.StringByID(StringId.EditRoomInfo)).LoadTopView(backAction);
roomBgView = new FrameLayout()
{
Y = Application.GetRealHeight(64),
- Height = Application.GetRealHeight(224),
+ Height = Application.GetRealWidth(232),
BackgroundColor = CSS_Color.MainBackgroundColor,
};
bodyView.AddChidren(roomBgView);
@@ -162,13 +178,16 @@
Gravity = Gravity.CenterHorizontal,
Y = Application.GetRealWidth(20),
Width = Application.GetRealWidth(343),
- Height = Application.GetRealHeight(184),
+ Height = Application.GetRealWidth(192),//2020-12-01 鎴块棿鍥剧墖姣斾緥鏀瑰洖16:9
//UnSelectedImagePath = room.backgroundImage,
- ImagePath = room.backgroundImage,
+ //ImagePath = room.backgroundImage,
Radius = (uint)Application.GetRealWidth(12),
//Radius = (uint)Application.GetRealWidth(6),
};
roomBgView.AddChidren(btnRoomBg);
+
+ //2020-12-03 淇敼鍥剧墖鍔犺浇鏂规硶
+ ImageUtlis.Current.LoadLocalOrNetworkImages(room.backgroundImage, btnRoomBg);
//鎴块棿淇℃伅缂栬緫鍖哄煙
roomInfoView = new VerticalScrolViewLayout()
@@ -219,7 +238,7 @@
TextAlignment = TextAlignment.CenterRight,
TextColor = CSS_Color.PromptingColor1,
TextSize = CSS_FontSize.TextFontSize,
- Text = room.name
+ Text = room.roomName
};
roomNameRow.AddChidren(btnRoomName);
@@ -273,44 +292,45 @@
roomInfoView.AddChidren(new Button() { X = Application.GetRealWidth(16), Height = Application.GetRealHeight(1), Width = Application.GetRealWidth(343), BackgroundColor = CSS_Color.DividingLineColor });
#endregion
#region 鍒嗕韩
- if (pageTitleId != StringId.AddRoom)
- {
- sharedView = new FrameLayout()
- {
- Height = Application.GetRealHeight(50),
- };
- roomInfoView.AddChidren(sharedView);
- rowCount++;
- btnSharedTitle = new Button()
- {
- X = Application.GetRealWidth(16),
- Width = Application.GetRealWidth(120),
- TextAlignment = TextAlignment.CenterLeft,
- TextColor = CSS_Color.FirstLevelTitleColor,
- TextSize = CSS_FontSize.SubheadingFontSize,
- TextID = StringId.Shared,
- };
- sharedView.AddChidren(btnSharedTitle);
- btnSharedInfo = new Button()
- {
- X = Application.GetRealWidth(100),
- Width = Application.GetRealWidth(230),
- TextAlignment = TextAlignment.CenterRight,
- TextColor = CSS_Color.PromptingColor1,
- TextSize = CSS_FontSize.TextFontSize,
- };
- sharedView.AddChidren(btnSharedInfo);
- btnSharedRight = new Button()
- {
- X = Application.GetRealWidth(339),
- Gravity = Gravity.CenterVertical,
- Width = Application.GetMinRealAverage(16),
- Height = Application.GetMinRealAverage(16),
- UnSelectedImagePath = "Public/Right.png",
- };
- sharedView.AddChidren(btnSharedRight);
- roomInfoView.AddChidren(new Button() { X = Application.GetRealWidth(16), Height = Application.GetRealHeight(1), Width = Application.GetRealWidth(343), BackgroundColor = CSS_Color.DividingLineColor });
- }
+ //if (pageTitleId != StringId.AddRoom)
+ //{
+ // sharedView = new FrameLayout()
+ // {
+ // Height = Application.GetRealHeight(50),
+ // };
+ // roomInfoView.AddChidren(sharedView);
+ // rowCount++;
+ // btnSharedTitle = new Button()
+ // {
+ // X = Application.GetRealWidth(16),
+ // Width = Application.GetRealWidth(120),
+ // TextAlignment = TextAlignment.CenterLeft,
+ // TextColor = CSS_Color.FirstLevelTitleColor,
+ // TextSize = CSS_FontSize.SubheadingFontSize,
+ // TextID = StringId.Shared,
+ // };
+ // sharedView.AddChidren(btnSharedTitle);
+ // btnSharedInfo = new Button()
+ // {
+ // X = Application.GetRealWidth(100),
+ // Width = Application.GetRealWidth(230),
+ // TextAlignment = TextAlignment.CenterRight,
+ // TextColor = CSS_Color.PromptingColor1,
+ // TextSize = CSS_FontSize.TextFontSize,
+ // };
+ // sharedView.AddChidren(btnSharedInfo);
+ // btnSharedRight = new Button()
+ // {
+ // X = Application.GetRealWidth(339),
+ // Gravity = Gravity.CenterVertical,
+ // Width = Application.GetMinRealAverage(16),
+ // Height = Application.GetMinRealAverage(16),
+ // UnSelectedImagePath = "Public/Right.png",
+ // };
+ // sharedView.AddChidren(btnSharedRight);
+ // roomInfoView.AddChidren(new Button() { X = Application.GetRealWidth(16), Height = Application.GetRealHeight(1), Width = Application.GetRealWidth(343), BackgroundColor = CSS_Color.DividingLineColor });
+ //}
+
#endregion
#region 鍔熻兘绠＄悊
functionManagemantView = new FrameLayout()
@@ -322,7 +342,7 @@
btnFunctionManagementTitle = new Button()
{
X = Application.GetRealWidth(16),
- Width = Application.GetRealWidth(120),
+ Width = Application.GetRealWidth(220),
TextAlignment = TextAlignment.CenterLeft,
TextColor = CSS_Color.FirstLevelTitleColor,
TextSize = CSS_FontSize.SubheadingFontSize,
@@ -348,8 +368,8 @@
Height = Application.GetRealHeight(50),
BackgroundColor = CSS_Color.MainBackgroundColor,
TextAlignment = TextAlignment.Center,
- TextColor = this.pageTitleId == StringId.AddRoom ? CSS_Color.MainColor : CSS_Color.WarningColor,
- TextID = this.pageTitleId == StringId.AddRoom ? StringId.Save : StringId.DeleteRoom,
+ TextColor = CSS_Color.WarningColor,
+ TextID = StringId.DeleteRoom,
TextSize = CSS_FontSize.SubheadingFontSize,
};
bodyView.AddChidren(btnOption);
--
Gitblit v1.8.0