wjc
2023-06-05 a19e58425e44c8a83c3d1b23de292659c38a6b1e
Merge branch 'Dev-Branch' into wjc
9个文件已添加
1个文件已删除
59个文件已修改
3335 ■■■■■ 已修改文件
DLL/IOS/Shared.IOS.HDLCNVRSDK.dll 补丁 | 查看 | 原始文档 | blame | 历史
DLL/IOS/Shared.IOS.HDLFVSDK.dll 补丁 | 查看 | 原始文档 | blame | 历史
DLL/LC/IOS/Shared.IOS.LCVideoOnSDK.dll 补丁 | 查看 | 原始文档 | blame | 历史
DLL/Linphone/Android/Shared.Droid.HDLLinphone.dll 补丁 | 查看 | 原始文档 | blame | 历史
DLL/Linphone/Android/Shared.Droid.HDLLinphone0525.dll 补丁 | 查看 | 原始文档 | blame | 历史
DLL/Linphone/iOS/Shared.IOS.HDLLinphoneSDK.dll 补丁 | 查看 | 原始文档 | blame | 历史
DLL/Shared.Droid.dll 补丁 | 查看 | 原始文档 | blame | 历史
DLL/Shared.Droid0512.dll 补丁 | 查看 | 原始文档 | blame | 历史
DLL/Shared.Droid0524.dll 补丁 | 查看 | 原始文档 | blame | 历史
DLL/Shared.Droid230425.dll 补丁 | 查看 | 原始文档 | blame | 历史
DLL/Shared.Droid230508.dll 补丁 | 查看 | 原始文档 | blame | 历史
DLL/Shared.IOS.dll 补丁 | 查看 | 原始文档 | blame | 历史
DLL/Shared.IOS0524.dll 补丁 | 查看 | 原始文档 | blame | 历史
DLL/Shared.IOS0525.dll 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_Android/Application.cs 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_Android/Assets/Language.ini 45 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_Android/Assets/Phone/LogicIcon/selectlocation.png 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_Android/HDL-ON_Android.csproj 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_Android/Other/LocationUtils.cs 25 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_Android/Properties/AndroidManifest.xml 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_Android/Resources/Resource.designer.cs 1732 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_Android/SplashActivity.cs 24 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_iOS/AppDelegate.cs 63 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_iOS/Info.plist 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_iOS/Resources/Language.ini 45 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_iOS/Resources/Phone/LogicIcon/selectlocation.png 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_iOS/ViewController.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/Common/ApiUtlis.cs 103 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/Common/HDLCommon.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/Common/R.cs 30 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/DAL/DriverLayer/Control.cs 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/DAL/Server/HttpServerRequest.cs 70 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/DAL/Server/HttpUtil.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/DAL/Server/NewAPI.cs 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/DAL/Server/NewApiRes.cs 45 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/Entity/DB_ResidenceData.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/Entity/FunctionList.cs 30 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/Entity/ResponseEntity/RegionInfoRes.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/MainPage.cs 54 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI0-Stan/Controls/BottomControls/BottomTimeSelectControl.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI0-Stan/Form/Base/CommonFormBase.cs 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI0-Stan/Form/HideOptionFileContentForm.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI0-Stan/Logic/HdlMessageLogic.cs 26 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI1-Login/ForgetPasswordPage.cs 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI1-Login/ForgetPasswordPageBLL.cs 50 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI1-Login/LoginPage.cs 108 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI1-Login/LoginPageBLL.cs 129 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs 16 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/2-Classification/FunctionPage.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/3-Intelligence/Automation/ChooseIocate.cs 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/AboutOnPage.cs 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/ResidentialManagePage.cs 119 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/FuntionControlView/AC/ACPage.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPageBLL.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/FuntionControlView/DoorLock/DoorLockPage.cs 355 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/FuntionControlView/DoorLock/DoorLockSelectTimePage.cs 104 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPageBLL.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPageBLL.cs 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/FuntionControlView/Light/RGBWPageBLL.cs 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/FuntionControlView/Music/View/PlayView.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
SiriIntents/Info.plist 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
SiriIntentsUI/Info.plist 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DLL/IOS/Shared.IOS.HDLCNVRSDK.dll
Binary files differ
DLL/IOS/Shared.IOS.HDLFVSDK.dll
Binary files differ
DLL/LC/IOS/Shared.IOS.LCVideoOnSDK.dll
Binary files differ
DLL/Linphone/Android/Shared.Droid.HDLLinphone.dll
Binary files differ
DLL/Linphone/Android/Shared.Droid.HDLLinphone0525.dll
Binary files differ
DLL/Linphone/iOS/Shared.IOS.HDLLinphoneSDK.dll
Binary files differ
DLL/Shared.Droid.dll
Binary files differ
DLL/Shared.Droid0512.dll
Binary files differ
DLL/Shared.Droid0524.dll
Binary files differ
DLL/Shared.Droid230425.dll
Binary files differ
DLL/Shared.Droid230508.dll
Binary files differ
DLL/Shared.IOS.dll
Binary files differ
DLL/Shared.IOS0524.dll
Binary files differ
DLL/Shared.IOS0525.dll
Binary files differ
HDL-ON_Android/Application.cs
@@ -40,9 +40,6 @@
        public override void OnCreate()
        {
            if (Shared.Application.Activity != null)
            {
                //reStartApp(this);
HDL-ON_Android/Assets/Language.ini
@@ -607,6 +607,14 @@
620=To_Be_Accepted
621=INITIAL_TATE
622=ACCEPTANCE
623=Latitude and longitude
624=Triggered range
625=Residential unbound
626=After unbinding the residence, the residence will be removed from your account. Are you sure you want to proceed?
627=The set time needs to be later than the current time.
628=Temporary password validity period cannot be greater than 24 hours.
629=Successfully unbound the residence.
2532=Visitor Invitation Record
@@ -729,7 +737,7 @@
1095=Select Date
1096=Generate
1097=Temporary password has been copied
1098=Clear Password?
1098=Do you want to delete the temporary password?
1099=The expire time must be later than the effective time
1100=Unlock Method
1101=It'll synchronize with actual lock, confirm to delete?
@@ -1882,7 +1890,13 @@
620=待验收
621=初始态
622=验收
623=经纬度
624=触发范围
625=住宅解绑
626=住宅解绑之后,住宅将会从你的账号中移除,确定要操作吗?
627=设置的时间需要晚于当前时间
628=临时密码有效期不能大于24小时。
629=住宅解绑成功。
2532=访客邀请记录
2533=访客管理
@@ -2013,8 +2027,8 @@
1095=选择日期
1096=生成
1097=临时密码已经复制
1098=清除当前临时密码?
1099=生效时间必须大于失效时间
1098=是否删除临时密码?
1099=生效时间必须早于失效时间
1100=开锁方式管理
1101=删除操作将被同步于实体锁上{0}是否还需要删除?
1102=确认删除
@@ -3156,6 +3170,14 @@
620=To_Be_Accepted
621=INITIAL_TATE
622=ACCEPTANCE
623=Latitude and longitude
624=Triggered range
625=Residential unbound
626=After unbinding the residence, the residence will be removed from your account. Are you sure you want to proceed?
627=The set time needs to be later than the current time.
628=Temporary password validity period cannot be greater than 24 hours.
629=Successfully unbound the residence.
2532=Visitor Invitation Record
@@ -4425,6 +4447,14 @@
620=To_Be_Accepted
621=INITIAL_TATE
622=ACCEPTANCE
623=Latitude and longitude
624=Triggered range
625=Residential unbound
626=After unbinding the residence, the residence will be removed from your account. Are you sure you want to proceed?
627=The set time needs to be later than the current time.
628=Temporary password validity period cannot be greater than 24 hours.
629=Successfully unbound the residence.
@@ -5684,6 +5714,13 @@
620=To_Be_Accepted
621=INITIAL_TATE
622=ACCEPTANCE
623=Latitude and longitude
624=Triggered range
625=Residential unbound
626=After unbinding the residence, the residence will be removed from your account. Are you sure you want to proceed?
627=The set time needs to be later than the current time.
628=Temporary password validity period cannot be greater than 24 hours.
629=Successfully unbound the residence.
HDL-ON_Android/Assets/Phone/LogicIcon/selectlocation.png
HDL-ON_Android/HDL-ON_Android.csproj
@@ -226,6 +226,7 @@
    <Compile Include="Zxing\CustomCaptureActivity.cs" />
    <Compile Include="Zxing\ScanActivity.cs" />
    <Compile Include="LeChengVideo\LeTest.cs" />
    <Compile Include="Other\LocationUtils.cs" />
  </ItemGroup>
  <ItemGroup>
    <AndroidAsset Include="Assets\agconnect-services.json" />
@@ -425,6 +426,7 @@
    <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\securitydoorezviz.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\VideoDoorlockClose1.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\VideoDoorLockOpen1.png" />
    <AndroidAsset Include="Assets\Phone\LogicIcon\selectlocation.png" />
  </ItemGroup>
  <ItemGroup>
    <AndroidResource Include="Resources\values\colors.xml" />
HDL-ON_Android/Other/LocationUtils.cs
New file
@@ -0,0 +1,25 @@
using System;
using System.Threading.Tasks;
using Xamarin.Essentials;
namespace HDL_ON_Android
{
    public static class LocationUtils
    {
        public static async Task<Location> GetCurrentLocationAsync()
        {
            try
            {
                var request = new GeolocationRequest(GeolocationAccuracy.Medium);
                var location = await Geolocation.GetLocationAsync(request);
                return location;
            }
            catch (Exception ex)
            {
                // 处理异常
                Console.WriteLine($"获取位置信息失败: {ex.Message}");
                return null;
            }
        }
    }
}
HDL-ON_Android/Properties/AndroidManifest.xml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.7.3" package="com.hdl.onpro" xmlns:tools="http://schemas.android.com/tools" android:versionCode="202305031">
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.8.0" package="com.hdl.onpro" xmlns:tools="http://schemas.android.com/tools" android:versionCode="202306011">
    <uses-sdk android:minSdkVersion="26" android:targetSdkVersion="29" />
    <uses-permission android:name="android.permission.RECEIVE_SMS" />
    <!--友盟-->
    <!--<uses-sdk android:minSdkVersion="8"></uses-sdk>-->
    <!--<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>-->
HDL-ON_Android/Resources/Resource.designer.cs
@@ -14,7 +14,7 @@
{
    
    
    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "1.0.0.0")]
    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "12.2.8.165")]
    public partial class Resource
    {
        
@@ -20678,265 +20678,268 @@
            public const int text_year_ago = 2131690526;
            
            // aapt resource value: 0x7F0F041F
            public const int tip_heard_voice = 2131690527;
            public const int tip_confirm_unlock = 2131690527;
            
            // aapt resource value: 0x7F0F0420
            public const int tip_login_out = 2131690528;
            public const int tip_heard_voice = 2131690528;
            
            // aapt resource value: 0x7F0F0421
            public const int tip_of_added_by_yourself_and_online = 2131690529;
            public const int tip_login_out = 2131690529;
            
            // aapt resource value: 0x7F0F0422
            public const int tip_of_bad_net = 2131690530;
            public const int tip_of_added_by_yourself_and_online = 2131690530;
            
            // aapt resource value: 0x7F0F0423
            public const int tip_playback_again = 2131690531;
            public const int tip_of_bad_net = 2131690531;
            
            // aapt resource value: 0x7F0F0424
            public const int tip_specified_device = 2131690532;
            public const int tip_playback_again = 2131690532;
            
            // aapt resource value: 0x7F0F0425
            public const int title_activate_device = 2131690533;
            public const int tip_specified_device = 2131690533;
            
            // aapt resource value: 0x7F0F0426
            public const int title_activate_device_fail = 2131690534;
            public const int title_activate_device = 2131690534;
            
            // aapt resource value: 0x7F0F0427
            public const int title_activity_connect_device_wifi = 2131690535;
            public const int title_activate_device_fail = 2131690535;
            
            // aapt resource value: 0x7F0F0428
            public const int title_activity_ezupgrade_device = 2131690536;
            public const int title_activity_connect_device_wifi = 2131690536;
            
            // aapt resource value: 0x7F0F0429
            public const int today = 2131690537;
            public const int title_activity_ezupgrade_device = 2131690537;
            
            // aapt resource value: 0x7F0F042A
            public const int touch_fingerprint_sensor_hint = 2131690538;
            public const int today = 2131690538;
            
            // aapt resource value: 0x7F0F042B
            public const int touch_to_load = 2131690539;
            public const int touch_fingerprint_sensor_hint = 2131690539;
            
            // aapt resource value: 0x7F0F042C
            public const int try_again = 2131690540;
            public const int touch_to_load = 2131690540;
            
            // aapt resource value: 0x7F0F042D
            public const int ui_call_demo_txt = 2131690541;
            public const int try_again = 2131690541;
            
            // aapt resource value: 0x7F0F042E
            public const int unable_identify_two_dimensional_code_tip = 2131690542;
            public const int ui_call_demo_txt = 2131690542;
            
            // aapt resource value: 0x7F0F042F
            public const int unbind_to_bind = 2131690543;
            public const int unable_identify_two_dimensional_code_tip = 2131690543;
            
            // aapt resource value: 0x7F0F0430
            public const int unblanking = 2131690544;
            public const int unbind_to_bind = 2131690544;
            
            // aapt resource value: 0x7F0F0431
            public const int unknow_ssid = 2131690545;
            public const int unblanking = 2131690545;
            
            // aapt resource value: 0x7F0F0432
            public const int unlock_fail = 2131690546;
            public const int unknow_ssid = 2131690546;
            
            // aapt resource value: 0x7F0F0433
            public const int unlock_success = 2131690547;
            public const int unlock_fail = 2131690547;
            
            // aapt resource value: 0x7F0F0434
            public const int unnamed = 2131690548;
            public const int unlock_success = 2131690548;
            
            // aapt resource value: 0x7F0F0435
            public const int update_exit = 2131690549;
            public const int unnamed = 2131690549;
            
            // aapt resource value: 0x7F0F0436
            public const int upgrade = 2131690550;
            public const int update_exit = 2131690550;
            
            // aapt resource value: 0x7F0F0437
            public const int upgrade_fail = 2131690551;
            public const int upgrade = 2131690551;
            
            // aapt resource value: 0x7F0F0438
            public const int upgrade_progress = 2131690552;
            public const int upgrade_fail = 2131690552;
            
            // aapt resource value: 0x7F0F0439
            public const int upgrade_success = 2131690553;
            public const int upgrade_progress = 2131690553;
            
            // aapt resource value: 0x7F0F043A
            public const int upgrade_success_progress = 2131690554;
            public const int upgrade_success = 2131690554;
            
            // aapt resource value: 0x7F0F043B
            public const int user_input_name = 2131690555;
            public const int upgrade_success_progress = 2131690555;
            
            // aapt resource value: 0x7F0F043C
            public const int user_login_title = 2131690556;
            public const int user_input_name = 2131690556;
            
            // aapt resource value: 0x7F0F043D
            public const int user_name_txt = 2131690557;
            public const int user_login_title = 2131690557;
            
            // aapt resource value: 0x7F0F043E
            public const int user_pwd_login_login = 2131690558;
            public const int user_name_txt = 2131690558;
            
            // aapt resource value: 0x7F0F043F
            public const int user_register = 2131690559;
            public const int user_pwd_login_login = 2131690559;
            
            // aapt resource value: 0x7F0F0440
            public const int user_register_btn = 2131690560;
            public const int user_register = 2131690560;
            
            // aapt resource value: 0x7F0F0441
            public const int valid_code_retrieve_valid_num = 2131690561;
            public const int user_register_btn = 2131690561;
            
            // aapt resource value: 0x7F0F0442
            public const int verify_camera_fail_network_exception = 2131690562;
            public const int valid_code_retrieve_valid_num = 2131690562;
            
            // aapt resource value: 0x7F0F0443
            public const int verify_code_error = 2131690563;
            public const int verify_camera_fail_network_exception = 2131690563;
            
            // aapt resource value: 0x7F0F0444
            public const int verify_sms_code_fail = 2131690564;
            public const int verify_code_error = 2131690564;
            
            // aapt resource value: 0x7F0F0445
            public const int verify_sms_code_success = 2131690565;
            public const int verify_sms_code_fail = 2131690565;
            
            // aapt resource value: 0x7F0F0446
            public const int version_newest = 2131690566;
            public const int verify_sms_code_success = 2131690566;
            
            // aapt resource value: 0x7F0F0447
            public const int video_answer = 2131690567;
            public const int version_newest = 2131690567;
            
            // aapt resource value: 0x7F0F0448
            public const int video_box = 2131690568;
            public const int video_answer = 2131690568;
            
            // aapt resource value: 0x7F0F0449
            public const int video_confirm = 2131690569;
            public const int video_box = 2131690569;
            
            // aapt resource value: 0x7F0F044A
            public const int video_device = 2131690570;
            public const int video_confirm = 2131690570;
            
            // aapt resource value: 0x7F0F044B
            public const int video_fail = 2131690571;
            public const int video_device = 2131690571;
            
            // aapt resource value: 0x7F0F044C
            public const int video_hang_up = 2131690572;
            public const int video_fail = 2131690572;
            
            // aapt resource value: 0x7F0F044D
            public const int video_icon = 2131690573;
            public const int video_hang_up = 2131690573;
            
            // aapt resource value: 0x7F0F044E
            public const int video_not_answer = 2131690574;
            public const int video_icon = 2131690574;
            
            // aapt resource value: 0x7F0F044F
            public const int video_screenshot = 2131690575;
            public const int video_not_answer = 2131690575;
            
            // aapt resource value: 0x7F0F0450
            public const int video_square = 2131690576;
            public const int video_screenshot = 2131690576;
            
            // aapt resource value: 0x7F0F0451
            public const int video_success = 2131690577;
            public const int video_square = 2131690577;
            
            // aapt resource value: 0x7F0F0452
            public const int video_talk_call_cancel = 2131690578;
            public const int video_success = 2131690578;
            
            // aapt resource value: 0x7F0F0453
            public const int video_talk_call_is_accepted = 2131690579;
            public const int video_talk_call_cancel = 2131690579;
            
            // aapt resource value: 0x7F0F0454
            public const int video_talk_is_playing = 2131690580;
            public const int video_talk_call_is_accepted = 2131690580;
            
            // aapt resource value: 0x7F0F0455
            public const int video_talk_sdk_toast_hang_up = 2131690581;
            public const int video_talk_is_playing = 2131690581;
            
            // aapt resource value: 0x7F0F0456
            public const int video_talk_sdk_toast_nobody = 2131690582;
            public const int video_talk_sdk_toast_hang_up = 2131690582;
            
            // aapt resource value: 0x7F0F0457
            public const int video_talk_signal_weak = 2131690583;
            public const int video_talk_sdk_toast_nobody = 2131690583;
            
            // aapt resource value: 0x7F0F0458
            public const int video_talk_watch_is_busy = 2131690584;
            public const int video_talk_signal_weak = 2131690584;
            
            // aapt resource value: 0x7F0F0459
            public const int video_talk_watch_temperature_high_hang = 2131690585;
            public const int video_talk_watch_is_busy = 2131690585;
            
            // aapt resource value: 0x7F0F045A
            public const int video_talk_watch_temperature_high_hint = 2131690586;
            public const int video_talk_watch_temperature_high_hang = 2131690586;
            
            // aapt resource value: 0x7F0F045B
            public const int video_talk_watch_temperature_high_reject = 2131690587;
            public const int video_talk_watch_temperature_high_hint = 2131690587;
            
            // aapt resource value: 0x7F0F045C
            public const int video_talk_watch_temperature_high_warn = 2131690588;
            public const int video_talk_watch_temperature_high_reject = 2131690588;
            
            // aapt resource value: 0x7F0F045D
            public const int video_tip = 2131690589;
            public const int video_talk_watch_temperature_high_warn = 2131690589;
            
            // aapt resource value: 0x7F0F045E
            public const int video_unlock = 2131690590;
            public const int video_tip = 2131690590;
            
            // aapt resource value: 0x7F0F045F
            public const int wait = 2131690591;
            public const int video_unlock = 2131690591;
            
            // aapt resource value: 0x7F0F0460
            public const int web_login_button_txt = 2131690592;
            public const int wait = 2131690592;
            
            // aapt resource value: 0x7F0F0461
            public const int wechat_interconnect = 2131690593;
            public const int web_login_button_txt = 2131690593;
            
            // aapt resource value: 0x7F0F0462
            public const int wifi_connected = 2131690594;
            public const int wechat_interconnect = 2131690594;
            
            // aapt resource value: 0x7F0F0463
            public const int wifi_connection_finish_need_refresh = 2131690595;
            public const int wifi_connected = 2131690595;
            
            // aapt resource value: 0x7F0F0464
            public const int wifi_set = 2131690596;
            public const int wifi_connection_finish_need_refresh = 2131690596;
            
            // aapt resource value: 0x7F0F0465
            public const int wifi_setting = 2131690597;
            public const int wifi_set = 2131690597;
            
            // aapt resource value: 0x7F0F0466
            public const int wired_connection = 2131690598;
            // aapt resource value: 0x7F0F0468
            public const int xlistview_footer_hint_normal = 2131690600;
            public const int wifi_setting = 2131690598;
            
            // aapt resource value: 0x7F0F0467
            public const int xlistview_footer_hint_no_more_device = 2131690599;
            public const int wired_connection = 2131690599;
            
            // aapt resource value: 0x7F0F0469
            public const int xlistview_footer_hint_ready = 2131690601;
            public const int xlistview_footer_hint_normal = 2131690601;
            // aapt resource value: 0x7F0F0468
            public const int xlistview_footer_hint_no_more_device = 2131690600;
            
            // aapt resource value: 0x7F0F046A
            public const int xlistview_footer_no_more = 2131690602;
            public const int xlistview_footer_hint_ready = 2131690602;
            
            // aapt resource value: 0x7F0F046B
            public const int xlistview_footer_no_more_msg = 2131690603;
            public const int xlistview_footer_no_more = 2131690603;
            
            // aapt resource value: 0x7F0F046C
            public const int xlistview_header_hint_loading = 2131690604;
            public const int xlistview_footer_no_more_msg = 2131690604;
            
            // aapt resource value: 0x7F0F046D
            public const int xlistview_header_hint_more = 2131690605;
            public const int xlistview_header_hint_loading = 2131690605;
            
            // aapt resource value: 0x7F0F046E
            public const int xlistview_header_hint_normal = 2131690606;
            public const int xlistview_header_hint_more = 2131690606;
            
            // aapt resource value: 0x7F0F046F
            public const int xlistview_header_hint_ready = 2131690607;
            public const int xlistview_header_hint_normal = 2131690607;
            
            // aapt resource value: 0x7F0F0470
            public const int xlistview_header_last_time = 2131690608;
            public const int xlistview_header_hint_ready = 2131690608;
            
            // aapt resource value: 0x7F0F0471
            public const int zxing_app_name = 2131690609;
            public const int xlistview_header_last_time = 2131690609;
            
            // aapt resource value: 0x7F0F0472
            public const int zxing_button_ok = 2131690610;
            public const int zxing_app_name = 2131690610;
            
            // aapt resource value: 0x7F0F0473
            public const int zxing_msg_camera_framework_bug = 2131690611;
            public const int zxing_button_ok = 2131690611;
            
            // aapt resource value: 0x7F0F0474
            public const int zxing_msg_default_status = 2131690612;
            public const int zxing_msg_camera_framework_bug = 2131690612;
            
            // aapt resource value: 0x7F0F0475
            public const int zxing_scan_tips = 2131690613;
            public const int zxing_msg_default_status = 2131690613;
            // aapt resource value: 0x7F0F0476
            public const int zxing_scan_tips = 2131690614;
            
            static String()
            {
@@ -20951,17 +20954,17 @@
        public partial class Style
        {
            
            // aapt resource value: 0x7F1001A6
            public const int add_device_btn_style = 2131755430;
            // aapt resource value: 0x7F1001A7
            public const int add_device_common_16dp_2c2c2c = 2131755431;
            public const int add_device_btn_style = 2131755431;
            
            // aapt resource value: 0x7F1001A8
            public const int add_device_help_style = 2131755432;
            public const int add_device_common_16dp_2c2c2c = 2131755432;
            
            // aapt resource value: 0x7F1001A5
            public const int add_Device_timeout_btn_style = 2131755429;
            // aapt resource value: 0x7F1001A9
            public const int add_device_help_style = 2131755433;
            // aapt resource value: 0x7F1001A6
            public const int add_Device_timeout_btn_style = 2131755430;
            
            // aapt resource value: 0x7F100003
            public const int AlertDialog_AppCompat = 2131755011;
@@ -20993,8 +20996,8 @@
            // aapt resource value: 0x7F10000B
            public const int AppTheme_NoActionBar = 2131755019;
            
            // aapt resource value: 0x7F1001A9
            public const int auto_wifi_status_style_normal = 2131755433;
            // aapt resource value: 0x7F1001AA
            public const int auto_wifi_status_style_normal = 2131755434;
            
            // aapt resource value: 0x7F100000
            public const int AVLoadingIndicatorView = 2131755008;
@@ -21500,11 +21503,11 @@
            // aapt resource value: 0x7F1000B1
            public const int BottomSheetDialogAnimation = 2131755185;
            
            // aapt resource value: 0x7F1001AA
            public const int cc_line_long = 2131755434;
            // aapt resource value: 0x7F1001AB
            public const int checks_dialog = 2131755435;
            public const int cc_line_long = 2131755435;
            // aapt resource value: 0x7F1001AC
            public const int checks_dialog = 2131755436;
            
            // aapt resource value: 0x7F1000B2
            public const int CommonGroupLayout = 2131755186;
@@ -21512,815 +21515,818 @@
            // aapt resource value: 0x7F1000B3
            public const int CommonListView = 2131755187;
            
            // aapt resource value: 0x7F1001AC
            public const int common_horizontal_line_style = 2131755436;
            // aapt resource value: 0x7F1001AD
            public const int common_input_style = 2131755437;
            public const int common_horizontal_line_style = 2131755437;
            
            // aapt resource value: 0x7F1001AE
            public const int custom_dialog = 2131755438;
            // aapt resource value: 0x7F1001AF
            public const int custom_dialog2 = 2131755439;
            // aapt resource value: 0x7F1001B0
            public const int dahua_wight_progressBar = 2131755440;
            // aapt resource value: 0x7F1001B1
            public const int dev_detail_relativeLayout = 2131755441;
            public const int common_input_style = 2131755438;
            
            // aapt resource value: 0x7F1000B4
            public const int DialogTheme = 2131755188;
            public const int CustomAlertDialog = 2131755188;
            
            // aapt resource value: 0x7F1000B5
            public const int FullAppTheme = 2131755189;
            // aapt resource value: 0x7F1001AF
            public const int custom_dialog = 2131755439;
            
            // aapt resource value: 0x7F1000B6
            public const int JPushTheme = 2131755190;
            // aapt resource value: 0x7F1001B0
            public const int custom_dialog2 = 2131755440;
            // aapt resource value: 0x7F1001B1
            public const int dahua_wight_progressBar = 2131755441;
            
            // aapt resource value: 0x7F1001B2
            public const int lc_bottom_button_style = 2131755442;
            public const int dev_detail_relativeLayout = 2131755442;
            
            // aapt resource value: 0x7F1001B3
            public const int lc_demo_loading = 2131755443;
            // aapt resource value: 0x7F1000B5
            public const int DialogTheme = 2131755189;
            // aapt resource value: 0x7F1000B6
            public const int FullAppTheme = 2131755190;
            
            // aapt resource value: 0x7F1000B7
            public const int List = 2131755191;
            public const int JPushTheme = 2131755191;
            
            // aapt resource value: 0x7F1000B8
            public const int LoadingTextView = 2131755192;
            // aapt resource value: 0x7F1000B9
            public const int LoadingTextView_Percent = 2131755193;
            // aapt resource value: 0x7F1001B5
            public const int mobile_common_cam_text_edit = 2131755445;
            // aapt resource value: 0x7F1001B6
            public const int mobile_common_cam_text_edit_enabled = 2131755446;
            // aapt resource value: 0x7F1001B7
            public const int mobile_common_cam_text_name = 2131755447;
            // aapt resource value: 0x7F1001B8
            public const int mobile_common_cam_text_name_enabled = 2131755448;
            // aapt resource value: 0x7F1001B9
            public const int mobile_common_cam_text_sub = 2131755449;
            // aapt resource value: 0x7F1001BA
            public const int mobile_common_checks_dialog = 2131755450;
            // aapt resource value: 0x7F1001BB
            public const int mobile_common_common_title = 2131755451;
            // aapt resource value: 0x7F1001BC
            public const int mobile_common_custom_dialog = 2131755452;
            // aapt resource value: 0x7F1001BD
            public const int mobile_common_dahua_wight_progressBar = 2131755453;
            // aapt resource value: 0x7F1001BE
            public const int mobile_common_dahua_wight_progressBar_Small = 2131755454;
            // aapt resource value: 0x7F1001BF
            public const int mobile_common_dialog_anima = 2131755455;
            // aapt resource value: 0x7F1001B3
            public const int lc_bottom_button_style = 2131755443;
            
            // aapt resource value: 0x7F1001B4
            public const int mobile_common_TextAppearance_22sp_black_bold = 2131755444;
            public const int lc_demo_loading = 2131755444;
            // aapt resource value: 0x7F1000B8
            public const int List = 2131755192;
            // aapt resource value: 0x7F1000B9
            public const int LoadingTextView = 2131755193;
            
            // aapt resource value: 0x7F1000BA
            public const int MyDialogStyle = 2131755194;
            public const int LoadingTextView_Percent = 2131755194;
            
            // aapt resource value: 0x7F1000BB
            public const int MyTheme = 2131755195;
            // aapt resource value: 0x7F1001B6
            public const int mobile_common_cam_text_edit = 2131755446;
            
            // aapt resource value: 0x7F1000BC
            public const int MyTheme1 = 2131755196;
            // aapt resource value: 0x7F1001B7
            public const int mobile_common_cam_text_edit_enabled = 2131755447;
            // aapt resource value: 0x7F1001B8
            public const int mobile_common_cam_text_name = 2131755448;
            // aapt resource value: 0x7F1001B9
            public const int mobile_common_cam_text_name_enabled = 2131755449;
            // aapt resource value: 0x7F1001BA
            public const int mobile_common_cam_text_sub = 2131755450;
            // aapt resource value: 0x7F1001BB
            public const int mobile_common_checks_dialog = 2131755451;
            // aapt resource value: 0x7F1001BC
            public const int mobile_common_common_title = 2131755452;
            // aapt resource value: 0x7F1001BD
            public const int mobile_common_custom_dialog = 2131755453;
            // aapt resource value: 0x7F1001BE
            public const int mobile_common_dahua_wight_progressBar = 2131755454;
            // aapt resource value: 0x7F1001BF
            public const int mobile_common_dahua_wight_progressBar_Small = 2131755455;
            
            // aapt resource value: 0x7F1001C0
            public const int picker_view_scale_anim = 2131755456;
            public const int mobile_common_dialog_anima = 2131755456;
            
            // aapt resource value: 0x7F1001C1
            public const int picker_view_slide_anim = 2131755457;
            // aapt resource value: 0x7F1001B5
            public const int mobile_common_TextAppearance_22sp_black_bold = 2131755445;
            // aapt resource value: 0x7F1000BB
            public const int MyDialogStyle = 2131755195;
            // aapt resource value: 0x7F1000BC
            public const int MyTheme = 2131755196;
            
            // aapt resource value: 0x7F1000BD
            public const int Platform_AppCompat = 2131755197;
            public const int MyTheme1 = 2131755197;
            
            // aapt resource value: 0x7F1000BE
            public const int Platform_AppCompat_Light = 2131755198;
            // aapt resource value: 0x7F1000BF
            public const int Platform_ThemeOverlay_AppCompat = 2131755199;
            // aapt resource value: 0x7F1000C0
            public const int Platform_ThemeOverlay_AppCompat_Dark = 2131755200;
            // aapt resource value: 0x7F1000C1
            public const int Platform_ThemeOverlay_AppCompat_Light = 2131755201;
            // aapt resource value: 0x7F1000C2
            public const int Platform_V11_AppCompat = 2131755202;
            // aapt resource value: 0x7F1000C3
            public const int Platform_V11_AppCompat_Light = 2131755203;
            // aapt resource value: 0x7F1000C4
            public const int Platform_V14_AppCompat = 2131755204;
            // aapt resource value: 0x7F1000C5
            public const int Platform_V14_AppCompat_Light = 2131755205;
            // aapt resource value: 0x7F1000C6
            public const int Platform_V21_AppCompat = 2131755206;
            // aapt resource value: 0x7F1000C7
            public const int Platform_V21_AppCompat_Light = 2131755207;
            // aapt resource value: 0x7F1000C8
            public const int Platform_V25_AppCompat = 2131755208;
            // aapt resource value: 0x7F1000C9
            public const int Platform_V25_AppCompat_Light = 2131755209;
            // aapt resource value: 0x7F1000CA
            public const int Platform_Widget_AppCompat_Spinner = 2131755210;
            // aapt resource value: 0x7F1001C1
            public const int picker_view_scale_anim = 2131755457;
            
            // aapt resource value: 0x7F1001C2
            public const int popwindowUpAnim = 2131755458;
            public const int picker_view_slide_anim = 2131755458;
            // aapt resource value: 0x7F1000BE
            public const int Platform_AppCompat = 2131755198;
            // aapt resource value: 0x7F1000BF
            public const int Platform_AppCompat_Light = 2131755199;
            // aapt resource value: 0x7F1000C0
            public const int Platform_ThemeOverlay_AppCompat = 2131755200;
            // aapt resource value: 0x7F1000C1
            public const int Platform_ThemeOverlay_AppCompat_Dark = 2131755201;
            // aapt resource value: 0x7F1000C2
            public const int Platform_ThemeOverlay_AppCompat_Light = 2131755202;
            // aapt resource value: 0x7F1000C3
            public const int Platform_V11_AppCompat = 2131755203;
            // aapt resource value: 0x7F1000C4
            public const int Platform_V11_AppCompat_Light = 2131755204;
            // aapt resource value: 0x7F1000C5
            public const int Platform_V14_AppCompat = 2131755205;
            // aapt resource value: 0x7F1000C6
            public const int Platform_V14_AppCompat_Light = 2131755206;
            // aapt resource value: 0x7F1000C7
            public const int Platform_V21_AppCompat = 2131755207;
            // aapt resource value: 0x7F1000C8
            public const int Platform_V21_AppCompat_Light = 2131755208;
            // aapt resource value: 0x7F1000C9
            public const int Platform_V25_AppCompat = 2131755209;
            // aapt resource value: 0x7F1000CA
            public const int Platform_V25_AppCompat_Light = 2131755210;
            
            // aapt resource value: 0x7F1000CB
            public const int RtlOverlay_DialogWindowTitle_AppCompat = 2131755211;
            // aapt resource value: 0x7F1000CC
            public const int RtlOverlay_Widget_AppCompat_ActionBar_TitleItem = 2131755212;
            // aapt resource value: 0x7F1000CD
            public const int RtlOverlay_Widget_AppCompat_DialogTitle_Icon = 2131755213;
            // aapt resource value: 0x7F1000CE
            public const int RtlOverlay_Widget_AppCompat_PopupMenuItem = 2131755214;
            // aapt resource value: 0x7F1000CF
            public const int RtlOverlay_Widget_AppCompat_PopupMenuItem_InternalGroup = 2131755215;
            // aapt resource value: 0x7F1000D0
            public const int RtlOverlay_Widget_AppCompat_PopupMenuItem_Text = 2131755216;
            // aapt resource value: 0x7F1000D6
            public const int RtlOverlay_Widget_AppCompat_SearchView_MagIcon = 2131755222;
            // aapt resource value: 0x7F1000D1
            public const int RtlOverlay_Widget_AppCompat_Search_DropDown = 2131755217;
            // aapt resource value: 0x7F1000D2
            public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Icon1 = 2131755218;
            // aapt resource value: 0x7F1000D3
            public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Icon2 = 2131755219;
            // aapt resource value: 0x7F1000D4
            public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Query = 2131755220;
            // aapt resource value: 0x7F1000D5
            public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Text = 2131755221;
            // aapt resource value: 0x7F1000D7
            public const int RtlUnderlay_Widget_AppCompat_ActionButton = 2131755223;
            // aapt resource value: 0x7F1000D8
            public const int RtlUnderlay_Widget_AppCompat_ActionButton_Overflow = 2131755224;
            public const int Platform_Widget_AppCompat_Spinner = 2131755211;
            
            // aapt resource value: 0x7F1001C3
            public const int sign_dialog = 2131755459;
            public const int popwindowUpAnim = 2131755459;
            // aapt resource value: 0x7F1000CC
            public const int RtlOverlay_DialogWindowTitle_AppCompat = 2131755212;
            // aapt resource value: 0x7F1000CD
            public const int RtlOverlay_Widget_AppCompat_ActionBar_TitleItem = 2131755213;
            // aapt resource value: 0x7F1000CE
            public const int RtlOverlay_Widget_AppCompat_DialogTitle_Icon = 2131755214;
            // aapt resource value: 0x7F1000CF
            public const int RtlOverlay_Widget_AppCompat_PopupMenuItem = 2131755215;
            // aapt resource value: 0x7F1000D0
            public const int RtlOverlay_Widget_AppCompat_PopupMenuItem_InternalGroup = 2131755216;
            // aapt resource value: 0x7F1000D1
            public const int RtlOverlay_Widget_AppCompat_PopupMenuItem_Text = 2131755217;
            // aapt resource value: 0x7F1000D7
            public const int RtlOverlay_Widget_AppCompat_SearchView_MagIcon = 2131755223;
            // aapt resource value: 0x7F1000D2
            public const int RtlOverlay_Widget_AppCompat_Search_DropDown = 2131755218;
            // aapt resource value: 0x7F1000D3
            public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Icon1 = 2131755219;
            // aapt resource value: 0x7F1000D4
            public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Icon2 = 2131755220;
            // aapt resource value: 0x7F1000D5
            public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Query = 2131755221;
            // aapt resource value: 0x7F1000D6
            public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Text = 2131755222;
            // aapt resource value: 0x7F1000D8
            public const int RtlUnderlay_Widget_AppCompat_ActionButton = 2131755224;
            
            // aapt resource value: 0x7F1000D9
            public const int SplashTheme = 2131755225;
            // aapt resource value: 0x7F1000DA
            public const int TextAppearance_17sp_lc_black_color = 2131755226;
            // aapt resource value: 0x7F1000DB
            public const int TextAppearance_AppCompat = 2131755227;
            // aapt resource value: 0x7F1000DC
            public const int TextAppearance_AppCompat_Body1 = 2131755228;
            // aapt resource value: 0x7F1000DD
            public const int TextAppearance_AppCompat_Body2 = 2131755229;
            // aapt resource value: 0x7F1000DE
            public const int TextAppearance_AppCompat_Button = 2131755230;
            // aapt resource value: 0x7F1000DF
            public const int TextAppearance_AppCompat_Caption = 2131755231;
            // aapt resource value: 0x7F1000E0
            public const int TextAppearance_AppCompat_Display1 = 2131755232;
            // aapt resource value: 0x7F1000E1
            public const int TextAppearance_AppCompat_Display2 = 2131755233;
            // aapt resource value: 0x7F1000E2
            public const int TextAppearance_AppCompat_Display3 = 2131755234;
            // aapt resource value: 0x7F1000E3
            public const int TextAppearance_AppCompat_Display4 = 2131755235;
            // aapt resource value: 0x7F1000E4
            public const int TextAppearance_AppCompat_Headline = 2131755236;
            // aapt resource value: 0x7F1000E5
            public const int TextAppearance_AppCompat_Inverse = 2131755237;
            // aapt resource value: 0x7F1000E6
            public const int TextAppearance_AppCompat_Large = 2131755238;
            // aapt resource value: 0x7F1000E7
            public const int TextAppearance_AppCompat_Large_Inverse = 2131755239;
            // aapt resource value: 0x7F1000E8
            public const int TextAppearance_AppCompat_Light_SearchResult_Subtitle = 2131755240;
            // aapt resource value: 0x7F1000E9
            public const int TextAppearance_AppCompat_Light_SearchResult_Title = 2131755241;
            // aapt resource value: 0x7F1000EA
            public const int TextAppearance_AppCompat_Light_Widget_PopupMenu_Large = 2131755242;
            // aapt resource value: 0x7F1000EB
            public const int TextAppearance_AppCompat_Light_Widget_PopupMenu_Small = 2131755243;
            // aapt resource value: 0x7F1000EC
            public const int TextAppearance_AppCompat_Medium = 2131755244;
            // aapt resource value: 0x7F1000ED
            public const int TextAppearance_AppCompat_Medium_Inverse = 2131755245;
            // aapt resource value: 0x7F1000EE
            public const int TextAppearance_AppCompat_Menu = 2131755246;
            // aapt resource value: 0x7F1000EF
            public const int TextAppearance_AppCompat_Notification = 2131755247;
            // aapt resource value: 0x7F1000F0
            public const int TextAppearance_AppCompat_Notification_Info = 2131755248;
            // aapt resource value: 0x7F1000F1
            public const int TextAppearance_AppCompat_Notification_Info_Media = 2131755249;
            // aapt resource value: 0x7F1000F2
            public const int TextAppearance_AppCompat_Notification_Line2 = 2131755250;
            // aapt resource value: 0x7F1000F3
            public const int TextAppearance_AppCompat_Notification_Line2_Media = 2131755251;
            // aapt resource value: 0x7F1000F4
            public const int TextAppearance_AppCompat_Notification_Media = 2131755252;
            // aapt resource value: 0x7F1000F5
            public const int TextAppearance_AppCompat_Notification_Time = 2131755253;
            // aapt resource value: 0x7F1000F6
            public const int TextAppearance_AppCompat_Notification_Time_Media = 2131755254;
            // aapt resource value: 0x7F1000F7
            public const int TextAppearance_AppCompat_Notification_Title = 2131755255;
            // aapt resource value: 0x7F1000F8
            public const int TextAppearance_AppCompat_Notification_Title_Media = 2131755256;
            // aapt resource value: 0x7F1000F9
            public const int TextAppearance_AppCompat_SearchResult_Subtitle = 2131755257;
            // aapt resource value: 0x7F1000FA
            public const int TextAppearance_AppCompat_SearchResult_Title = 2131755258;
            // aapt resource value: 0x7F1000FB
            public const int TextAppearance_AppCompat_Small = 2131755259;
            // aapt resource value: 0x7F1000FC
            public const int TextAppearance_AppCompat_Small_Inverse = 2131755260;
            // aapt resource value: 0x7F1000FD
            public const int TextAppearance_AppCompat_Subhead = 2131755261;
            // aapt resource value: 0x7F1000FE
            public const int TextAppearance_AppCompat_Subhead_Inverse = 2131755262;
            // aapt resource value: 0x7F1000FF
            public const int TextAppearance_AppCompat_Title = 2131755263;
            // aapt resource value: 0x7F100100
            public const int TextAppearance_AppCompat_Title_Inverse = 2131755264;
            // aapt resource value: 0x7F100101
            public const int TextAppearance_AppCompat_Tooltip = 2131755265;
            // aapt resource value: 0x7F100102
            public const int TextAppearance_AppCompat_Widget_ActionBar_Menu = 2131755266;
            // aapt resource value: 0x7F100103
            public const int TextAppearance_AppCompat_Widget_ActionBar_Subtitle = 2131755267;
            // aapt resource value: 0x7F100104
            public const int TextAppearance_AppCompat_Widget_ActionBar_Subtitle_Inverse = 2131755268;
            // aapt resource value: 0x7F100105
            public const int TextAppearance_AppCompat_Widget_ActionBar_Title = 2131755269;
            // aapt resource value: 0x7F100106
            public const int TextAppearance_AppCompat_Widget_ActionBar_Title_Inverse = 2131755270;
            // aapt resource value: 0x7F100107
            public const int TextAppearance_AppCompat_Widget_ActionMode_Subtitle = 2131755271;
            // aapt resource value: 0x7F100108
            public const int TextAppearance_AppCompat_Widget_ActionMode_Subtitle_Inverse = 2131755272;
            // aapt resource value: 0x7F100109
            public const int TextAppearance_AppCompat_Widget_ActionMode_Title = 2131755273;
            // aapt resource value: 0x7F10010A
            public const int TextAppearance_AppCompat_Widget_ActionMode_Title_Inverse = 2131755274;
            // aapt resource value: 0x7F10010B
            public const int TextAppearance_AppCompat_Widget_Button = 2131755275;
            // aapt resource value: 0x7F10010C
            public const int TextAppearance_AppCompat_Widget_Button_Borderless_Colored = 2131755276;
            // aapt resource value: 0x7F10010D
            public const int TextAppearance_AppCompat_Widget_Button_Colored = 2131755277;
            // aapt resource value: 0x7F10010E
            public const int TextAppearance_AppCompat_Widget_Button_Inverse = 2131755278;
            // aapt resource value: 0x7F10010F
            public const int TextAppearance_AppCompat_Widget_DropDownItem = 2131755279;
            // aapt resource value: 0x7F100110
            public const int TextAppearance_AppCompat_Widget_PopupMenu_Header = 2131755280;
            // aapt resource value: 0x7F100111
            public const int TextAppearance_AppCompat_Widget_PopupMenu_Large = 2131755281;
            // aapt resource value: 0x7F100112
            public const int TextAppearance_AppCompat_Widget_PopupMenu_Small = 2131755282;
            // aapt resource value: 0x7F100113
            public const int TextAppearance_AppCompat_Widget_Switch = 2131755283;
            // aapt resource value: 0x7F100114
            public const int TextAppearance_AppCompat_Widget_TextView_SpinnerItem = 2131755284;
            // aapt resource value: 0x7F100115
            public const int TextAppearance_Compat_Notification = 2131755285;
            // aapt resource value: 0x7F100116
            public const int TextAppearance_Compat_Notification_Info = 2131755286;
            // aapt resource value: 0x7F100117
            public const int TextAppearance_Compat_Notification_Info_Media = 2131755287;
            // aapt resource value: 0x7F100118
            public const int TextAppearance_Compat_Notification_Line2 = 2131755288;
            // aapt resource value: 0x7F100119
            public const int TextAppearance_Compat_Notification_Line2_Media = 2131755289;
            // aapt resource value: 0x7F10011A
            public const int TextAppearance_Compat_Notification_Media = 2131755290;
            // aapt resource value: 0x7F10011B
            public const int TextAppearance_Compat_Notification_Time = 2131755291;
            // aapt resource value: 0x7F10011C
            public const int TextAppearance_Compat_Notification_Time_Media = 2131755292;
            // aapt resource value: 0x7F10011D
            public const int TextAppearance_Compat_Notification_Title = 2131755293;
            // aapt resource value: 0x7F10011E
            public const int TextAppearance_Compat_Notification_Title_Media = 2131755294;
            // aapt resource value: 0x7F10011F
            public const int TextAppearance_Design_CollapsingToolbar_Expanded = 2131755295;
            // aapt resource value: 0x7F100120
            public const int TextAppearance_Design_Counter = 2131755296;
            // aapt resource value: 0x7F100121
            public const int TextAppearance_Design_Counter_Overflow = 2131755297;
            // aapt resource value: 0x7F100122
            public const int TextAppearance_Design_Error = 2131755298;
            // aapt resource value: 0x7F100123
            public const int TextAppearance_Design_Hint = 2131755299;
            // aapt resource value: 0x7F100124
            public const int TextAppearance_Design_Snackbar_Message = 2131755300;
            // aapt resource value: 0x7F100125
            public const int TextAppearance_Design_Tab = 2131755301;
            // aapt resource value: 0x7F100126
            public const int TextAppearance_Widget_AppCompat_ExpandedMenu_Item = 2131755302;
            // aapt resource value: 0x7F100127
            public const int TextAppearance_Widget_AppCompat_Toolbar_Subtitle = 2131755303;
            // aapt resource value: 0x7F100128
            public const int TextAppearance_Widget_AppCompat_Toolbar_Title = 2131755304;
            // aapt resource value: 0x7F100129
            public const int TextView = 2131755305;
            // aapt resource value: 0x7F100146
            public const int ThemeOverlay_AppCompat = 2131755334;
            // aapt resource value: 0x7F100147
            public const int ThemeOverlay_AppCompat_ActionBar = 2131755335;
            // aapt resource value: 0x7F100148
            public const int ThemeOverlay_AppCompat_Dark = 2131755336;
            // aapt resource value: 0x7F100149
            public const int ThemeOverlay_AppCompat_Dark_ActionBar = 2131755337;
            // aapt resource value: 0x7F10014A
            public const int ThemeOverlay_AppCompat_Dialog = 2131755338;
            // aapt resource value: 0x7F10014B
            public const int ThemeOverlay_AppCompat_Dialog_Alert = 2131755339;
            // aapt resource value: 0x7F10014C
            public const int ThemeOverlay_AppCompat_Light = 2131755340;
            // aapt resource value: 0x7F10012A
            public const int Theme_AppCompat = 2131755306;
            // aapt resource value: 0x7F10012B
            public const int Theme_AppCompat_CompactMenu = 2131755307;
            // aapt resource value: 0x7F10012C
            public const int Theme_AppCompat_DayNight = 2131755308;
            // aapt resource value: 0x7F10012D
            public const int Theme_AppCompat_DayNight_DarkActionBar = 2131755309;
            // aapt resource value: 0x7F10012E
            public const int Theme_AppCompat_DayNight_Dialog = 2131755310;
            // aapt resource value: 0x7F100131
            public const int Theme_AppCompat_DayNight_DialogWhenLarge = 2131755313;
            // aapt resource value: 0x7F10012F
            public const int Theme_AppCompat_DayNight_Dialog_Alert = 2131755311;
            // aapt resource value: 0x7F100130
            public const int Theme_AppCompat_DayNight_Dialog_MinWidth = 2131755312;
            // aapt resource value: 0x7F100132
            public const int Theme_AppCompat_DayNight_NoActionBar = 2131755314;
            // aapt resource value: 0x7F100133
            public const int Theme_AppCompat_Dialog = 2131755315;
            // aapt resource value: 0x7F100136
            public const int Theme_AppCompat_DialogWhenLarge = 2131755318;
            // aapt resource value: 0x7F100134
            public const int Theme_AppCompat_Dialog_Alert = 2131755316;
            // aapt resource value: 0x7F100135
            public const int Theme_AppCompat_Dialog_MinWidth = 2131755317;
            // aapt resource value: 0x7F100137
            public const int Theme_AppCompat_Light = 2131755319;
            // aapt resource value: 0x7F100138
            public const int Theme_AppCompat_Light_DarkActionBar = 2131755320;
            // aapt resource value: 0x7F100139
            public const int Theme_AppCompat_Light_Dialog = 2131755321;
            // aapt resource value: 0x7F10013C
            public const int Theme_AppCompat_Light_DialogWhenLarge = 2131755324;
            // aapt resource value: 0x7F10013A
            public const int Theme_AppCompat_Light_Dialog_Alert = 2131755322;
            // aapt resource value: 0x7F10013B
            public const int Theme_AppCompat_Light_Dialog_MinWidth = 2131755323;
            // aapt resource value: 0x7F10013D
            public const int Theme_AppCompat_Light_NoActionBar = 2131755325;
            // aapt resource value: 0x7F10013E
            public const int Theme_AppCompat_NoActionBar = 2131755326;
            // aapt resource value: 0x7F10013F
            public const int Theme_BiometricPromptDialog = 2131755327;
            // aapt resource value: 0x7F100140
            public const int Theme_Design = 2131755328;
            // aapt resource value: 0x7F100141
            public const int Theme_Design_BottomSheetDialog = 2131755329;
            // aapt resource value: 0x7F100142
            public const int Theme_Design_Light = 2131755330;
            // aapt resource value: 0x7F100143
            public const int Theme_Design_Light_BottomSheetDialog = 2131755331;
            // aapt resource value: 0x7F100144
            public const int Theme_Design_Light_NoActionBar = 2131755332;
            // aapt resource value: 0x7F100145
            public const int Theme_Design_NoActionBar = 2131755333;
            public const int RtlUnderlay_Widget_AppCompat_ActionButton_Overflow = 2131755225;
            
            // aapt resource value: 0x7F1001C4
            public const int time_picker_style = 2131755460;
            public const int sign_dialog = 2131755460;
            // aapt resource value: 0x7F1000DA
            public const int SplashTheme = 2131755226;
            // aapt resource value: 0x7F1000DB
            public const int TextAppearance_17sp_lc_black_color = 2131755227;
            // aapt resource value: 0x7F1000DC
            public const int TextAppearance_AppCompat = 2131755228;
            // aapt resource value: 0x7F1000DD
            public const int TextAppearance_AppCompat_Body1 = 2131755229;
            // aapt resource value: 0x7F1000DE
            public const int TextAppearance_AppCompat_Body2 = 2131755230;
            // aapt resource value: 0x7F1000DF
            public const int TextAppearance_AppCompat_Button = 2131755231;
            // aapt resource value: 0x7F1000E0
            public const int TextAppearance_AppCompat_Caption = 2131755232;
            // aapt resource value: 0x7F1000E1
            public const int TextAppearance_AppCompat_Display1 = 2131755233;
            // aapt resource value: 0x7F1000E2
            public const int TextAppearance_AppCompat_Display2 = 2131755234;
            // aapt resource value: 0x7F1000E3
            public const int TextAppearance_AppCompat_Display3 = 2131755235;
            // aapt resource value: 0x7F1000E4
            public const int TextAppearance_AppCompat_Display4 = 2131755236;
            // aapt resource value: 0x7F1000E5
            public const int TextAppearance_AppCompat_Headline = 2131755237;
            // aapt resource value: 0x7F1000E6
            public const int TextAppearance_AppCompat_Inverse = 2131755238;
            // aapt resource value: 0x7F1000E7
            public const int TextAppearance_AppCompat_Large = 2131755239;
            // aapt resource value: 0x7F1000E8
            public const int TextAppearance_AppCompat_Large_Inverse = 2131755240;
            // aapt resource value: 0x7F1000E9
            public const int TextAppearance_AppCompat_Light_SearchResult_Subtitle = 2131755241;
            // aapt resource value: 0x7F1000EA
            public const int TextAppearance_AppCompat_Light_SearchResult_Title = 2131755242;
            // aapt resource value: 0x7F1000EB
            public const int TextAppearance_AppCompat_Light_Widget_PopupMenu_Large = 2131755243;
            // aapt resource value: 0x7F1000EC
            public const int TextAppearance_AppCompat_Light_Widget_PopupMenu_Small = 2131755244;
            // aapt resource value: 0x7F1000ED
            public const int TextAppearance_AppCompat_Medium = 2131755245;
            // aapt resource value: 0x7F1000EE
            public const int TextAppearance_AppCompat_Medium_Inverse = 2131755246;
            // aapt resource value: 0x7F1000EF
            public const int TextAppearance_AppCompat_Menu = 2131755247;
            // aapt resource value: 0x7F1000F0
            public const int TextAppearance_AppCompat_Notification = 2131755248;
            // aapt resource value: 0x7F1000F1
            public const int TextAppearance_AppCompat_Notification_Info = 2131755249;
            // aapt resource value: 0x7F1000F2
            public const int TextAppearance_AppCompat_Notification_Info_Media = 2131755250;
            // aapt resource value: 0x7F1000F3
            public const int TextAppearance_AppCompat_Notification_Line2 = 2131755251;
            // aapt resource value: 0x7F1000F4
            public const int TextAppearance_AppCompat_Notification_Line2_Media = 2131755252;
            // aapt resource value: 0x7F1000F5
            public const int TextAppearance_AppCompat_Notification_Media = 2131755253;
            // aapt resource value: 0x7F1000F6
            public const int TextAppearance_AppCompat_Notification_Time = 2131755254;
            // aapt resource value: 0x7F1000F7
            public const int TextAppearance_AppCompat_Notification_Time_Media = 2131755255;
            // aapt resource value: 0x7F1000F8
            public const int TextAppearance_AppCompat_Notification_Title = 2131755256;
            // aapt resource value: 0x7F1000F9
            public const int TextAppearance_AppCompat_Notification_Title_Media = 2131755257;
            // aapt resource value: 0x7F1000FA
            public const int TextAppearance_AppCompat_SearchResult_Subtitle = 2131755258;
            // aapt resource value: 0x7F1000FB
            public const int TextAppearance_AppCompat_SearchResult_Title = 2131755259;
            // aapt resource value: 0x7F1000FC
            public const int TextAppearance_AppCompat_Small = 2131755260;
            // aapt resource value: 0x7F1000FD
            public const int TextAppearance_AppCompat_Small_Inverse = 2131755261;
            // aapt resource value: 0x7F1000FE
            public const int TextAppearance_AppCompat_Subhead = 2131755262;
            // aapt resource value: 0x7F1000FF
            public const int TextAppearance_AppCompat_Subhead_Inverse = 2131755263;
            // aapt resource value: 0x7F100100
            public const int TextAppearance_AppCompat_Title = 2131755264;
            // aapt resource value: 0x7F100101
            public const int TextAppearance_AppCompat_Title_Inverse = 2131755265;
            // aapt resource value: 0x7F100102
            public const int TextAppearance_AppCompat_Tooltip = 2131755266;
            // aapt resource value: 0x7F100103
            public const int TextAppearance_AppCompat_Widget_ActionBar_Menu = 2131755267;
            // aapt resource value: 0x7F100104
            public const int TextAppearance_AppCompat_Widget_ActionBar_Subtitle = 2131755268;
            // aapt resource value: 0x7F100105
            public const int TextAppearance_AppCompat_Widget_ActionBar_Subtitle_Inverse = 2131755269;
            // aapt resource value: 0x7F100106
            public const int TextAppearance_AppCompat_Widget_ActionBar_Title = 2131755270;
            // aapt resource value: 0x7F100107
            public const int TextAppearance_AppCompat_Widget_ActionBar_Title_Inverse = 2131755271;
            // aapt resource value: 0x7F100108
            public const int TextAppearance_AppCompat_Widget_ActionMode_Subtitle = 2131755272;
            // aapt resource value: 0x7F100109
            public const int TextAppearance_AppCompat_Widget_ActionMode_Subtitle_Inverse = 2131755273;
            // aapt resource value: 0x7F10010A
            public const int TextAppearance_AppCompat_Widget_ActionMode_Title = 2131755274;
            // aapt resource value: 0x7F10010B
            public const int TextAppearance_AppCompat_Widget_ActionMode_Title_Inverse = 2131755275;
            // aapt resource value: 0x7F10010C
            public const int TextAppearance_AppCompat_Widget_Button = 2131755276;
            // aapt resource value: 0x7F10010D
            public const int TextAppearance_AppCompat_Widget_Button_Borderless_Colored = 2131755277;
            // aapt resource value: 0x7F10010E
            public const int TextAppearance_AppCompat_Widget_Button_Colored = 2131755278;
            // aapt resource value: 0x7F10010F
            public const int TextAppearance_AppCompat_Widget_Button_Inverse = 2131755279;
            // aapt resource value: 0x7F100110
            public const int TextAppearance_AppCompat_Widget_DropDownItem = 2131755280;
            // aapt resource value: 0x7F100111
            public const int TextAppearance_AppCompat_Widget_PopupMenu_Header = 2131755281;
            // aapt resource value: 0x7F100112
            public const int TextAppearance_AppCompat_Widget_PopupMenu_Large = 2131755282;
            // aapt resource value: 0x7F100113
            public const int TextAppearance_AppCompat_Widget_PopupMenu_Small = 2131755283;
            // aapt resource value: 0x7F100114
            public const int TextAppearance_AppCompat_Widget_Switch = 2131755284;
            // aapt resource value: 0x7F100115
            public const int TextAppearance_AppCompat_Widget_TextView_SpinnerItem = 2131755285;
            // aapt resource value: 0x7F100116
            public const int TextAppearance_Compat_Notification = 2131755286;
            // aapt resource value: 0x7F100117
            public const int TextAppearance_Compat_Notification_Info = 2131755287;
            // aapt resource value: 0x7F100118
            public const int TextAppearance_Compat_Notification_Info_Media = 2131755288;
            // aapt resource value: 0x7F100119
            public const int TextAppearance_Compat_Notification_Line2 = 2131755289;
            // aapt resource value: 0x7F10011A
            public const int TextAppearance_Compat_Notification_Line2_Media = 2131755290;
            // aapt resource value: 0x7F10011B
            public const int TextAppearance_Compat_Notification_Media = 2131755291;
            // aapt resource value: 0x7F10011C
            public const int TextAppearance_Compat_Notification_Time = 2131755292;
            // aapt resource value: 0x7F10011D
            public const int TextAppearance_Compat_Notification_Time_Media = 2131755293;
            // aapt resource value: 0x7F10011E
            public const int TextAppearance_Compat_Notification_Title = 2131755294;
            // aapt resource value: 0x7F10011F
            public const int TextAppearance_Compat_Notification_Title_Media = 2131755295;
            // aapt resource value: 0x7F100120
            public const int TextAppearance_Design_CollapsingToolbar_Expanded = 2131755296;
            // aapt resource value: 0x7F100121
            public const int TextAppearance_Design_Counter = 2131755297;
            // aapt resource value: 0x7F100122
            public const int TextAppearance_Design_Counter_Overflow = 2131755298;
            // aapt resource value: 0x7F100123
            public const int TextAppearance_Design_Error = 2131755299;
            // aapt resource value: 0x7F100124
            public const int TextAppearance_Design_Hint = 2131755300;
            // aapt resource value: 0x7F100125
            public const int TextAppearance_Design_Snackbar_Message = 2131755301;
            // aapt resource value: 0x7F100126
            public const int TextAppearance_Design_Tab = 2131755302;
            // aapt resource value: 0x7F100127
            public const int TextAppearance_Widget_AppCompat_ExpandedMenu_Item = 2131755303;
            // aapt resource value: 0x7F100128
            public const int TextAppearance_Widget_AppCompat_Toolbar_Subtitle = 2131755304;
            // aapt resource value: 0x7F100129
            public const int TextAppearance_Widget_AppCompat_Toolbar_Title = 2131755305;
            // aapt resource value: 0x7F10012A
            public const int TextView = 2131755306;
            // aapt resource value: 0x7F100147
            public const int ThemeOverlay_AppCompat = 2131755335;
            // aapt resource value: 0x7F100148
            public const int ThemeOverlay_AppCompat_ActionBar = 2131755336;
            // aapt resource value: 0x7F100149
            public const int ThemeOverlay_AppCompat_Dark = 2131755337;
            // aapt resource value: 0x7F10014A
            public const int ThemeOverlay_AppCompat_Dark_ActionBar = 2131755338;
            // aapt resource value: 0x7F10014B
            public const int ThemeOverlay_AppCompat_Dialog = 2131755339;
            // aapt resource value: 0x7F10014C
            public const int ThemeOverlay_AppCompat_Dialog_Alert = 2131755340;
            
            // aapt resource value: 0x7F10014D
            public const int TitleBar_Dark = 2131755341;
            public const int ThemeOverlay_AppCompat_Light = 2131755341;
            
            // aapt resource value: 0x7F10014E
            public const int TitleBar_Light = 2131755342;
            // aapt resource value: 0x7F10012B
            public const int Theme_AppCompat = 2131755307;
            
            // aapt resource value: 0x7F10014F
            public const int TitleBar_Light_Web = 2131755343;
            // aapt resource value: 0x7F10012C
            public const int Theme_AppCompat_CompactMenu = 2131755308;
            // aapt resource value: 0x7F10012D
            public const int Theme_AppCompat_DayNight = 2131755309;
            // aapt resource value: 0x7F10012E
            public const int Theme_AppCompat_DayNight_DarkActionBar = 2131755310;
            // aapt resource value: 0x7F10012F
            public const int Theme_AppCompat_DayNight_Dialog = 2131755311;
            // aapt resource value: 0x7F100132
            public const int Theme_AppCompat_DayNight_DialogWhenLarge = 2131755314;
            // aapt resource value: 0x7F100130
            public const int Theme_AppCompat_DayNight_Dialog_Alert = 2131755312;
            // aapt resource value: 0x7F100131
            public const int Theme_AppCompat_DayNight_Dialog_MinWidth = 2131755313;
            // aapt resource value: 0x7F100133
            public const int Theme_AppCompat_DayNight_NoActionBar = 2131755315;
            // aapt resource value: 0x7F100134
            public const int Theme_AppCompat_Dialog = 2131755316;
            // aapt resource value: 0x7F100137
            public const int Theme_AppCompat_DialogWhenLarge = 2131755319;
            // aapt resource value: 0x7F100135
            public const int Theme_AppCompat_Dialog_Alert = 2131755317;
            // aapt resource value: 0x7F100136
            public const int Theme_AppCompat_Dialog_MinWidth = 2131755318;
            // aapt resource value: 0x7F100138
            public const int Theme_AppCompat_Light = 2131755320;
            // aapt resource value: 0x7F100139
            public const int Theme_AppCompat_Light_DarkActionBar = 2131755321;
            // aapt resource value: 0x7F10013A
            public const int Theme_AppCompat_Light_Dialog = 2131755322;
            // aapt resource value: 0x7F10013D
            public const int Theme_AppCompat_Light_DialogWhenLarge = 2131755325;
            // aapt resource value: 0x7F10013B
            public const int Theme_AppCompat_Light_Dialog_Alert = 2131755323;
            // aapt resource value: 0x7F10013C
            public const int Theme_AppCompat_Light_Dialog_MinWidth = 2131755324;
            // aapt resource value: 0x7F10013E
            public const int Theme_AppCompat_Light_NoActionBar = 2131755326;
            // aapt resource value: 0x7F10013F
            public const int Theme_AppCompat_NoActionBar = 2131755327;
            // aapt resource value: 0x7F100140
            public const int Theme_BiometricPromptDialog = 2131755328;
            // aapt resource value: 0x7F100141
            public const int Theme_Design = 2131755329;
            // aapt resource value: 0x7F100142
            public const int Theme_Design_BottomSheetDialog = 2131755330;
            // aapt resource value: 0x7F100143
            public const int Theme_Design_Light = 2131755331;
            // aapt resource value: 0x7F100144
            public const int Theme_Design_Light_BottomSheetDialog = 2131755332;
            // aapt resource value: 0x7F100145
            public const int Theme_Design_Light_NoActionBar = 2131755333;
            // aapt resource value: 0x7F100146
            public const int Theme_Design_NoActionBar = 2131755334;
            
            // aapt resource value: 0x7F1001C5
            public const int translucent = 2131755461;
            public const int time_picker_style = 2131755461;
            
            // aapt resource value: 0x7F1001C6
            public const int user_module_edittext = 2131755462;
            // aapt resource value: 0x7F10014E
            public const int TitleBar_Dark = 2131755342;
            
            // aapt resource value: 0x7F1001C7
            public const int video_dialog = 2131755463;
            // aapt resource value: 0x7F10014F
            public const int TitleBar_Light = 2131755343;
            
            // aapt resource value: 0x7F100150
            public const int Widget_AppCompat_ActionBar = 2131755344;
            public const int TitleBar_Light_Web = 2131755344;
            
            // aapt resource value: 0x7F100151
            public const int Widget_AppCompat_ActionBar_Solid = 2131755345;
            // aapt resource value: 0x7F1001C6
            public const int translucent = 2131755462;
            
            // aapt resource value: 0x7F100152
            public const int Widget_AppCompat_ActionBar_TabBar = 2131755346;
            // aapt resource value: 0x7F100153
            public const int Widget_AppCompat_ActionBar_TabText = 2131755347;
            // aapt resource value: 0x7F100154
            public const int Widget_AppCompat_ActionBar_TabView = 2131755348;
            // aapt resource value: 0x7F100155
            public const int Widget_AppCompat_ActionButton = 2131755349;
            // aapt resource value: 0x7F100156
            public const int Widget_AppCompat_ActionButton_CloseMode = 2131755350;
            // aapt resource value: 0x7F100157
            public const int Widget_AppCompat_ActionButton_Overflow = 2131755351;
            // aapt resource value: 0x7F100158
            public const int Widget_AppCompat_ActionMode = 2131755352;
            // aapt resource value: 0x7F100159
            public const int Widget_AppCompat_ActivityChooserView = 2131755353;
            // aapt resource value: 0x7F10015A
            public const int Widget_AppCompat_AutoCompleteTextView = 2131755354;
            // aapt resource value: 0x7F10015B
            public const int Widget_AppCompat_Button = 2131755355;
            // aapt resource value: 0x7F100161
            public const int Widget_AppCompat_ButtonBar = 2131755361;
            // aapt resource value: 0x7F100162
            public const int Widget_AppCompat_ButtonBar_AlertDialog = 2131755362;
            // aapt resource value: 0x7F10015C
            public const int Widget_AppCompat_Button_Borderless = 2131755356;
            // aapt resource value: 0x7F10015D
            public const int Widget_AppCompat_Button_Borderless_Colored = 2131755357;
            // aapt resource value: 0x7F10015E
            public const int Widget_AppCompat_Button_ButtonBar_AlertDialog = 2131755358;
            // aapt resource value: 0x7F10015F
            public const int Widget_AppCompat_Button_Colored = 2131755359;
            // aapt resource value: 0x7F100160
            public const int Widget_AppCompat_Button_Small = 2131755360;
            // aapt resource value: 0x7F100163
            public const int Widget_AppCompat_CompoundButton_CheckBox = 2131755363;
            // aapt resource value: 0x7F100164
            public const int Widget_AppCompat_CompoundButton_RadioButton = 2131755364;
            // aapt resource value: 0x7F100165
            public const int Widget_AppCompat_CompoundButton_Switch = 2131755365;
            // aapt resource value: 0x7F100166
            public const int Widget_AppCompat_DrawerArrowToggle = 2131755366;
            // aapt resource value: 0x7F100167
            public const int Widget_AppCompat_DropDownItem_Spinner = 2131755367;
            // aapt resource value: 0x7F100168
            public const int Widget_AppCompat_EditText = 2131755368;
            // aapt resource value: 0x7F100169
            public const int Widget_AppCompat_ImageButton = 2131755369;
            // aapt resource value: 0x7F10016A
            public const int Widget_AppCompat_Light_ActionBar = 2131755370;
            // aapt resource value: 0x7F10016B
            public const int Widget_AppCompat_Light_ActionBar_Solid = 2131755371;
            // aapt resource value: 0x7F10016C
            public const int Widget_AppCompat_Light_ActionBar_Solid_Inverse = 2131755372;
            // aapt resource value: 0x7F10016D
            public const int Widget_AppCompat_Light_ActionBar_TabBar = 2131755373;
            // aapt resource value: 0x7F10016E
            public const int Widget_AppCompat_Light_ActionBar_TabBar_Inverse = 2131755374;
            // aapt resource value: 0x7F10016F
            public const int Widget_AppCompat_Light_ActionBar_TabText = 2131755375;
            // aapt resource value: 0x7F100170
            public const int Widget_AppCompat_Light_ActionBar_TabText_Inverse = 2131755376;
            // aapt resource value: 0x7F100171
            public const int Widget_AppCompat_Light_ActionBar_TabView = 2131755377;
            // aapt resource value: 0x7F100172
            public const int Widget_AppCompat_Light_ActionBar_TabView_Inverse = 2131755378;
            // aapt resource value: 0x7F100173
            public const int Widget_AppCompat_Light_ActionButton = 2131755379;
            // aapt resource value: 0x7F100174
            public const int Widget_AppCompat_Light_ActionButton_CloseMode = 2131755380;
            // aapt resource value: 0x7F100175
            public const int Widget_AppCompat_Light_ActionButton_Overflow = 2131755381;
            // aapt resource value: 0x7F100176
            public const int Widget_AppCompat_Light_ActionMode_Inverse = 2131755382;
            // aapt resource value: 0x7F100177
            public const int Widget_AppCompat_Light_ActivityChooserView = 2131755383;
            // aapt resource value: 0x7F100178
            public const int Widget_AppCompat_Light_AutoCompleteTextView = 2131755384;
            // aapt resource value: 0x7F100179
            public const int Widget_AppCompat_Light_DropDownItem_Spinner = 2131755385;
            // aapt resource value: 0x7F10017A
            public const int Widget_AppCompat_Light_ListPopupWindow = 2131755386;
            // aapt resource value: 0x7F10017B
            public const int Widget_AppCompat_Light_ListView_DropDown = 2131755387;
            // aapt resource value: 0x7F10017C
            public const int Widget_AppCompat_Light_PopupMenu = 2131755388;
            // aapt resource value: 0x7F10017D
            public const int Widget_AppCompat_Light_PopupMenu_Overflow = 2131755389;
            // aapt resource value: 0x7F10017E
            public const int Widget_AppCompat_Light_SearchView = 2131755390;
            // aapt resource value: 0x7F10017F
            public const int Widget_AppCompat_Light_Spinner_DropDown_ActionBar = 2131755391;
            // aapt resource value: 0x7F100180
            public const int Widget_AppCompat_ListMenuView = 2131755392;
            // aapt resource value: 0x7F100181
            public const int Widget_AppCompat_ListPopupWindow = 2131755393;
            // aapt resource value: 0x7F100182
            public const int Widget_AppCompat_ListView = 2131755394;
            // aapt resource value: 0x7F100183
            public const int Widget_AppCompat_ListView_DropDown = 2131755395;
            // aapt resource value: 0x7F100184
            public const int Widget_AppCompat_ListView_Menu = 2131755396;
            // aapt resource value: 0x7F100185
            public const int Widget_AppCompat_PopupMenu = 2131755397;
            // aapt resource value: 0x7F100186
            public const int Widget_AppCompat_PopupMenu_Overflow = 2131755398;
            // aapt resource value: 0x7F100187
            public const int Widget_AppCompat_PopupWindow = 2131755399;
            // aapt resource value: 0x7F100188
            public const int Widget_AppCompat_ProgressBar = 2131755400;
            // aapt resource value: 0x7F100189
            public const int Widget_AppCompat_ProgressBar_Horizontal = 2131755401;
            // aapt resource value: 0x7F10018A
            public const int Widget_AppCompat_RatingBar = 2131755402;
            // aapt resource value: 0x7F10018B
            public const int Widget_AppCompat_RatingBar_Indicator = 2131755403;
            // aapt resource value: 0x7F10018C
            public const int Widget_AppCompat_RatingBar_Small = 2131755404;
            // aapt resource value: 0x7F10018D
            public const int Widget_AppCompat_SearchView = 2131755405;
            // aapt resource value: 0x7F10018E
            public const int Widget_AppCompat_SearchView_ActionBar = 2131755406;
            // aapt resource value: 0x7F10018F
            public const int Widget_AppCompat_SeekBar = 2131755407;
            // aapt resource value: 0x7F100190
            public const int Widget_AppCompat_SeekBar_Discrete = 2131755408;
            // aapt resource value: 0x7F100191
            public const int Widget_AppCompat_Spinner = 2131755409;
            // aapt resource value: 0x7F100192
            public const int Widget_AppCompat_Spinner_DropDown = 2131755410;
            // aapt resource value: 0x7F100193
            public const int Widget_AppCompat_Spinner_DropDown_ActionBar = 2131755411;
            // aapt resource value: 0x7F100194
            public const int Widget_AppCompat_Spinner_Underlined = 2131755412;
            // aapt resource value: 0x7F100195
            public const int Widget_AppCompat_TextView_SpinnerItem = 2131755413;
            // aapt resource value: 0x7F100196
            public const int Widget_AppCompat_Toolbar = 2131755414;
            // aapt resource value: 0x7F100197
            public const int Widget_AppCompat_Toolbar_Button_Navigation = 2131755415;
            // aapt resource value: 0x7F100198
            public const int Widget_Compat_NotificationActionContainer = 2131755416;
            // aapt resource value: 0x7F100199
            public const int Widget_Compat_NotificationActionText = 2131755417;
            // aapt resource value: 0x7F10019A
            public const int Widget_Design_AppBarLayout = 2131755418;
            // aapt resource value: 0x7F10019B
            public const int Widget_Design_BottomNavigationView = 2131755419;
            // aapt resource value: 0x7F10019C
            public const int Widget_Design_BottomSheet_Modal = 2131755420;
            // aapt resource value: 0x7F10019D
            public const int Widget_Design_CollapsingToolbar = 2131755421;
            // aapt resource value: 0x7F10019E
            public const int Widget_Design_CoordinatorLayout = 2131755422;
            // aapt resource value: 0x7F10019F
            public const int Widget_Design_FloatingActionButton = 2131755423;
            // aapt resource value: 0x7F1001A0
            public const int Widget_Design_NavigationView = 2131755424;
            // aapt resource value: 0x7F1001A1
            public const int Widget_Design_ScrimInsetsFrameLayout = 2131755425;
            // aapt resource value: 0x7F1001A2
            public const int Widget_Design_Snackbar = 2131755426;
            // aapt resource value: 0x7F1001A3
            public const int Widget_Design_TabLayout = 2131755427;
            // aapt resource value: 0x7F1001A4
            public const int Widget_Design_TextInputLayout = 2131755428;
            // aapt resource value: 0x7F1001C7
            public const int user_module_edittext = 2131755463;
            
            // aapt resource value: 0x7F1001C8
            public const int zxing_CaptureTheme = 2131755464;
            public const int video_dialog = 2131755464;
            // aapt resource value: 0x7F100151
            public const int Widget_AppCompat_ActionBar = 2131755345;
            // aapt resource value: 0x7F100152
            public const int Widget_AppCompat_ActionBar_Solid = 2131755346;
            // aapt resource value: 0x7F100153
            public const int Widget_AppCompat_ActionBar_TabBar = 2131755347;
            // aapt resource value: 0x7F100154
            public const int Widget_AppCompat_ActionBar_TabText = 2131755348;
            // aapt resource value: 0x7F100155
            public const int Widget_AppCompat_ActionBar_TabView = 2131755349;
            // aapt resource value: 0x7F100156
            public const int Widget_AppCompat_ActionButton = 2131755350;
            // aapt resource value: 0x7F100157
            public const int Widget_AppCompat_ActionButton_CloseMode = 2131755351;
            // aapt resource value: 0x7F100158
            public const int Widget_AppCompat_ActionButton_Overflow = 2131755352;
            // aapt resource value: 0x7F100159
            public const int Widget_AppCompat_ActionMode = 2131755353;
            // aapt resource value: 0x7F10015A
            public const int Widget_AppCompat_ActivityChooserView = 2131755354;
            // aapt resource value: 0x7F10015B
            public const int Widget_AppCompat_AutoCompleteTextView = 2131755355;
            // aapt resource value: 0x7F10015C
            public const int Widget_AppCompat_Button = 2131755356;
            // aapt resource value: 0x7F100162
            public const int Widget_AppCompat_ButtonBar = 2131755362;
            // aapt resource value: 0x7F100163
            public const int Widget_AppCompat_ButtonBar_AlertDialog = 2131755363;
            // aapt resource value: 0x7F10015D
            public const int Widget_AppCompat_Button_Borderless = 2131755357;
            // aapt resource value: 0x7F10015E
            public const int Widget_AppCompat_Button_Borderless_Colored = 2131755358;
            // aapt resource value: 0x7F10015F
            public const int Widget_AppCompat_Button_ButtonBar_AlertDialog = 2131755359;
            // aapt resource value: 0x7F100160
            public const int Widget_AppCompat_Button_Colored = 2131755360;
            // aapt resource value: 0x7F100161
            public const int Widget_AppCompat_Button_Small = 2131755361;
            // aapt resource value: 0x7F100164
            public const int Widget_AppCompat_CompoundButton_CheckBox = 2131755364;
            // aapt resource value: 0x7F100165
            public const int Widget_AppCompat_CompoundButton_RadioButton = 2131755365;
            // aapt resource value: 0x7F100166
            public const int Widget_AppCompat_CompoundButton_Switch = 2131755366;
            // aapt resource value: 0x7F100167
            public const int Widget_AppCompat_DrawerArrowToggle = 2131755367;
            // aapt resource value: 0x7F100168
            public const int Widget_AppCompat_DropDownItem_Spinner = 2131755368;
            // aapt resource value: 0x7F100169
            public const int Widget_AppCompat_EditText = 2131755369;
            // aapt resource value: 0x7F10016A
            public const int Widget_AppCompat_ImageButton = 2131755370;
            // aapt resource value: 0x7F10016B
            public const int Widget_AppCompat_Light_ActionBar = 2131755371;
            // aapt resource value: 0x7F10016C
            public const int Widget_AppCompat_Light_ActionBar_Solid = 2131755372;
            // aapt resource value: 0x7F10016D
            public const int Widget_AppCompat_Light_ActionBar_Solid_Inverse = 2131755373;
            // aapt resource value: 0x7F10016E
            public const int Widget_AppCompat_Light_ActionBar_TabBar = 2131755374;
            // aapt resource value: 0x7F10016F
            public const int Widget_AppCompat_Light_ActionBar_TabBar_Inverse = 2131755375;
            // aapt resource value: 0x7F100170
            public const int Widget_AppCompat_Light_ActionBar_TabText = 2131755376;
            // aapt resource value: 0x7F100171
            public const int Widget_AppCompat_Light_ActionBar_TabText_Inverse = 2131755377;
            // aapt resource value: 0x7F100172
            public const int Widget_AppCompat_Light_ActionBar_TabView = 2131755378;
            // aapt resource value: 0x7F100173
            public const int Widget_AppCompat_Light_ActionBar_TabView_Inverse = 2131755379;
            // aapt resource value: 0x7F100174
            public const int Widget_AppCompat_Light_ActionButton = 2131755380;
            // aapt resource value: 0x7F100175
            public const int Widget_AppCompat_Light_ActionButton_CloseMode = 2131755381;
            // aapt resource value: 0x7F100176
            public const int Widget_AppCompat_Light_ActionButton_Overflow = 2131755382;
            // aapt resource value: 0x7F100177
            public const int Widget_AppCompat_Light_ActionMode_Inverse = 2131755383;
            // aapt resource value: 0x7F100178
            public const int Widget_AppCompat_Light_ActivityChooserView = 2131755384;
            // aapt resource value: 0x7F100179
            public const int Widget_AppCompat_Light_AutoCompleteTextView = 2131755385;
            // aapt resource value: 0x7F10017A
            public const int Widget_AppCompat_Light_DropDownItem_Spinner = 2131755386;
            // aapt resource value: 0x7F10017B
            public const int Widget_AppCompat_Light_ListPopupWindow = 2131755387;
            // aapt resource value: 0x7F10017C
            public const int Widget_AppCompat_Light_ListView_DropDown = 2131755388;
            // aapt resource value: 0x7F10017D
            public const int Widget_AppCompat_Light_PopupMenu = 2131755389;
            // aapt resource value: 0x7F10017E
            public const int Widget_AppCompat_Light_PopupMenu_Overflow = 2131755390;
            // aapt resource value: 0x7F10017F
            public const int Widget_AppCompat_Light_SearchView = 2131755391;
            // aapt resource value: 0x7F100180
            public const int Widget_AppCompat_Light_Spinner_DropDown_ActionBar = 2131755392;
            // aapt resource value: 0x7F100181
            public const int Widget_AppCompat_ListMenuView = 2131755393;
            // aapt resource value: 0x7F100182
            public const int Widget_AppCompat_ListPopupWindow = 2131755394;
            // aapt resource value: 0x7F100183
            public const int Widget_AppCompat_ListView = 2131755395;
            // aapt resource value: 0x7F100184
            public const int Widget_AppCompat_ListView_DropDown = 2131755396;
            // aapt resource value: 0x7F100185
            public const int Widget_AppCompat_ListView_Menu = 2131755397;
            // aapt resource value: 0x7F100186
            public const int Widget_AppCompat_PopupMenu = 2131755398;
            // aapt resource value: 0x7F100187
            public const int Widget_AppCompat_PopupMenu_Overflow = 2131755399;
            // aapt resource value: 0x7F100188
            public const int Widget_AppCompat_PopupWindow = 2131755400;
            // aapt resource value: 0x7F100189
            public const int Widget_AppCompat_ProgressBar = 2131755401;
            // aapt resource value: 0x7F10018A
            public const int Widget_AppCompat_ProgressBar_Horizontal = 2131755402;
            // aapt resource value: 0x7F10018B
            public const int Widget_AppCompat_RatingBar = 2131755403;
            // aapt resource value: 0x7F10018C
            public const int Widget_AppCompat_RatingBar_Indicator = 2131755404;
            // aapt resource value: 0x7F10018D
            public const int Widget_AppCompat_RatingBar_Small = 2131755405;
            // aapt resource value: 0x7F10018E
            public const int Widget_AppCompat_SearchView = 2131755406;
            // aapt resource value: 0x7F10018F
            public const int Widget_AppCompat_SearchView_ActionBar = 2131755407;
            // aapt resource value: 0x7F100190
            public const int Widget_AppCompat_SeekBar = 2131755408;
            // aapt resource value: 0x7F100191
            public const int Widget_AppCompat_SeekBar_Discrete = 2131755409;
            // aapt resource value: 0x7F100192
            public const int Widget_AppCompat_Spinner = 2131755410;
            // aapt resource value: 0x7F100193
            public const int Widget_AppCompat_Spinner_DropDown = 2131755411;
            // aapt resource value: 0x7F100194
            public const int Widget_AppCompat_Spinner_DropDown_ActionBar = 2131755412;
            // aapt resource value: 0x7F100195
            public const int Widget_AppCompat_Spinner_Underlined = 2131755413;
            // aapt resource value: 0x7F100196
            public const int Widget_AppCompat_TextView_SpinnerItem = 2131755414;
            // aapt resource value: 0x7F100197
            public const int Widget_AppCompat_Toolbar = 2131755415;
            // aapt resource value: 0x7F100198
            public const int Widget_AppCompat_Toolbar_Button_Navigation = 2131755416;
            // aapt resource value: 0x7F100199
            public const int Widget_Compat_NotificationActionContainer = 2131755417;
            // aapt resource value: 0x7F10019A
            public const int Widget_Compat_NotificationActionText = 2131755418;
            // aapt resource value: 0x7F10019B
            public const int Widget_Design_AppBarLayout = 2131755419;
            // aapt resource value: 0x7F10019C
            public const int Widget_Design_BottomNavigationView = 2131755420;
            // aapt resource value: 0x7F10019D
            public const int Widget_Design_BottomSheet_Modal = 2131755421;
            // aapt resource value: 0x7F10019E
            public const int Widget_Design_CollapsingToolbar = 2131755422;
            // aapt resource value: 0x7F10019F
            public const int Widget_Design_CoordinatorLayout = 2131755423;
            // aapt resource value: 0x7F1001A0
            public const int Widget_Design_FloatingActionButton = 2131755424;
            // aapt resource value: 0x7F1001A1
            public const int Widget_Design_NavigationView = 2131755425;
            // aapt resource value: 0x7F1001A2
            public const int Widget_Design_ScrimInsetsFrameLayout = 2131755426;
            // aapt resource value: 0x7F1001A3
            public const int Widget_Design_Snackbar = 2131755427;
            // aapt resource value: 0x7F1001A4
            public const int Widget_Design_TabLayout = 2131755428;
            // aapt resource value: 0x7F1001A5
            public const int Widget_Design_TextInputLayout = 2131755429;
            // aapt resource value: 0x7F1001C9
            public const int zxing_CaptureTheme = 2131755465;
            
            static Style()
            {
HDL-ON_Android/SplashActivity.cs
@@ -103,7 +103,7 @@
            //#endif
            JPushInterface.Init(this);
            //Com.Chteam.Agent.BuglyAgentHelper.Init(this.ApplicationContext, "316a8f5d83");
            Com.Chteam.Agent.BuglyAgentHelper.Init(this.ApplicationContext, "316a8f5d83");
@@ -252,20 +252,22 @@
            HDLUtils.SetAuthoritiesName("com.hdl.onpro.fileProvider");
            //Shared.Application.IsGpsEnable = true;
            bool isfirst = true;
            //bool isfirst = true;
            //获取经纬度 
            Shared.Application.LocationAction = (lon, lat) =>
            {
                try
                {
                    if (isfirst)
                    {
                        //只触发一次
                        //Shared.Application.LocationAction = null;
                        new HDL_ON.DAL.Server.HttpServerRequest().GetCityWeatherInfo(lon.ToString().Replace(",", "."), lat.ToString().Replace(",", "."));
                    }
                    isfirst = false;
                    //if (isfirst)
                    //{
                    //    //只触发一次
                    //    //Shared.Application.LocationAction = null;
                    //    new HDL_ON.DAL.Server.HttpServerRequest().GetCityWeatherInfo(lon.ToString().Replace(",", "."), lat.ToString().Replace(",", "."));
                    //}
                    //isfirst = false;
                    ///监听经纬度
                    HDL_ON.UI.UI2.Intelligence.Automation.LogicMethod.Current.AppLatAndLonEvent(lon, lat);
                    //关闭定位服务
@@ -279,6 +281,8 @@
            };
        }
        /// <summary>
        /// 
        /// </summary>
HDL-ON_iOS/AppDelegate.cs
@@ -4,9 +4,6 @@
using Shared;
using UIKit;
using UserNotifications;
using Microsoft.AppCenter;
using Microsoft.AppCenter.Analytics;
using Microsoft.AppCenter.Crashes;
using HDL_ON.UI;
using HDL_ON.DAL.Server;
using Intents;
@@ -189,8 +186,12 @@
        public override void OnResignActivation(UIApplication application)
        {
            //设置全视通状态
            Shared.IOS.HDLFVSDK.Video.FVapplicationWillResignActive(application);
            string systemVersion = UIKit.UIDevice.CurrentDevice.SystemVersion;
            string errorVersion = "16.2.0";
            if (systemVersion.CompareTo(errorVersion) < 0)///全视通不兼容ios16以上的系统,不要加载这个先
            {
                Shared.IOS.HDLFVSDK.Video.FVapplicationWillResignActive(application);
            }
            Console.WriteLine("OnResignActivation");
            UserInfo.Current.unlockTime = DateTime.Now;
        }
@@ -198,8 +199,12 @@
        public override void DidEnterBackground(UIApplication application)
        {
            //设置全视通状态
            Shared.IOS.HDLFVSDK.Video.FVapplicationDidEnterBackground(application);
            string systemVersion = UIKit.UIDevice.CurrentDevice.SystemVersion;
            string errorVersion = "16.2.0";
            if (systemVersion.CompareTo(errorVersion) < 0)///全视通不兼容ios16以上的系统,不要加载这个先
            {
                Shared.IOS.HDLFVSDK.Video.FVapplicationDidEnterBackground(application);
            }
            //SharedMethod.SharedMethod.IsBackground = true;
            //MainPage.IsEnterBackground = true;
            ////进入后台mqtt正在连接重置状态
@@ -226,8 +231,12 @@
        public override void OnActivated(UIApplication application)
        {
            //设置全视通状态
            Shared.IOS.HDLFVSDK.Video.FVapplicationDidBecomeActive(application);
            string systemVersion = UIKit.UIDevice.CurrentDevice.SystemVersion;
            string errorVersion = "16.2.0";
            if (systemVersion.CompareTo(errorVersion) < 0)///全视通不兼容ios16以上的系统,不要加载这个先
            {
                Shared.IOS.HDLFVSDK.Video.FVapplicationDidBecomeActive(application);
            }
            Console.WriteLine("OnActivated");
            base.OnActivated(application);
            //HDL_ON.DriverLayer.Control.Ins.SearchLoaclGateway();
@@ -285,12 +294,16 @@
        {
            //设置全视通状态
            Shared.IOS.HDLFVSDK.Video.FVapplication(application, new NSDictionary());
            string systemVersion = UIKit.UIDevice.CurrentDevice.SystemVersion;
            string errorVersion = "16.2.0";
            if (systemVersion.CompareTo(errorVersion) < 0)///全视通不兼容ios16以上的系统,不要加载这个先
            {
                Shared.IOS.HDLFVSDK.Video.FVapplication(application, new NSDictionary());
            }
            Console.WriteLine("111111111111");
            SetCurrentLanguage();
            //Shared.Application.FontSize = 12;
            Bugly.Bugly.StartWithAppId("b58fb35436");
            Bugly.Bugly.StartWithAppId("1dc40c170a");
            //取消EditText默认密码输入方式
            //Shared.Application.IsEditTextContentTypePassword = false;
            //默认使用苹方字体
@@ -304,8 +317,6 @@
            Window.RootViewController = rootViewController;
            Window.MakeKeyAndVisible();
            AppCenter.Start("e1add75a-82c6-4a5c-a902-4705b195748e", typeof(Analytics), typeof(Crashes));
            SharedMethod.SharedMethod.sharedApp = application;
            //NSString* nsCount = [[NSLocale currentLocale] objectForKey: NSLocaleCountryCode];
            application.StatusBarStyle = UIStatusBarStyle.DarkContent;
@@ -318,20 +329,15 @@
            //    //RemoteInfo.Current.ReadMsgList(true);
            //}
            //高德key
            GDMapKit.setGDApiKey("f0635ea15c5d579c6e93d9f07a06da69");
            //高德key
            GDMapKit.setGDApiKey("f0635ea15c5d579c6e93d9f07a06da69");
            Console.WriteLine("FinishedLaunching");
            return true;
        }
            /// <summary>
            /// 处理通知消息
            /// </summary>
            void HandleNotificationMessageUserInfo(NSDictionary userInfo, bool bFinishedLaunching)
        /// <summary>
        /// 处理通知消息
        /// </summary>
        void HandleNotificationMessageUserInfo(NSDictionary userInfo, bool bFinishedLaunching)
        {
            try
            {
@@ -349,13 +355,14 @@
                    if (userInfo.ContainsKey(new NSString("expandData")))
                    {
                        var expandDataStr = userInfo["expandData"] as NSString;
                        if(expandDataStr == null)
                        if (expandDataStr == null)
                        {
                            var expandDataNSD = userInfo["expandData"] as NSDictionary;
                            if (expandDataNSD != null)
                            {
                                expandData = expandDataNSD.ToString();
                                if(expandDataNSD.ContainsKey(new NSString("messageType"))){
                                if (expandDataNSD.ContainsKey(new NSString("messageType")))
                                {
                                    messageType = expandDataNSD["messageType"] as NSString;
                                    Utlis.WriteLine("messageType: " + messageType);
                                }
@@ -398,7 +405,7 @@
                        UserInfo.Current.pushMessageInfo = pushMes;
                        UserInfo.Current.inCall = DateTime.Now;
                    }
                    if (bFinishedLaunching)
                    {
                        if (pushMes.Extras != null)
@@ -424,7 +431,7 @@
                        //HDLCommon.Current.AdjustPushMessage(pushMes);
                        this.CommonAdjustPushMessage(pushMes);
                    }
                }
            }
            catch
HDL-ON_iOS/Info.plist
@@ -11,7 +11,7 @@
    <key>CFBundleName</key>
    <string>On Pro</string>
    <key>CFBundleShortVersionString</key>
    <string>1.7.3</string>
    <string>1.7.6</string>
    <key>CFBundleURLTypes</key>
    <array>
        <dict>
@@ -36,7 +36,7 @@
        </dict>
    </array>
    <key>CFBundleVersion</key>
    <string>1.7.3</string>
    <string>1.7.6</string>
    <key>LSApplicationQueriesSchemes</key>
    <array>
        <string>weixinULAPI</string>
HDL-ON_iOS/Resources/Language.ini
@@ -607,6 +607,14 @@
620=To_Be_Accepted
621=INITIAL_TATE
622=ACCEPTANCE
623=Latitude and longitude
624=Triggered range
625=Residential unbound
626=After unbinding the residence, the residence will be removed from your account. Are you sure you want to proceed?
627=The set time needs to be later than the current time.
628=Temporary password validity period cannot be greater than 24 hours.
629=Successfully unbound the residence.
2532=Visitor Invitation Record
@@ -729,7 +737,7 @@
1095=Select Date
1096=Generate
1097=Temporary password has been copied
1098=Clear Password?
1098=Do you want to delete the temporary password?
1099=The expire time must be later than the effective time
1100=Unlock Method
1101=It'll synchronize with actual lock, confirm to delete?
@@ -1882,7 +1890,13 @@
620=待验收
621=初始态
622=验收
623=经纬度
624=触发范围
625=住宅解绑
626=住宅解绑之后,住宅将会从你的账号中移除,确定要操作吗?
627=设置的时间需要晚于当前时间
628=临时密码有效期不能大于24小时。
629=住宅解绑成功。
2532=访客邀请记录
2533=访客管理
@@ -2013,8 +2027,8 @@
1095=选择日期
1096=生成
1097=临时密码已经复制
1098=清除当前临时密码?
1099=生效时间必须大于失效时间
1098=是否删除临时密码?
1099=生效时间必须早于失效时间
1100=开锁方式管理
1101=删除操作将被同步于实体锁上{0}是否还需要删除?
1102=确认删除
@@ -3156,6 +3170,14 @@
620=To_Be_Accepted
621=INITIAL_TATE
622=ACCEPTANCE
623=Latitude and longitude
624=Triggered range
625=Residential unbound
626=After unbinding the residence, the residence will be removed from your account. Are you sure you want to proceed?
627=The set time needs to be later than the current time.
628=Temporary password validity period cannot be greater than 24 hours.
629=Successfully unbound the residence.
2532=Visitor Invitation Record
@@ -4425,6 +4447,14 @@
620=To_Be_Accepted
621=INITIAL_TATE
622=ACCEPTANCE
623=Latitude and longitude
624=Triggered range
625=Residential unbound
626=After unbinding the residence, the residence will be removed from your account. Are you sure you want to proceed?
627=The set time needs to be later than the current time.
628=Temporary password validity period cannot be greater than 24 hours.
629=Successfully unbound the residence.
@@ -5684,6 +5714,13 @@
620=To_Be_Accepted
621=INITIAL_TATE
622=ACCEPTANCE
623=Latitude and longitude
624=Triggered range
625=Residential unbound
626=After unbinding the residence, the residence will be removed from your account. Are you sure you want to proceed?
627=The set time needs to be later than the current time.
628=Temporary password validity period cannot be greater than 24 hours.
629=Successfully unbound the residence.
HDL-ON_iOS/Resources/Phone/LogicIcon/selectlocation.png
HDL-ON_iOS/ViewController.cs
@@ -26,7 +26,7 @@
        {
            base.ViewDidLoad();
            HDL_ON.MainPage.Show();
            HDL_ON.MainPage.ShowAsync();
            try
            {
HDL_ON/Common/ApiUtlis.cs
@@ -173,7 +173,7 @@
                            if (deviceResult.Code == StateCode.SUCCESS)
                            {
                                FunctionList.List.ClearDatas();
                                MainPage.Log($"============设备============开始" + FunctionList.List.Functions.Count);
                                //MainPage.Log($"============设备============开始" + FunctionList.List.Functions.Count);
                                //MainPage.Log($"读取设备信息成功");
                                //MainPage.Log($"sid列表获取====" + deviceResult.Data.ToString());
                                var deviceList = JsonConvert.DeserializeObject<DevcieApiPack>(deviceResult.Data.ToString());
@@ -226,13 +226,13 @@
                                    }
                                }
                                //处理剩下的新增功能
                                int iiii = 0;
                                //int iiii = 0;
                                foreach (var newFunction in deviceList.list)
                                {
                                    newFunction.AssembleStatus();
                                    newFunction.SaveFunctionFile(); 
                                    FunctionList.List.IniFunctionList(newFunction.savePath,true);
                                    MainPage.Log($"============设备============{iiii++}");
                                    //MainPage.Log($"============设备============{iiii++}");
                                }
@@ -320,17 +320,22 @@
                                {
#if __IOS__
                                    List<VisitorTempPassword> dataList = new List<VisitorTempPassword>();
                                    Dictionary<string, object> dictionary = new Dictionary<string, object>();
                                    dictionary.Add("homeId", Entity.DB_ResidenceData.Instance.CurrentRegion.id);
                                    var requestJson = HttpUtil.GetSignRequestJson(dictionary);
                                    ResponsePackNew pack = HttpUtil.RequestHttpsPost(NewAPI.Api_Post_GetExtMemberInfo, requestJson);
                                    if(pack!= null)
                                    string systemVersion = UIKit.UIDevice.CurrentDevice.SystemVersion;
                                    string errorVersion = "16.2.0";
                                    if (systemVersion.CompareTo(errorVersion) < 0)///全视通不兼容ios16以上的系统,不要加载这个先
                                    {
                                        var data = Newtonsoft.Json.JsonConvert.DeserializeObject<FreeviewMemberInfo>(pack.Data.ToString());
                                        //登录全视通
                                        Shared.IOS.HDLFVSDK.Video.Init("", data.extUserId, DB_ResidenceData.Instance.CurrentRegion.id, "78FF1E4D-FC0A-4E71-9B79-0448E4460BD7", "T0001", "120.77.53.170:9700", "120.77.53.170:21664");
                                        List<VisitorTempPassword> dataList = new List<VisitorTempPassword>();
                                        Dictionary<string, object> dictionary = new Dictionary<string, object>();
                                        dictionary.Add("homeId", Entity.DB_ResidenceData.Instance.CurrentRegion.id);
                                        var requestJson = HttpUtil.GetSignRequestJson(dictionary);
                                        ResponsePackNew pack = HttpUtil.RequestHttpsPost(NewAPI.Api_Post_GetExtMemberInfo, requestJson);
                                        if (pack != null)
                                        {
                                            var data = JsonConvert.DeserializeObject<FreeviewMemberInfo>(pack.Data.ToString());
                                            //登录全视通
                                            Shared.IOS.HDLFVSDK.Video.Init("", data.extUserId, DB_ResidenceData.Instance.CurrentRegion.id, "78FF1E4D-FC0A-4E71-9B79-0448E4460BD7", "T0001", "120.77.53.170:9700", "120.77.53.170:21664");
                                        }
                                    }
#endif
                                }
@@ -351,9 +356,6 @@
                        }
#if DEBUG
                        DB_ResidenceData.Instance.HomeGateway.isSupportGroupControl = true;
#endif
                        if (DB_ResidenceData.Instance.HomeGateway.isSupportGroupControl)
                        {
                            var pack = Ins.HttpRequest.GetGroupControlList();
@@ -416,11 +418,7 @@
                                }
                            }
                        }
                    //})
                    //{ IsBackground = true }.Start();
                        //======================场景====================
                        try
                        {
                            complateScene = false;
@@ -481,21 +479,17 @@
                        {
                            complateScene = true;
                        }
                        //======================安防====================
                        GetSecurityList();
                    })
                    { IsBackground = true }.Start();
                    //===================读取逻辑列表==========================
                    Logic.LogicList.Clear();//主页下拉强制刷新自动化列表
                    //UI.UI2.Intelligence.Automation.MainView.GetLogicList();
                    //======================安防====================
                    GetSecurityList();
                    //======================注册推送====================
                    httpRequest.RegisteredPush();
                }
                catch (Exception ex)
                {
@@ -593,40 +587,43 @@
        /// </summary>
        public void GetSecurityList()
        {
            var pack = Ins.HttpRequest.GetSecurityList();
            if (pack.Code == StateCode.SUCCESS)
            lock (FunctionList.List.securities)
            {
                var packList = JsonConvert.DeserializeObject<List<SecurityAlarm>>(pack.Data.ToString());
                var sidList = new List<string>();
                foreach (var function in packList)
                var pack = Ins.HttpRequest.GetSecurityList();
                if (pack.Code == StateCode.SUCCESS)
                {
                    sidList.Add(function.sid);
                }
                var infoListPack = Ins.httpRequest.GetSecurityInfo(sidList, new List<string>());
                var infoList = JsonConvert.DeserializeObject<List<SecurityAlarm>>(infoListPack.Data.ToString());
                if (infoList != null)
                {
                    var filePathList = FileUtlis.Files.ReadFiles().FindAll((obj) => obj.StartsWith("SecurityData_"));
                    if (filePathList != null)
                    var packList = JsonConvert.DeserializeObject<List<SecurityAlarm>>(pack.Data.ToString());
                    Console.WriteLine("安防总数:" + packList.Count);
                    var sidList = new List<string>();
                    foreach (var function in packList)
                    {
                        foreach (var file in filePathList)
                        sidList.Add(function.sid);
                    }
                    var infoListPack = Ins.httpRequest.GetSecurityInfo(sidList, new List<string>());
                    var infoList = JsonConvert.DeserializeObject<List<SecurityAlarm>>(infoListPack.Data.ToString());
                    if (infoList != null)
                    {
                        var filePathList = FileUtlis.Files.ReadFiles().FindAll((obj) => obj.StartsWith("SecurityData_"));
                        if (filePathList != null)
                        {
                            FileUtlis.Files.DeleteFile(file);
                            foreach (var file in filePathList)
                            {
                                FileUtlis.Files.DeleteFile(file);
                            }
                        }
                        FunctionList.List.securities.Clear();
                        foreach (var function in infoList)
                        {
                            function.SaveFile();
                            FunctionList.List.IniFunctionList(function.savePath, true);
                        }
                    }
                    FunctionList.List.securities.Clear();
                    foreach (var function in infoList)
                    {
                        function.SaveFile();
                        FunctionList.List.IniFunctionList(function.savePath, true);
                    }
                }
            }
            else
            {
                MainPage.Log($"读取安防列表失败:Code:{pack.Code}; Msg:{pack.message}");
                else
                {
                    MainPage.Log($"读取安防列表失败:Code:{pack.Code}; Msg:{pack.message}");
                }
            }
        }
        /// <summary>
HDL_ON/Common/HDLCommon.cs
@@ -258,7 +258,7 @@
        {
            try
            {
                MainPage.Log($"接收到推送");
                //Extras为空不处理
                if (string.IsNullOrEmpty(jpushMessageInfo.Extras)) return;
HDL_ON/Common/R.cs
@@ -4,8 +4,34 @@
{
    public static class StringId
    {
        /// <summary>
        /// 住宅解绑成功
        /// </summary>
        public const int SuccessfullyUnboundTheResidence = 629;
        /// <summary>
        /// 临时密码有效期不能大于24小时
        /// </summary>
        public const int TempPwdValidityTip = 628;
        /// <summary>
        /// 设置的时间需要晚于当前时间
        /// </summary>
        public const int TempPwdSettingTip = 627;
        /// <summary>
        /// 住宅回滚提示
        /// </summary>
        public const int RollBackTipMsg = 626;
        /// <summary>
        /// 住宅回滚
        /// </summary>
        public const int RollBack = 625;
        /// <summary>
        /// 触发范围
        /// </summary>
        public const int TriggeredRange = 624;
        /// <summary>
        /// 经纬度
        /// </summary>
        public const int LatAndLon= 623;
        /// <summary>
        /// 验收
        /// </summary>
HDL_ON/DAL/DriverLayer/Control.cs
@@ -257,7 +257,8 @@
        public void SearchLoaclGateway()
        {
            //2021-01-15 : 住宅没有绑定网关的时候不用搜索,并且不能链接mqtt
            if (DB_ResidenceData.Instance.HomeGateway == null || string.IsNullOrEmpty(DB_ResidenceData.Instance.HomeGateway.gatewayId))
            if (DB_ResidenceData.Instance.HomeGateway == null || string.IsNullOrEmpty(DB_ResidenceData.Instance.HomeGateway.gatewayId) ||
                    !UserInfo.Current.IsLogin)
            {
                return;
            }
@@ -515,6 +516,7 @@
                        var sendBytes = Ins.ConvertSendBodyData(CommunicationTopic.ct.ControlFunctionTopic, functionControlDataJson);
                        new Control_Udp().SendLocalHdlLinkData(sendBytes, functionControlDataObj.id, resend);
                        MainPage.Log($"本地通讯 发送HDL-Link数据:{functionControlDataJson}");
                            Ins.myTcpClient.SendMessage(sendBytes);
                    }
                }
                //远程通讯
HDL_ON/DAL/Server/HttpServerRequest.cs
@@ -708,7 +708,21 @@
            var revertObj = HttpUtil.RequestHttpsPostFroHome(NewAPI.APi_Post_GetHoserDeliverUrl, jsonString);
            return revertObj;
        }
        /// <summary>
        /// 住宅交付回滚
        /// </summary>
        /// <returns></returns>
        public ResponsePackNew RollBack()
        {
            var d = new Dictionary<string, object>();
            d.Add("houseId", DB_ResidenceData.Instance.CurrentRegion.id);
            d.Add("communityId", DB_ResidenceData.Instance.CurrentRegion.communityId);
            d.Add("flowRecordContent", "onPro交付回滚");
            d.Add("projectFlowRecordActionEnum", "DELIVERY_ROLLBACK");
            var jsonString = HttpUtil.GetSignRequestJson(d);
            var revertObj = HttpUtil.RequestHttpsPostFroHome(NewAPI.APi_Post_UpdateProjectDebugStatus, jsonString);
            return revertObj;
        }
        /// <summary>
        /// 获取网关信息
@@ -1495,6 +1509,8 @@
        /// </summary>
        public void GetCityWeatherInfo(string lon, string lat)
        {
            if (lon == "0" || lat == "0")
                return;
            MainPage.cityInfo.lon = lon;
            MainPage.cityInfo.lat = lat;
@@ -1540,6 +1556,7 @@
                            MainPage.cityInfo.lowestTemperature = jt.GetValue("lowestTemperature").ToString();
                            MainPage.cityInfo.highestTemperature = jt.GetValue("highestTemperature").ToString();
                            MainPage.CityWeatherAction?.Invoke();
                            HDL_ON.UI.HomePage.LoadEvent_RefreshAir();
                            break;
                        }
                        catch (Exception ex)
@@ -1549,14 +1566,6 @@
                    }
                    System.Threading.Thread.Sleep(5000);
                }
                Shared.Application.RunOnMainThread(() =>
                {
                    try
                    {
                        HDL_ON.UI.HomePage.LoadEvent_RefreshAir();
                    }
                    catch { }
                });
            });
        }
        ///// <summary>
@@ -3042,8 +3051,49 @@
            //IMessageCommon.Current.ShowErrorInfoAlter(responePack.Code);
            return listSortLog;
        }
        /// <summary>
        /// 获取门锁临时密码
        /// </summary>
        /// <param name="deviceId"></param>
        /// <returns></returns>
        public ResponsePackNew GetDoorTempPassword(string deviceId)
        {
            Dictionary<string, object> d = new Dictionary<string, object>();
            d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
            d.Add("deviceId", deviceId);
            var requestJson = HttpUtil.GetSignRequestJson(d);
            return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_GetTempPasswrod, requestJson);
        }
        /// <summary>
        /// 创建门锁临时密码
        /// </summary>
        /// <param name="deviceId"></param>
        /// <returns></returns>
        public ResponsePackNew CreateDoorTempPassword(string deviceId,string beginTime,string endTime)
        {
            Dictionary<string, object> d = new Dictionary<string, object>();
            d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
            d.Add("deviceId", deviceId);
            d.Add("beginTime", beginTime);
            d.Add("endTime", endTime);
            var requestJson = HttpUtil.GetSignRequestJson(d);
            return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_CreateTempPasswrod, requestJson);
        }
        /// <summary>
        /// 删除门锁临时密码
        /// </summary>
        /// <returns></returns>
        public ResponsePackNew DelDoorTempPassword(string deviceId, string pwdId)
        {
            Dictionary<string, object> d = new Dictionary<string, object>();
            d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
            d.Add("deviceId", deviceId);
            d.Add("pwdId", pwdId);
            var requestJson = HttpUtil.GetSignRequestJson(d);
            return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_DelTempPasswrod, requestJson);
        }
#endregion
        #endregion
        #region ■ 音箱语言控制相关_________________________
        /// <summary>
HDL_ON/DAL/Server/HttpUtil.cs
@@ -18,8 +18,8 @@
        /// 固定域名,正式环境
        /// 公共域名就近解析
        /// </summary>
        public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";
        //public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";
        //public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";
        public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";
        const string APP_KEY = "HDL-HOME-APP-TEST";
        const string SECRET_KEY = "WeJ8TY88vbakCcnvH8G1tDUqzLWY8yss";
        //public const string GlobalRequestHttpsHost = "http://59.41.255.150:7777";//mmmm
HDL_ON/DAL/Server/NewAPI.cs
@@ -114,7 +114,10 @@
        /// 获取住宅交付链接
        /// </summary>
        public const string APi_Post_GetHoserDeliverUrl = "/home-wisdom/app/home/obtainDeliveryUrl";
        /// <summary>
        /// 更新项目状态 (交付、验收、撤销交付、验收未通过、重新调试、交付回滚等操作)
        /// </summary>
        public const string APi_Post_UpdateProjectDebugStatus = "/smart-footstone/mgmt/community/project/updateProjectDebugStatus";
        /// <summary>
        /// 获取住宅分页
        /// </summary>
@@ -706,6 +709,7 @@
        /// 解绑第三方iot平台账号
        /// </summary>
        public const string Api_Post_Unbound3tyIotAccount = "/smart-open/open-platform/tripartite/userUnbind";
        #endregion
        #region ■  -- 红外宝接口___________________________
        /// <summary>
@@ -747,7 +751,6 @@
        #endregion
        #endregion
        #region ■  -- 萤石SDK相关接口___________________________
@@ -881,6 +884,19 @@
        /// 门锁的历史记录
        /// </summary>
        public const string API_POST_DoorHistory = "/home-wisdom/app/device/door/logs";
        /// <summary>
        /// 获取临时密码
        /// </summary>
        public const string Api_Post_GetTempPasswrod = "/home-wisdom/app/device/door/getTempPwds";
        /// <summary>
        /// 创建临时密码
        /// </summary>
        public const string Api_Post_CreateTempPasswrod = "/home-wisdom/app/device/door/createTempPwd";
        /// <summary>
        /// 删除门锁临时密码
        /// </summary>
        public const string Api_Post_DelTempPasswrod = "/home-wisdom/app/device/door/tempPwdDel";
        #endregion
HDL_ON/DAL/Server/NewApiRes.cs
@@ -1251,51 +1251,6 @@
        public string packageUrl;//": "http://hdl-hz-test.oss-cn-hangzhou.aliyuncs.com/20/2022/11/51b8b0b2-0ebc-4632-a3b5-0be1e5d104e4.apk",
        public string remark;
    }
    /// <summary>
    ///
    /// </summary>
    [System.Serializable]
    public class AppVersionRes
    {
        /// <summary>
        /// 应用市场名称
        /// </summary>
        public string appMarket;
        /// <summary>
        /// app名称
        /// </summary>
        public string appName;
        /// <summary>
        /// ios下载地址
        /// </summary>
        public string iosUrl;
        /// <summary>
        /// 安卓下载地址
        /// </summary>
        public string androidUrl;
        /// <summary>
        /// 是否是强制更新
        /// </summary>
        public bool isEnforce;
        /// <summary>
        /// 发布系统,IOS、Android
        /// </summary>
        public string releaseSystem;
        /// <summary>
        /// 备注
        /// </summary>
        public string remark;
        /// <summary>
        /// 更新说明json,多语言有客户端解析
        /// </summary>
        public string updateDescription;
        /// <summary>
        /// 版本号
        /// </summary>
        public string version;
    }
    /// <summary>
    /// 更新说明json,多语言有客户端解析
    /// </summary>
HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs
@@ -134,7 +134,7 @@
                    mHDLSipInfo.sipAccount,
                    mHDLSipInfo.sipPasswd,
                    "139.159.157.75:47000",//mHDLSipInfo.realm,
                    "sip:139.159.157.75:47000;transport=udp",
                    //"sip:139.159.157.75:47000;transport=udp",
                    HDLLinphoneKit.InterPhoneTypeFreeview
                    );
            }
@@ -144,7 +144,7 @@
                   mHDLSipInfo.sipAccount,
                   mHDLSipInfo.sipPasswd,
                   mHDLSipInfo.realm,
                   mHDLSipInfo.proxy+ ";transport=udp",
                   //mHDLSipInfo.proxy+ ";transport=udp",
                   //"sip:139.159.157.75:47000;transport=udp",
                   HDLLinphoneKit.InterPhoneTypeHdl
                   );
@@ -836,8 +836,6 @@
            {
                Utlis.WriteLine("OnIncomingCall :" + userName);
            }
        }
HDL_ON/Entity/DB_ResidenceData.cs
@@ -185,7 +185,7 @@
        /// <summary>
        /// 网关详细信息
        /// </summary>
        public HomeGatewayInfo HomeGateway;
        public HomeGatewayInfo HomeGateway;// = new HomeGatewayInfo ();
        /// <summary>
        /// 0:一端口
HDL_ON/Entity/FunctionList.cs
@@ -14,20 +14,20 @@
    {
        static FunctionList _FunctionList;
        public static void ClearData()
        {
            try
            {
                _FunctionList._IpCamImou = null;
                _FunctionList.ClearDatas();
                _FunctionList = null;
            }
            catch (Exception ex)
            {
                MainPage.Log($"清理FunctionList异常:{ex.Message}");
                _FunctionList = null;
            }
        }
        //public static void ClearData()
        //{
        //    try
        //    {
        //        _FunctionList._IpCamImou = null;
        //        _FunctionList.ClearDatas();
        //        _FunctionList = null;
        //    }
        //    catch (Exception ex)
        //    {
        //        MainPage.Log($"清理FunctionList异常:{ex.Message}");
        //        _FunctionList = null;
        //    }
        //}
        public static FunctionList List
        {
@@ -384,7 +384,7 @@
                    var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<SecurityAlarm>(dataString);
                    if (temp == null)
                    {
                        MainPage.Log("null");
                        MainPage.Log("SecurityData_null");
                        FileUtlis.Files.DeleteFile(filePath);
                        return;
                    }
HDL_ON/Entity/ResponseEntity/RegionInfoRes.cs
@@ -56,6 +56,10 @@
        /// </summary>
        public string id { get; set; }
        /// <summary>
        /// 项目id
        /// </summary>
        public string communityId = string.Empty;
        /// <summary>
        /// 住宅名称
        /// </summary>
        public string homeName { get; set; }
HDL_ON/UI/MainPage.cs
@@ -26,7 +26,7 @@
        /// <summary>
        /// 版本号
        /// </summary>
        public static string VersionString = "1.7.3";
        public static string VersionString = "1.8.0";
        ///// <summary>
        ///// 客户端类型
        ///// </summary>
@@ -136,11 +136,11 @@
                {
                    _RoomNotSupportFunctionList = new List<string>();
                    _RoomNotSupportFunctionList.Add(SPK.EnergyStandard);
                    _RoomNotSupportFunctionList.Add(SPK.MusicStandard);
                    _RoomNotSupportFunctionList.Add(SPK.AvMusic);
                    //_RoomNotSupportFunctionList.Add(SPK.MusicStandard);
                    //_RoomNotSupportFunctionList.Add(SPK.AvMusic);
                    _RoomNotSupportFunctionList.Add(SPK.AirSwitch);
                    _RoomNotSupportFunctionList.Add(SPK.ElectricEnergy);
                    _RoomNotSupportFunctionList.Add(SPK.OtherCommon);
                    //_RoomNotSupportFunctionList.Add(SPK.OtherCommon);
                    _RoomNotSupportFunctionList.Add(SPK.SensorLight);
                    _RoomNotSupportFunctionList.AddRange(SPK.EnvironDeviceSpkList());
                    //_RoomNotSupportFunctionList.AddRange(SPK.ArmSensorSpkList());
@@ -204,6 +204,52 @@
                //    Application.HideSoftInput();
                //});
            }
            try
            {
                CommonClass.excptionAction = (obj) =>
                {
                    Application.RunOnMainThread(() =>
                    {
                        Stan.HdlMessageLogic.Current.ShowAppProgramIsError(obj);
                    });
                };
            }
            catch (Exception ex)
            {
            }
#if __ANDROID__
            new System.Threading.Thread(async () =>
            {
                int i = 0;
                while (i < 10) {
                    try
                    {
                        var location_android = await HDL_ON_Android.LocationUtils.GetCurrentLocationAsync();
                        if (location_android != null)
                        {
                            MainPage.cityInfo.lat = location_android.Latitude.ToString();
                            MainPage.cityInfo.lon = location_android.Longitude.ToString();
                            new HDL_ON.DAL.Server.HttpServerRequest().GetCityWeatherInfo(MainPage.cityInfo.lon.Replace(",", "."), MainPage.cityInfo.lat.ToString().Replace(",", "."));
                            i = 100;
                            Application.RunOnMainThread(() => {
                                HomePage.LoadEvent_RefreshAir();
                            });
                        }
                        else
                        {
                            i++;
                        }
                    } catch (Exception ex)
                    {
                        Log($"经纬度获取异常: {ex.Message}");
                    }
                }
            })
            { IsBackground = true }.Start();
#endif
        }
        /// <summary>
HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs
@@ -238,10 +238,8 @@
                        doorLockPage.AddForm(function, btnCollectionIcon, btnName, btnFromFloor);
                        break;
                    case SPK.IpCam_Imou:
#if __IOS__
                        if (Shared.IOS.HDLCNVRSDK.HDLLCNVRSDK.SharedInstance().AccessToken == null)
                        {//未初始化摄像头
                        if (Shared.IOS.HDLCNVRSDK.HDLLCNVRSDK.SharedInstance().AccessToken == null){//未初始化摄像头
                            Shared.IOS.HDLCNVRSDK.HDLLCNVRSDK.SharedInstance().InitSDKWithAppKey("HDL-HOME-APP-TEST", "WeJ8TY88vbakCcnvH8G1tDUqzLWY8yss", OnAppConfig.Instance.RequestHttpsHost);
                            Shared.IOS.HDLCNVRSDK.HDLLCNVRSDK.SharedInstance().AccessToken = UserInfo.Current.LoginTokenString;
                            Shared.IOS.HDLCNVRSDK.HDLLCNVRSDK.SharedInstance().RefreshToken = UserInfo.Current.RefreshToken;
@@ -249,8 +247,10 @@
                            Shared.IOS.HDLCNVRSDK.HDLLCNVRSDK.SharedInstance().RefreshDeviceList();
                        }
                        //跳转大华摄像头
                        Shared.Application.currentVC.NavigationController.NavigationBar.BarTintColor = UIKit.UIColor.LightGray;
                        Shared.IOS.HDLCNVRSDK.HDLLCNVRSDK.SharedInstance().RefreshDeviceList();
                        Shared.IOS.HDLCNVRSDK.HDLLCNVRSDK.SharedInstance().ToMonitorViewWithDeviceId(function.extDevId, function.name, Shared.Application.currentVC);
                        //Shared.Application.currentVC.NavigationController.NavigationBar.Hidden = false;
#else
                        FunctionList.List.GetIpCamImouList();
                        if (string.IsNullOrEmpty(Com.Utils.HdlToLcUtils.Instance.SubAccessToken))
HDL_ON/UI/UI0-Stan/Controls/BottomControls/BottomTimeSelectControl.cs
@@ -95,7 +95,7 @@
            //初始化底层控件
            var frameWhiteBack = base.InitBaseControl();
            frameWhiteBack.Height = Application.GetRealHeight(contentView);
            //frameWhiteBack.Y = frameWhiteBack.Parent.Height - Application.GetRealHeight(297 + 20);
            //frameWhiteBack.Y = Application.GetRealHeight(667 - contentView + 60);
            //取消
            base.btnCancel.ButtonClickEvent += (sender, e) =>
HDL_ON/UI/UI0-Stan/Form/Base/CommonFormBase.cs
@@ -115,8 +115,15 @@
            }
            catch (Exception ex)
            {
                //出现未知错误
                HdlMessageLogic.Current.ShowAppProgramIsError(ex);
                if (ex.Message == "stop")
                {
                    //自定义中断关闭页面,召元写的太复杂,只能用这种方式强行中断方法运行  2023-06-01 09:22:46
                }
                else
                {
                    //出现未知错误
                    HdlMessageLogic.Current.ShowAppProgramIsError(ex);
                }
            }
        }
HDL_ON/UI/UI0-Stan/Form/HideOptionFileContentForm.cs
@@ -76,6 +76,7 @@
            btnText.TextAlignment = TextAlignment.TopLeft;
            btnText.TextColor = UI.CSS.CSS_Color.MainColor;
            btnText.Text = textValue;
            btnText.Enable = false;
#if __Android__
            btnText.Foucs = false;
#endif
HDL_ON/UI/UI0-Stan/Logic/HdlMessageLogic.cs
@@ -82,16 +82,32 @@
        {
            this.ShowMassage(ShowMsgType.Error, "System Error!", () =>
            {
                //string msg = ex.Message + "\r\n";
                //msg += ex.StackTrace;
                string msg = ex.Message + "\r\n";
                msg += ex.StackTrace;
                //var form = new HideOptionFileContentForm();
                //form.AddForm(string.Empty);
                //form.SetTextContent(msg);
                var form = new HideOptionFileContentForm();
                form.AddForm(string.Empty);
                form.SetTextContent(msg);
            }, "ok");
        }
        /// <summary>
        /// 显示App程序出现了致命错误
        /// </summary>
        /// <param name="ex"></param>
        public void ShowAppProgramIsError(string msg)
        {
            this.ShowMassage(ShowMsgType.Error, "System Error!", () =>
            {
                var form = new HideOptionFileContentForm();
                form.AddForm(string.Empty);
                form.SetTextContent(msg);
            }, "ok");
        }
        #endregion
    }
}
HDL_ON/UI/UI1-Login/ForgetPasswordPage.cs
@@ -112,7 +112,7 @@
        /// <summary>
        /// 验证码文本输入框
        /// </summary>
        EditText etVerificationCode;
        TextView etVerificationCode;
        /// <summary>
        /// 获取验证码按钮
        /// </summary>
@@ -341,16 +341,16 @@
            //};
            //verificationCodeView.AddChidren(btnDividingLineVertical_VerificationCodeView1);
            etVerificationCode = new EditText()
            etVerificationCode = new TextView()
            {
                X = Application.GetRealWidth(49),
                Width = Application.GetRealWidth(61 + 84),
                TextAlignment = TextAlignment.CenterLeft,
                //TextAlignment = TextAlignment.CenterLeft,
                TextColor = CSS_Color.FirstLevelTitleColor,
                TextSize = CSS_FontSize.TextFontSize,
                PlaceholderTextColor = CSS_Color.PromptingColor1,
                PlaceholderText = Language.StringByID(StringId.PlsEntryVerificationCode),
                IsNumberKeyboardType = true
                //PlaceholderTextColor = CSS_Color.PromptingColor1,
                //PlaceholderText = Language.StringByID(StringId.PlsEntryVerificationCode),
                //IsNumberKeyboardType = true
            };
            verificationCodeView.AddChidren(etVerificationCode);
HDL_ON/UI/UI1-Login/ForgetPasswordPageBLL.cs
@@ -145,14 +145,14 @@
            //    }
            //};
            Action<View, string> textChangeEventHandler = (view, textStr) =>
            {
                LoadMothed_EnableResetButton();
            };
            //etAccount.TextChangeEventHandler += textChangeEventHandler;
            etPassword.TextChangeEventHandler += textChangeEventHandler;
            etRepeatPassword.TextChangeEventHandler += textChangeEventHandler;
            etVerificationCode.TextChangeEventHandler += textChangeEventHandler;
            //Action<View, string> textChangeEventHandler = (view, textStr) =>
            //{
            //    LoadMothed_EnableResetButton();
            //};
            ////etAccount.TextChangeEventHandler += textChangeEventHandler;
            //etPassword.TextChangeEventHandler += textChangeEventHandler;
            //etRepeatPassword.TextChangeEventHandler += textChangeEventHandler;
            //etVerificationCode.TextChangeEventHandler += textChangeEventHandler;
        }
        /// <summary>
@@ -286,23 +286,23 @@
            };
            //验证码文本框焦点变化事件
            etVerificationCode.FoucsChanged += (sender, e) =>
            {
                if (etVerificationCode.Foucs)
                {
                    HDLCommon.Current.BottomLineShowType(btnVerificationCodeViewBottomLine, BottomLineType.GotFocus);
                }
                else
                {
                    if (isHitBack) return;//点击返回关闭页面不检测提示
            //etVerificationCode.FoucsChanged += (sender, e) =>
            //{
            //    if (etVerificationCode.Foucs)
            //    {
            //        HDLCommon.Current.BottomLineShowType(btnVerificationCodeViewBottomLine, BottomLineType.GotFocus);
            //    }
            //    else
            //    {
            //        if (isHitBack) return;//点击返回关闭页面不检测提示
                    HDLCommon.Current.BottomLineShowType(btnVerificationCodeViewBottomLine, BottomLineType.Normal);
                    if (etVerificationCode.Text.Length > 4)
                    {
                        LoadMothed_EnableResetButton();
                    }
                }
            };
            //        HDLCommon.Current.BottomLineShowType(btnVerificationCodeViewBottomLine, BottomLineType.Normal);
            //        if (etVerificationCode.Text.Length > 4)
            //        {
            //            LoadMothed_EnableResetButton();
            //        }
            //    }
            //};
        }
@@ -401,7 +401,7 @@
                                    {
                                        //短信发送间隔60s
                                        (sender as Button).IsSelected = false;
                                        etVerificationCode.Foucs = true;
                                        //etVerificationCode.Foucs = true;
                                    });
                                    //2.1获取验证码倒计时
                                    new Thread(() =>
HDL_ON/UI/UI1-Login/LoginPage.cs
@@ -22,6 +22,70 @@
                Application.HideSoftInput();
            };
            pm = new HttpServerRequest();
#if __ANDROID__
            BaseActivity.HideKeyboardEvent = () => {
                if (this.Y != 0)
                {
                    Application.RunOnMainThread(() =>
                    {
                        try
                        {
                            this.Y = 0;
                        }
                        catch { }
                    });
                }
            };
            BaseActivity.ShowKeyboardEvent = () => {
                try
                {
                    if (etPassword.Foucs)
                    {
                        new Thread(() =>
                        {
                            for (var i = 0; i < 10; i++)
                            {
                                Application.RunOnMainThread(() =>
                                {
                                    try
                                    {
                                        this.Y = 0 - Application.GetRealHeight(10 * i);
                                    }
                                    catch { }
                                });
                                Thread.Sleep(10);
                            }
                        })
                        { IsBackground = true }.Start();
                    }
                }
                catch { }
            };
            BaseActivity.SmsAction = (message) => {
                Console.WriteLine($"接收到短信:"+ message);
                string pattern = @"【HDL】.*(\d{6}).*";
                Regex regex = new Regex(pattern);
                Match match = regex.Match(message);
                if (match.Success)
                {
                    string code = match.Groups[1].Value;
                    Console.WriteLine("验证码为:" + code);
                    if(loginType==0 && logintMode == 1)
                    {
                        etPassword.Text = code;
                    }
                    smsCode = code;
                }
                else
                {
                    Console.WriteLine("未找到验证码!");
                }
            };
#endif
        }
        public override void RemoveFromParent()
@@ -33,13 +97,20 @@
                waitPage = null;
            }
#if __ANDROID__
            BaseActivity.HideKeyboardEvent = () => {
            };
            BaseActivity.ShowKeyboardEvent = () => { };
            BaseActivity.SmsAction = (sms) => { };
#endif
            base.RemoveFromParent();
            //2020-12-22 增加点击隐藏键盘事件
            //Application.HideSoftInput();
        }
        #region 局部变量
#region 局部变量
        /// <summary>
        /// 登录类型
        /// 0:手机
@@ -54,9 +125,13 @@
        int logintMode = 0;
        string account = "";
        string password = "";
        #endregion
        /// <summary>
        /// 短信验证码
        /// </summary>
        string smsCode = "";
#endregion
        #region 控件列表
#region 控件列表
        /// <summary>
        /// 等待提示
        /// </summary>
@@ -149,7 +224,7 @@
        /// 服务器请求对象
        /// </summary>
        HttpServerRequest pm;
        #endregion
#endregion
        string verAccount = "";
@@ -190,6 +265,9 @@
                UnSelectedImagePath = "Public/Logo-bg.png"
            };
            bodyView.AddChidren(btnIcon_bg);
            btnIcon_bg.MouseDownEventHandler += (sender, e) => {
                Application.HideSoftInput();
            };
#if DEBUG
            btnIcon_bg.MouseUpEventHandler += (sender, e) =>
@@ -208,7 +286,6 @@
                //return;
                if (b)
                {
                    //etAccount.Text = "13375012446";//测试服务器
                    //etAccount.Text = "1033326940@qq.com";
                    //etAccount.Text = "18022428438";//wjc
                    //etAccount.Text = "13602944661";//kx
@@ -218,7 +295,6 @@
                    //etAccount.Text = "tf@smarttech.com.ua";
                    //etAccount.Text = "455740454@qq.com";
                    //etAccount.Text = "18688565449";
                    etAccount.Text = "support7@hdlautomation.com";
                    //etAccount.Text = "18570064522";
                    //etAccount.Text = "18718417827";
                    //etAccount.Text = "18188019284";
@@ -237,6 +313,8 @@
                    //etAccount.Text = "13751916353";
                    etAccount.Text = "13549566666";
                    etAccount.Text = "18316672920";
                    etAccount.Text = "support7@hdlautomation.com";
                    etAccount.Text = "13375012446";//测试服务器
                }
                else
                {
@@ -297,7 +375,7 @@
            };
#endif
            #region 登录方式选择
#region 登录方式选择
            btnPhoneLogin = new Button()
            {
                X = Application.GetRealWidth(28),
@@ -822,6 +900,7 @@
                        new FunctionAttributes() { key = "mode",value =new List<string>(){ "day", "night", "away", "normal", "timer" }, curValue="day",state = "day"   },
                        new FunctionAttributes() { key = "set_temp",value =new List<string>(){ "" }, curValue="26",state = "26" ,max = 35,min = 5  },
                        new FunctionAttributes() { key = "room_temp",value =new List<string>(){ "" }, curValue="26",state = "26"   },
                        new FunctionAttributes() { key = "temperature_type", value = new List<string>() { "°F", "°C" }, curValue = "°F", state = "°F" },
                    },
                };
                fh.SaveFunctionFile();
@@ -1250,8 +1329,8 @@
#endif
                #endregion
                #region 场景
#endregion
#region 场景
                var scene1 = new Scene()
                {
                    sid = "scene1",
@@ -1545,6 +1624,7 @@
                        new FunctionAttributes() { key = "set_temp",step = "0.5", value = new List<string>() { "16", "30"}, curValue = "16", state = "16",max = 30,min = 16 },
                        new FunctionAttributes() { key = "room_temp", value = new List<string>() { }, curValue = "20", state = "20" },
                        new FunctionAttributes() { key = "swing", value = new List<string>() {"up_down", "left_right", "stop" }, curValue = "20", state = "20" },
                        new FunctionAttributes() { key = "temperature_type", value = new List<string>() { "°F", "°C" }, curValue = "°F", state = "°F" },
                    }
                };
                ac2.SaveFunctionFile();
@@ -1570,7 +1650,7 @@
                //    collect = false,
                //};
                //scene6.SaveSceneFile();
                #endregion
#endregion
                var lightSwitch6 = new Function()
@@ -1633,11 +1713,11 @@
#region 隐私政策
            AddServiceAgreementControl(bodyView);
            #endregion
#endregion
        }
        #region ■ 服务协议___________________________
#region ■ 服务协议___________________________
        bool isAgreePrivacyPolicy = false;
        /// <summary>
        /// 添加服务协议控件
@@ -1759,12 +1839,12 @@
                OpenWebViewPage(true);
            };
            #if __ANDROID__
#if __ANDROID__
            //if(OnAppConfig.Instance.FirstRunApp || !OnAppConfig.Instance.isAgreePrivacyPolicy)
            //{
            //    HDL_ON_Android.HDLONUtils.StartSplashActivity();    
            //}
            #endif
#endif
        }
        /// <summary>
HDL_ON/UI/UI1-Login/LoginPageBLL.cs
@@ -86,6 +86,9 @@
                        btnAccountViewBottomLine.Height = Application.GetRealHeight(2);
                        return;
                    }
#if __IOS__
                    etPassword.Foucs = true;
#endif
                    //加载Loading效果
                    var waitPage = new Loading();
                    bodyView.AddChidren(waitPage);
@@ -227,6 +230,9 @@
                    }
                    //验证码不需要隐藏
                    etPassword.SecureTextEntry = false;
#if __IOS__
                    etPassword.SetTextContentTypeToOneTimeCode();
#endif
                }
                #endregion
            }
@@ -315,6 +321,7 @@
                //}
                //隐藏密码
                etPassword.SecureTextEntry = true;
                //etPassword.IsNumberKeyboardType = false;
            }
            //验证码登录
            else if (logintMode == 1)
@@ -342,6 +349,9 @@
                }
                //验证码不需要隐藏
                etPassword.SecureTextEntry = false;
                etPassword.Text = smsCode;
                //etPassword.IsNumberKeyboardType = true;
            }
        }
@@ -435,9 +445,27 @@
                {
                    btnPasswordViewBottomLine.BackgroundColor = CSS_Color.MainColor;
                    btnPasswordViewBottomLine.Height = Application.GetRealHeight(2);
#if __IOS__
      new Thread(() => {
                            for(var i = 0; i < 10; i++)
                            {
                                Application.RunOnMainThread(() =>
                                {
                                    this.Y = 0-Application.GetRealHeight(10 * i);
                                });
                                Thread.Sleep(10);
                            }
                        }) { IsBackground = true }.Start();
                    var sst = etPassword.MyTextContentType;
                    Console.WriteLine(sst);
                    etPassword.SetTextContentTypeToOneTimeCode();
#endif
                }
                else
                {
                    this.Y = 0;
                    btnPasswordViewBottomLine.BackgroundColor = CSS_Color.DividingLineColor;
                    btnPasswordViewBottomLine.Height = Application.GetRealHeight(1);
                }
@@ -451,13 +479,9 @@
            //当焦点在密码文本框时,点击键盘回撤按键,触发的事件
            etPassword.EditorEnterAction += (obj) =>
            {
                LoginEvent();
                Application.HideSoftInput();
            };
            etPassword.MouseUpEventHandler = (sender, e) =>
            {
                etPassword.Foucs = true;
            };
        }
        /// <summary>
@@ -486,49 +510,7 @@
        {
            btnLogin.MouseUpEventHandler += (sender, e) =>
            {
                if (btnLogin.IsSelected)
                {
                    //判断是否同意了隐私政策
                    if (CheckPrivacyPolicy() == false) return;
                    account = etAccount.Text.Trim();
                    password = etPassword.Text.Trim();
                    if (loginType == 0)
                    {
                        if (!Utlis.CheckPhoneNumber(account, phoneZoneCode))
                        {
                            var tip = new Tip()
                            {
                                MaxWidth = Application.GetRealWidth(300),
                                Text = Language.StringByID(StringId.PlsEntryCorrectMobilNeumber),
                                CloseTime = 1,
                                Direction = AMPopTipDirection.None
                            };
                            tip.Show(bodyView);
                            return;
                        }
                    }
                    else
                    {
                        if (!Utlis.CheckEmail(account))
                        {
                            var tip = new Tip()
                            {
                                Text = Language.StringByID(StringId.PlsEntryCorrectEmailAddress),
                                CloseTime = 1,
                                Direction = AMPopTipDirection.None
                            };
                            tip.Show(bodyView);
                            return;
                        }
                    }
                    //创建登录线程
                    var loginThread = LoadThread_Login();
                    waitPage = new Loading();
                    new PublicAssmebly().LoadPage_WaitPage(loginThread, bodyView, waitPage);
                }
                LoginEvent();
            };
            #region 当账号密码都输入时,才能点击登录按钮
            etAccount.TextChangeEventHandler = (sender, e) =>
@@ -566,7 +548,58 @@
            };
            #endregion
        }
        /// <summary>
        /// 登录事件
        /// </summary>
        void LoginEvent()
        {
            if (btnLogin.IsSelected)
            {
                //判断是否同意了隐私政策
                if (CheckPrivacyPolicy() == false)
                {
                    Application.HideSoftInput();
                    return;
                }
                account = etAccount.Text.Trim();
                password = etPassword.Text.Trim();
                if (loginType == 0)
                {
                    if (!Utlis.CheckPhoneNumber(account, phoneZoneCode))
                    {
                        var tip = new Tip()
                        {
                            MaxWidth = Application.GetRealWidth(300),
                            Text = Language.StringByID(StringId.PlsEntryCorrectMobilNeumber),
                            CloseTime = 1,
                            Direction = AMPopTipDirection.None
                        };
                        tip.Show(bodyView);
                        return;
                    }
                }
                else
                {
                    if (!Utlis.CheckEmail(account))
                    {
                        var tip = new Tip()
                        {
                            Text = Language.StringByID(StringId.PlsEntryCorrectEmailAddress),
                            CloseTime = 1,
                            Direction = AMPopTipDirection.None
                        };
                        tip.Show(bodyView);
                        return;
                    }
                }
                //创建登录线程
                var loginThread = LoadThread_Login();
                waitPage = new Loading();
                new PublicAssmebly().LoadPage_WaitPage(loginThread, bodyView, waitPage);
            }
        }
        /// <summary>
        /// 加载登录线程
        /// </summary>
HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs
@@ -604,14 +604,14 @@
                        d.Add(FunctionAttributeKey.FadeTime, function.GetAttrState(FunctionAttributeKey.FadeTime));
                        Control.Ins.SendWriteCommand(function, d);
                    }
                    else if (function.spk == SPK.PanelSocket)
                    {
                        if (function.attributes.Find((obj) => obj.key == "on_off_usb") != null)
                        {
                            d.Add("on_off_usb", function.trait_on_off.curValue.ToString());
                        }
                        Control.Ins.SendWriteCommand(function, d);
                    }
                    //else if (function.spk == SPK.PanelSocket)//去掉,统一处理总控
                    //{
                    //    if (function.attributes.Find((obj) => obj.key == "on_off_usb") != null)
                    //    {
                    //        d.Add("on_off_usb", function.trait_on_off.curValue.ToString());
                    //    }
                    //    Control.Ins.SendWriteCommand(function, d);
                    //}
                    else
                    {
                        d.Add("on_off", function.trait_on_off.curValue.ToString());
HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
@@ -1194,7 +1194,6 @@
                {
                    btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
                    {
                        var skipView = new FunctionPage();
                        MainPage.BasePageView.AddChidren(skipView);
                        skipView.LoadPage(functionPageTitleId);
HDL_ON/UI/UI2/2-Classification/FunctionPage.cs
@@ -34,6 +34,7 @@
        {
            bodyView = this;
            functionList = new List<Function>();
        }
        public void LoadPage(int titleId_out)
HDL_ON/UI/UI2/3-Intelligence/Automation/ChooseIocate.cs
@@ -25,7 +25,7 @@
            {
                RemoveFromParent();
            };
            topView.topNameBtn.Text = "选择定位位置";
            topView.topNameBtn.TextID = StringId.Setting;// = "选择定位位置";
            FrameLayout viewLayout = new FrameLayout
            {
@@ -43,7 +43,7 @@
            lonlatView.btnText.X = Application.GetRealWidth(16);
            lonlatView.btnLine.X = Application.GetRealWidth(16);
            lonlatView.btnLine.Width = Application.GetRealWidth(375 - 16 - 16);
            lonlatView.btnText.Text = "当前的经纬度";
            lonlatView.btnText.TextID = StringId.LatAndLon;
            lonlatView.btnState.Visible = true;
            lonlatView.btnState.IsMoreLines = true;
            lonlatView.btnState.Height = Application.GetRealHeight(25);
@@ -59,7 +59,7 @@
            locateView.btnText.X = Application.GetRealWidth(16);
            locateView.btnLine.X = Application.GetRealWidth(16);
            locateView.btnLine.Width = Application.GetRealWidth(375 - 16 - 16);
            locateView.btnText.Text = "在该位置范围时";
            locateView.btnText.TextID = StringId.TriggeredRange;
            locateView.btnState.Visible = true;
            locateView.btnState.Text = this.queryItem(r.ToString());
            viewLayout.AddChidren(locateView.FLayoutView());
HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs
@@ -396,7 +396,12 @@
                        }
                        break;
                    case 8:
                        {
                            iconInt = 5;
                        }
                        break;
                    case 10:
                        {
                            iconInt = 4;
HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/AboutOnPage.cs
@@ -230,7 +230,7 @@
        /// </summary>
        void OpenUrl()
        {
            if (!string.IsNullOrEmpty(newAppVersion))
            if (!string.IsNullOrEmpty(newAppVersion)&& newAppVersion.Contains("http"))
            {
                HDLUtils.OpenUrl(newAppVersionUrl);
            }
@@ -314,7 +314,7 @@
                var newVersion = versionResult.version;
                if (newVersion.CompareTo(MainPage.VersionString) > 0)
                {
                    newAppVersionUrl = versionResult.androidUrl;
                    newAppVersionUrl = versionResult.packageUrl;
                    return newVersion;
                }
                return "";
@@ -361,7 +361,7 @@
        /// 检测新版本
        /// </summary>
        /// <returns>The https app version async.</returns>
        private AppVersionRes CheckAppVersion()
        private AppVersionResNew CheckAppVersion()
        {
            try
            {
@@ -373,7 +373,7 @@
                        return null;
                    }
                    var responeData = Newtonsoft.Json.JsonConvert.DeserializeObject<AppVersionRes>(result.Data.ToString());
                    var responeData = Newtonsoft.Json.JsonConvert.DeserializeObject<AppVersionResNew>(result.Data.ToString());
                    return responeData;
                }
                return null;
HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/ResidentialManagePage.cs
@@ -1,4 +1,5 @@
using System;
using HDL_ON.DAL.Server;
using HDL_ON.Entity;
using HDL_ON.UI.CSS;
using Shared;
@@ -391,6 +392,83 @@
                    };
                    transferRow.AddChidren(btnTrasferSkinIcon);
                    #endregion
                    LoadEvent_SkipAdminMigrationConfirmPage();
                    LoadEvent_SkipTransferConfirmPage();
                    var btnRollBack = new Button()
                    {
                        Y = Application.GetRealHeight(623),
                        Height = Application.GetRealHeight(50),
                        TextAlignment = TextAlignment.Center,
                        TextSize = CSS_FontSize.SubheadingFontSize,
                        TextColor = CSS_Color.AuxiliaryColor2,
                        TextID = StringId.RollBack,
                        BackgroundColor = CSS_Color.MainBackgroundColor,
                    };
                    bodyView.AddChidren(btnRollBack);
                    if (MainPage.Increase)
                    {
                        btnRollBack.Y = Application.GetRealHeight(613);
                        btnRollBack.Height = Application.GetRealHeight(50);
                        bodyView.AddChidren(new Button() { Y = Application.GetRealHeight(663), Height = Application.GetRealHeight(20), BackgroundColor = CSS_Color.MainBackgroundColor });
                    }
                    btnRollBack.MouseUpEventHandler += (sender, e) =>
                    {
                        Action okAction = () =>
                        {
                            var waitPage = new Loading();
                            this.AddChidren(waitPage);
                            waitPage.Start("");
                            new System.Threading.Thread(() => {
                                try
                                {
                                    var pack = Common.ApiUtlis.Ins.HttpRequest.RollBack();
                                    Application.RunOnMainThread(() =>
                                    {
                                        if (pack != null)
                                        {
                                            if (pack.Code == StateCode.SUCCESS)
                                            {
                                                new PublicAssmebly().TipMsg(StringId.Tip, StringId.SuccessfullyUnboundTheResidence, () =>
                                                {
                                                    Common.ApiUtlis.Ins.HttpRequest.GetHomePager();
                                                });
                                            }
                                            else
                                            {
                                                IMessageCommon.Current.ShowErrorInfoAlter(pack.Code);
                                            }
                                        }
                                    });
                                }
                                catch (Exception ex)
                                {
                                    MainPage.Log($"住宅回滚异常:{ex.Message}");
                                }
                                finally
                                {
                                    Application.RunOnMainThread(() =>
                                    {
                                        try
                                        {
                                            waitPage.Hide();
                                            waitPage.RemoveFromParent();
                                            waitPage = null;
                                        }
                                        catch { }
                                    });
                                }
                            })
                            { IsBackground = true }.Start();
                        };
                        new ConfirmDialog().ShowDialog(StringId.Tip, StringId.RollBackTipMsg, okAction);
                    };
                }
                #region 调试权限
@@ -446,17 +524,38 @@
                {
                    DB_ResidenceData.Instance.CurrentRegion.debugPerm = !DB_ResidenceData.Instance.CurrentRegion.debugPerm;
                    btnCommissioningAuthoritySwitchIcon.IsSelected = DB_ResidenceData.Instance.CurrentRegion.debugPerm;
                    var waitPage = new Loading();
                    bodyView.AddChidren(waitPage);
                    waitPage.Start("");
                    new System.Threading.Thread(() =>
                    {
                        new DAL.Server.HttpServerRequest().ChangeResidenceDebugPerm(DB_ResidenceData.Instance.CurrentRegion.debugPerm);
                        try
                        {
                            var pack = new DAL.Server.HttpServerRequest().ChangeResidenceDebugPerm(DB_ResidenceData.Instance.CurrentRegion.debugPerm);
                            if (pack != null)
                            {
                                if (pack.Code == DAL.Server.StateCode.SUCCESS)
                                {
                                    DB_ResidenceData.Instance.CurrentRegion.debugStatus = DB_ResidenceData.Instance.CurrentRegion.debugPerm ? "SECONDARY_DEBUGGIN" : "Delivered";
                                    Application.RunOnMainThread(() =>
                                    {
                                        bodyView.RemoveAll();
                                        LoadPage();
                                    });
                                }
                            }
                        }catch(Exception ex)
                        {
                            Application.RunOnMainThread(() => {
                                waitPage.Hide();
                            });
                        }
                    })
                    { IsBackground = true }.Start();
                };
                #endregion
                LoadEvent_SkipAdminMigrationConfirmPage();
                LoadEvent_SkipTransferConfirmPage();
            }
            //调试完成  才能加载二维码
            else if (DB_ResidenceData.Instance.CurrentRegion.deliverStatus == "WAIT_DELIVERED")
@@ -530,26 +629,28 @@
                switch (DB_ResidenceData.Instance.CurrentRegion.deliverStatus)
                {
                    case "To_Be_Debugged"://待调试
                        btnHouseStatusTipTitle.Text += Language.StringByID(StringId.To_Be_Debugged);
                        btnHouseStatusTipTitle.Text += " : "+ Language.StringByID(StringId.To_Be_Debugged);
                        break;
                    case "Debugging"://调试中
                        btnHouseStatusTipTitle.Text += Language.StringByID(StringId.Debugging);
                        btnHouseStatusTipTitle.Text += " : " + Language.StringByID(StringId.Debugging);
                        break;
                    case "INITIAL_TATE"://初始态
                        btnHouseStatusTipTitle.Text += Language.StringByID(StringId.INITIAL_TATE);
                        btnHouseStatusTipTitle.Text += " : " + Language.StringByID(StringId.INITIAL_TATE);
                        break;
                    case "ACCEPTANCE"://验收
                        btnHouseStatusTipTitle.Text += Language.StringByID(StringId.ACCEPTANCE);
                        btnHouseStatusTipTitle.Text += " : " + Language.StringByID(StringId.ACCEPTANCE);
                        break;
                    case "To_Be_Accepted"://待验收
                        btnHouseStatusTipTitle.Text += Language.StringByID(StringId.To_Be_Accepted);
                        btnHouseStatusTipTitle.Text += " : " + Language.StringByID(StringId.To_Be_Accepted);
                        break;
                    default:
                        btnHouseStatusTipTitle.Text += Language.StringByID(StringId.INITIAL_TATE);
                        btnHouseStatusTipTitle.Text += " : " + Language.StringByID(StringId.INITIAL_TATE);
                        break;
                }
                #endregion
HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs
@@ -104,7 +104,7 @@
            var temp = (int)Convert.ToDouble(setTempTemp);
            if (temp <= 0)
            {
                //默认值改成16,2022年06月10日10:03:19 成甫要求的
                //默认值改成16
                temp = 16;
                device.SetAttrState(FunctionAttributeKey.SetTemp, temp.ToString());
            }
@@ -156,7 +156,7 @@
                    TextSize = CSS_FontSize.EmphasisFontSize_Secondary,
                    IsBold = true,
                    TextAlignment = TextAlignment.CenterLeft,
                    Text = "°C",
                    Text = acFunction.GetTempUnitString(device),
                };
                FrameWhiteCentet1.AddChidren(btnTempUint);
@@ -166,7 +166,7 @@
                    Y = btnTemp.Bottom,
                    Width = Application.GetRealWidth(120),
                    Height = Application.GetRealHeight(30),
                    Text = Language.StringByID(StringId.Indoor) + " 20°C",
                    Text = Language.StringByID(StringId.Indoor) + " 20" + acFunction.GetTempUnitString(device),
                    TextColor = CSS_Color.PromptingColor1,
                    TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
                    TextAlignment = TextAlignment.TopCenter,
@@ -1035,7 +1035,9 @@
                {
                    //device = FunctionList.List.Functions.Find((obj) => obj.sid == device.sid);
                    btnIndoorTemp.Text = Language.StringByID(StringId.Indoor) + " " + Convert.ToInt32(Convert.ToDouble(device.GetAttrState(FunctionAttributeKey.RoomTemp).Replace(",", "."))) + "°C";
                    btnIndoorTemp.Text = Language.StringByID(StringId.Indoor) + " "
                    + Convert.ToInt32(Convert.ToDouble(device.GetAttrState(FunctionAttributeKey.RoomTemp).Replace(",", ".")))
                     + acFunction.GetTempUnitString(device);
                    btnMode.SelectedImagePath = acFunction.GetModeIconPath(device.GetAttrState(FunctionAttributeKey.Mode));
                    btnSwing.SelectedImagePath = acFunction.GetSwingIconPath(device.GetAttrState(FunctionAttributeKey.Swing));
                    btnWindSpeed.SelectedImagePath = acFunction.GetFanIconPath(device.GetAttrState(FunctionAttributeKey.FanSpeed));
HDL_ON/UI/UI2/FuntionControlView/AC/ACPage.cs
@@ -204,6 +204,10 @@
                Text = "°C",
            };
            controlView.AddChidren(btnTempUint);
            if (function.GetAttribute(FunctionAttributeKey.TempType) != null)
            {
                btnTempUint.Text = function.GetAttrState(FunctionAttributeKey.TempType);
            }
            btnIndoorTemp = new Button()
            {
HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPageBLL.cs
@@ -159,7 +159,7 @@
                { IsBackground = true }.Start();
                function.trait_on_off.curValue = "off";
                function.SetAttrState(FunctionAttributeKey.Percent, 0);
                System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
                var d = new System.Collections.Generic.Dictionary<string, string>();
                d.Add(FunctionAttributeKey.OnOff, function.trait_on_off.curValue.ToString());
                DriverLayer.Control.Ins.SendWriteCommand(function, d);
                //CurtainAnimation(100);
HDL_ON/UI/UI2/FuntionControlView/DoorLock/DoorLockPage.cs
@@ -6,6 +6,7 @@
using HDL_ON.UI.CSS;
using HDL_ON.Entity;
using HDL_ON.DriverLayer;
using HDL_ON.DAL.Server;
namespace HDL_ON.UI
{
@@ -73,6 +74,8 @@
        /// </summary>
        private Dictionary<string, string> dicText = new Dictionary<string, string>();
        #endregion
        #region ■ 初始化_____________________________
@@ -117,6 +120,47 @@
            this.RefreshFormStatu();
            //读取设备状态
            Control.Ins.SendReadCommand(device);
            // 获取临时密码
            GetTempPwd();
        }
        /// <summary>
        /// 获取临时密码
        /// </summary>
        private void GetTempPwd()
        {
            new System.Threading.Thread(() =>
            {
                try
                {
                    var pack = Common.ApiUtlis.Ins.HttpRequest.GetDoorTempPassword(device.deviceId);
                    if (pack != null)
                    {
                        Application.RunOnMainThread(() =>
                        {
                            if (pack.Code == StateCode.SUCCESS)
                            {
                                var tempPasswrodObj = Newtonsoft.Json.JsonConvert.DeserializeObject<List<DoorTempPassword>>(pack.Data.ToString());
                                if (tempPasswrodObj.Count > 0)
                                {
                                    doorLockData.TempPassword = tempPasswrodObj[0].pwd;
                                    doorLockData.StartTimeTick = tempPasswrodObj[0].beginTime;
                                    doorLockData.EndTimeTick = tempPasswrodObj[0].endTime;
                                    doorLockData.PwdId = tempPasswrodObj[0].pwdId;
                                    this.InitTempPasswordControl();
                                }
                            }
                        });
                    }
                }
                catch (Exception ex)
                {
                    MainPage.Log($"获取临时密码异常:{ex.Message}");
                }
            })
            { IsBackground = true }.Start();
        }
        /// <summary>
@@ -185,37 +229,43 @@
            frameTempPsw.Visible = false;
            FrameWhiteCentet1.AddChidren(frameTempPsw);
            ////声音
            //this.btnVoice = new IconViewControl(24);
            //btnVoice.UnSelectedImagePath = "FunctionIcon/DoorLock/Voice.png";
            //btnVoice.X = Application.GetRealWidth(23);
            //btnVoice.Y = Application.GetRealHeight(410);
            //FrameWhiteCentet1.AddChidren(btnVoice);
            //声音
            this.btnVoice = new IconViewControl(24);
            btnVoice.UnSelectedImagePath = "FunctionIcon/DoorLock/Voice.png";
            btnVoice.X = Application.GetRealWidth(23);
            btnVoice.Y = Application.GetRealHeight(410);
            FrameWhiteCentet1.AddChidren(btnVoice);
            ////声音的滑动条
            //this.seekBarVoiceControl = new SeekBarImageControl(215);
            //seekBarVoiceControl.Gravity = Gravity.CenterHorizontal;
            //FrameWhiteCentet1.AddChidren(seekBarVoiceControl);
            //seekBarVoiceControl.Y = btnVoice.Y - (seekBarVoiceControl.Height - btnVoice.Height) / 2;
            ////绑定PageLayout控件
            //seekBarVoiceControl.BindPageLayout();
            //声音的滑动条
            this.seekBarVoiceControl = new SeekBarImageControl(215);
            seekBarVoiceControl.Gravity = Gravity.CenterHorizontal;
            FrameWhiteCentet1.AddChidren(seekBarVoiceControl);
            seekBarVoiceControl.Y = btnVoice.Y - (seekBarVoiceControl.Height - btnVoice.Height) / 2;
            //绑定PageLayout控件
            seekBarVoiceControl.BindPageLayout();
            ////声音百分比
            //this.btnVoicePersent = new NormalViewControl(Application.GetRealWidth(50), btnVoice.Height, false);
            //btnVoicePersent.X = seekBarVoiceControl.Right + Application.GetRealWidth(8) - seekBarVoiceControl.SeekBarPadding;
            //btnVoicePersent.Y = btnVoice.Y;
            //btnVoicePersent.TextColor = CSS_Color.PromptingColor1;
            //btnVoicePersent.TextSize = CSS_FontSize.PromptFontSize_FirstLevel;
            //btnVoicePersent.Text = "100%";
            //FrameWhiteCentet1.AddChidren(btnVoicePersent);
            //声音百分比
            this.btnVoicePersent = new NormalViewControl(Application.GetRealWidth(50), btnVoice.Height, false);
            btnVoicePersent.X = seekBarVoiceControl.Right + Application.GetRealWidth(8) - seekBarVoiceControl.SeekBarPadding;
            btnVoicePersent.Y = btnVoice.Y;
            btnVoicePersent.TextColor = CSS_Color.PromptingColor1;
            btnVoicePersent.TextSize = CSS_FontSize.PromptFontSize_FirstLevel;
            btnVoicePersent.Text = "100%";
            FrameWhiteCentet1.AddChidren(btnVoicePersent);
            //seekBarVoiceControl.ProgressChangedEvent += (div, value) =>
            //{
            //    btnVoicePersent.Text = value + "%";
            //    if (div == 1)
            //    {
            //    }
            //};
            seekBarVoiceControl.ProgressChangedEvent += (div, value) =>
            {
                btnVoicePersent.Text = value + "%";
                //if (div == 1)
                //{
                //}
            };
            seekBarVoiceControl.OnStopTrackingTouchEvent = (sender, e) => {
                var dic = new Dictionary<string, string>();
                dic.Add("door_volume", e.ToString());
                Control.Ins.SendWriteCommand(this.device, dic);
            };
            //初始化开锁菜单(一键开锁,临时密码开锁)
            this.InitUnLockMenuControl();
@@ -229,7 +279,7 @@
        private void InitUnLockMenuControl()
        {
            //如果是成员,则只有一键开锁
            if (true)// DB_ResidenceData.Instance.CurrentRegion.isOtherShare == true)
            if ( DB_ResidenceData.Instance.CurrentRegion.isOtherShare == true)
            {
                //一键开锁
                var btnOneKey = new NormalViewControl(100, 25, true);
@@ -556,32 +606,34 @@
                this.frameTempPsw.AddChidren(btnDelete);
                btnDelete.ButtonClickEvent += (sender, e) =>
                {
                    //清除当前临时密码?
                    HdlMessageLogic.Current.ShowMassage(ShowMsgType.Confirm, Language.StringByID(StringId.ClearTempPsswordMsg), () =>
                    if (Convert.ToInt64(this.doorLockData.EndTimeTick) < DateTime.Now.Ticks)
                    {
                        //清空临时密码
                        this.doorLockData.TempPassword = string.Empty;
                        this.doorLockData.StatrtTime = string.Empty;
                        this.doorLockData.EndTime = string.Empty;
                        //重新初始化临时密码控件
                        this.InitTempPasswordControl();
                    });
                        DelTempPwd();
                    }
                    else
                    {
                        //清除当前临时密码?
                        HdlMessageLogic.Current.ShowMassage(ShowMsgType.Confirm, Language.StringByID(StringId.ClearTempPsswordMsg), () =>
                        {
                            DelTempPwd();
                        });
                    }
                };
                //复制临时密码图标
                var btnCopy = new IconViewControl(28);
                btnCopy.UnSelectedImagePath = "FunctionIcon/DoorLock/Shard.png";
                btnCopy.X = this.frameTempPsw.Width - btnCopy.IconSize - btnDelete.X;
                btnCopy.Y = btnDelete.Y;
                this.frameTempPsw.AddChidren(btnCopy);
                btnCopy.ButtonClickEvent += (sender, e) =>
                {
                    //临时密码已经复制
                    HdlCommonLogic.Current.SetTextToShearPlate(this.doorLockData.TempPassword, Language.StringByID(StringId.TempPsswordHasBeenCopy));
                };
                ////复制临时密码图标
                //var btnCopy = new IconViewControl(28);
                //btnCopy.UnSelectedImagePath = "FunctionIcon/DoorLock/Shard.png";
                //btnCopy.X = this.frameTempPsw.Width - btnCopy.IconSize - btnDelete.X;
                //btnCopy.Y = btnDelete.Y;
                //this.frameTempPsw.AddChidren(btnCopy);
                //btnCopy.ButtonClickEvent += (sender, e) =>
                //{
                //    //临时密码已经复制
                //    HdlCommonLogic.Current.SetTextToShearPlate(this.doorLockData.TempPassword, Language.StringByID(StringId.TempPsswordHasBeenCopy));
                //};
                //生效时间
                var frameEffective = this.CreatEffectiveTimeControl(this.frameTempPsw, Language.StringByID(StringId.EffectiveTime), this.doorLockData.StatrtTime);
                var frameEffective = this.CreatEffectiveTimeControl(this.frameTempPsw, Language.StringByID(StringId.EffectiveTime), this.doorLockData.StartTime);
                frameEffective.X = Application.GetRealWidth(24);
                frameEffective.Y = Application.GetRealHeight(180);
@@ -600,6 +652,61 @@
                btnLine.TextSize = CSS_FontSize.PromptFontSize_FirstLevel;
                this.frameTempPsw.AddChidren(btnLine);
            }
        }
        /// <summary>
        /// 删除临时密码
        /// </summary>
        private void DelTempPwd()
        {
            var waitPage = new Loading();
            this.AddChidren(waitPage);
            waitPage.Start("");
            new System.Threading.Thread(() =>
            {
                try
                {
                    var pack = Common.ApiUtlis.Ins.HttpRequest.DelDoorTempPassword(device.deviceId, doorLockData.PwdId);
                    if (pack != null)
                    {
                        Application.RunOnMainThread(() =>
                        {
                            if (pack.Code == StateCode.SUCCESS)
                            {
                                //清空临时密码
                                this.doorLockData.TempPassword = string.Empty;
                                this.doorLockData.StartTimeTick = string.Empty;
                                this.doorLockData.EndTimeTick = string.Empty;
                                this.doorLockData.PwdId = string.Empty;
                                //重新初始化临时密码控件
                                this.InitTempPasswordControl();
                            }
                            else
                            {
                                IMessageCommon.Current.ShowErrorInfoAlter(pack.Code);
                            }
                        });
                    }
                }
                catch (Exception ex)
                {
                    MainPage.Log($"删除门锁临时密码异常: {ex.Message}");
                }
                finally
                {
                    Application.RunOnMainThread(() =>
                    {
                        try
                        {
                            waitPage.Hide();
                            waitPage.RemoveFromParent();
                            waitPage = null;
                        }
                        catch { }
                    });
                }
            })
            { IsBackground = true }.Start();
        }
        /// <summary>
@@ -657,12 +764,13 @@
            //生效时间
            var effectiveTime = Language.StringByID(StringId.EffectiveTime);
            contr.AddRowMenu(effectiveTime, startTime.ToString("yyyy.MM.dd HH:mm"), (btnView, btnValue) =>
            contr.AddRowMenu(effectiveTime + ": " + startTime.ToString("yyyy.MM.dd HH:mm"),"", (btnView, btnValue) =>
            {
                //关掉界面,然后重新调起来
                contr.Close();
                var form = new DoorLockSelectTimePage();
                form.TimeCheck = true;
                form.AddForm(startTime);
                form.SelectFinshEvent += (selectTime) =>
                {
@@ -673,12 +781,13 @@
            //失效时间
            var failTime = Language.StringByID(StringId.FailureTime);
            contr.AddRowMenu(failTime, endTime.ToString("yyyy.MM.dd HH:mm"), (btnView, btnValue) =>
            contr.AddRowMenu(failTime+": "+ endTime.ToString("yyyy.MM.dd HH:mm"),"", (btnView, btnValue) =>
            {
                //关掉界面,然后重新调起来
                contr.Close();
                var form = new DoorLockSelectTimePage();
                form.TimeCheck = true;
                form.AddForm(endTime);
                form.SelectFinshEvent += (selectTime) =>
                {
@@ -698,12 +807,26 @@
                    //关掉界面
                    contr.Close();
                    //生成临时密码
                    this.doorLockData.TempPassword = "987654";
                    this.doorLockData.StatrtTime = startTime.ToString("yyyy.MM.dd HH:mm");
                    this.doorLockData.EndTime = endTime.ToString("yyyy.MM.dd HH:mm");
                    //重新初始化临时密码控件
                    this.InitTempPasswordControl();
                    new System.Threading.Thread(() =>
                    {
                        var pack = Common.ApiUtlis.Ins.HttpRequest.CreateDoorTempPassword(device.deviceId,
                            Utlis.DateTimeToUnix(startTime).ToString(), Utlis.DateTimeToUnix(endTime).ToString());
                        if (pack != null)
                        {
                            if (pack.Code == StateCode.SUCCESS)
                            {
                                // 获取临时密码
                                GetTempPwd();
                            }
                            else
                            {
                                Application.RunOnMainThread(() => {
                                    IMessageCommon.Current.ShowErrorInfoAlter(pack.Code);
                                });
                            }
                        }
                    })
                    { IsBackground = true }.Start();
                }
            };
@@ -725,6 +848,12 @@
            {
                //生效时间必须大于失效时间
                HdlMessageLogic.Current.ShowMassage(ShowMsgType.Tip, Language.StringByID(StringId.EffectiveTimeMustBeOverFailureTime));
                return false;
            }
            if ((endTime - startTime).TotalHours>=24)
            {
                //临时密码有效期不能大于24小时
                HdlMessageLogic.Current.ShowMassage(ShowMsgType.Tip, Language.StringByID(StringId.TempPwdValidityTip));
                return false;
            }
            return true;
@@ -758,34 +887,43 @@
        /// </summary>
        private void RefreshFormStatu()
        {
            //如果不在线
            if (this.doorLockData.IsOnline == false)
            try
            {
                //开锁图片
                this.picLockControl.UnSelectedImagePath = "FunctionIcon/DoorLock/LockPictrue2.png";
                //连接状态
                this.btnOnlineIcon.UnSelectedImagePath = "FunctionIcon/DoorLock/UnConnect.png";
                this.btnOnlineView.Text = this.dicText["未连接"];
                this.btnOnlineView.TextColor = CSS_Color.AuxiliaryColor2;
                //常开模式图标
                if (this.btnNormallyOpenIcon != null)
                //如果不在线
                if (this.doorLockData.IsOnline == false)
                {
                    this.btnNormallyOpenIcon.UnSelectedImagePath = "FunctionIcon/DoorLock/NormallyOpenIcon2.png";
                    //开锁图片
                    this.picLockControl.UnSelectedImagePath = "FunctionIcon/DoorLock/LockPictrue2.png";
                    //连接状态
                    this.btnOnlineIcon.UnSelectedImagePath = "FunctionIcon/DoorLock/UnConnect.png";
                    this.btnOnlineView.Text = this.dicText["未连接"];
                    this.btnOnlineView.TextColor = CSS_Color.AuxiliaryColor2;
                    //常开模式图标
                    if (this.btnNormallyOpenIcon != null)
                    {
                        this.btnNormallyOpenIcon.UnSelectedImagePath = "FunctionIcon/DoorLock/NormallyOpenIcon2.png";
                    }
                }
                else
                {
                    //开锁图片
                    this.picLockControl.UnSelectedImagePath = this.doorLockData.Open == true ? "FunctionIcon/DoorLock/UnLockPictrue3.png" : "FunctionIcon/DoorLock/LockPictrue1.png";
                    //连接状态
                    this.btnOnlineIcon.UnSelectedImagePath = "FunctionIcon/DoorLock/Connect.png";
                    this.btnOnlineView.Text = this.dicText["已连接"];
                    this.btnOnlineView.TextColor = CSS_Color.PromptingColor1;
                    //常开模式图标
                    if (this.btnNormallyOpenIcon != null)
                    {
                        this.btnNormallyOpenIcon.UnSelectedImagePath = "FunctionIcon/DoorLock/NormallyOpenIcon1.png";
                    }
                }
                this.seekBarVoiceControl.Progress = this.doorLockData.Voice;
                this.btnVoicePersent.Text = this.doorLockData.Voice.ToString();
            }
            else
            catch (Exception ex)
            {
                //开锁图片
                this.picLockControl.UnSelectedImagePath = this.doorLockData.Open == true ? "FunctionIcon/DoorLock/UnLockPictrue3.png" : "FunctionIcon/DoorLock/LockPictrue1.png";
                //连接状态
                this.btnOnlineIcon.UnSelectedImagePath = "FunctionIcon/DoorLock/Connect.png";
                this.btnOnlineView.Text = this.dicText["已连接"];
                this.btnOnlineView.TextColor = CSS_Color.PromptingColor1;
                //常开模式图标
                if (this.btnNormallyOpenIcon != null)
                {
                    this.btnNormallyOpenIcon.UnSelectedImagePath = "FunctionIcon/DoorLock/NormallyOpenIcon1.png";
                }
                MainPage.Log($"界面更新异常,门锁:{ex.Message}");
            }
        }
@@ -1001,7 +1139,7 @@
                    }
                }
                //音量
                else if (data.key == "volume")
                else if (data.key == "door_volume")
                {
                    var value = data.state;
                    if (value != string.Empty)
@@ -1065,13 +1203,62 @@
            /// <summary>
            /// 临时密码生效时间(2020.03.17 13:27)
            /// </summary>
            public string StatrtTime = string.Empty;
            public string StartTime {
                get
                {
                    try
                    {
                        if(string.IsNullOrEmpty(StartTimeTick))
                        {
                            return string.Empty;
                        }
                        return Utlis.UnixToDateTime(Convert.ToInt64(StartTimeTick)).ToString("yyyy.MM.dd HH:mm");
                    }catch(Exception ex)
                    {
                        MainPage.Log($"临时密码生效时间转换异常: {ex.Message}");
                        return string.Empty;
                    }
                }
            }
            public string StartTimeTick = string.Empty;
            /// <summary>
            /// 临时密码失效时间(2020.03.17 13:27)
            /// </summary>
            public string EndTime = string.Empty;
            public string EndTime {
                get
                {
                    try
                    {
                        if (string.IsNullOrEmpty(EndTimeTick))
                        {
                            return string.Empty;
                        }
                        return Utlis.UnixToDateTime(Convert.ToInt64(EndTimeTick)).ToString("yyyy.MM.dd HH:mm");
                    }
                    catch (Exception ex)
                    {
                        MainPage.Log($"临时密码生效时间转换异常: {ex.Message}");
                        return string.Empty;
                    }
                }
            }
            public string EndTimeTick = string.Empty;
            /// <summary>
            /// 临时密码id
            /// </summary>
            public string PwdId = string.Empty;
        }
        /// <summary>
        /// 门锁临时密码
        /// </summary>
        private class DoorTempPassword
        {
            public string pwdId = string.Empty;
            public string pwd = string.Empty;
            public string beginTime = string.Empty;
            public string endTime = string.Empty;
        }
        #endregion
    }
}
HDL_ON/UI/UI2/FuntionControlView/DoorLock/DoorLockSelectTimePage.cs
@@ -22,6 +22,12 @@
        /// 选择的时间
        /// </summary>
        private DateTime selectDateTime;
        /// <summary>
        /// 时间校验
        /// 是否需要校验时间大于当前时间
        /// </summary>
        public bool TimeCheck = false;
        #endregion
@@ -51,18 +57,44 @@
            this.ClearBodyFrame();
            //选择日期
            var rowDate = new RowLayoutControl();
            var rowDate = new FrameLayout() {
                Height = Application.GetRealHeight(50),
            };
            rowDate.BackgroundColor = CSS_Color.MainBackgroundColor;
            bodyFrameLayout.AddChidren(rowDate);
            rowDate.frameTable.AddLeftCaption(Language.StringByID(StringId.SelectDate), 300);
            rowDate.frameTable.AddRightArrow();
            rowDate.frameTable.AddBottomLine();
            var btnDay = rowDate.frameTable.AddMostRightView(this.selectDateTime.ToString("yyyy.MM.dd"), 300);
            rowDate.frameTable.ButtonClickEvent += (sender, e) =>
            var btnDateLeft = new Button()
            {
                TextID = StringId.SelectDate,
                TextAlignment = TextAlignment.CenterLeft,
                Width = Application.GetRealWidth(300),
                X = Application.GetRealWidth(16),
                TextColor = CSS_Color.FirstLevelTitleColor,
            };
            rowDate.AddChidren(btnDateLeft);
            var btnDateRight = new Button()
            {
                X = Application.GetRealWidth(339),
                Gravity = Gravity.CenterVertical,
                Width = Application.GetMinRealAverage(16),
                Height = Application.GetMinRealAverage(16),
                UnSelectedImagePath = "Public/Right.png",
            };
            rowDate.AddChidren(btnDateRight);
            rowDate.AddChidren(new Button() { X = Application.GetRealWidth(16),Y = Application.GetRealHeight(49), Height = Application.GetRealHeight(1), Width = Application.GetRealWidth(343), BackgroundColor = CSS_Color.DividingLineColor });
            var btnDay = new Button()
            {
                Width = Application.GetRealWidth(327),
                TextAlignment = TextAlignment.CenterRight,
                Text = selectDateTime.ToString("yyyy.MM.dd"),
                TextColor = CSS_Color.FirstLevelTitleColor,
            };
            rowDate.AddChidren(btnDay);
            EventHandler<MouseEventArgs> dateEvent = (sender, e) =>
            {
                //显示日期选择的底部弹窗
                var contr = new BottomDateSelectControl();
                contr.InitControl(this.selectDateTime.Year, this.selectDateTime.Month, this.selectDateTime.Day, 1, 1);
                contr.InitControl(this.selectDateTime.Year, this.selectDateTime.Month, this.selectDateTime.Day, 0, 1);
                contr.FinishEvent += (div, year, month, day) =>
                {
                    //覆盖时间
@@ -73,21 +105,50 @@
                    }
                };
            };
            btnDateLeft.MouseUpEventHandler = dateEvent;
            btnDateRight.MouseUpEventHandler = dateEvent;
            btnDay.MouseUpEventHandler = dateEvent;
            //选择时间
            var rowTime = new RowLayoutControl();
            rowTime.Y = rowDate.Bottom;
            rowTime.BackgroundColor = CSS_Color.MainBackgroundColor;
            var rowTime = new FrameLayout() {
                Y = rowDate.Bottom,
                Height = Application.GetRealHeight(50),
                BackgroundColor = CSS_Color.MainBackgroundColor,
            };
            bodyFrameLayout.AddChidren(rowTime);
            rowTime.frameTable.AddLeftCaption(Language.StringByID(StringId.SelectTime), 300);
            rowTime.frameTable.AddRightArrow();
            var btnTime = rowTime.frameTable.AddMostRightView(this.selectDateTime.ToString("HH:mm"), 300);
            rowTime.frameTable.ButtonClickEvent += (sender, e) =>
            rowTime.AddChidren(new Button() { X = Application.GetRealWidth(16),Y = Application.GetRealHeight(49), Height = Application.GetRealHeight(1), Width = Application.GetRealWidth(343), BackgroundColor = CSS_Color.DividingLineColor });
            var btnTimeLeft = new Button()
            {
                TextID = StringId.SelectTime,
                TextAlignment = TextAlignment.CenterLeft,
                Width = Application.GetRealWidth(300),
                X = Application.GetRealWidth(16),
                TextColor = CSS_Color.FirstLevelTitleColor,
            };
            rowTime.AddChidren(btnTimeLeft);
            var btnTimeRight = new Button()
            {
                X = Application.GetRealWidth(339),
                Gravity = Gravity.CenterVertical,
                Width = Application.GetMinRealAverage(16),
                Height = Application.GetMinRealAverage(16),
                UnSelectedImagePath = "Public/Right.png",
            };
            rowTime.AddChidren(btnTimeRight);
            var btnTime = new Button()
            {
                Width = Application.GetRealWidth(327),
                TextAlignment = TextAlignment.CenterRight,
                Text = selectDateTime.ToString("HH:mm"),
                TextColor = CSS_Color.FirstLevelTitleColor,
            };
            rowTime.AddChidren(btnTime);
            EventHandler<MouseEventArgs> timeEvent = (sender, e) =>
            {
                //显示日期选择的底部弹窗
                var contr = new BottomTimeSelectControl();
                contr.RowCount = 5;
                contr.InitControl(this.selectDateTime.Hour, this.selectDateTime.Minute, -1);
                contr.RowCount = 4;
                contr.InitControl(this.selectDateTime.Hour, this.selectDateTime.Minute,250);
                contr.FinishEvent += (div, hour, minute) =>
                {
                    //覆盖时间
@@ -98,6 +159,9 @@
                    }
                };
            };
            btnTimeLeft.MouseUpEventHandler = timeEvent;
            btnTimeRight.MouseUpEventHandler = timeEvent;
            btnTime.MouseUpEventHandler = timeEvent;
        }
        #endregion
@@ -109,6 +173,14 @@
        /// </summary>
        public override void CloseFormBefore()
        {
            if (TimeCheck)
            {
                if (DateTime.Now > this.selectDateTime.AddMinutes(1))
                {
                    new PublicAssmebly().TipMsg(StringId.Tip, StringId.TempPwdSettingTip);
                    throw new Exception("stop");
                }
            }
            base.CloseFormBefore();
            //调用回调事件
            this.SelectFinshEvent?.Invoke(this.selectDateTime);
HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPageBLL.cs
@@ -19,6 +19,10 @@
                    {
                        return;
                    }
                    if (updateTemp.sid != bodyView.function.sid)
                    {
                        return;
                    }
                    var outinTemp = Convert.ToInt32(Convert.ToDouble(updateTemp.GetAttrState(FunctionAttributeKey.SetTemp).Replace(",", ".")));
                    bodyView.btnTemp.Text = outinTemp.ToString();
                    //bodyView.btnIndoorTemp.Text = Language.StringByID(StringId.IndoorTemp) + Convert.ToInt32(Convert.ToDouble(updateTemp.GetAttrState(FunctionAttributeKey.RoomTemp).Replace(",", "."))) + "°C";
HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPageBLL.cs
@@ -248,7 +248,10 @@
                    function.trait_on_off.curValue = btnSwitch.IsSelected ? "on" : "off";
                    System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
                    d.Add(FunctionAttributeKey.OnOff, function.trait_on_off.curValue.ToString());
                    d.Add(FunctionAttributeKey.FadeTime, barFadeTime.Progress.ToString());
                    if (function.GetAttribute(FunctionAttributeKey.FadeTime) != null)
                    {
                        d.Add(FunctionAttributeKey.FadeTime, barFadeTime.Progress.ToString());
                    }
                    //if (btnSwitch.IsSelected)
                    //{
                    //    d.Add(FunctionAttributeKey.Brightness, function.lastBrightness.ToString());
HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs
@@ -179,7 +179,10 @@
                    function.trait_on_off.curValue = btnSwitch.IsSelected ? "on" : "off";
                    System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
                    d.Add(FunctionAttributeKey.OnOff, function.trait_on_off.curValue.ToString());
                    d.Add(FunctionAttributeKey.FadeTime, barFadeTime.Progress.ToString());
                    if (function.GetAttribute(FunctionAttributeKey.FadeTime) != null)
                    {
                        d.Add(FunctionAttributeKey.FadeTime, barFadeTime.Progress.ToString());
                    }
                    //if (btnSwitch.IsSelected)
                    //{
                    //    if(function.lastBrightness == 0)
HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs
@@ -185,6 +185,7 @@
                            lightTemp.SetRGBcolor(lastColor, function);
                            System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
                            d.Add(FunctionAttributeKey.RGB, lightTemp.GetRGBcolorString(function));
                            d.Add(FunctionAttributeKey.Brightness, dimmerBar.Progress.ToString());
                            Control.Ins.SendWriteCommand(function, d,false,0);
                            break;
                        }
@@ -305,8 +306,10 @@
                    function.trait_on_off.curValue = btnSwitch.IsSelected ? "on" : "off";
                    System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
                    d.Add(FunctionAttributeKey.OnOff, function.trait_on_off.curValue.ToString());
                    d.Add(FunctionAttributeKey.FadeTime, barFadeTime.Progress.ToString());
                    if (function.GetAttribute(FunctionAttributeKey.FadeTime) != null)
                    {
                        d.Add(FunctionAttributeKey.FadeTime, barFadeTime.Progress.ToString());
                    }
                    if (btnSwitch.IsSelected)
                    {
                        if(function.lastBrightness == 0)
HDL_ON/UI/UI2/FuntionControlView/Light/RGBWPageBLL.cs
@@ -307,7 +307,10 @@
                    function.trait_on_off.curValue = btnSwitch.IsSelected ? "on" : "off";
                    System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
                    d.Add(FunctionAttributeKey.OnOff, function.trait_on_off.curValue.ToString());
                    d.Add(FunctionAttributeKey.FadeTime, barFadeTime.Progress.ToString());
                    if (function.GetAttribute(FunctionAttributeKey.FadeTime) != null)
                    {
                        d.Add(FunctionAttributeKey.FadeTime, barFadeTime.Progress.ToString());
                    }
                    if (btnSwitch.IsSelected)
                    {
                        if (function.lastBrightness == 0)
HDL_ON/UI/UI2/FuntionControlView/Music/View/PlayView.cs
@@ -214,7 +214,6 @@
            SeekBarViewHeight = Application.GetRealWidth(8),//进度条的高度
            ProgressChangeDelayTime = 300,//0.3秒发送一次
            SeekBarPadding = Application.GetRealWidth(20),
        };
        /// <summary>
SiriIntents/Info.plist
@@ -11,9 +11,9 @@
    <key>CFBundlePackageType</key>
    <string>XPC!</string>
    <key>CFBundleShortVersionString</key>
    <string>1.3.202304211</string>
    <string>1.7.6</string>
    <key>CFBundleVersion</key>
    <string>1.3.04211</string>
    <string>1.7.6</string>
    <key>MinimumOSVersion</key>
    <string>12.2</string>
    <key>NSExtension</key>
SiriIntentsUI/Info.plist
@@ -15,9 +15,9 @@
    <key>CFBundlePackageType</key>
    <string>XPC!</string>
    <key>CFBundleShortVersionString</key>
    <string>1.3.202304211</string>
    <string>1.7.6</string>
    <key>CFBundleVersion</key>
    <string>1.3.04211</string>
    <string>1.7.6</string>
    <key>MinimumOSVersion</key>
    <string>12.2</string>
    <key>NSExtension</key>