From c4b73204e8875dbb27ff0f26959ae69497ab4b5b Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期三, 24 三月 2021 16:25:48 +0800
Subject: [PATCH] 1
---
HDL-ON_Android/Properties/AndroidManifest.xml | 2
HDL-ON_iOS/Info.plist | 4
HDL-ON_iOS/Resources/Language.ini | 58 ----
HDL-ON_Android/Assets/Language.ini | 61 -----
HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs | 8
HDL-ON_Android/Resources/Resource.designer.cs | 523 +++++++++++++++++++++---------------------
.vs/HDL_APP_Project/xs/UserPrefs.xml | 59 +---
HDL_ON/UI/MainPage.cs | 2
8 files changed, 290 insertions(+), 427 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index 31d6ab9..7679500 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,54 +1,25 @@
-锘�<Properties StartupConfiguration="{D998E133-F0DD-4760-BE3C-461632F54DA4}|Default">
+锘�<Properties StartupConfiguration="{09712674-2A38-407B-B1E2-560B2C352F9A}|Default">
<MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008020-000404163432002E" />
- <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs">
+ <MonoDevelop.Ide.Workbench>
<Files>
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddButton.cs" Line="176" Column="51" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs" Line="494" Column="58" />
+ <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddButton.cs" Line="174" Column="51" />
+ <File FileName="HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs" Line="427" Column="1" />
<File FileName="HDL-ON_iOS/Info.plist" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/View/BrandListView.cs" Line="1" Column="1" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/BrandList.cs" Line="62" Column="30" />
- <File FileName="HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs" Line="327" Column="74" />
- <File FileName="HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs" Line="137" Column="36" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirSend.cs" Line="169" Column="18" />
- <File FileName="HDL_ON/Entity/Function/Scene.cs" Line="63" Column="33" />
- <File FileName="HDL_ON/UI/UI1-Login/LoginPage.cs" Line="203" Column="24" />
- <File FileName="HDL_ON/UI/MainPage.cs" Line="213" Column="32" />
+ <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/View/BrandListView.cs" />
+ <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/BrandList.cs" />
+ <File FileName="HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs" />
+ <File FileName="HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs" />
+ <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirSend.cs" />
+ <File FileName="HDL_ON/Entity/Function/Scene.cs" />
+ <File FileName="HDL_ON/UI/UI1-Login/LoginPage.cs" />
+ <File FileName="HDL_ON/UI/MainPage.cs" />
</Files>
<Pads>
<Pad Id="ProjectPad">
<State name="__root__">
<Node name="HDL_APP_Project" expanded="True">
- <Node name="HDL_ON" expanded="True">
- <Node name="Entity" expanded="True">
- <Node name="Device" expanded="True" />
- <Node name="Function" expanded="True" />
- </Node>
- <Node name="UI" expanded="True">
- <Node name="UI0-Public" expanded="True" />
- <Node name="UI1-Login" expanded="True" />
- <Node name="UI2" expanded="True">
- <Node name="3-Intelligence" expanded="True" />
- <Node name="4-PersonalCenter" expanded="True">
- <Node name="PirDevice" expanded="True" />
- </Node>
- <Node name="FuntionControlView" expanded="True">
- <Node name="1ContorlPage" expanded="True">
- <Node name="AcControlPage.cs" selected="True" />
- </Node>
- <Node name="Electrical" expanded="True" />
- </Node>
- </Node>
- </Node>
- </Node>
- <Node name="HDL-ON_iOS" expanded="True">
- <Node name="Resources" expanded="True">
- <Node name="Phone" expanded="True">
- <Node name="Public" expanded="True">
- <Node name="MsgIcon" expanded="True" />
- </Node>
- </Node>
- </Node>
- </Node>
+ <Node name="HDL-ON_Android" selected="True" />
+ <Node name="HDL-ON_iOS" expanded="True" />
<Node name="ys" expanded="True" />
</Node>
</State>
@@ -61,7 +32,7 @@
<String>Shared.Droid.TouchID/Shared.Droid.TouchID.csproj</String>
<String>Shared.IOS/Shared.IOS.csproj</String>
</DisabledProjects>
- <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhone" />
+ <MonoDevelop.Ide.Workspace ActiveConfiguration="Release" />
<MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.SelectDevice" />
<MonoDevelop.Ide.DebuggingService.Breakpoints>
<BreakpointStore />
diff --git a/HDL-ON_Android/Assets/Language.ini b/HDL-ON_Android/Assets/Language.ini
index 6539302..850d302 100644
--- a/HDL-ON_Android/Assets/Language.ini
+++ b/HDL-ON_Android/Assets/Language.ini
@@ -1394,67 +1394,6 @@
6078=绯荤粺缁存姢涓瓇璇风◢鍚庡啀璇晘
6079=鑾峰彇鏁版嵁澶辫触
-
-
-
-6015=鍦ㄧ嚎
-6016=绂荤嚎
-6017=鐗堟湰鍙�
-6018=璇疯緭鍏ラ仴鎺у櫒鍚嶇О
-6019=鎻愮ず锛氶仴鎺у櫒鍒涘缓鍚庡彲鍦ㄥ姛鑳�-鐢靛櫒鍒嗙被{\r\n}鏌ユ壘浣跨敤
-6020=鎺ㄨ崘鎸夐敭
-6021=璇疯緭鍏ユ寜閿悕绉�
-6022=涓嬩竴姝�
-6023=鐢垫簮
-6024=闊抽噺+
-6025=闊抽噺-
-6026=棰戦亾+
-6027=棰戦亾-
-6028=涓�
-6029=涓�
-6030=宸�
-6031=鍙�
-6032=闈欓煶
-6034=纭
-6035=鎾斁
-6037=閫�鍑�
-6038=鑿滃崟
-6039=鏆傚仠
-6040=杩斿洖
-6041=鍋滄
-6042=涓婚〉
-6043=蹇繘
-6044=蹇��
-6045=瀹氭椂
-6046=澶嶅埗閬ユ帶鍔熻兘
-6047=瀵瑰噯閬ユ帶鍣ㄤ腑蹇冩寜涓嬬浉鍚屾寜閿�
-6048=鏅鸿兘閬ユ帶鍣�
-6049=娣诲姞鎸夐敭
-6050=*闀挎寜鍙繘琛岃嚜瀹氫箟鎺掑簭
-6051=瀹屾垚
-6052=娣诲姞鎴愬姛
-6053=鍙埌鍒嗙被-鍔熻兘-鐢靛櫒鎿嶄綔浣跨敤
-6054=鎵�灞炲垎绫�
-6055=閬ユ帶鍣ㄥ悕绉�
-6056=鎵�灞炲尯鍩�
-6057=缁х画娣诲姞
-6058=鐢靛櫒
-6059=娣诲姞澶辫触
-6060=閲嶈瘯
-6061=鍖归厤閬ユ帶鍣�
-6062=璇风偣鍑讳互涓嬫寜閽�
-6063=纭璁惧鏄惁鏈夊搷搴�
-6064=鎺у埗澶辫触
-6065=鎺у埗鎴愬姛
-6066=鐢垫簮寮�
-6067=妯″紡鍒跺喎
-6068=椋庨�熶腑椋�
-6069=娓╁害26鈩�
-6070=鍒犻櫎璁惧
-6071=淇敼鍚嶅瓧
-6072=纭鍒犻櫎
-6073=鍙栨秷
-
7000=鏂板缓鑷姩鍖�
7001=缂栬緫鑷姩鍖�
7002=濡傛灉
diff --git a/HDL-ON_Android/Properties/AndroidManifest.xml b/HDL-ON_Android/Properties/AndroidManifest.xml
index ce71aaa..d1cd886 100644
--- a/HDL-ON_Android/Properties/AndroidManifest.xml
+++ b/HDL-ON_Android/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
锘�<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="20210323" android:versionName="1.1.202103233" package="com.hdl.onpro">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="202103241" android:versionName="1.1.202103241" package="com.hdl.onpro">
<uses-sdk android:minSdkVersion="26" android:targetSdkVersion="26" />
<!-- 瀹氫綅鏉冮檺-->
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
diff --git a/HDL-ON_Android/Resources/Resource.designer.cs b/HDL-ON_Android/Resources/Resource.designer.cs
index 0a2f86a..2e0269e 100644
--- a/HDL-ON_Android/Resources/Resource.designer.cs
+++ b/HDL-ON_Android/Resources/Resource.designer.cs
@@ -9340,526 +9340,529 @@
public const int abc_select_dialog_material = 2131427354;
// aapt resource value: 0x7F0B001B
- public const int activity_add_device_to_acount_ez = 2131427355;
+ public const int activity_add_device_to_acount = 2131427355;
// aapt resource value: 0x7F0B001C
- public const int activity_collect_device_info = 2131427356;
+ public const int activity_add_device_to_acount_ez = 2131427356;
// aapt resource value: 0x7F0B001D
- public const int activity_collect_play_info = 2131427357;
+ public const int activity_collect_device_info = 2131427357;
// aapt resource value: 0x7F0B001E
- public const int activity_config_wifi_executing = 2131427358;
+ public const int activity_collect_play_info = 2131427358;
// aapt resource value: 0x7F0B001F
- public const int activity_ezupgrade_device = 2131427359;
+ public const int activity_config_wifi_executing = 2131427359;
// aapt resource value: 0x7F0B0020
- public const int activity_hc = 2131427360;
+ public const int activity_ezupgrade_device = 2131427360;
// aapt resource value: 0x7F0B0021
- public const int activity_hcactive = 2131427361;
+ public const int activity_hc = 2131427361;
// aapt resource value: 0x7F0B0022
- public const int activity_hcplay = 2131427362;
+ public const int activity_hcactive = 2131427362;
// aapt resource value: 0x7F0B0023
- public const int activity_interface_self_test = 2131427363;
+ public const int activity_hcplay = 2131427363;
// aapt resource value: 0x7F0B0024
- public const int activity_interface_test = 2131427364;
+ public const int activity_interface_self_test = 2131427364;
// aapt resource value: 0x7F0B0025
- public const int activity_lan_multi_device = 2131427365;
+ public const int activity_interface_test = 2131427365;
// aapt resource value: 0x7F0B0026
- public const int activity_list = 2131427366;
+ public const int activity_lan_multi_device = 2131427366;
// aapt resource value: 0x7F0B0027
- public const int activity_main = 2131427367;
+ public const int activity_list = 2131427367;
// aapt resource value: 0x7F0B0028
- public const int activity_main_ez = 2131427368;
+ public const int activity_main = 2131427368;
// aapt resource value: 0x7F0B0029
- public const int activity_manual_choose_config_wifi_way = 2131427369;
+ public const int activity_main_ez = 2131427369;
// aapt resource value: 0x7F0B002A
- public const int activity_manual_connect_device_hotspot = 2131427370;
+ public const int activity_manual_choose_config_wifi_way = 2131427370;
// aapt resource value: 0x7F0B002B
- public const int activity_manual_input_device_hotspot_info = 2131427371;
+ public const int activity_manual_connect_device_hotspot = 2131427371;
// aapt resource value: 0x7F0B002C
- public const int activity_more_features_entrance = 2131427372;
+ public const int activity_manual_input_device_hotspot_info = 2131427372;
// aapt resource value: 0x7F0B002D
- public const int activity_multi_screen_preview = 2131427373;
+ public const int activity_more_features_entrance = 2131427373;
// aapt resource value: 0x7F0B002E
- public const int activity_my_collect = 2131427374;
+ public const int activity_multi_screen_preview = 2131427374;
// aapt resource value: 0x7F0B002F
- public const int activity_option = 2131427375;
+ public const int activity_my_collect = 2131427375;
// aapt resource value: 0x7F0B0030
- public const int activity_origin_stream_control = 2131427376;
+ public const int activity_option = 2131427376;
// aapt resource value: 0x7F0B0031
- public const int activity_rtp_stream_play = 2131427377;
+ public const int activity_origin_stream_control = 2131427377;
// aapt resource value: 0x7F0B0032
- public const int activity_square = 2131427378;
+ public const int activity_rtp_stream_play = 2131427378;
// aapt resource value: 0x7F0B0033
- public const int activity_square_video_list = 2131427379;
+ public const int activity_square = 2131427379;
// aapt resource value: 0x7F0B0034
- public const int activity_square_video_list2 = 2131427380;
+ public const int activity_square_video_list = 2131427380;
// aapt resource value: 0x7F0B0035
- public const int activity_square_video_search = 2131427381;
+ public const int activity_square_video_list2 = 2131427381;
// aapt resource value: 0x7F0B0036
- public const int activity_support = 2131427382;
+ public const int activity_square_video_search = 2131427382;
// aapt resource value: 0x7F0B0037
- public const int activity_test_config_wifi = 2131427383;
+ public const int activity_support = 2131427383;
// aapt resource value: 0x7F0B0038
- public const int activity_test_for_sdk = 2131427384;
+ public const int activity_test_config_wifi = 2131427384;
// aapt resource value: 0x7F0B0039
- public const int activity_test_page = 2131427385;
+ public const int activity_test_for_sdk = 2131427385;
// aapt resource value: 0x7F0B003A
- public const int activity_video_talk = 2131427386;
+ public const int activity_test_page = 2131427386;
// aapt resource value: 0x7F0B003B
- public const int add_camera_by_series_number_page = 2131427387;
+ public const int activity_video_talk = 2131427387;
// aapt resource value: 0x7F0B003C
- public const int auto_wifi_connecting = 2131427388;
+ public const int add_camera_by_series_number_page = 2131427388;
// aapt resource value: 0x7F0B003D
- public const int auto_wifi_connecting_status_item = 2131427389;
+ public const int auto_wifi_connecting = 2131427389;
// aapt resource value: 0x7F0B003E
- public const int auto_wifi_connecting_status_item_ez = 2131427390;
+ public const int auto_wifi_connecting_status_item = 2131427390;
// aapt resource value: 0x7F0B003F
- public const int auto_wifi_net_config = 2131427391;
+ public const int auto_wifi_connecting_status_item_ez = 2131427391;
// aapt resource value: 0x7F0B0040
- public const int auto_wifi_prepare_step_on = 2131427392;
+ public const int auto_wifi_net_config = 2131427392;
// aapt resource value: 0x7F0B0041
- public const int auto_wifi_reset = 2131427393;
+ public const int auto_wifi_prepare_step_on = 2131427393;
// aapt resource value: 0x7F0B0042
- public const int auto_wifi_reset_introduce = 2131427394;
+ public const int auto_wifi_reset = 2131427394;
// aapt resource value: 0x7F0B0043
- public const int auto_wifi_reset_introduce_ez = 2131427395;
+ public const int auto_wifi_reset_introduce = 2131427395;
// aapt resource value: 0x7F0B0044
- public const int biometric_prompt_dialog_content = 2131427396;
+ public const int auto_wifi_reset_introduce_ez = 2131427396;
// aapt resource value: 0x7F0B0045
- public const int cameralist_page = 2131427397;
+ public const int biometric_prompt_dialog_content = 2131427397;
// aapt resource value: 0x7F0B0046
- public const int cameralist_page_ez = 2131427398;
+ public const int cameralist_page = 2131427398;
// aapt resource value: 0x7F0B0047
- public const int cameralist_small_item = 2131427399;
+ public const int cameralist_page_ez = 2131427399;
// aapt resource value: 0x7F0B0048
- public const int cameralist_small_item_ez = 2131427400;
+ public const int cameralist_small_item = 2131427400;
// aapt resource value: 0x7F0B0049
- public const int capture_activity = 2131427401;
+ public const int cameralist_small_item_ez = 2131427401;
// aapt resource value: 0x7F0B004A
- public const int capture_activity_ez = 2131427402;
+ public const int capture_activity = 2131427402;
// aapt resource value: 0x7F0B004B
- public const int cc_activity_widget_countrycode = 2131427403;
+ public const int capture_activity_ez = 2131427403;
// aapt resource value: 0x7F0B004C
- public const int cc_activity_widget_sortselection = 2131427404;
+ public const int cc_activity_widget_countrycode = 2131427404;
// aapt resource value: 0x7F0B004D
- public const int cc_country_list_item = 2131427405;
+ public const int cc_activity_widget_sortselection = 2131427405;
// aapt resource value: 0x7F0B004E
- public const int city_config_item = 2131427406;
+ public const int cc_country_list_item = 2131427406;
// aapt resource value: 0x7F0B004F
- public const int city_config_item_ez = 2131427407;
+ public const int city_config_item = 2131427407;
// aapt resource value: 0x7F0B0050
- public const int ddns_device_ist_page = 2131427408;
+ public const int city_config_item_ez = 2131427408;
// aapt resource value: 0x7F0B0051
- public const int ddns_device_list_item = 2131427409;
+ public const int ddns_device_ist_page = 2131427409;
// aapt resource value: 0x7F0B0052
- public const int design_bottom_navigation_item = 2131427410;
+ public const int ddns_device_list_item = 2131427410;
// aapt resource value: 0x7F0B0053
- public const int design_bottom_sheet_dialog = 2131427411;
+ public const int design_bottom_navigation_item = 2131427411;
// aapt resource value: 0x7F0B0054
- public const int design_layout_snackbar = 2131427412;
+ public const int design_bottom_sheet_dialog = 2131427412;
// aapt resource value: 0x7F0B0055
- public const int design_layout_snackbar_include = 2131427413;
+ public const int design_layout_snackbar = 2131427413;
// aapt resource value: 0x7F0B0056
- public const int design_layout_tab_icon = 2131427414;
+ public const int design_layout_snackbar_include = 2131427414;
// aapt resource value: 0x7F0B0057
- public const int design_layout_tab_text = 2131427415;
+ public const int design_layout_tab_icon = 2131427415;
// aapt resource value: 0x7F0B0058
- public const int design_menu_item_action_area = 2131427416;
+ public const int design_layout_tab_text = 2131427416;
// aapt resource value: 0x7F0B0059
- public const int design_navigation_item = 2131427417;
+ public const int design_menu_item_action_area = 2131427417;
// aapt resource value: 0x7F0B005A
- public const int design_navigation_item_header = 2131427418;
+ public const int design_navigation_item = 2131427418;
// aapt resource value: 0x7F0B005B
- public const int design_navigation_item_separator = 2131427419;
+ public const int design_navigation_item_header = 2131427419;
// aapt resource value: 0x7F0B005C
- public const int design_navigation_item_subheader = 2131427420;
+ public const int design_navigation_item_separator = 2131427420;
// aapt resource value: 0x7F0B005D
- public const int design_navigation_menu = 2131427421;
+ public const int design_navigation_item_subheader = 2131427421;
// aapt resource value: 0x7F0B005E
- public const int design_navigation_menu_item = 2131427422;
+ public const int design_navigation_menu = 2131427422;
// aapt resource value: 0x7F0B005F
- public const int design_text_input_password_icon = 2131427423;
+ public const int design_navigation_menu_item = 2131427423;
// aapt resource value: 0x7F0B0060
- public const int device_discover_item = 2131427424;
+ public const int design_text_input_password_icon = 2131427424;
// aapt resource value: 0x7F0B0061
- public const int device_discover_page = 2131427425;
+ public const int device_discover_item = 2131427425;
// aapt resource value: 0x7F0B0062
- public const int device_setting_page = 2131427426;
+ public const int device_discover_page = 2131427426;
// aapt resource value: 0x7F0B0063
- public const int device_video_encrypt_dialog = 2131427427;
-
- // aapt resource value: 0x7F0B006F
- public const int ezopen_realplay_operate_bar = 2131427439;
-
- // aapt resource value: 0x7F0B0070
- public const int ezopen_realplay_operate_bar2 = 2131427440;
+ public const int device_setting_page = 2131427427;
// aapt resource value: 0x7F0B0064
- public const int ez_demo_interface_activity = 2131427428;
+ public const int device_video_encrypt_dialog = 2131427428;
- // aapt resource value: 0x7F0B0065
- public const int ez_message_image_page = 2131427429;
-
- // aapt resource value: 0x7F0B0066
- public const int ez_message_list_item = 2131427430;
-
- // aapt resource value: 0x7F0B0067
- public const int ez_message_list_section = 2131427431;
-
- // aapt resource value: 0x7F0B0068
- public const int ez_message_page = 2131427432;
-
- // aapt resource value: 0x7F0B006A
- public const int ez_playback_list_page = 2131427434;
-
- // aapt resource value: 0x7F0B0069
- public const int ez_play_control = 2131427433;
-
- // aapt resource value: 0x7F0B006B
- public const int ez_realplay_page = 2131427435;
-
- // aapt resource value: 0x7F0B006C
- public const int ez_realplay_prompt_layout = 2131427436;
-
- // aapt resource value: 0x7F0B006D
- public const int ez_realplay_quality_items = 2131427437;
-
- // aapt resource value: 0x7F0B006E
- public const int ez_remote_playback_page = 2131427438;
+ // aapt resource value: 0x7F0B0070
+ public const int ezopen_realplay_operate_bar = 2131427440;
// aapt resource value: 0x7F0B0071
- public const int fragment_city_config = 2131427441;
+ public const int ezopen_realplay_operate_bar2 = 2131427441;
+
+ // aapt resource value: 0x7F0B0065
+ public const int ez_demo_interface_activity = 2131427429;
+
+ // aapt resource value: 0x7F0B0066
+ public const int ez_message_image_page = 2131427430;
+
+ // aapt resource value: 0x7F0B0067
+ public const int ez_message_list_item = 2131427431;
+
+ // aapt resource value: 0x7F0B0068
+ public const int ez_message_list_section = 2131427432;
+
+ // aapt resource value: 0x7F0B0069
+ public const int ez_message_page = 2131427433;
+
+ // aapt resource value: 0x7F0B006B
+ public const int ez_playback_list_page = 2131427435;
+
+ // aapt resource value: 0x7F0B006A
+ public const int ez_play_control = 2131427434;
+
+ // aapt resource value: 0x7F0B006C
+ public const int ez_realplay_page = 2131427436;
+
+ // aapt resource value: 0x7F0B006D
+ public const int ez_realplay_prompt_layout = 2131427437;
+
+ // aapt resource value: 0x7F0B006E
+ public const int ez_realplay_quality_items = 2131427438;
+
+ // aapt resource value: 0x7F0B006F
+ public const int ez_remote_playback_page = 2131427439;
// aapt resource value: 0x7F0B0072
- public const int fragment_search_video = 2131427442;
+ public const int fragment_city_config = 2131427442;
// aapt resource value: 0x7F0B0073
- public const int fragment_square_video_list = 2131427443;
+ public const int fragment_search_video = 2131427443;
// aapt resource value: 0x7F0B0074
- public const int hdl_gallery_banner_view_layout = 2131427444;
+ public const int fragment_square_video_list = 2131427444;
// aapt resource value: 0x7F0B0075
- public const int hdl_widget_activity_crop_image = 2131427445;
+ public const int hdl_gallery_banner_view_layout = 2131427445;
// aapt resource value: 0x7F0B0076
- public const int hdl_widget_activity_geofence_round = 2131427446;
+ public const int hdl_widget_activity_crop_image = 2131427446;
// aapt resource value: 0x7F0B0077
- public const int hdl_widget_air_button = 2131427447;
+ public const int hdl_widget_activity_geofence_round = 2131427447;
// aapt resource value: 0x7F0B0078
- public const int hdl_widget_include_pickerview_topbar = 2131427448;
+ public const int hdl_widget_air_button = 2131427448;
// aapt resource value: 0x7F0B0079
- public const int hdl_widget_layout_basepickerview = 2131427449;
+ public const int hdl_widget_include_pickerview_topbar = 2131427449;
// aapt resource value: 0x7F0B007A
- public const int hdl_widget_pickerview = 2131427450;
+ public const int hdl_widget_layout_basepickerview = 2131427450;
// aapt resource value: 0x7F0B007B
- public const int hdl_widget_pickerview_options = 2131427451;
+ public const int hdl_widget_pickerview = 2131427451;
// aapt resource value: 0x7F0B007C
- public const int hdl_widget_pickerview_time = 2131427452;
+ public const int hdl_widget_pickerview_options = 2131427452;
// aapt resource value: 0x7F0B007D
- public const int item_multi_screen_preview = 2131427453;
+ public const int hdl_widget_pickerview_time = 2131427453;
// aapt resource value: 0x7F0B007E
- public const int lan_device_adapter_item = 2131427454;
+ public const int item_multi_screen_preview = 2131427454;
// aapt resource value: 0x7F0B007F
- public const int lan_device_login_dialog = 2131427455;
+ public const int lan_device_adapter_item = 2131427455;
// aapt resource value: 0x7F0B0080
- public const int layout_camera_view = 2131427456;
+ public const int lan_device_login_dialog = 2131427456;
// aapt resource value: 0x7F0B0081
- public const int layout_camera_view_soft = 2131427457;
+ public const int layout_camera_view = 2131427457;
// aapt resource value: 0x7F0B0082
- public const int layout_change_playback_rate = 2131427458;
+ public const int layout_camera_view_soft = 2131427458;
// aapt resource value: 0x7F0B0083
- public const int layout_child_watch_video_talk_operation = 2131427459;
+ public const int layout_change_playback_rate = 2131427459;
// aapt resource value: 0x7F0B0084
- public const int layout_dialog_tip = 2131427460;
+ public const int layout_child_watch_video_talk_operation = 2131427460;
// aapt resource value: 0x7F0B0085
- public const int layout_login_anim = 2131427461;
+ public const int layout_dialog_tip = 2131427461;
// aapt resource value: 0x7F0B0086
- public const int line_connecting_introduce_activity = 2131427462;
+ public const int layout_login_anim = 2131427462;
// aapt resource value: 0x7F0B0087
- public const int list_section = 2131427463;
+ public const int line_connecting_introduce_activity = 2131427463;
// aapt resource value: 0x7F0B0088
- public const int loading_text_view = 2131427464;
+ public const int list_section = 2131427464;
// aapt resource value: 0x7F0B0089
- public const int login_page = 2131427465;
+ public const int loading_text_view = 2131427465;
// aapt resource value: 0x7F0B008A
- public const int message_list_item = 2131427466;
+ public const int login_page = 2131427466;
// aapt resource value: 0x7F0B008B
- public const int message_page = 2131427467;
+ public const int message_list_item = 2131427467;
// aapt resource value: 0x7F0B008C
- public const int modify_device_name_page = 2131427468;
+ public const int message_page = 2131427468;
// aapt resource value: 0x7F0B008D
- public const int network_error_retry_page = 2131427469;
-
- // aapt resource value: 0x7F0B0091
- public const int notification_action = 2131427473;
-
- // aapt resource value: 0x7F0B0092
- public const int notification_action_tombstone = 2131427474;
-
- // aapt resource value: 0x7F0B0093
- public const int notification_media_action = 2131427475;
-
- // aapt resource value: 0x7F0B0094
- public const int notification_media_cancel_action = 2131427476;
-
- // aapt resource value: 0x7F0B0095
- public const int notification_template_big_media = 2131427477;
-
- // aapt resource value: 0x7F0B0096
- public const int notification_template_big_media_custom = 2131427478;
-
- // aapt resource value: 0x7F0B0097
- public const int notification_template_big_media_narrow = 2131427479;
-
- // aapt resource value: 0x7F0B0098
- public const int notification_template_big_media_narrow_custom = 2131427480;
-
- // aapt resource value: 0x7F0B0099
- public const int notification_template_custom_big = 2131427481;
-
- // aapt resource value: 0x7F0B009A
- public const int notification_template_icon_group = 2131427482;
-
- // aapt resource value: 0x7F0B009B
- public const int notification_template_lines_media = 2131427483;
-
- // aapt resource value: 0x7F0B009C
- public const int notification_template_media = 2131427484;
-
- // aapt resource value: 0x7F0B009D
- public const int notification_template_media_custom = 2131427485;
-
- // aapt resource value: 0x7F0B009E
- public const int notification_template_part_chronometer = 2131427486;
-
- // aapt resource value: 0x7F0B009F
- public const int notification_template_part_time = 2131427487;
-
- // aapt resource value: 0x7F0B00A0
- public const int notifier_alarmloginfo_list_item = 2131427488;
-
- // aapt resource value: 0x7F0B00A1
- public const int notifier_page = 2131427489;
+ public const int modify_device_name_page = 2131427469;
// aapt resource value: 0x7F0B008E
- public const int no_device_more_footer = 2131427470;
+ public const int network_error_retry_page = 2131427470;
- // aapt resource value: 0x7F0B008F
- public const int no_more_footer = 2131427471;
+ // aapt resource value: 0x7F0B0092
+ public const int notification_action = 2131427474;
- // aapt resource value: 0x7F0B0090
- public const int no_msg_more_footer = 2131427472;
+ // aapt resource value: 0x7F0B0093
+ public const int notification_action_tombstone = 2131427475;
+
+ // aapt resource value: 0x7F0B0094
+ public const int notification_media_action = 2131427476;
+
+ // aapt resource value: 0x7F0B0095
+ public const int notification_media_cancel_action = 2131427477;
+
+ // aapt resource value: 0x7F0B0096
+ public const int notification_template_big_media = 2131427478;
+
+ // aapt resource value: 0x7F0B0097
+ public const int notification_template_big_media_custom = 2131427479;
+
+ // aapt resource value: 0x7F0B0098
+ public const int notification_template_big_media_narrow = 2131427480;
+
+ // aapt resource value: 0x7F0B0099
+ public const int notification_template_big_media_narrow_custom = 2131427481;
+
+ // aapt resource value: 0x7F0B009A
+ public const int notification_template_custom_big = 2131427482;
+
+ // aapt resource value: 0x7F0B009B
+ public const int notification_template_icon_group = 2131427483;
+
+ // aapt resource value: 0x7F0B009C
+ public const int notification_template_lines_media = 2131427484;
+
+ // aapt resource value: 0x7F0B009D
+ public const int notification_template_media = 2131427485;
+
+ // aapt resource value: 0x7F0B009E
+ public const int notification_template_media_custom = 2131427486;
+
+ // aapt resource value: 0x7F0B009F
+ public const int notification_template_part_chronometer = 2131427487;
+
+ // aapt resource value: 0x7F0B00A0
+ public const int notification_template_part_time = 2131427488;
+
+ // aapt resource value: 0x7F0B00A1
+ public const int notifier_alarmloginfo_list_item = 2131427489;
// aapt resource value: 0x7F0B00A2
- public const int open_ysservice_dialog = 2131427490;
+ public const int notifier_page = 2131427490;
+
+ // aapt resource value: 0x7F0B008F
+ public const int no_device_more_footer = 2131427471;
+
+ // aapt resource value: 0x7F0B0090
+ public const int no_more_footer = 2131427472;
+
+ // aapt resource value: 0x7F0B0091
+ public const int no_msg_more_footer = 2131427473;
// aapt resource value: 0x7F0B00A3
- public const int password_error_layout = 2131427491;
+ public const int open_ysservice_dialog = 2131427491;
// aapt resource value: 0x7F0B00A4
- public const int playback_list_page = 2131427492;
+ public const int password_error_layout = 2131427492;
// aapt resource value: 0x7F0B00A5
- public const int pull_to_refresh_footer = 2131427493;
+ public const int playback_list_page = 2131427493;
// aapt resource value: 0x7F0B00A6
- public const int pull_to_refresh_header = 2131427494;
-
- // aapt resource value: 0x7F0B00B2
- public const int realplayer_item = 2131427506;
-
- // aapt resource value: 0x7F0B00B3
- public const int realplayer_page = 2131427507;
+ public const int pull_to_refresh_footer = 2131427494;
// aapt resource value: 0x7F0B00A7
- public const int realplay_control_layout = 2131427495;
+ public const int pull_to_refresh_header = 2131427495;
- // aapt resource value: 0x7F0B00A8
- public const int realplay_full_operate_layout = 2131427496;
-
- // aapt resource value: 0x7F0B00A9
- public const int realplay_loading_layout = 2131427497;
-
- // aapt resource value: 0x7F0B00AA
- public const int realplay_operate_bar = 2131427498;
-
- // aapt resource value: 0x7F0B00AB
- public const int realplay_operate_bar2 = 2131427499;
-
- // aapt resource value: 0x7F0B00AC
- public const int realplay_page = 2131427500;
-
- // aapt resource value: 0x7F0B00AD
- public const int realplay_prompt_layout = 2131427501;
-
- // aapt resource value: 0x7F0B00AE
- public const int realplay_ptz_wnd = 2131427502;
-
- // aapt resource value: 0x7F0B00AF
- public const int realplay_quality_items = 2131427503;
-
- // aapt resource value: 0x7F0B00B0
- public const int realplay_quality_wnd = 2131427504;
-
- // aapt resource value: 0x7F0B00B1
- public const int realplay_talkback_wnd = 2131427505;
+ // aapt resource value: 0x7F0B00B3
+ public const int realplayer_item = 2131427507;
// aapt resource value: 0x7F0B00B4
- public const int remote_playback_page = 2131427508;
+ public const int realplayer_page = 2131427508;
+
+ // aapt resource value: 0x7F0B00A8
+ public const int realplay_control_layout = 2131427496;
+
+ // aapt resource value: 0x7F0B00A9
+ public const int realplay_full_operate_layout = 2131427497;
+
+ // aapt resource value: 0x7F0B00AA
+ public const int realplay_loading_layout = 2131427498;
+
+ // aapt resource value: 0x7F0B00AB
+ public const int realplay_operate_bar = 2131427499;
+
+ // aapt resource value: 0x7F0B00AC
+ public const int realplay_operate_bar2 = 2131427500;
+
+ // aapt resource value: 0x7F0B00AD
+ public const int realplay_page = 2131427501;
+
+ // aapt resource value: 0x7F0B00AE
+ public const int realplay_prompt_layout = 2131427502;
+
+ // aapt resource value: 0x7F0B00AF
+ public const int realplay_ptz_wnd = 2131427503;
+
+ // aapt resource value: 0x7F0B00B0
+ public const int realplay_quality_items = 2131427504;
+
+ // aapt resource value: 0x7F0B00B1
+ public const int realplay_quality_wnd = 2131427505;
+
+ // aapt resource value: 0x7F0B00B2
+ public const int realplay_talkback_wnd = 2131427506;
// aapt resource value: 0x7F0B00B5
- public const int section_list_item = 2131427509;
+ public const int remote_playback_page = 2131427509;
// aapt resource value: 0x7F0B00B6
- public const int select_camera_no_dialog = 2131427510;
+ public const int section_list_item = 2131427510;
// aapt resource value: 0x7F0B00B7
- public const int select_camera_no_dialog_item = 2131427511;
+ public const int select_camera_no_dialog = 2131427511;
// aapt resource value: 0x7F0B00B8
- public const int select_dialog_item_material = 2131427512;
+ public const int select_camera_no_dialog_item = 2131427512;
// aapt resource value: 0x7F0B00B9
- public const int select_dialog_multichoice_material = 2131427513;
+ public const int select_dialog_item_material = 2131427513;
// aapt resource value: 0x7F0B00BA
- public const int select_dialog_singlechoice_material = 2131427514;
+ public const int select_dialog_multichoice_material = 2131427514;
// aapt resource value: 0x7F0B00BB
- public const int sms_verify_dialog = 2131427515;
+ public const int select_dialog_singlechoice_material = 2131427515;
// aapt resource value: 0x7F0B00BC
- public const int square_column_item = 2131427516;
+ public const int sms_verify_dialog = 2131427516;
// aapt resource value: 0x7F0B00BD
- public const int square_video_item = 2131427517;
+ public const int square_column_item = 2131427517;
// aapt resource value: 0x7F0B00BE
- public const int srl_classics_footer = 2131427518;
+ public const int square_video_item = 2131427518;
// aapt resource value: 0x7F0B00BF
- public const int srl_classics_header = 2131427519;
+ public const int srl_classics_footer = 2131427519;
// aapt resource value: 0x7F0B00C0
- public const int support_simple_spinner_dropdown_item = 2131427520;
+ public const int srl_classics_header = 2131427520;
// aapt resource value: 0x7F0B00C1
- public const int tooltip = 2131427521;
+ public const int support_simple_spinner_dropdown_item = 2131427521;
// aapt resource value: 0x7F0B00C2
- public const int topbar = 2131427522;
+ public const int tooltip = 2131427522;
// aapt resource value: 0x7F0B00C3
- public const int verifycode_layout = 2131427523;
+ public const int topbar = 2131427523;
// aapt resource value: 0x7F0B00C4
- public const int wait_dialog = 2131427524;
+ public const int verifycode_layout = 2131427524;
// aapt resource value: 0x7F0B00C5
- public const int web_page = 2131427525;
-
- // aapt resource value: 0x7F0B00C7
- public const int zxingscanneractivitylayout = 2131427527;
-
- // aapt resource value: 0x7F0B00C8
- public const int zxingscannerfragmentlayout = 2131427528;
+ public const int wait_dialog = 2131427525;
// aapt resource value: 0x7F0B00C6
- public const int zxing_layout = 2131427526;
+ public const int web_page = 2131427526;
+
+ // aapt resource value: 0x7F0B00C8
+ public const int zxingscanneractivitylayout = 2131427528;
+
+ // aapt resource value: 0x7F0B00C9
+ public const int zxingscannerfragmentlayout = 2131427529;
+
+ // aapt resource value: 0x7F0B00C7
+ public const int zxing_layout = 2131427527;
static Layout()
{
diff --git a/HDL-ON_iOS/Info.plist b/HDL-ON_iOS/Info.plist
index d92cb1f..8eb6e8f 100644
--- a/HDL-ON_iOS/Info.plist
+++ b/HDL-ON_iOS/Info.plist
@@ -104,9 +104,9 @@
<key>UIStatusBarStyle</key>
<string>UIStatusBarStyleLightContent</string>
<key>CFBundleShortVersionString</key>
- <string>1.1.202103233</string>
+ <string>1.1.202103241</string>
<key>CFBundleVersion</key>
- <string>202103233</string>
+ <string>202103241</string>
<key>NSLocationWhenInUseUsageDescription</key>
<string>Use geographic location to provide services such as weather</string>
<key>NSAppleMusicUsageDescription</key>
diff --git a/HDL-ON_iOS/Resources/Language.ini b/HDL-ON_iOS/Resources/Language.ini
index 930ba63..850d302 100644
--- a/HDL-ON_iOS/Resources/Language.ini
+++ b/HDL-ON_iOS/Resources/Language.ini
@@ -1394,64 +1394,6 @@
6078=绯荤粺缁存姢涓瓇璇风◢鍚庡啀璇晘
6079=鑾峰彇鏁版嵁澶辫触
-6015=鍦ㄧ嚎
-6016=绂荤嚎
-6017=鐗堟湰鍙�
-6018=璇疯緭鍏ラ仴鎺у櫒鍚嶇О
-6019=鎻愮ず锛氶仴鎺у櫒鍒涘缓鍚庡彲鍦ㄥ姛鑳�-鐢靛櫒鍒嗙被{\r\n}鏌ユ壘浣跨敤
-6020=鎺ㄨ崘鎸夐敭
-6021=璇疯緭鍏ユ寜閿悕绉�
-6022=涓嬩竴姝�
-6023=鐢垫簮
-6024=闊抽噺+
-6025=闊抽噺-
-6026=棰戦亾+
-6027=棰戦亾-
-6028=涓�
-6029=涓�
-6030=宸�
-6031=鍙�
-6032=闈欓煶
-6034=纭
-6035=鎾斁
-6037=閫�鍑�
-6038=鑿滃崟
-6039=鏆傚仠
-6040=杩斿洖
-6041=鍋滄
-6042=涓婚〉
-6043=蹇繘
-6044=蹇��
-6045=瀹氭椂
-6046=澶嶅埗閬ユ帶鍔熻兘
-6047=瀵瑰噯閬ユ帶鍣ㄤ腑蹇冩寜涓嬬浉鍚屾寜閿�
-6048=鏅鸿兘閬ユ帶鍣�
-6049=娣诲姞鎸夐敭
-6050=*闀挎寜鍙繘琛岃嚜瀹氫箟鎺掑簭
-6051=瀹屾垚
-6052=娣诲姞鎴愬姛
-6053=鍙埌鍒嗙被-鍔熻兘-鐢靛櫒鎿嶄綔浣跨敤
-6054=鎵�灞炲垎绫�
-6055=閬ユ帶鍣ㄥ悕绉�
-6056=鎵�灞炲尯鍩�
-6057=缁х画娣诲姞
-6058=鐢靛櫒
-6059=娣诲姞澶辫触
-6060=閲嶈瘯
-6061=鍖归厤閬ユ帶鍣�
-6062=璇风偣鍑讳互涓嬫寜閽�
-6063=纭璁惧鏄惁鏈夊搷搴�
-6064=鎺у埗澶辫触
-6065=鎺у埗鎴愬姛
-6066=鐢垫簮寮�
-6067=妯″紡鍒跺喎
-6068=椋庨�熶腑椋�
-6069=娓╁害26鈩�
-6070=鍒犻櫎璁惧
-6071=淇敼鍚嶅瓧
-6072=纭鍒犻櫎
-6073=鍙栨秷
-
7000=鏂板缓鑷姩鍖�
7001=缂栬緫鑷姩鍖�
7002=濡傛灉
diff --git a/HDL_ON/UI/MainPage.cs b/HDL_ON/UI/MainPage.cs
index c96de11..65444e3 100644
--- a/HDL_ON/UI/MainPage.cs
+++ b/HDL_ON/UI/MainPage.cs
@@ -20,7 +20,7 @@
/// <summary>
/// 鐗堟湰鍙�
/// </summary>
- public static string VersionString = "1.1.0323";
+ public static string VersionString = "1.1.0324";
///// <summary>
///// 瀹㈡埛绔被鍨�
///// </summary>
diff --git a/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs b/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs
index 31940db..2fee51d 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs
@@ -719,6 +719,14 @@
device.SetAttrState(FunctionAttributeKey.SetTemp, e.ToString());
btnTemp.Text = e.ToString();
};
+ arcBar.MouseDownEventHandler = (sender, e) => {
+ Console.WriteLine("ddd");
+ MainPage.BasePageView.ScrollEnabled =false;
+ };
+ arcBar.MouseUpEventHandler = (sender, e) => {
+ Console.WriteLine("ddd2");
+ MainPage.BasePageView.ScrollEnabled = true;
+ };
}
/// <summary>
/// 鎺у埗妯″紡浜嬩欢
--
Gitblit v1.8.0