On Pro

wxr

2021-12-14 6cc05bf6044c72f63b289da6b0a542970b16ef75

On Pro

 HDL-ON_Android/Assets/Language.ini

@@ -501,6 +501,7 @@
513=Please enter the pairing code
514=Gateway location information is not configured
515=Add Security
516=Withdrawal
 
1000=Room Humidity
1001=V-chip
@@ -1625,6 +1626,7 @@
513=请输入配对码
514=未配置网关位置信息
515=添加安防
516=撤销同意
 
1000=室内湿度
1001=童锁

 HDL-ON_Android/Properties/AndroidManifest.xml

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="202112066" android:versionName="1.3.202112066" package="com.hdl.onpro">
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="202112131" android:versionName="1.4.3" package="com.hdl.onpro">
    <uses-sdk android:minSdkVersion="23" android:targetSdkVersion="28" />
    <!-- 乐橙可视对讲需要的权限 -->
    <!--<uses-permission android:name="android.permission.INTERNET" />-->

 HDL-ON_Android/Resources/drawable/Loading.png

 HDL-ON_Android/Resources/mipmap-hdpi/Loading.png

 HDL-ON_Android/Resources/mipmap-mdpi/Loading.png

 HDL-ON_Android/Resources/mipmap-xhdpi/Loading.png

 HDL-ON_Android/Resources/mipmap-xxhdpi/Loading.png

 HDL-ON_Android/Resources/mipmap-xxxhdpi/Loading.png

 HDL-ON_iOS/Resources/Language.ini

@@ -501,6 +501,7 @@
513=Please enter the pairing code
514=Gateway location information is not configured
515=Add Security
516=Withdrawal
 
1000=Room Humidity
1001=V-chip
@@ -1625,6 +1626,7 @@
513=请输入配对码
514=未配置网关位置信息
515=添加安防
516=撤销同意
 
1000=室内湿度
1001=童锁
@@ -2120,7 +2122,6 @@
7152=离开或到达某地
7153=离开
7154=到达





 HDL_ON/Common/HDLCommon.cs

@@ -432,7 +432,6 @@
                    new Other.SkipControl().SetData(false, "", "", "","");
                    var sDM = new SiriKit.SceneDateManager();
                    Console.WriteLine($"IsLogin:{sDM.IsLgoin};accessToken:{sDM.AccessToken};refreshToken:{sDM.RefreshToken};RegionUrl:{sDM.RegionUrl};HomeId:{sDM.HomeId}");

#endif
                }
                catch (Exception ex)

 HDL_ON/Common/R.cs

@@ -4,7 +4,10 @@
{
    public static class StringId
    {

        /// <summary>
        /// 撤销同意
        /// </summary>
        public const int WithdrawalConsent = 516;
        /// <summary>
        /// 添加安防
        /// </summary>

 HDL_ON/UI/MainPage.cs

@@ -26,7 +26,7 @@
    /// <summary>
    /// 版本号
    /// </summary>
    public static string VersionString = "1.4.1206";
    public static string VersionString = "1.4.3";
    ///// <summary>
    ///// 客户端类型
    ///// </summary>

 HDL_ON/UI/UI0-Public/PublicAssmebly.cs

@@ -235,6 +235,16 @@
        /// <param name="callBackAction"></param>
        public void TipOptionMsg(int titleId, int msgId, Action callBackAction)
        {
            TipOptionMsg(titleId, Language.StringByID(msgId), callBackAction);
        }
        /// <summary>
        /// 加载提示弹窗
        /// </summary>
        /// <param name="titleId"></param>
        /// <param name="msgId"></param>
        /// <param name="callBackAction"></param>
        public void TipOptionMsg(int titleId, string msg, Action callBackAction)
        {
            Dialog dialog = new Dialog()
            {
                BackgroundColor = CSS_Color.DialogTransparentColor1,
@@ -273,7 +283,7 @@
                TextAlignment = TextAlignment.Center,
                TextColor = CSS_Color.TextualColor,
                TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
                TextID = msgId,
                Text = msg,
                IsMoreLines = true,
            };
            contentView.AddChidren(btnMsg);

 HDL_ON/UI/UI0-Public/TopViewDiv.cs

@@ -366,6 +366,33 @@
            };
        }
        /// <summary>
        /// 协议管理顶部
        /// 带撤销同意按钮
        /// </summary>
        public void LoadTopView_WithdrawalConsent(Action withdrawalConsentAction)
        {
            LoadTopView();

            var btnAddIcon = new Button()
            {
                X = Application.GetRealWidth(352-100),
                Y = Application.GetRealHeight(29),
                Width = Application.GetMinRealAverage(100),
                Height = Application.GetMinRealAverage(28),
                TextID = StringId.WithdrawalConsent,
                TextAlignment = TextAlignment.CenterRight,
                TextColor = CSS_Color.MainColor,
                TextSize = CSS_FontSize.TextFontSize,
            };
            contentView.AddChidren(btnAddIcon);

            btnAddIcon.MouseUpEventHandler += (sender, e) =>
            {
                withdrawalConsentAction?.Invoke();
            };
        }

        /// <summary>
        /// 成员顶部栏
        /// </summary>
        public void LoadTopView_MemberTopView(Action addAction, Action action)

 HDL_ON/UI/UI0-Public/Widget/WebViewDialog.cs

@@ -71,6 +71,60 @@
            this.Show();
        }

        /// <summary>
        /// 加载页面
        /// 附带撤销同意按钮
        /// </summary>
        /// <param name="titleStr"></param>
        /// <param name="url"></param>
        public void LoadPageWithdrawalConsent(string titleStr,string url)
        {
            bodyView.BackgroundColor = CSS_Color.MainBackgroundColor;
            this.AddChidren(bodyView);
            Action action = () => {
                string msg = "";
                if(Language.CurrentLanguage == "Chinese")
                {
                    msg = "撤回授权后，您将无法继续使用On Pro App";

                }else
                {
                    msg = "After you withdraw your authorization, you will no longer be able to use On Pro app";
                }
                Action withdramAction = () => {
                    OnAppConfig.Instance.isAgreePrivacyPolicy = false;
                    OnAppConfig.Instance.SaveConfig();
                    HDLCommon.Current.Logout();
                    Close();
                };
                new PublicAssmebly().TipOptionMsg(StringId.Tip, msg, withdramAction);
            };
            new TopViewDiv(this, bodyView, titleStr).LoadTopView_WithdrawalConsent(action);
            //WebView
            mWebView = new WebView()
            {
                Y = Application.GetRealHeight(64),
                Height = bodyView.Height - Application.GetRealHeight(64),
                X = Application.GetRealWidth(16),
                Width = bodyView.Width - Application.GetRealWidth(32)
            };
            bodyView.AddChidren(mWebView);

            try
            {
                if (!string.IsNullOrEmpty(url))
                {
                    //加载网址
                    mWebView.LoadRequest(url);
                }
            }
            catch
            {

            }

            this.Show();
        }


        /// <summary>
        /// 加载页面

 HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/AboutOnPage.cs

@@ -64,7 +64,7 @@
                Y = Application.GetRealWidth(184),
                Height = Application.GetRealWidth(28),
                TextAlignment = TextAlignment.Center,
                Text = "ON+",
                Text = "On Pro",
                TextColor = CSS_Color.FirstLevelTitleColor,
                TextSize = CSS_FontSize.EmphasisFontSize_Secondary,
                IsBold = true,
@@ -154,6 +154,35 @@
            versionUpdateView.GoAction = versionUpdateAction;
            #endregion

            #region 软件服务协议
            var serviceAgreementView = new ListCellView()
            {
                Y = versionUpdateView.Bottom,
            };
            bodyView.AddChidren(serviceAgreementView);
            serviceAgreementView.BtnTilte.TextID = StringId.UserAgreement;
            Action serviceAgreementAction = () => {
                string url = Constant.URL_PRIVACYPOLICY;
                string titleStr = Language.StringByID(StringId.PrivacyPolicy);
                new WebViewDialog().LoadPageWithdrawalConsent(titleStr, url);
            };
            serviceAgreementView.GoAction = serviceAgreementAction;
            #endregion

            #region 用户信息保护协议
            var privacyPolicyView = new ListCellView()
            {
                Y = serviceAgreementView.Bottom,
            };
            bodyView.AddChidren(privacyPolicyView);
            privacyPolicyView.BtnTilte.TextID = StringId.PrivacyPolicy;
            Action privacyPolicyAction = () => {
                string url =  Constant.URL_USERAGREEMENT;
                string titleStr = Language.StringByID(StringId.UserAgreement);
                new WebViewDialog().LoadPageWithdrawalConsent(titleStr, url);
            };
            #endregion
            privacyPolicyView.GoAction = privacyPolicyAction;
            CheckIfNeedUpdateAsync();
        }