备份

wxr

2021-12-30 d275465c510dc1cf4e61227d7bf6d6054042b379

备份

 HDL-ON_Android/AgreementActivity.cs

@@ -37,7 +37,7 @@
            {
                Intent i = new Intent(this, typeof(WebviewActivity));

                i.PutExtra("url", "https://developer.hdlcontrol.com/HDLOnPlusPrivacyPolicy.html");
                i.PutExtra("url", HDL_ON.Constant.URL_PRIVACYPOLICY);
                StartActivity(i);
                Intent data = new Intent();
                data.PutExtra("data", "disagree");
@@ -47,7 +47,7 @@
            {
                Intent i = new Intent(this, typeof(WebviewActivity));

                i.PutExtra("url", "https://developer.hdlcontrol.com/HDLOnPlusUserAgreement.html");
                i.PutExtra("url",HDL_ON.Constant.URL_USERAGREEMENT);

                StartActivity(i);
                Intent data = new Intent();

 HDL-ON_Android/Assets/Language.ini

@@ -293,7 +293,7 @@
289=Remove The Binding
290=Fail to get the history
291=No favorites
292=About ON+
292=About On Pro
293=Member
294=Administrator
295=Change password
@@ -369,7 +369,7 @@
365=Can not communicate with the server, fail to edit the scene information
366=Can not communicate with the server, fail to delete the scene
367=Can not communicate with the server, fail to delete the floor
368=Welcome to enjoy ON+
368=Welcome to enjoy On Pro
369=Add new residence
370=Become family member
371=Can not use the function, please bind the gateway
@@ -1504,7 +1504,7 @@
365=无法与服务器通讯,场景信息编辑失败。
366=无法与服务器通讯,场景删除失败。
367=无法与服务器通讯,楼层删除失败。
368=欢迎使用ON+
368=欢迎使用On Pro
369=添加新住宅
370=成为家庭成员
371=功能无法使用，请绑定网关

 HDL-ON_Android/HDL-ON_Android.csproj

@@ -64,6 +64,7 @@
    <AndroidSigningStorePass>85521566</AndroidSigningStorePass>
    <AndroidSigningKeyPass>85521566</AndroidSigningKeyPass>
    <AndroidSigningKeyAlias>on_plus</AndroidSigningKeyAlias>
    <AndroidSupportedAbis>armeabi-v7a;arm64-v8a</AndroidSupportedAbis>
  </PropertyGroup>
  <ItemGroup>
    <Reference Include="Shared.Droid.JPush">
@@ -1337,6 +1338,7 @@
  </ItemGroup>
  <ItemGroup>
    <AndroidNativeLibrary Include="libs\armeabi-v7a\libelianjni.so" />
    <AndroidNativeLibrary Include="libs\arm64-v8a\libelianjni.so" />
  </ItemGroup>
  <ItemGroup>
    <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\Connect.png" />

 HDL-ON_Android/Other/HDLONUtils.cs

@@ -31,5 +31,13 @@
                System.Console.WriteLine("发送广播刷新图库 catch");
            }
        }

        public static void StartSplashActivity()
        {
            Intent intent = new Intent(Shared.Application.Activity, typeof(SplashActivity));
            Shared.Application.Activity.StartActivity(intent);
            Shared.Application.Activity.Finish();
        }

    }
}

 HDL-ON_Android/Properties/AndroidManifest.xml

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="202112271" android:versionName="1.4.5" package="com.hdl.onpro">
    <uses-sdk android:minSdkVersion="23" android:targetSdkVersion="28" />
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="202112283" android:versionName="1.4.5" package="com.hdl.onpro">
    <uses-sdk android:minSdkVersion="23" android:targetSdkVersion="30" />
    <!-- 乐橙可视对讲需要的权限 -->
    <!--<uses-permission android:name="android.permission.INTERNET" />-->
    <!--网络访问-->
@@ -82,7 +82,7 @@
    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
    <uses-permission android:name="android.permission.READ_LOGS" />
    <!-- 极光推送结束 -->
    <application android:allowBackup="true" android:icon="@drawable/Icon" android:networkSecurityConfig="@xml/network_security_config" android:largeHeap="true" android:label="On Pro">
    <application android:allowBackup="true" android:debuggable="true" android:icon="@drawable/Icon" android:networkSecurityConfig="@xml/network_security_config" android:largeHeap="true" android:label="On Pro">
        <provider android:name="android.support.v4.content.FileProvider" android:authorities="com.hdl.onpro.fileProvider" android:grantUriPermissions="true" android:exported="false">
            <meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/file_paths" />
        </provider>

 HDL-ON_Android/Scan.cs

@@ -11,6 +11,9 @@
        public Scan()
        {
        }

        public static string TipMsg = string.Empty;

        static MobileBarcodeScanner scanner;
        public static void OpenScan(Action<string> action)
        {
@@ -73,14 +76,23 @@
                        intent.SetData(uri);
                        Application.Activity.StartActivity(intent);
                    };
                    if (string.IsNullOrEmpty(TipMsg))
                    {
                    if (Language.CurrentLanguage == "Chinese")
                    {
                        new HDL_ON.UI.PublicAssmebly().TipOptionMsg(StringId.Tip, "相机访问权限已被拒绝，请前往系统设置打开相关权限。", action1);
                    }else
                        }
                        else
                    {
                        new HDL_ON.UI.PublicAssmebly().TipOptionMsg(StringId.Tip, "Camera access has been denied. Please go to system settings to open relevant permissions.",action1);
                    }
                }
                    else
                    {
                        new HDL_ON.UI.PublicAssmebly().TipOptionMsg(StringId.Tip, TipMsg,action1,45);
                        TipMsg = string.Empty;
                    }
                }
            });
        }


 HDL-ON_Android/SplashActivity.cs

@@ -53,7 +53,7 @@



            if (HDL_ON.OnAppConfig.Instance.FirstRunApp)
            if (HDL_ON.OnAppConfig.Instance.FirstRunApp || !HDL_ON.OnAppConfig.Instance.isAgreePrivacyPolicy)
            {
                
                Intent intent = new Intent(this, typeof(AgreementActivity));
@@ -319,4 +319,6 @@
    }


    

}

 HDL-ON_Android/libs/arm64-v8a/libelianjni.so

Binary files differ

 HDL-ON_iOS/Info.plist

@@ -100,7 +100,7 @@
    <key>UIStatusBarStyle</key>
    <string>UIStatusBarStyleLightContent</string>
    <key>CFBundleShortVersionString</key>
    <string>1.4.302112271</string>
    <string>1.4.502112271</string>
    <key>CFBundleVersion</key>
    <string>1.4.12271</string>
    <key>NSLocationWhenInUseUsageDescription</key>

 HDL-ON_iOS/Resources/Language.ini

@@ -293,7 +293,7 @@
289=Remove The Binding
290=Fail to get the history
291=No favorites
292=About ON+
292=About On Pro
293=Member
294=Administrator
295=Change password
@@ -369,7 +369,7 @@
365=Can not communicate with the server, fail to edit the scene information
366=Can not communicate with the server, fail to delete the scene
367=Can not communicate with the server, fail to delete the floor
368=Welcome to enjoy ON+
368=Welcome to enjoy On Pro
369=Add new residence
370=Become family member
371=Can not use the function, please bind the gateway
@@ -1504,7 +1504,7 @@
365=无法与服务器通讯,场景信息编辑失败。
366=无法与服务器通讯,场景删除失败。
367=无法与服务器通讯,楼层删除失败。
368=欢迎使用ON+
368=欢迎使用On Pro
369=添加新住宅
370=成为家庭成员
371=功能无法使用，请绑定网关

 HDL-ON_iOS/Scan.cs

@@ -8,6 +8,7 @@
    public class Scan
    {

        public static string TipMsg = "";
        public Scan()
        {
        }

 HDL_ON/Common/Constant.cs

@@ -1,4 +1,6 @@
using System;
using Shared;

namespace HDL_ON
{
    #region ■ 全局常量 ____________________________
@@ -10,11 +12,34 @@
        /// <summary>
        /// 用户协议
        /// </summary>
        public const string URL_USERAGREEMENT = "https://developer.hdlcontrol.com/HDLOnPlusUserAgreement.html";
        public static string URL_USERAGREEMENT {
            get {
                if (Language.CurrentLanguage == "Chinese") {
                    return "https://developer.hdlcontrol.com/HDLOnPlusUserAgreement.html";
                }
                else
                {
                    return "https://developer.hdlcontrol.com/OnProServiceAgreement-En.html";
                }
            }
        }
        /// <summary>
        /// 隐私政策
        /// </summary>
        public const string URL_PRIVACYPOLICY = "https://developer.hdlcontrol.com/HDLOnPlusPrivacyPolicy.html";
        public static string URL_PRIVACYPOLICY
        {
            get
            {
                if (Language.CurrentLanguage == "Chinese")
                {
                    return "https://developer.hdlcontrol.com/HDLOnPlusPrivacyPolicy.html";
                }
                else
                {
                    return "https://developer.hdlcontrol.com/OnProUserAgreement-En.html";
                }
            }
        }
        /// <summary>
        /// 技术支持电话号码
        /// </summary>

 HDL_ON/UI/BindingResidence/BindingResidencePage.cs

@@ -91,6 +91,14 @@

            btnAddNewResidence.MouseUpEventHandler = (sender, e) =>
            {
                if (Language.CurrentLanguage == "Chinese")
                {
                    Scan.TipMsg = "您已拒绝App相机访问权限，这将导致您无法使用扫描二维码绑定我的家庭，但您可以通过加入其他用户的家庭，体验智能家居服务，如需启用绑定我的家庭服务，请前往手机系统设置打开相关权限";
                }
                else
                {
                    Scan.TipMsg = "You have denied access to the app camera, which will make you unable to bind my family with the scanned QR code, but you can experience smart home services by joining other users' families. To enable the bind my family service, please go to the mobile phone system settings to open the relevant permissions";
                }
                Scan.OpenScan((scanString) =>
                {
                    //执行绑定住宅

 HDL_ON/UI/UI0-Public/PublicAssmebly.cs

@@ -243,7 +243,7 @@
        /// <param name="titleId"></param>
        /// <param name="msgId"></param>
        /// <param name="callBackAction"></param>
        public void TipOptionMsg(int titleId, string msg, Action callBackAction)
        public void TipOptionMsg(int titleId, string msg, Action callBackAction,int extraHeight = 0)
        {
            Dialog dialog = new Dialog()
            {
@@ -254,7 +254,7 @@
            {
                Gravity = Gravity.Center,
                Width = Application.GetRealWidth(270),
                Height = Application.GetRealHeight(140),
                Height = Application.GetRealHeight(140 + extraHeight),
                BackgroundColor = CSS.CSS_Color.MainBackgroundColor,
                BorderColor = 0x00000000,
                BorderWidth = 0,
@@ -277,7 +277,7 @@
            Button btnMsg = new Button()
            {
                Gravity = Gravity.CenterHorizontal,
                Height = Application.GetRealHeight(35),
                Height = Application.GetRealHeight(35 + extraHeight),
                Y = btnTitle.Bottom,
                Width = Application.GetRealHeight(200),
                TextAlignment = TextAlignment.Center,
@@ -290,7 +290,7 @@

            Button btnLine = new Button()
            {
                Y = Application.GetRealHeight(96),
                Y = Application.GetRealHeight(96 + extraHeight),
                Height = Application.GetRealHeight(1),
                Width = Application.GetRealWidth(270 / 2),
                BackgroundColor = CSS.CSS_Color.DividingLineColor,

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

@@ -92,6 +92,7 @@
                }
                Action withdramAction = () => {
                    OnAppConfig.Instance.isAgreePrivacyPolicy = false;
                    OnAppConfig.Instance.FirstRunApp = true;
                    OnAppConfig.Instance.SaveConfig();
                    HDLCommon.Current.Logout();
                    Close();

 HDL_ON/UI/UI1-Login/LoginPage.cs

@@ -169,7 +169,7 @@
        public void LoadView(UserInfo userInfo = null)
        {
#if __Android__
            OnAppConfig.Instance.isAgreePrivacyPolicy = false;
            OnAppConfig.Instance.isAgreePrivacyPolicy = true;
#endif
            var btnIcon = new Button()
            {
@@ -207,15 +207,14 @@
                //return;
                if (b)
                {
                    //etAccount.Text = "tf@smarttech.com.ua";//国外账号，有住宅，登录无法显示
                    //etAccount.Text = "13375012446";//测试服务器
                    //etAccount.Text = "1033326940@qq.com";
                    //etAccount.Text = "18022428438";//wjc
                    //etAccount.Text = "13602944661";//kx
                    etAccount.Text = "13226233133";//豆豆
                    etAccount.Text = "18316672920";
                    //etAccount.Text = "13226233133";//豆豆
                    //etAccount.Text = "18316672920";
                    //etAccount.Text = "18316120654";//tujie
                    etAccount.Text = "15626203746";
                    //etAccount.Text = "15626203746";
                    //etAccount.Text = "13450425807";//黄竹溪 knx项目
                }
                else
@@ -233,9 +232,9 @@
                    //etAccount.Text = "15971583093";//高胜
                    //etAccount.Text = "15217626103";//昆明金茂项目
                    //etAccount.Text = "18598273624";
                    //etAccount.Text = "tf@smarttech.com.ua";
                    etAccount.Text = "tf@smarttech.com.ua";
                    //etAccount.Text = "18814122445";//董泽斌 天河办公室
                    etAccount.Text = "18824864143";//"464027401@qq.com"; //"2791308028@qq.com";//13697499568
                    //etAccount.Text = "18824864143";//"464027401@qq.com"; //"2791308028@qq.com";//13697499568
                    //etAccount.Text = "18402017839";//wjc
                    //etAccount.Text = "13430286286";//cwc
                    //etAccount.Text = "13709260805";
@@ -246,9 +245,9 @@
                }
                b = !b;
                etPassword.Text = "123456";
                if(etAccount.Text == "fslcjm5@163.com")
                if(etAccount.Text == "tf@smarttech.com.ua")
                {
                    etPassword.Text = "a123456";
                    etPassword.Text = "Smart2021";
                }
                //etPassword.Text = "Hdl85521566";
                btnLogin.IsSelected = true;
@@ -1132,6 +1131,11 @@
        private void AddServiceAgreementControl(FrameLayout frameLayout)
        {
            isAgreePrivacyPolicy = OnAppConfig.Instance.isAgreePrivacyPolicy;





            var frameRow = new FrameLayout()
            {
                Height = Application.GetRealHeight(28),
@@ -1158,7 +1162,7 @@
                Height = Application.GetMinRealAverage(28),
                UnSelectedImagePath = "Public/ChooseIcon.png",
                SelectedImagePath = "Public/ChooseOnIcon.png",
                IsSelected = isAgreePrivacyPolicy,
                IsSelected = OnAppConfig.Instance.isAgreePrivacyPolicy,
                Gravity = Gravity.Center
            };
            agreeView.AddChidren(agreeBtn);
@@ -1238,6 +1242,13 @@
            {
                OpenWebViewPage(true);
            };

            #if __ANDROID__
            //if(OnAppConfig.Instance.FirstRunApp || !OnAppConfig.Instance.isAgreePrivacyPolicy)
            //{
            //    HDL_ON_Android.HDLONUtils.StartSplashActivity();    
            //}
            #endif
        }

        /// <summary>

 HDL_ON/UI/UI1-Login/LoginPageBLL.cs

@@ -42,6 +42,7 @@
                    OnAppConfig.Instance.GlobalRegion = mGlobalRegionListObj;
                    OnAppConfig.Instance.SaveConfig();
                }
                OnAppConfig.Instance.RequestHttpsHost = @"https://bahrain-gateway.hdlcontrol.com";
            }
            catch { }
        }

 HDL_ON/UI/UI2/FuntionControlView/ArmCenter/ArmCenterPage.cs

@@ -661,6 +661,7 @@
                TextSize = CSS_FontSize.TextFontSize,
                Text = title,
                IsBold = true,
                IsMoreLines = true,
            };
            this.AddChidren(btnTitle);


 HDL_ON/UI/UI2/FuntionControlView/Energy/EnergyMainPage.cs

@@ -180,8 +180,15 @@
                double.TryParse(ene.GetAttrState(FunctionAttributeKey.TotalElectricity), out tt);
                tt *= 100;//乘以100，小于1无法加载echart
                tt = Math.Round(tt, 2);
                if (list.ContainsKey(ene.name))
                {
                    list.Add(ene.name + "1", tt.ToString());
                }
                else
                {
                list.Add(ene.name, tt.ToString());
            }
            }
            myEchartsView_Pie.ShowWithOption(new EchartsOption_Pie().InitDateJson(list));

            btnDrodDown = new Button()

 SiriIntents/Info.plist

@@ -11,9 +11,9 @@
    <key>CFBundlePackageType</key>
    <string>XPC!</string>
    <key>CFBundleShortVersionString</key>
    <string>1.3.202112062</string>
    <string>1.3.202112271</string>
    <key>CFBundleVersion</key>
    <string>1.3.12062</string>
    <string>1.3.12271</string>
    <key>MinimumOSVersion</key>
    <string>12.0</string>
    <key>NSExtension</key>

 SiriIntentsUI/Info.plist

@@ -15,9 +15,9 @@
    <key>CFBundlePackageType</key>
    <string>XPC!</string>
    <key>CFBundleShortVersionString</key>
    <string>1.3.202112062</string>
    <string>1.3.202112271</string>
    <key>CFBundleVersion</key>
    <string>1.3.12062</string>
    <string>1.3.12271</string>
    <key>MinimumOSVersion</key>
    <string>12.0</string>
    <key>NSExtension</key>