From 9e518a597809c9e3637d8ff2f06dd664afed023b Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 12 十二月 2019 16:59:32 +0800
Subject: [PATCH] 更改了图片的大小
---
ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs | 4
ZigbeeApp/GateWay.Droid/Assets/Language.ini | 4
ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/4.jpg | 0
ZigbeeApp/GateWay.Droid/Resources/Resource.designer.cs | 478 ++++++++++++++++++++++++----------------------------
ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/9.jpg | 0
ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/9.jpg | 0
ZigbeeApp/Shared/Phone/Device/CommonForm/RoomView.cs | 2
ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/8.jpg | 0
ZigbeeApp/Shared/DLL/IOS/Shared.IOS.dll | 0
ZigbeeApp/Shared/Phone/Device/CommonForm/SceneMainView.cs | 13
ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/0.jpg | 0
ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/0.jpg | 0
ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/4.jpg | 0
ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/3.jpg | 0
ZigbeeApp/Shared/DLL/Android/Shared.Droid.dll | 0
ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/5.jpg | 0
ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/8.jpg | 0
ZigbeeApp/Shared/DLL/Android/Shared.Droid.HDLWidget.dll | 0
ZigbeeApp/Shared/Phone/Device/Category/CategoryAddScene.cs | 12 +
ZigbeeApp/GateWay.Droid/Assets/Phone/RoomIcon/0.JPG | 0
ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/7.jpg | 0
ZigbeeApp/Shared/Phone/Device/Room/EditRoom.cs | 10 +
ZigbeeApp/Home.Ios/Resources/Phone/RoomIcon/0.JPG | 0
ZigbeeApp/Shared/Common/Device.cs | 15 +
ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/1.jpg | 0
ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/6.jpg | 0
ZigbeeApp/GateWay.Droid/Properties/AndroidManifest.xml | 2
ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/2.jpg | 0
ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/6.jpg | 0
ZigbeeApp/Shared/DLL/Android/Shared.Droid.Smartrefresh.dll | 0
ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/2.jpg | 0
ZigbeeApp/Shared/DLL/IOS/Shared.IOS.TBL.dll | 0
ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/7.jpg | 0
ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/1.jpg | 0
ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/3.jpg | 0
ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/5.jpg | 0
36 files changed, 269 insertions(+), 271 deletions(-)
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Language.ini b/ZigbeeApp/GateWay.Droid/Assets/Language.ini
index 0408330..6610a60 100755
--- a/ZigbeeApp/GateWay.Droid/Assets/Language.ini
+++ b/ZigbeeApp/GateWay.Droid/Assets/Language.ini
@@ -226,6 +226,8 @@
220=瀵嗙爜鍙兘涓嶅瓨鍦紝灏濊瘯閲嶆柊楠岃瘉杩滅▼寮�閿佸瘑鐮�
221=缁戝畾澶辫触锛岀粦瀹氬嚭鐜版湭鐭ラ敊璇�
222=绂荤嚎鍦烘櫙
+223=纭鍒犻櫎鎸夐敭妯″紡鍙婃竻绌烘墍鏈夌洰鏍�
+224=缁戝畾鐩爣涓虹┖锛岃閫夋嫨闇�瑕佺粦瀹氱洰鏍�
548=鎻愰啋璁剧疆
550=鏂板鐢ㄦ埛
@@ -1797,7 +1799,7 @@
30003=姘翠镜浼犳劅鍣�
30004=閽ュ寵鎵�
30005=闂ㄧ獥浼犳劅鍣�
-30006=Zigbee寰柇浜戞帶鍒跺櫒
+30006=鏅鸿兘绌哄紑
30007=Zigbee鏅鸿兘寮�鍚堝笜鐢垫満
30008=4鎸夐敭瑙︽懜闈㈡澘(4璺户鐢靛櫒搴曞骇)
30009=220Pir浼犳劅鍣�
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/RoomIcon/0.JPG b/ZigbeeApp/GateWay.Droid/Assets/Phone/RoomIcon/0.JPG
index b073d45..9856d91 100755
--- a/ZigbeeApp/GateWay.Droid/Assets/Phone/RoomIcon/0.JPG
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/RoomIcon/0.JPG
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/0.jpg b/ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/0.jpg
index 138fcc0..842fbdb 100755
--- a/ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/0.jpg
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/0.jpg
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/1.jpg b/ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/1.jpg
index 2ca1843..85a2df1 100755
--- a/ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/1.jpg
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/1.jpg
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/2.jpg b/ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/2.jpg
index 110fd90..8d969d8 100755
--- a/ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/2.jpg
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/2.jpg
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/3.jpg b/ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/3.jpg
index 7c2eac6..e65a012 100755
--- a/ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/3.jpg
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/3.jpg
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/4.jpg b/ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/4.jpg
index 7df2f14..01bdaa4 100755
--- a/ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/4.jpg
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/4.jpg
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/5.jpg b/ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/5.jpg
index dbc3018..12fa10b 100755
--- a/ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/5.jpg
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/5.jpg
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/6.jpg b/ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/6.jpg
index f9db5be..c4f8c1c 100755
--- a/ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/6.jpg
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/6.jpg
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/7.jpg b/ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/7.jpg
index dc1e95e..5404baa 100755
--- a/ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/7.jpg
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/7.jpg
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/8.jpg b/ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/8.jpg
index c7b55c1..c82a229 100755
--- a/ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/8.jpg
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/8.jpg
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/9.jpg b/ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/9.jpg
index 154c111..0a90bf0 100755
--- a/ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/9.jpg
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/9.jpg
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Properties/AndroidManifest.xml b/ZigbeeApp/GateWay.Droid/Properties/AndroidManifest.xml
index 7d85765..1c9548e 100644
--- a/ZigbeeApp/GateWay.Droid/Properties/AndroidManifest.xml
+++ b/ZigbeeApp/GateWay.Droid/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
锘�<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.hdl.home" android:versionCode="2019120901" android:installLocation="auto" android:versionName="1.0.19120901">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.hdl.home" android:versionCode="2019121201" android:installLocation="auto" android:versionName="1.0.19121201">
<uses-sdk android:minSdkVersion="23" android:targetSdkVersion="26" />
<permission android:name="com.hdl.home.permission.JPUSH_MESSAGE" android:protectionLevel="signature" />
<uses-permission android:name="android.permission.WAKE_LOCK" />
diff --git a/ZigbeeApp/GateWay.Droid/Resources/Resource.designer.cs b/ZigbeeApp/GateWay.Droid/Resources/Resource.designer.cs
index bcf64c2..8231f7c 100644
--- a/ZigbeeApp/GateWay.Droid/Resources/Resource.designer.cs
+++ b/ZigbeeApp/GateWay.Droid/Resources/Resource.designer.cs
@@ -3000,12 +3000,6 @@
// aapt resource value: 0x7f090028
public const int CTRL = 2131296296;
- // aapt resource value: 0x7f09008e
- public const int Custom = 2131296398;
-
- // aapt resource value: 0x7f09008d
- public const int CustomLabel = 2131296397;
-
// aapt resource value: 0x7f090054
public const int FILL = 2131296340;
@@ -3027,23 +3021,8 @@
// aapt resource value: 0x7f090051
public const int MatchLayout = 2131296337;
- // aapt resource value: 0x7f090088
- public const int Notice = 2131296392;
-
- // aapt resource value: 0x7f09008c
- public const int Password = 2131296396;
-
- // aapt resource value: 0x7f09008b
- public const int PasswordLabel = 2131296395;
-
// aapt resource value: 0x7f09002b
public const int SHIFT = 2131296299;
-
- // aapt resource value: 0x7f09008a
- public const int SSID = 2131296394;
-
- // aapt resource value: 0x7f090089
- public const int SSIDLabel = 2131296393;
// aapt resource value: 0x7f090056
public const int STROKE = 2131296342;
@@ -3057,8 +3036,8 @@
// aapt resource value: 0x7f090053
public const int Translate = 2131296339;
- // aapt resource value: 0x7f0900cb
- public const int action0 = 2131296459;
+ // aapt resource value: 0x7f0900c0
+ public const int action0 = 2131296448;
// aapt resource value: 0x7f090079
public const int action_bar = 2131296377;
@@ -3081,17 +3060,17 @@
// aapt resource value: 0x7f090057
public const int action_bar_title = 2131296343;
- // aapt resource value: 0x7f0900c8
- public const int action_container = 2131296456;
+ // aapt resource value: 0x7f0900bd
+ public const int action_container = 2131296445;
// aapt resource value: 0x7f09007a
public const int action_context_bar = 2131296378;
- // aapt resource value: 0x7f0900cf
- public const int action_divider = 2131296463;
+ // aapt resource value: 0x7f0900c4
+ public const int action_divider = 2131296452;
- // aapt resource value: 0x7f0900c9
- public const int action_image = 2131296457;
+ // aapt resource value: 0x7f0900be
+ public const int action_image = 2131296446;
// aapt resource value: 0x7f090003
public const int action_menu_divider = 2131296259;
@@ -3108,11 +3087,11 @@
// aapt resource value: 0x7f090059
public const int action_mode_close_button = 2131296345;
- // aapt resource value: 0x7f0900ca
- public const int action_text = 2131296458;
+ // aapt resource value: 0x7f0900bf
+ public const int action_text = 2131296447;
- // aapt resource value: 0x7f0900d8
- public const int actions = 2131296472;
+ // aapt resource value: 0x7f0900cd
+ public const int actions = 2131296461;
// aapt resource value: 0x7f09005a
public const int activity_chooser_view_content = 2131296346;
@@ -3144,17 +3123,17 @@
// aapt resource value: 0x7f090032
public const int bottom = 2131296306;
- // aapt resource value: 0x7f0900b3
- public const int btnCancel = 2131296435;
+ // aapt resource value: 0x7f0900a8
+ public const int btnCancel = 2131296424;
- // aapt resource value: 0x7f0900b5
- public const int btnSubmit = 2131296437;
+ // aapt resource value: 0x7f0900aa
+ public const int btnSubmit = 2131296426;
// aapt resource value: 0x7f090060
public const int buttonPanel = 2131296352;
- // aapt resource value: 0x7f0900cc
- public const int cancel_action = 2131296460;
+ // aapt resource value: 0x7f0900c1
+ public const int cancel_action = 2131296449;
// aapt resource value: 0x7f09003a
public const int center = 2131296314;
@@ -3168,8 +3147,8 @@
// aapt resource value: 0x7f090070
public const int checkbox = 2131296368;
- // aapt resource value: 0x7f0900d4
- public const int chronometer = 2131296468;
+ // aapt resource value: 0x7f0900c9
+ public const int chronometer = 2131296457;
// aapt resource value: 0x7f090043
public const int clip_horizontal = 2131296323;
@@ -3180,20 +3159,20 @@
// aapt resource value: 0x7f09002e
public const int collapseActionView = 2131296302;
- // aapt resource value: 0x7f090099
- public const int container = 2131296409;
+ // aapt resource value: 0x7f09008e
+ public const int container = 2131296398;
- // aapt resource value: 0x7f0900e1
- public const int contentFrame = 2131296481;
+ // aapt resource value: 0x7f0900d6
+ public const int contentFrame = 2131296470;
// aapt resource value: 0x7f090063
public const int contentPanel = 2131296355;
- // aapt resource value: 0x7f0900b7
- public const int content_container = 2131296439;
+ // aapt resource value: 0x7f0900ac
+ public const int content_container = 2131296428;
- // aapt resource value: 0x7f09009a
- public const int coordinator = 2131296410;
+ // aapt resource value: 0x7f09008f
+ public const int coordinator = 2131296399;
// aapt resource value: 0x7f09006a
public const int custom = 2131296362;
@@ -3201,8 +3180,8 @@
// aapt resource value: 0x7f090069
public const int customPanel = 2131296361;
- // aapt resource value: 0x7f0900c3
- public const int day = 2131296451;
+ // aapt resource value: 0x7f0900b8
+ public const int day = 2131296440;
// aapt resource value: 0x7f090077
public const int decor_content_parent = 2131296375;
@@ -3210,23 +3189,23 @@
// aapt resource value: 0x7f09005d
public const int default_activity_button = 2131296349;
- // aapt resource value: 0x7f090094
- public const int description = 2131296404;
+ // aapt resource value: 0x7f090089
+ public const int description = 2131296393;
- // aapt resource value: 0x7f09009c
- public const int design_bottom_sheet = 2131296412;
+ // aapt resource value: 0x7f090091
+ public const int design_bottom_sheet = 2131296401;
- // aapt resource value: 0x7f0900a3
- public const int design_menu_item_action_area = 2131296419;
+ // aapt resource value: 0x7f090098
+ public const int design_menu_item_action_area = 2131296408;
- // aapt resource value: 0x7f0900a2
- public const int design_menu_item_action_area_stub = 2131296418;
+ // aapt resource value: 0x7f090097
+ public const int design_menu_item_action_area_stub = 2131296407;
- // aapt resource value: 0x7f0900a1
- public const int design_menu_item_text = 2131296417;
+ // aapt resource value: 0x7f090096
+ public const int design_menu_item_text = 2131296406;
- // aapt resource value: 0x7f0900a0
- public const int design_navigation_view = 2131296416;
+ // aapt resource value: 0x7f090095
+ public const int design_navigation_view = 2131296405;
// aapt resource value: 0x7f090015
public const int disableHome = 2131296277;
@@ -3237,8 +3216,8 @@
// aapt resource value: 0x7f090025
public const int end = 2131296293;
- // aapt resource value: 0x7f0900da
- public const int end_padder = 2131296474;
+ // aapt resource value: 0x7f0900cf
+ public const int end_padder = 2131296463;
// aapt resource value: 0x7f090034
public const int enterAlways = 2131296308;
@@ -3264,8 +3243,8 @@
// aapt resource value: 0x7f09003d
public const int fill_vertical = 2131296317;
- // aapt resource value: 0x7f090095
- public const int fingerprint_icon = 2131296405;
+ // aapt resource value: 0x7f09008a
+ public const int fingerprint_icon = 2131296394;
// aapt resource value: 0x7f090049
public const int @fixed = 2131296329;
@@ -3273,56 +3252,56 @@
// aapt resource value: 0x7f09004d
public const int forever = 2131296333;
- // aapt resource value: 0x7f0900a8
- public const int gd_btn_back = 2131296424;
-
- // aapt resource value: 0x7f0900b1
- public const int gd_btn_myLocation = 2131296433;
-
- // aapt resource value: 0x7f0900b0
- public const int gd_btn_save = 2131296432;
-
- // aapt resource value: 0x7f0900ad
- public const int gd_img_search_delete = 2131296429;
-
- // aapt resource value: 0x7f0900af
- public const int gd_ll_myhome = 2131296431;
-
- // aapt resource value: 0x7f0900ab
- public const int gd_ll_search = 2131296427;
-
- // aapt resource value: 0x7f0900aa
- public const int gd_mapView = 2131296426;
-
- // aapt resource value: 0x7f0900a7
- public const int gd_rl_topview = 2131296423;
-
- // aapt resource value: 0x7f0900a9
- public const int gd_tv_activity_title = 2131296425;
-
- // aapt resource value: 0x7f0900ae
- public const int gd_tv_radius = 2131296430;
-
- // aapt resource value: 0x7f0900ac
- public const int gd_tv_search_title = 2131296428;
-
- // aapt resource value: 0x7f0900a5
- public const int hdl_gallery_rootView = 2131296421;
+ // aapt resource value: 0x7f09009d
+ public const int gd_btn_back = 2131296413;
// aapt resource value: 0x7f0900a6
- public const int hdl_gallery_viewPager = 2131296422;
+ public const int gd_btn_myLocation = 2131296422;
- // aapt resource value: 0x7f0900b9
- public const int hdl_options1 = 2131296441;
+ // aapt resource value: 0x7f0900a5
+ public const int gd_btn_save = 2131296421;
- // aapt resource value: 0x7f0900ba
- public const int hdl_options2 = 2131296442;
+ // aapt resource value: 0x7f0900a2
+ public const int gd_img_search_delete = 2131296418;
- // aapt resource value: 0x7f0900bb
- public const int hdl_options3 = 2131296443;
+ // aapt resource value: 0x7f0900a4
+ public const int gd_ll_myhome = 2131296420;
- // aapt resource value: 0x7f0900b8
- public const int hdl_pickerview_ll = 2131296440;
+ // aapt resource value: 0x7f0900a0
+ public const int gd_ll_search = 2131296416;
+
+ // aapt resource value: 0x7f09009f
+ public const int gd_mapView = 2131296415;
+
+ // aapt resource value: 0x7f09009c
+ public const int gd_rl_topview = 2131296412;
+
+ // aapt resource value: 0x7f09009e
+ public const int gd_tv_activity_title = 2131296414;
+
+ // aapt resource value: 0x7f0900a3
+ public const int gd_tv_radius = 2131296419;
+
+ // aapt resource value: 0x7f0900a1
+ public const int gd_tv_search_title = 2131296417;
+
+ // aapt resource value: 0x7f09009a
+ public const int hdl_gallery_rootView = 2131296410;
+
+ // aapt resource value: 0x7f09009b
+ public const int hdl_gallery_viewPager = 2131296411;
+
+ // aapt resource value: 0x7f0900ae
+ public const int hdl_options1 = 2131296430;
+
+ // aapt resource value: 0x7f0900af
+ public const int hdl_options2 = 2131296431;
+
+ // aapt resource value: 0x7f0900b0
+ public const int hdl_options3 = 2131296432;
+
+ // aapt resource value: 0x7f0900ad
+ public const int hdl_pickerview_ll = 2131296429;
// aapt resource value: 0x7f090005
public const int home = 2131296261;
@@ -3330,14 +3309,14 @@
// aapt resource value: 0x7f090016
public const int homeAsUp = 2131296278;
- // aapt resource value: 0x7f0900c4
- public const int hour = 2131296452;
+ // aapt resource value: 0x7f0900b9
+ public const int hour = 2131296441;
// aapt resource value: 0x7f09005f
public const int icon = 2131296351;
- // aapt resource value: 0x7f0900d9
- public const int icon_group = 2131296473;
+ // aapt resource value: 0x7f0900ce
+ public const int icon_group = 2131296462;
// aapt resource value: 0x7f09002f
public const int ifRoom = 2131296303;
@@ -3345,8 +3324,8 @@
// aapt resource value: 0x7f09005c
public const int image = 2131296348;
- // aapt resource value: 0x7f0900d5
- public const int info = 2131296469;
+ // aapt resource value: 0x7f0900ca
+ public const int info = 2131296458;
// aapt resource value: 0x7f09004e
public const int italic = 2131296334;
@@ -3354,8 +3333,8 @@
// aapt resource value: 0x7f090000
public const int item_touch_helper_previous_elevation = 2131296256;
- // aapt resource value: 0x7f090098
- public const int largeLabel = 2131296408;
+ // aapt resource value: 0x7f09008d
+ public const int largeLabel = 2131296397;
// aapt resource value: 0x7f09003e
public const int left = 2131296318;
@@ -3372,35 +3351,35 @@
// aapt resource value: 0x7f09005e
public const int list_item = 2131296350;
- // aapt resource value: 0x7f0900e3
- public const int masked = 2131296483;
+ // aapt resource value: 0x7f0900d8
+ public const int masked = 2131296472;
- // aapt resource value: 0x7f0900ce
- public const int media_actions = 2131296462;
+ // aapt resource value: 0x7f0900c3
+ public const int media_actions = 2131296451;
- // aapt resource value: 0x7f0900e0
- public const int message = 2131296480;
+ // aapt resource value: 0x7f0900d5
+ public const int message = 2131296469;
// aapt resource value: 0x7f090026
public const int middle = 2131296294;
- // aapt resource value: 0x7f0900c5
- public const int min = 2131296453;
+ // aapt resource value: 0x7f0900ba
+ public const int min = 2131296442;
// aapt resource value: 0x7f090048
public const int mini = 2131296328;
- // aapt resource value: 0x7f0900c2
- public const int month = 2131296450;
+ // aapt resource value: 0x7f0900b7
+ public const int month = 2131296439;
// aapt resource value: 0x7f09001c
public const int multiply = 2131296284;
- // aapt resource value: 0x7f0900c7
- public const int myButton = 2131296455;
+ // aapt resource value: 0x7f0900bc
+ public const int myButton = 2131296444;
- // aapt resource value: 0x7f09009f
- public const int navigation_header_container = 2131296415;
+ // aapt resource value: 0x7f090094
+ public const int navigation_header_container = 2131296404;
// aapt resource value: 0x7f090030
public const int never = 2131296304;
@@ -3411,29 +3390,29 @@
// aapt resource value: 0x7f090013
public const int normal = 2131296275;
- // aapt resource value: 0x7f0900d7
- public const int notification_background = 2131296471;
+ // aapt resource value: 0x7f0900cc
+ public const int notification_background = 2131296460;
- // aapt resource value: 0x7f0900d1
- public const int notification_main_column = 2131296465;
+ // aapt resource value: 0x7f0900c6
+ public const int notification_main_column = 2131296454;
- // aapt resource value: 0x7f0900d0
- public const int notification_main_column_container = 2131296464;
+ // aapt resource value: 0x7f0900c5
+ public const int notification_main_column_container = 2131296453;
- // aapt resource value: 0x7f0900bd
- public const int options1 = 2131296445;
+ // aapt resource value: 0x7f0900b2
+ public const int options1 = 2131296434;
- // aapt resource value: 0x7f0900be
- public const int options2 = 2131296446;
+ // aapt resource value: 0x7f0900b3
+ public const int options2 = 2131296435;
- // aapt resource value: 0x7f0900bf
- public const int options3 = 2131296447;
+ // aapt resource value: 0x7f0900b4
+ public const int options3 = 2131296436;
- // aapt resource value: 0x7f0900bc
- public const int optionspicker = 2131296444;
+ // aapt resource value: 0x7f0900b1
+ public const int optionspicker = 2131296433;
- // aapt resource value: 0x7f0900b6
- public const int outmost_container = 2131296438;
+ // aapt resource value: 0x7f0900ab
+ public const int outmost_container = 2131296427;
// aapt resource value: 0x7f090041
public const int parallax = 2131296321;
@@ -3456,14 +3435,14 @@
// aapt resource value: 0x7f09003f
public const int right = 2131296319;
- // aapt resource value: 0x7f0900d6
- public const int right_icon = 2131296470;
+ // aapt resource value: 0x7f0900cb
+ public const int right_icon = 2131296459;
- // aapt resource value: 0x7f0900d2
- public const int right_side = 2131296466;
+ // aapt resource value: 0x7f0900c7
+ public const int right_side = 2131296455;
- // aapt resource value: 0x7f0900b2
- public const int rv_topbar = 2131296434;
+ // aapt resource value: 0x7f0900a7
+ public const int rv_topbar = 2131296423;
// aapt resource value: 0x7f09001d
public const int screen = 2131296285;
@@ -3513,8 +3492,8 @@
// aapt resource value: 0x7f090086
public const int search_voice_btn = 2131296390;
- // aapt resource value: 0x7f0900c6
- public const int second = 2131296454;
+ // aapt resource value: 0x7f0900bb
+ public const int second = 2131296443;
// aapt resource value: 0x7f090087
public const int select_dialog_listview = 2131296391;
@@ -3531,14 +3510,14 @@
// aapt resource value: 0x7f09001a
public const int showTitle = 2131296282;
- // aapt resource value: 0x7f090097
- public const int smallLabel = 2131296407;
+ // aapt resource value: 0x7f09008c
+ public const int smallLabel = 2131296396;
- // aapt resource value: 0x7f09009e
- public const int snackbar_action = 2131296414;
+ // aapt resource value: 0x7f090093
+ public const int snackbar_action = 2131296403;
- // aapt resource value: 0x7f09009d
- public const int snackbar_text = 2131296413;
+ // aapt resource value: 0x7f090092
+ public const int snackbar_text = 2131296402;
// aapt resource value: 0x7f090038
public const int snap = 2131296312;
@@ -3558,41 +3537,29 @@
// aapt resource value: 0x7f090020
public const int src_over = 2131296288;
- // aapt resource value: 0x7f0900db
- public const int srl_classics_arrow = 2131296475;
+ // aapt resource value: 0x7f0900d0
+ public const int srl_classics_arrow = 2131296464;
- // aapt resource value: 0x7f0900de
- public const int srl_classics_center = 2131296478;
+ // aapt resource value: 0x7f0900d3
+ public const int srl_classics_center = 2131296467;
- // aapt resource value: 0x7f0900dd
- public const int srl_classics_progress = 2131296477;
+ // aapt resource value: 0x7f0900d2
+ public const int srl_classics_progress = 2131296466;
- // aapt resource value: 0x7f0900dc
- public const int srl_classics_title = 2131296476;
+ // aapt resource value: 0x7f0900d1
+ public const int srl_classics_title = 2131296465;
- // aapt resource value: 0x7f0900df
- public const int srl_classics_update = 2131296479;
+ // aapt resource value: 0x7f0900d4
+ public const int srl_classics_update = 2131296468;
// aapt resource value: 0x7f090040
public const int start = 2131296320;
- // aapt resource value: 0x7f09008f
- public const int startV1 = 2131296399;
+ // aapt resource value: 0x7f09008b
+ public const int status = 2131296395;
- // aapt resource value: 0x7f090091
- public const int startV1V4 = 2131296401;
-
- // aapt resource value: 0x7f090090
- public const int startV4 = 2131296400;
-
- // aapt resource value: 0x7f090096
- public const int status = 2131296406;
-
- // aapt resource value: 0x7f0900cd
- public const int status_bar_latest_event_content = 2131296461;
-
- // aapt resource value: 0x7f090092
- public const int stop = 2131296402;
+ // aapt resource value: 0x7f0900c2
+ public const int status_bar_latest_event_content = 2131296450;
// aapt resource value: 0x7f090073
public const int submenuarrow = 2131296371;
@@ -3600,8 +3567,8 @@
// aapt resource value: 0x7f090084
public const int submit_area = 2131296388;
- // aapt resource value: 0x7f090093
- public const int subtitle = 2131296403;
+ // aapt resource value: 0x7f090088
+ public const int subtitle = 2131296392;
// aapt resource value: 0x7f090014
public const int tabMode = 2131296276;
@@ -3618,8 +3585,8 @@
// aapt resource value: 0x7f090066
public const int textSpacerNoTitle = 2131296358;
- // aapt resource value: 0x7f0900a4
- public const int text_input_password_toggle = 2131296420;
+ // aapt resource value: 0x7f090099
+ public const int text_input_password_toggle = 2131296409;
// aapt resource value: 0x7f09000a
public const int textinput_counter = 2131296266;
@@ -3627,11 +3594,11 @@
// aapt resource value: 0x7f09000b
public const int textinput_error = 2131296267;
- // aapt resource value: 0x7f0900d3
- public const int time = 2131296467;
+ // aapt resource value: 0x7f0900c8
+ public const int time = 2131296456;
- // aapt resource value: 0x7f0900c0
- public const int timepicker = 2131296448;
+ // aapt resource value: 0x7f0900b5
+ public const int timepicker = 2131296437;
// aapt resource value: 0x7f090011
public const int title = 2131296273;
@@ -3648,11 +3615,11 @@
// aapt resource value: 0x7f09006b
public const int topPanel = 2131296363;
- // aapt resource value: 0x7f09009b
- public const int touch_outside = 2131296411;
+ // aapt resource value: 0x7f090090
+ public const int touch_outside = 2131296400;
- // aapt resource value: 0x7f0900b4
- public const int tvTitle = 2131296436;
+ // aapt resource value: 0x7f0900a9
+ public const int tvTitle = 2131296425;
// aapt resource value: 0x7f090022
public const int uniform = 2131296290;
@@ -3666,8 +3633,8 @@
// aapt resource value: 0x7f09000c
public const int view_offset_helper = 2131296268;
- // aapt resource value: 0x7f0900e2
- public const int visible = 2131296482;
+ // aapt resource value: 0x7f0900d7
+ public const int visible = 2131296471;
// aapt resource value: 0x7f090031
public const int withText = 2131296305;
@@ -3675,8 +3642,8 @@
// aapt resource value: 0x7f090023
public const int wrap_content = 2131296291;
- // aapt resource value: 0x7f0900c1
- public const int year = 2131296449;
+ // aapt resource value: 0x7f0900b6
+ public const int year = 2131296438;
static Id()
{
@@ -3819,154 +3786,151 @@
public const int abc_select_dialog_material = 2130968602;
// aapt resource value: 0x7f04001b
- public const int activity_elian = 2130968603;
+ public const int biometric_prompt_dialog_content = 2130968603;
// aapt resource value: 0x7f04001c
- public const int biometric_prompt_dialog_content = 2130968604;
+ public const int design_bottom_navigation_item = 2130968604;
// aapt resource value: 0x7f04001d
- public const int design_bottom_navigation_item = 2130968605;
+ public const int design_bottom_sheet_dialog = 2130968605;
// aapt resource value: 0x7f04001e
- public const int design_bottom_sheet_dialog = 2130968606;
+ public const int design_layout_snackbar = 2130968606;
// aapt resource value: 0x7f04001f
- public const int design_layout_snackbar = 2130968607;
+ public const int design_layout_snackbar_include = 2130968607;
// aapt resource value: 0x7f040020
- public const int design_layout_snackbar_include = 2130968608;
+ public const int design_layout_tab_icon = 2130968608;
// aapt resource value: 0x7f040021
- public const int design_layout_tab_icon = 2130968609;
+ public const int design_layout_tab_text = 2130968609;
// aapt resource value: 0x7f040022
- public const int design_layout_tab_text = 2130968610;
+ public const int design_menu_item_action_area = 2130968610;
// aapt resource value: 0x7f040023
- public const int design_menu_item_action_area = 2130968611;
+ public const int design_navigation_item = 2130968611;
// aapt resource value: 0x7f040024
- public const int design_navigation_item = 2130968612;
+ public const int design_navigation_item_header = 2130968612;
// aapt resource value: 0x7f040025
- public const int design_navigation_item_header = 2130968613;
+ public const int design_navigation_item_separator = 2130968613;
// aapt resource value: 0x7f040026
- public const int design_navigation_item_separator = 2130968614;
+ public const int design_navigation_item_subheader = 2130968614;
// aapt resource value: 0x7f040027
- public const int design_navigation_item_subheader = 2130968615;
+ public const int design_navigation_menu = 2130968615;
// aapt resource value: 0x7f040028
- public const int design_navigation_menu = 2130968616;
+ public const int design_navigation_menu_item = 2130968616;
// aapt resource value: 0x7f040029
- public const int design_navigation_menu_item = 2130968617;
+ public const int design_text_input_password_icon = 2130968617;
// aapt resource value: 0x7f04002a
- public const int design_text_input_password_icon = 2130968618;
+ public const int hdl_gallery_banner_view_layout = 2130968618;
// aapt resource value: 0x7f04002b
- public const int hdl_gallery_banner_view_layout = 2130968619;
+ public const int hdl_widget_activity_crop_image = 2130968619;
// aapt resource value: 0x7f04002c
- public const int hdl_widget_activity_crop_image = 2130968620;
+ public const int hdl_widget_activity_geofence_round = 2130968620;
// aapt resource value: 0x7f04002d
- public const int hdl_widget_activity_geofence_round = 2130968621;
+ public const int hdl_widget_air_button = 2130968621;
// aapt resource value: 0x7f04002e
- public const int hdl_widget_air_button = 2130968622;
+ public const int hdl_widget_include_pickerview_topbar = 2130968622;
// aapt resource value: 0x7f04002f
- public const int hdl_widget_include_pickerview_topbar = 2130968623;
+ public const int hdl_widget_layout_basepickerview = 2130968623;
// aapt resource value: 0x7f040030
- public const int hdl_widget_layout_basepickerview = 2130968624;
+ public const int hdl_widget_pickerview = 2130968624;
// aapt resource value: 0x7f040031
- public const int hdl_widget_pickerview = 2130968625;
+ public const int hdl_widget_pickerview_options = 2130968625;
// aapt resource value: 0x7f040032
- public const int hdl_widget_pickerview_options = 2130968626;
+ public const int hdl_widget_pickerview_time = 2130968626;
// aapt resource value: 0x7f040033
- public const int hdl_widget_pickerview_time = 2130968627;
+ public const int Main = 2130968627;
// aapt resource value: 0x7f040034
- public const int Main = 2130968628;
+ public const int notification_action = 2130968628;
// aapt resource value: 0x7f040035
- public const int notification_action = 2130968629;
+ public const int notification_action_tombstone = 2130968629;
// aapt resource value: 0x7f040036
- public const int notification_action_tombstone = 2130968630;
+ public const int notification_media_action = 2130968630;
// aapt resource value: 0x7f040037
- public const int notification_media_action = 2130968631;
+ public const int notification_media_cancel_action = 2130968631;
// aapt resource value: 0x7f040038
- public const int notification_media_cancel_action = 2130968632;
+ public const int notification_template_big_media = 2130968632;
// aapt resource value: 0x7f040039
- public const int notification_template_big_media = 2130968633;
+ public const int notification_template_big_media_custom = 2130968633;
// aapt resource value: 0x7f04003a
- public const int notification_template_big_media_custom = 2130968634;
+ public const int notification_template_big_media_narrow = 2130968634;
// aapt resource value: 0x7f04003b
- public const int notification_template_big_media_narrow = 2130968635;
+ public const int notification_template_big_media_narrow_custom = 2130968635;
// aapt resource value: 0x7f04003c
- public const int notification_template_big_media_narrow_custom = 2130968636;
+ public const int notification_template_custom_big = 2130968636;
// aapt resource value: 0x7f04003d
- public const int notification_template_custom_big = 2130968637;
+ public const int notification_template_icon_group = 2130968637;
// aapt resource value: 0x7f04003e
- public const int notification_template_icon_group = 2130968638;
+ public const int notification_template_lines_media = 2130968638;
// aapt resource value: 0x7f04003f
- public const int notification_template_lines_media = 2130968639;
+ public const int notification_template_media = 2130968639;
// aapt resource value: 0x7f040040
- public const int notification_template_media = 2130968640;
+ public const int notification_template_media_custom = 2130968640;
// aapt resource value: 0x7f040041
- public const int notification_template_media_custom = 2130968641;
+ public const int notification_template_part_chronometer = 2130968641;
// aapt resource value: 0x7f040042
- public const int notification_template_part_chronometer = 2130968642;
+ public const int notification_template_part_time = 2130968642;
// aapt resource value: 0x7f040043
- public const int notification_template_part_time = 2130968643;
+ public const int select_dialog_item_material = 2130968643;
// aapt resource value: 0x7f040044
- public const int select_dialog_item_material = 2130968644;
+ public const int select_dialog_multichoice_material = 2130968644;
// aapt resource value: 0x7f040045
- public const int select_dialog_multichoice_material = 2130968645;
+ public const int select_dialog_singlechoice_material = 2130968645;
// aapt resource value: 0x7f040046
- public const int select_dialog_singlechoice_material = 2130968646;
+ public const int srl_classics_footer = 2130968646;
// aapt resource value: 0x7f040047
- public const int srl_classics_footer = 2130968647;
+ public const int srl_classics_header = 2130968647;
// aapt resource value: 0x7f040048
- public const int srl_classics_header = 2130968648;
+ public const int support_simple_spinner_dropdown_item = 2130968648;
// aapt resource value: 0x7f040049
- public const int support_simple_spinner_dropdown_item = 2130968649;
+ public const int tooltip = 2130968649;
// aapt resource value: 0x7f04004a
- public const int tooltip = 2130968650;
+ public const int zxingscanneractivitylayout = 2130968650;
// aapt resource value: 0x7f04004b
- public const int zxingscanneractivitylayout = 2130968651;
-
- // aapt resource value: 0x7f04004c
- public const int zxingscannerfragmentlayout = 2130968652;
+ public const int zxingscannerfragmentlayout = 2130968651;
static Layout()
{
diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/RoomIcon/0.JPG b/ZigbeeApp/Home.Ios/Resources/Phone/RoomIcon/0.JPG
index b073d45..9856d91 100755
--- a/ZigbeeApp/Home.Ios/Resources/Phone/RoomIcon/0.JPG
+++ b/ZigbeeApp/Home.Ios/Resources/Phone/RoomIcon/0.JPG
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/0.jpg b/ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/0.jpg
index 138fcc0..842fbdb 100755
--- a/ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/0.jpg
+++ b/ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/0.jpg
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/1.jpg b/ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/1.jpg
index 2ca1843..85a2df1 100755
--- a/ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/1.jpg
+++ b/ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/1.jpg
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/2.jpg b/ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/2.jpg
index 110fd90..8d969d8 100755
--- a/ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/2.jpg
+++ b/ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/2.jpg
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/3.jpg b/ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/3.jpg
index 7c2eac6..e65a012 100755
--- a/ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/3.jpg
+++ b/ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/3.jpg
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/4.jpg b/ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/4.jpg
index 7df2f14..01bdaa4 100755
--- a/ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/4.jpg
+++ b/ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/4.jpg
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/5.jpg b/ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/5.jpg
index dbc3018..12fa10b 100755
--- a/ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/5.jpg
+++ b/ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/5.jpg
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/6.jpg b/ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/6.jpg
index f9db5be..c4f8c1c 100755
--- a/ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/6.jpg
+++ b/ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/6.jpg
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/7.jpg b/ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/7.jpg
index dc1e95e..5404baa 100755
--- a/ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/7.jpg
+++ b/ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/7.jpg
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/8.jpg b/ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/8.jpg
index c7b55c1..c82a229 100755
--- a/ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/8.jpg
+++ b/ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/8.jpg
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/9.jpg b/ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/9.jpg
index 154c111..0a90bf0 100755
--- a/ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/9.jpg
+++ b/ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/9.jpg
Binary files differ
diff --git a/ZigbeeApp/Shared/Common/Device.cs b/ZigbeeApp/Shared/Common/Device.cs
index 409b460..8dfbe3b 100755
--- a/ZigbeeApp/Shared/Common/Device.cs
+++ b/ZigbeeApp/Shared/Common/Device.cs
@@ -2051,6 +2051,9 @@
this.dicDeviceModelIdEnum["MPT2/R2-ZB.18"] = "202-200";//2鎸夐敭瑙︽懜闈㈡澘
this.dicDeviceModelIdEnum["MPT1/R1-ZB.18"] = "203-200";//12鎸夐敭瑙︽懜闈㈡澘
this.dicDeviceModelIdEnum["MPT4-ZB.18"] = "210-200";//4鎸夐敭瑙︽懜闈㈡澘(鍙甫鐢垫簮搴曞骇)
+ this.dicDeviceModelIdEnum["MPT4R4L/S-ZB1.8"] = "220-200";//绠�绾�4鎸夐敭闈㈡澘
+ this.dicDeviceModelIdEnum["MPT3R3L/S-ZB1.8"] = "221-200";//绠�绾�3鎸夐敭闈㈡澘
+ this.dicDeviceModelIdEnum["MPT2R2L/S-ZB1.8"] = "222-200";//绠�绾�2鎸夐敭闈㈡澘
//=========鈽呪槄PIR浼犳劅鍣ㄧ被(1200-1299)鈽呪槄=========
this.dicDeviceModelIdEnum["MSPIR01-ZB.10"] = "1200-1200";//pir浼犳劅鍣�220
@@ -2153,6 +2156,18 @@
/// 4鎸夐敭澶氬姛鑳借Е鎽搁潰鏉匡紙鍙甫鐢垫簮搴曞骇锛� 闀滃儚id锛�210
/// </summary>
ButtonPanel_FourNotPower = 210,
+ /// <summary>
+ /// 绠�绾�4鎸夐敭闈㈡澘 闀滃儚id锛�220
+ /// </summary>
+ ButtonPanel_SimpleFour = 220,
+ /// <summary>
+ /// 绠�绾�3鎸夐敭闈㈡澘 闀滃儚id锛�221
+ /// </summary>
+ ButtonPanel_SimpleThree = 221,
+ /// <summary>
+ /// 绠�绾�2鎸夐敭闈㈡澘 闀滃儚id锛�222
+ /// </summary>
+ ButtonPanel_SimpleTwo = 222,
//=========鈽呪槄PIR浼犳劅鍣ㄧ被(1200-1299)鈽呪槄=========
/// <summary>
diff --git a/ZigbeeApp/Shared/DLL/Android/Shared.Droid.HDLWidget.dll b/ZigbeeApp/Shared/DLL/Android/Shared.Droid.HDLWidget.dll
index 0abb720..ef4abd0 100755
--- a/ZigbeeApp/Shared/DLL/Android/Shared.Droid.HDLWidget.dll
+++ b/ZigbeeApp/Shared/DLL/Android/Shared.Droid.HDLWidget.dll
Binary files differ
diff --git a/ZigbeeApp/Shared/DLL/Android/Shared.Droid.Smartrefresh.dll b/ZigbeeApp/Shared/DLL/Android/Shared.Droid.Smartrefresh.dll
index 2eb1eaf..7d7a66c 100755
--- a/ZigbeeApp/Shared/DLL/Android/Shared.Droid.Smartrefresh.dll
+++ b/ZigbeeApp/Shared/DLL/Android/Shared.Droid.Smartrefresh.dll
Binary files differ
diff --git a/ZigbeeApp/Shared/DLL/Android/Shared.Droid.dll b/ZigbeeApp/Shared/DLL/Android/Shared.Droid.dll
index 5b52ea8..0f6badc 100755
--- a/ZigbeeApp/Shared/DLL/Android/Shared.Droid.dll
+++ b/ZigbeeApp/Shared/DLL/Android/Shared.Droid.dll
Binary files differ
diff --git a/ZigbeeApp/Shared/DLL/IOS/Shared.IOS.TBL.dll b/ZigbeeApp/Shared/DLL/IOS/Shared.IOS.TBL.dll
index 1343a3b..a5ed496 100755
--- a/ZigbeeApp/Shared/DLL/IOS/Shared.IOS.TBL.dll
+++ b/ZigbeeApp/Shared/DLL/IOS/Shared.IOS.TBL.dll
Binary files differ
diff --git a/ZigbeeApp/Shared/DLL/IOS/Shared.IOS.dll b/ZigbeeApp/Shared/DLL/IOS/Shared.IOS.dll
index cf7afbf..6fa3f33 100755
--- a/ZigbeeApp/Shared/DLL/IOS/Shared.IOS.dll
+++ b/ZigbeeApp/Shared/DLL/IOS/Shared.IOS.dll
Binary files differ
diff --git a/ZigbeeApp/Shared/Phone/Device/Category/CategoryAddScene.cs b/ZigbeeApp/Shared/Phone/Device/Category/CategoryAddScene.cs
index a025338..b0c2487 100755
--- a/ZigbeeApp/Shared/Phone/Device/Category/CategoryAddScene.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Category/CategoryAddScene.cs
@@ -554,7 +554,11 @@
var fileName = $"SceneIcon_{tradeTime}";
//閫氳繃鐩告満鎷嶇収瑁佸壀
CropImage.TakePicture((imagePath) =>
- {
+ {
+ if (string.IsNullOrEmpty(imagePath) == true)
+ {
+ return;
+ }
if (isModify)
{
if (IconPathType != 0)
@@ -578,7 +582,11 @@
var fileName = $"SceneIcon_{tradeTime}";
//浠庣浉鍐岄�夋嫨鍥剧墖瑁佸壀
CropImage.SelectPicture((imagePath) =>
- {
+ {
+ if (string.IsNullOrEmpty(imagePath) == true)
+ {
+ return;
+ }
if (isModify)
{
if (IconPathType != 0)
diff --git a/ZigbeeApp/Shared/Phone/Device/CommonForm/RoomView.cs b/ZigbeeApp/Shared/Phone/Device/CommonForm/RoomView.cs
index 7ed1c76..e024c63 100755
--- a/ZigbeeApp/Shared/Phone/Device/CommonForm/RoomView.cs
+++ b/ZigbeeApp/Shared/Phone/Device/CommonForm/RoomView.cs
@@ -103,7 +103,7 @@
var temperatureText = new Button
{
X = Application.GetRealWidth(69),
- Width = Application.GetRealWidth(86),
+ Width = Application.GetRealWidth(100),
Height = Application.GetRealHeight(58),
Gravity = Gravity.CenterVertical,
Text = "26鈩�"
diff --git a/ZigbeeApp/Shared/Phone/Device/CommonForm/SceneMainView.cs b/ZigbeeApp/Shared/Phone/Device/CommonForm/SceneMainView.cs
old mode 100755
new mode 100644
index daf0928..6a5a053
--- a/ZigbeeApp/Shared/Phone/Device/CommonForm/SceneMainView.cs
+++ b/ZigbeeApp/Shared/Phone/Device/CommonForm/SceneMainView.cs
@@ -120,9 +120,9 @@
TimeButton = new Button()
{
- X = Application.GetMinRealAverage(40),
- Y = Application.GetMinRealAverage(17),
- Width = Application.GetMinRealAverage(320),
+ X = Application.GetMinRealAverage(30),
+ Y = Application.GetMinRealAverage(20),
+ Width = Application.GetMinRealAverage(63),
Height = Application.GetMinRealAverage(63),
TextColor = ZigbeeColor.Current.GXCTextSelectedColor3,
TextAlignment = TextAlignment.CenterLeft,
@@ -131,8 +131,8 @@
CollectButton = new Button
{
- X = Application.GetMinRealAverage(366),
- Y = Application.GetMinRealAverage(14),
+ X = Application.GetMinRealAverage(340),
+ Y = Application.GetMinRealAverage(1),
Width = Application.GetMinRealAverage(107),
Height = Application.GetMinRealAverage(107),
UnSelectedImagePath = "Item/Collection1.png",
@@ -167,6 +167,7 @@
CollectButton.MouseUpEventHandler += CollectionEvent;
SceneIcon.MouseUpEventHandler += SceneUpHandler;
SceneNameButton.MouseUpEventHandler += SceneUpHandler;
+ sceneBG.MouseUpEventHandler += SceneUpHandler;
}
/// <summary>
@@ -175,7 +176,7 @@
/// <param name="name"></param>
public void SetTimeText(string name)
{
- TimeButton.Width = Application.GetMinRealAverage(320);
+ TimeButton.Width = Application.GetMinRealAverage(280);
TimeButton.Height = Application.GetMinRealAverage(63);
TimeButton.UnSelectedImagePath = string.Empty;
TimeButton.Text = name;
diff --git a/ZigbeeApp/Shared/Phone/Device/Room/EditRoom.cs b/ZigbeeApp/Shared/Phone/Device/Room/EditRoom.cs
index f32f6f5..2748b44 100755
--- a/ZigbeeApp/Shared/Phone/Device/Room/EditRoom.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Room/EditRoom.cs
@@ -533,7 +533,11 @@
var fileName = $"RoomIcon_{tradeTime}.png";
//閫氳繃鐩告満鎷嶇収瑁佸壀
CropImage.TakePicture((imagePath) =>
- {
+ {
+ if (string.IsNullOrEmpty(imagePath) == true)
+ {
+ return;
+ }
if (IconPathType != 0)
{
Global.DeleteFilebyHomeId(backGround.ImagePath);
@@ -555,6 +559,10 @@
//浠庣浉鍐岄�夋嫨鍥剧墖瑁佸壀
CropImage.SelectPicture((imagePath) =>
{
+ if (string.IsNullOrEmpty(imagePath) == true)
+ {
+ return;
+ }
if (IconPathType != 0)
{
Global.DeleteFilebyHomeId(backGround.ImagePath);
diff --git a/ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs b/ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs
index db20b28..e0b94c9 100755
--- a/ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs
+++ b/ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs
@@ -646,9 +646,9 @@
};
AddChidren(roomPageView);
//涓庡睆骞曡竟妗嗙殑杈硅窛
- roomPageView.TCBJ = Application.GetRealWidth(112);
+ roomPageView.TCBJ = Application.GetRealWidth(181);
//涓や釜page涔嬮棿鐨勯棿璺�
- roomPageView.JMBJ = Application.GetRealWidth(69);
+ roomPageView.JMBJ = Application.GetRealWidth(0);
//褰撳墠鎴块棿
//Room.CurrentRoom = Room.CurrentRoom == null ? Room.Lists[0] : Room.CurrentRoom;
--
Gitblit v1.8.0