JLChen
2020-12-21 ce646aa99af43539ac865977f0177f9d97d596a5
2020-12-21 1.功能介绍列表拉取
8个文件已修改
242 ■■■■ 已修改文件
.vs/HDL_APP_Project/xs/UserPrefs.xml 33 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/DAL/Server/NewAPI.cs 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/DAL/Server/NewApiRes.cs 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI0-Public/OperationSuccessPromptPage.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI0-Public/Widget/WebViewDialog.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/1-HomePage/MessageCenterPage.cs 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/FunctionIntroductionPage.cs 175 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/4-PersonalCenter/GetSupport/GetSupportPage.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
.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 name="HDL-ON_iOS" expanded="True" />
            </Node>
            <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" />
HDL_ON/DAL/Server/NewAPI.cs
old mode 100755 new mode 100644
@@ -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>
        /// 上传图片
HDL_ON/DAL/Server/NewApiRes.cs
@@ -1123,6 +1123,18 @@
        public string Id;
    }
    /// <summary>
    /// AppNameObj
    /// </summary>
    [System.Serializable]
    public class AppNameObj
    {
        /// <summary>
        /// 软件来源,Evoyo、ON、ON_Plus
        /// </summary>
        public string appName = SoftwareType.ON_Plus.ToString();
    }
    #region APP版本检测
    /// <summary>
    /// AppVersionCheckObj
HDL_ON/UI/UI0-Public/OperationSuccessPromptPage.cs
old mode 100755 new mode 100644
@@ -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,
HDL_ON/UI/UI0-Public/Widget/WebViewDialog.cs
old mode 100755 new mode 100644
@@ -43,8 +43,12 @@
            };
            bodyView.AddChidren(webView);
            if (!string.IsNullOrEmpty(url))
            {
            //加载网址
            webView.LoadRequest(url);
            }
            this.Show();
        }
    }
HDL_ON/UI/UI2/1-HomePage/MessageCenterPage.cs
old mode 100755 new mode 100644
@@ -464,7 +464,15 @@
        void GetPushMessageList(int queryType = 0)
        {
            bodyScrolView.RemoveAll();
            if(PushMessageInfoList == null)
            {
                PushMessageInfoList = new List<PushMessageInfo>();
            }
            else
            {
            PushMessageInfoList.Clear();
            }
            YearMark = "";//标记清空
            if (string.IsNullOrEmpty(OnAppConfig.Instance.PushId))
            {
HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/FunctionIntroductionPage.cs
old mode 100755 new mode 100644
@@ -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月dd日");
            }
            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,
                functionURLInfoList = new List<APPFunctionURLInfo>();
            }
            else
            {
                functionURLInfoList.Clear();
            }
            var waitPage = new Loading();
            bodyView.AddChidren(waitPage);
            waitPage.Start(Language.StringByID(StringId.PleaseWait));
            new Thread(() =>
            {
                try
                {
                    var requestJson = HttpUtil.GetSignRequestJson(new AppNameObj()
                    {
            });
            list.Add(new APPFunctionURLInfo()
                    var result = HttpUtil.RequestHttpsPost(NewAPI.API_POST_FunctionIntroductionList, requestJson);
                    if (result.Code == StateCode.SUCCESS)
            {
                Title = "HDL ON PRO 1.0.09 主要更新",
                CreateTime = "10月26",
                Url = Constant.URL_PRIVACYPOLICY,
            });
            list.Add(new APPFunctionURLInfo()
                        functionURLInfoList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<APPFunctionURLInfo>>(result.Data.ToString());
                        Application.RunOnMainThread(() =>
            {
                Title = "HDL ON PRO 1.0.08 主要更新",
                CreateTime = "09月26",
                Url = Constant.URL_PRIVACYPOLICY,
                            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();
        }
            foreach (var info in list)
        /// <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>
        ///
        /// 功能介绍对应的HTML地址
        /// </summary>
        public string Url;
    }
HDL_ON/UI/UI2/4-PersonalCenter/GetSupport/GetSupportPage.cs
old mode 100755 new mode 100644
@@ -60,7 +60,7 @@
            FrameLayout emailRow = new FrameLayout()
            {
                Y = Application.GetRealHeight(114),
                Y = phoneRow.Bottom,
                Height = Application.GetRealWidth(50),
            };
            bodyView.AddChidren(emailRow);