From 9dd7baecbb3b2d053e45f4ea297857894f582874 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 27 八月 2021 18:56:08 +0800
Subject: [PATCH] 2021-08-27 1.推送消息改为分页查询，增加物业通知按钮（未完善先屏蔽）。 2.修改人脸录入接口
---
HDL_ON/DAL/Server/NewAPI.cs | 10 ++-
HDL_ON/Common/Constant.cs | 12 ++++
HDL_ON/DAL/Server/NewApiRes.cs | 8 ++
HDL_ON/DAL/Server/HttpServerRequest.cs | 12 +++-
.vs/HDL_APP_Project/xs/UserPrefs.xml | 25 +++++---
HDL_ON/UI/UI2/1-HomePage/MessageCenterPage.cs | 54 ++++++++++++++++-
6 files changed, 101 insertions(+), 20 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index 1fe65aa..cf028d2 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,28 +1,35 @@
-锘�<Properties StartupConfiguration="{09712674-2A38-407B-B1E2-560B2C352F9A}|Default">
+锘�<Properties StartupConfiguration="{D998E133-F0DD-4760-BE3C-461632F54DA4}|Default">
<MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008030-00014C392121802E" />
- <MonoDevelop.Ide.Workbench>
+ <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/4-PersonalCenter/FaceManagement/FacePassagePage.cs">
<Files>
- <File FileName="HDL-ON_Android/Properties/AndroidManifest.xml" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/FaceManagement/FacePassagePage.cs" Line="470" Column="29" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/FaceManagement/FaceSettingResultPage.cs" Line="30" Column="62" />
+ <File FileName="HDL_ON/UI/UI2/1-HomePage/MessageCenterPage.cs" Line="202" Column="58" />
+ <File FileName="HDL_ON/DAL/Server/HttpServerRequest.cs" Line="2648" Column="43" />
+ <File FileName="HDL_ON/DAL/Server/NewApiRes.cs" Line="1077" Column="18" />
+ <File FileName="HDL_ON/DAL/Server/NewAPI.cs" Line="673" Column="51" />
+ <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/FaceManagement/FacePassagePage.cs" Line="522" Column="60" />
</Files>
<Pads>
<Pad Id="ProjectPad">
<State name="__root__">
<Node name="HDL_APP_Project" expanded="True">
<Node name="HDL_ON" expanded="True">
+ <Node name="Common" expanded="True" />
+ <Node name="DAL" expanded="True">
+ <Node name="Server" expanded="True" />
+ </Node>
<Node name="UI" expanded="True">
<Node name="UI2" expanded="True">
+ <Node name="1-HomePage" expanded="True" />
<Node name="4-PersonalCenter" expanded="True">
- <Node name="FaceManagement" expanded="True" />
+ <Node name="FaceManagement" expanded="True">
+ <Node name="FacePassagePage.cs" selected="True" />
+ </Node>
</Node>
</Node>
</Node>
</Node>
<Node name="HDL-ON_Android" expanded="True">
- <Node name="References" expanded="True">
- <Node name="Shared.Droid.HDLWidget" selected="True" />
- </Node>
+ <Node name="References" expanded="True" />
<Node name="Other" expanded="True" />
<Node name="Properties" expanded="True" />
<Node name="Resources" expanded="True">
diff --git a/HDL_ON/Common/Constant.cs b/HDL_ON/Common/Constant.cs
index a5c0598..06fb199 100644
--- a/HDL_ON/Common/Constant.cs
+++ b/HDL_ON/Common/Constant.cs
@@ -233,6 +233,18 @@
/// 绯荤粺淇℃伅
/// </summary>
Prompt,
+ /// <summary>
+ /// 鏂伴椈
+ /// </summary>
+ News,
+ /// <summary>
+ /// 鎺ㄨ崘
+ /// </summary>
+ Recommend,
+ /// <summary>
+ /// 鐗╀笟閫氱煡锛屽緟纭淇敼
+ /// </summary>
+ Property,
}
/// <summary>
diff --git a/HDL_ON/DAL/Server/HttpServerRequest.cs b/HDL_ON/DAL/Server/HttpServerRequest.cs
index e292c2a..a9e1eef 100644
--- a/HDL_ON/DAL/Server/HttpServerRequest.cs
+++ b/HDL_ON/DAL/Server/HttpServerRequest.cs
@@ -1041,7 +1041,7 @@
/// <summary>
/// 鏌ヨ鎺ㄩ�佷俊鎭垪琛�
/// </summary>
- /// <param name="queryType">0鍏ㄩ儴 1鍒嗕韩涓庡姛鑳� 2鎶ヨ绫� 3绯荤粺淇℃伅</param>
+ /// <param name="queryType">0鍏ㄩ儴 1鍒嗕韩涓庡姛鑳� 2鎶ヨ绫� 3绯荤粺淇℃伅 4鐗╀笟閫氱煡</param>
/// <returns></returns>
public ResponsePackNew PushSerivceGetPushmessagelist(int queryType = 0)
{
@@ -1059,14 +1059,19 @@
{
pushType = PushType.Prompt.ToString();
}
-
+ else if (queryType == 4)
+ {
+ pushType = PushType.Property.ToString();
+ }
var requestJson = HttpUtil.GetSignRequestJson(new GetMessageListObj()
{
pushId = OnAppConfig.Instance.PushId,
pushType = pushType,
homeId = DB_ResidenceData.Instance.CurrentRegion.id,
});
- return HttpUtil.RequestHttpsPost(NewAPI.API_POST_PushSerivce_Getpushmessagelist, requestJson);
+ //鏀逛负鍒嗛〉鏌ヨ
+ return HttpUtil.RequestHttpsPost(NewAPI.API_POST_PushSerivce_Getpushmessagelist_Paging, requestJson);
+
}
/// <summary>
@@ -2644,6 +2649,7 @@
{
Dictionary<string, object> d = new Dictionary<string, object>();
d.Add("userFace", @"data:image/jpg;base64,"+imageBytes);
+ d.Add("houseId", DB_ResidenceData.Instance.CurrentRegion.id);
//MainPage.Log(imageBytes);
diff --git a/HDL_ON/DAL/Server/NewAPI.cs b/HDL_ON/DAL/Server/NewAPI.cs
index 8da4766..ddf6265 100644
--- a/HDL_ON/DAL/Server/NewAPI.cs
+++ b/HDL_ON/DAL/Server/NewAPI.cs
@@ -284,10 +284,14 @@
/// 鍒犻櫎鎺ㄩ�乀oken
/// </summary>
public const string API_POST_PushSerivce_DeleteToken = "/smart-footstone/app/push-information/delete";
+ ///// <summary>
+ /////// 鑾峰彇鎺ㄩ�佹秷鎭褰�
+ /////// </summary>
+ //public const string API_POST_PushSerivce_Getpushmessagelist = "/smart-footstone/app/message/list";
/// <summary>
- /// 鑾峰彇鎺ㄩ�佹秷鎭褰�
+ /// 鑾峰彇鎺ㄩ�佹秷鎭褰� 鍒嗛〉
/// </summary>
- public const string API_POST_PushSerivce_Getpushmessagelist = "/smart-footstone/app/message/list";
+ public const string API_POST_PushSerivce_Getpushmessagelist_Paging = "/smart-footstone/app/message/list";
/// <summary>
/// 娓呯┖鎺ㄩ�佺殑娑堟伅璁板綍
/// </summary>
@@ -666,7 +670,7 @@
/// <summary>
/// 浜鸿劯褰曞叆
/// </summary>
- public const string Api_Post_InputUserFace = "/community-wisdom/app/doorDevice/inputUserFace";
+ public const string Api_Post_InputUserFace = "/community-wisdom/app/doorDevice/inputUserFaceHouse";
/// <summary>
/// 寮�鍏充汉鑴稿姛鑳�
/// </summary>
diff --git a/HDL_ON/DAL/Server/NewApiRes.cs b/HDL_ON/DAL/Server/NewApiRes.cs
index 4d5cf58..766a70d 100644
--- a/HDL_ON/DAL/Server/NewApiRes.cs
+++ b/HDL_ON/DAL/Server/NewApiRes.cs
@@ -1085,6 +1085,14 @@
/// ""锛氬叏閮紱Default锛氬垎浜笌鍔熻兘锛汚larm锛氭姤璀︾被锛汸rompt锛氱郴缁熸秷鎭�
/// </summary>
public string pushType;
+ /// <summary>
+ /// 椤甸潰澶у皬
+ /// </summary>
+ public int pageSize = 100;
+ /// <summary>
+ /// 椤甸潰搴忓彿
+ /// </summary>
+ public int pageNo = 1;
}
/// <summary>
diff --git a/HDL_ON/UI/UI2/1-HomePage/MessageCenterPage.cs b/HDL_ON/UI/UI2/1-HomePage/MessageCenterPage.cs
index f00ffbe..96c0947 100644
--- a/HDL_ON/UI/UI2/1-HomePage/MessageCenterPage.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/MessageCenterPage.cs
@@ -27,16 +27,17 @@
/// <summary>
/// menuView
/// </summary>
- FrameLayout menuView;
+ HorizontalScrolViewLayout menuView;//2021-08-27 澧炲姞澶氫簡涓�涓彍鍗曟寜閽墍浠ユ敼涓烘粴鍔ㄦ帶浠�
MenuButton allMenuButton;
MenuButton shareMenuButton;
MenuButton alarmMenuButton;
MenuButton systemMenuButton;
+ MenuButton propertyMenuButton;//澧炲姞鐗╀笟閫氱煡鎸夐挳
FrameLayout messageView;
/// <summary>
/// 鏄剧ず鐨勬秷鎭被鍨�
- /// 0鍏ㄩ儴 1鍒嗕韩涓庡姛鑳� 2鎶ヨ绫� 3绯荤粺淇℃伅
+ /// 0鍏ㄩ儴 1鍒嗕韩涓庡姛鑳� 2鎶ヨ绫� 3绯荤粺淇℃伅 4鐗╀笟鍏憡
/// </summary>
int showMesType = 0;
/// <summary>
@@ -89,7 +90,7 @@
void AddTopMenuView()
{
- menuView = new FrameLayout()
+ menuView = new HorizontalScrolViewLayout()
{
Y = Application.GetRealHeight(64),
Height = Application.GetRealWidth(117),
@@ -97,6 +98,12 @@
};
bodyView.AddChidren(menuView);
+ //宸adding View
+ menuView.AddChidren(new Button()
+ {
+ Width = Application.GetRealWidth(15),
+ BackgroundColor = CSS_Color.viewTranslucence
+ });
#region 鍏ㄩ儴鎸夐挳
allMenuButton = new MenuButton()
@@ -184,7 +191,31 @@
MenuButtonSelect(3);
};
systemMenuButton.SelectAction = systemAction;
-#endregion
+ #endregion
+
+ #region 鐗╀笟閫氱煡
+ propertyMenuButton = new MenuButton()
+ {
+ X = systemMenuButton.Right,
+ Y = Application.GetRealWidth(16),
+ };
+ //menuView.AddChidren(propertyMenuButton); //鍏堝睆钄�
+ propertyMenuButton.ImageButton.SelectedImagePath = "Collection/MesCenter/SystemOn.png";
+ propertyMenuButton.ImageButton.UnSelectedImagePath = "Collection/MesCenter/System.png";
+ propertyMenuButton.TextButton.TextID = StringId.SystemMessage;
+ Action propertyAction = () =>
+ {
+ MenuButtonSelect(4);
+ };
+ propertyMenuButton.SelectAction = propertyAction;
+ #endregion
+
+ //鍏堝睆钄�
+ ////鍙硃addingView
+ //menuView.AddChidren(new Button() {
+ // Width = Application.GetRealWidth(15),
+ // BackgroundColor = CSS_Color.viewTranslucence
+ //});
}
@@ -214,7 +245,7 @@
/// <summary>
///
/// </summary>
- /// <param name="selectId">0鍏ㄩ儴 1鍒嗕韩涓庡姛鑳� 2鎶ヨ绫� 3绯荤粺淇℃伅</param>
+ /// <param name="selectId">0鍏ㄩ儴 1鍒嗕韩涓庡姛鑳� 2鎶ヨ绫� 3绯荤粺淇℃伅 4鐗╀笟閫氱煡</param>
void MenuButtonSelect(int selectId)
{
showMesType = selectId;
@@ -225,6 +256,7 @@
shareMenuButton.IsSelected = true;
alarmMenuButton.IsSelected = true;
systemMenuButton.IsSelected = true;
+ propertyMenuButton.IsSelected = true;
}
else if (selectId == 1)
@@ -233,6 +265,7 @@
shareMenuButton.IsSelected = true;
alarmMenuButton.IsSelected = false;
systemMenuButton.IsSelected = false;
+ propertyMenuButton.IsSelected = false;
}
else if (selectId == 2)
@@ -241,6 +274,7 @@
shareMenuButton.IsSelected = false;
alarmMenuButton.IsSelected = true;
systemMenuButton.IsSelected = false;
+ propertyMenuButton.IsSelected = false;
}
else if (selectId == 3)
{
@@ -248,6 +282,16 @@
shareMenuButton.IsSelected = false;
alarmMenuButton.IsSelected = false;
systemMenuButton.IsSelected = true;
+ propertyMenuButton.IsSelected = false;
+
+ }
+ else if (selectId == 4)
+ {
+ allMenuButton.IsSelected = false;
+ shareMenuButton.IsSelected = false;
+ alarmMenuButton.IsSelected = false;
+ systemMenuButton.IsSelected = false;
+ propertyMenuButton.IsSelected = true;
}
--
Gitblit v1.8.0