From ce646aa99af43539ac865977f0177f9d97d596a5 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期一, 21 十二月 2020 14:36:20 +0800
Subject: [PATCH] 2020-12-21 1.功能介绍列表拉取

---
 HDL_ON/DAL/Server/NewAPI.cs                                        |    6 +
 HDL_ON/DAL/Server/NewApiRes.cs                                     |   12 ++
 HDL_ON/UI/UI0-Public/OperationSuccessPromptPage.cs                 |    2 
 HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/FunctionIntroductionPage.cs |  179 +++++++++++++++++++++++++++++------
 HDL_ON/UI/UI2/4-PersonalCenter/GetSupport/GetSupportPage.cs        |    2 
 HDL_ON/UI/UI0-Public/Widget/WebViewDialog.cs                       |    8 +
 .vs/HDL_APP_Project/xs/UserPrefs.xml                               |   33 ++++--
 HDL_ON/UI/UI2/1-HomePage/MessageCenterPage.cs                      |   10 +
 8 files changed, 202 insertions(+), 50 deletions(-)

diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index 69cc761..11211cd 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,26 +1,37 @@
-锘�<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/UnlockSetting/AppUnlockSettingsPage.cs">
+    <Files>
+      <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/ComplaintsPage.cs" Line="1" Column="1" />
+      <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/FunctionIntroductionPage.cs" Line="150" Column="14" />
+      <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/GetSupport/GetSupportPage.cs" Line="63" Column="36" />
+      <File FileName="HDL-ON_iOS/Resources/Language.ini" Line="191" Column="14" />
+      <File FileName="HDL_ON/Common/R.cs" Line="224" Column="47" />
+      <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockGesturePage.cs" Line="281" Column="43" />
+      <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockPasswordPage.cs" Line="286" Column="62" />
+      <File FileName="HDL_ON/UI/UI0-Public/OperationSuccessPromptPage.cs" Line="105" Column="54" />
+      <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockSettingsPage.cs" Line="1" Column="1" />
+    </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="UI" expanded="True">
-                <Node name="UI0-Public" expanded="True">
-                  <Node name="Widget" expanded="True">
-                    <Node name="UpdateTipDialog.cs" selected="True" />
-                  </Node>
-                </Node>
+                <Node name="UI0-Public" expanded="True" />
                 <Node name="UI2" expanded="True">
                   <Node name="4-PersonalCenter" expanded="True">
-                    <Node name="AboutOn" expanded="True" />
-                    <Node name="AccountBindInfo" expanded="True" />
+                    <Node name="UnlockSetting" expanded="True">
+                      <Node name="AppUnlockSettingsPage.cs" selected="True" />
+                    </Node>
                   </Node>
                 </Node>
               </Node>
             </Node>
-            <Node name="HDL-ON_iOS" expanded="True" />
+            <Node name="HDL-ON_iOS" expanded="True">
+              <Node name="Resources" expanded="True" />
+            </Node>
           </Node>
         </State>
       </Pad>
@@ -33,7 +44,7 @@
     <String>Shared.IOS/Shared.IOS.csproj</String>
   </DisabledProjects>
   <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhone" />
-  <MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.364c4b3158493098" />
+  <MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.Android_Accelerated_Oreo" />
   <MonoDevelop.Ide.DebuggingService.Breakpoints>
     <BreakpointStore>
       <Breakpoint file="/Users/jlchen/JLChen/ProjectsCode/HDLGit/ON+/HDL_ON/DAL/Mqtt/MqttClient.cs" relfile="HDL_ON/DAL/Mqtt/MqttClient.cs" line="552" column="1" />
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/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/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/4-PersonalCenter/AboutOn/FunctionIntroductionPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/FunctionIntroductionPage.cs
old mode 100755
new mode 100644
index c0eccff..c82d7af
--- 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,15 +64,22 @@
         /// </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)
@@ -95,7 +114,7 @@
                 TextAlignment = TextAlignment.CenterLeft,
                 TextColor = CSS_Color.PromptingColor1,
                 TextSize = CSS_FontSize.PromptFontSize_SecondaryLevel,
-                Text = functionInfo.CreateTime
+                //Text = functionInfo.CreateTime
             };
 
             rowView.AddChidren(btnSubtitle);
@@ -122,42 +141,134 @@
             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
+                {
+                    var requestJson = HttpUtil.GetSignRequestJson(new AppNameObj()
+                    {
+                    });
 
-            foreach (var info in list)
+                    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 +279,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);

--
Gitblit v1.8.0