| .vs/HDL_APP_Project/xs/UserPrefs.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/Common/Constant.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/DAL/Server/HttpServerRequest.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/DAL/Server/NewAPI.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/DAL/Server/NewApiRes.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/UI2/1-HomePage/MessageCenterPage.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
.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"> HDL_ON/Common/Constant.cs
@@ -233,6 +233,18 @@ /// 系统信息 /// </summary> Prompt, /// <summary> /// 新闻 /// </summary> News, /// <summary> /// 推荐 /// </summary> Recommend, /// <summary> /// 物业通知，待确认修改 /// </summary> Property, } /// <summary> 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);
@@ -284,10 +284,14 @@ /// 删除推送Token /// </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> HDL_ON/DAL/Server/NewApiRes.cs
@@ -1085,6 +1085,14 @@ /// ""：全部；Default：分享与功能；Alarm：报警类；Prompt：系统消息 /// </summary> public string pushType; /// <summary> /// 页面大小 /// </summary> public int pageSize = 100; /// <summary> /// 页面序号 /// </summary> public int pageNo = 1; } /// <summary> 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); //左padding 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 //先屏蔽 ////右paddingView //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; }
