From db196464ea74daaffb35860eef8c80cf254ce578 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期二, 14 一月 2020 13:56:25 +0800
Subject: [PATCH] 2020.1.14

---
 ZigbeeApp/GateWay.Droid/Assets/Phone/Floor/SelectFloor_Left_3.png  |    0 
 ZigbeeApp/Shared/Phone/Device/Category/SelectDevice.cs             |   10 
 ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs                    |   22 +-
 ZigbeeApp/GateWay.Droid/Assets/Phone/Floor/SelectFloor_Right_4.png |    0 
 ZigbeeApp/Shared/Phone/Device/Curtain/RollerShadeControl.cs        |    2 
 ZigbeeApp/Shared/Phone/Device/Light/DimmableLightControl.cs        |    2 
 ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj                       |   10 +
 ZigbeeApp/GateWay.Droid/Assets/Phone/Floor/SelectFloor_Left_2.png  |    0 
 ZigbeeApp/GateWay.Droid/Assets/Phone/Floor/SelectFloor_Right_5.png |    0 
 ZigbeeApp/Shared/Phone/Device/Category/Category.cs                 |   26 ++--
 ZigbeeApp/GateWay.Droid/Assets/Phone/Floor/SelectFloor_Left_4.png  |    0 
 ZigbeeApp/Shared/Phone/Device/Light/PlugControl.cs                 |    2 
 ZigbeeApp/Shared/Phone/Device/AC/ACControl.cs                      |    2 
 ZigbeeApp/GateWay.Droid/Assets/Phone/Floor/SelectFloor_Left_1.png  |    0 
 ZigbeeApp/Shared/Phone/Device/Category/CategoryAddScene.cs         |   10 
 ZigbeeApp/Shared/Phone/Device/CommonForm/DeviceDetailInfo.cs       |    2 
 ZigbeeApp/GateWay.Droid/Assets/Phone/Floor/SelectFloor_Left_5.png  |    0 
 ZigbeeApp/Shared/Phone/Device/Category/SelectFloor.cs              |   69 +++++++---
 ZigbeeApp/Shared/Phone/Device/Room/UnallocatedRoom.cs              |    2 
 ZigbeeApp/GateWay.Droid/Assets/Phone/Floor/SelectFloor_Right_2.png |    0 
 ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml                             |   34 +++--
 ZigbeeApp/Shared/Phone/Device/Light/OnOffControl.cs                |    2 
 ZigbeeApp/Shared/Phone/Device/Light/LightControl.cs                |    2 
 ZigbeeApp/Shared/Phone/Device/Room/RoomManagement.cs               |  112 +++++++++++-------
 ZigbeeApp/GateWay.Droid/Assets/Phone/Floor/SelectFloor_Right_1.png |    0 
 ZigbeeApp/Shared/Phone/Device/Category/SelectHouse.cs              |   36 ++++-
 ZigbeeApp/GateWay.Droid/Assets/Phone/Floor/SelectFloor_Right_3.png |    0 
 ZigbeeApp/Shared/Phone/Device/Light/AirSwitchControl.cs            |    2 
 28 files changed, 212 insertions(+), 135 deletions(-)

diff --git a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
index 37eb562..6cb7120 100644
--- a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
+++ b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
@@ -1,34 +1,40 @@
 锘�<Properties StartupConfiguration="{28EDE1FF-20EF-476B-8AF8-24A3EEB69F45}|Default">
-  <MonoDevelop.Ide.ItemProperties.GateWay.Droid PreferredExecutionTarget="Android.M7BBB18B19152766" />
+  <MonoDevelop.Ide.ItemProperties.GateWay.Droid PreferredExecutionTarget="Android.SelectDevice" />
   <MonoDevelop.Ide.ItemProperties.GateWay.Ios automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.8c0bdb303f25d82c2a42fb8bfca449bfaca00260" />
   <MonoDevelop.Ide.ItemProperties.ShardLib PreferredExecutionTarget="Android.M7BBB18B19152766" />
-  <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/AC/ACControl.cs">
+  <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Room/RoomManagement.cs">
     <Files>
       <File FileName="Shared/R.cs" Line="1364" Column="1" />
       <File FileName="GateWay.Droid/Assets/Language.ini" />
-      <File FileName="Shared/Phone/Device/CommonForm/SceneCategoryView.cs" />
-      <File FileName="Shared/Phone/Device/CommonForm/SceneMainView.cs" />
-      <File FileName="Shared/Phone/Device/AC/ACControl.cs" Line="127" Column="9" />
-      <File FileName="Shared/Phone/ZigBee/Device/AC.cs" Line="98" Column="22" />
+      <File FileName="Shared/Phone/Device/Category/SelectFloor.cs" />
+      <File FileName="Shared/Phone/Device/Category/SelectHouse.cs" />
+      <File FileName="Shared/Phone/Device/Room/UnallocatedRoom.cs" />
+      <File FileName="Shared/Phone/Device/Room/RoomManagement.cs" Line="155" Column="19" />
+      <File FileName="Shared/Common/Room.cs" Line="1" Column="1" />
     </Files>
     <Pads>
       <Pad Id="ProjectPad">
         <State name="__root__">
           <Node name="GateWay" expanded="True">
-            <Node name="GateWay.Droid" expanded="True" />
+            <Node name="GateWay.Droid" expanded="True">
+              <Node name="Assets" expanded="True">
+                <Node name="Phone" expanded="True">
+                  <Node name="Floor" expanded="True" />
+                </Node>
+              </Node>
+            </Node>
             <Node name="Shared" expanded="True">
+              <Node name="Common" expanded="True" />
               <Node name="Phone" expanded="True">
                 <Node name="Device" expanded="True">
-                  <Node name="AC" expanded="True">
-                    <Node name="ACControl.cs" selected="True" />
-                  </Node>
+                  <Node name="AC" expanded="True" />
                   <Node name="Category" expanded="True" />
-                  <Node name="Curtain" expanded="True" />
+                  <Node name="CommonForm" expanded="True" />
+                  <Node name="Room" expanded="True">
+                    <Node name="RoomManagement.cs" selected="True" />
+                  </Node>
                 </Node>
                 <Node name="UserView" expanded="True" />
-                <Node name="ZigBee" expanded="True">
-                  <Node name="Device" expanded="True" />
-                </Node>
               </Node>
             </Node>
           </Node>
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/Floor/SelectFloor_Left_1.png b/ZigbeeApp/GateWay.Droid/Assets/Phone/Floor/SelectFloor_Left_1.png
new file mode 100755
index 0000000..58da76f
--- /dev/null
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/Floor/SelectFloor_Left_1.png
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/Floor/SelectFloor_Left_2.png b/ZigbeeApp/GateWay.Droid/Assets/Phone/Floor/SelectFloor_Left_2.png
new file mode 100755
index 0000000..6e6efe1
--- /dev/null
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/Floor/SelectFloor_Left_2.png
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/Floor/SelectFloor_Left_3.png b/ZigbeeApp/GateWay.Droid/Assets/Phone/Floor/SelectFloor_Left_3.png
new file mode 100755
index 0000000..4810d96
--- /dev/null
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/Floor/SelectFloor_Left_3.png
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/Floor/SelectFloor_Left_4.png b/ZigbeeApp/GateWay.Droid/Assets/Phone/Floor/SelectFloor_Left_4.png
new file mode 100755
index 0000000..0b81807
--- /dev/null
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/Floor/SelectFloor_Left_4.png
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/Floor/SelectFloor_Left_5.png b/ZigbeeApp/GateWay.Droid/Assets/Phone/Floor/SelectFloor_Left_5.png
new file mode 100755
index 0000000..11e9253
--- /dev/null
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/Floor/SelectFloor_Left_5.png
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/Floor/SelectFloor_Right_1.png b/ZigbeeApp/GateWay.Droid/Assets/Phone/Floor/SelectFloor_Right_1.png
new file mode 100755
index 0000000..e3b2779
--- /dev/null
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/Floor/SelectFloor_Right_1.png
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/Floor/SelectFloor_Right_2.png b/ZigbeeApp/GateWay.Droid/Assets/Phone/Floor/SelectFloor_Right_2.png
new file mode 100755
index 0000000..30ec898
--- /dev/null
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/Floor/SelectFloor_Right_2.png
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/Floor/SelectFloor_Right_3.png b/ZigbeeApp/GateWay.Droid/Assets/Phone/Floor/SelectFloor_Right_3.png
new file mode 100755
index 0000000..58e08df
--- /dev/null
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/Floor/SelectFloor_Right_3.png
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/Floor/SelectFloor_Right_4.png b/ZigbeeApp/GateWay.Droid/Assets/Phone/Floor/SelectFloor_Right_4.png
new file mode 100755
index 0000000..98f4609
--- /dev/null
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/Floor/SelectFloor_Right_4.png
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/Floor/SelectFloor_Right_5.png b/ZigbeeApp/GateWay.Droid/Assets/Phone/Floor/SelectFloor_Right_5.png
new file mode 100755
index 0000000..d5a8772
--- /dev/null
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/Floor/SelectFloor_Right_5.png
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj b/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj
index 73b4359..9f43cab 100644
--- a/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj
+++ b/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj
@@ -567,6 +567,16 @@
     <AndroidAsset Include="Assets\Phone\Item\ProgressBubbles.png" />
     <AndroidAsset Include="Assets\Phone\Room\IconBackground.png" />
     <AndroidAsset Include="Assets\Phone\Room\IconSelectedBackground.png" />
+    <AndroidAsset Include="Assets\Phone\Floor\SelectFloor_Left_1.png" />
+    <AndroidAsset Include="Assets\Phone\Floor\SelectFloor_Left_2.png" />
+    <AndroidAsset Include="Assets\Phone\Floor\SelectFloor_Left_3.png" />
+    <AndroidAsset Include="Assets\Phone\Floor\SelectFloor_Left_4.png" />
+    <AndroidAsset Include="Assets\Phone\Floor\SelectFloor_Left_5.png" />
+    <AndroidAsset Include="Assets\Phone\Floor\SelectFloor_Right_1.png" />
+    <AndroidAsset Include="Assets\Phone\Floor\SelectFloor_Right_2.png" />
+    <AndroidAsset Include="Assets\Phone\Floor\SelectFloor_Right_3.png" />
+    <AndroidAsset Include="Assets\Phone\Floor\SelectFloor_Right_4.png" />
+    <AndroidAsset Include="Assets\Phone\Floor\SelectFloor_Right_5.png" />
   </ItemGroup>
   <ItemGroup>
     <AndroidAsset Include="Assets\Phone\Item\InputAccountIcon.png" />
diff --git a/ZigbeeApp/Shared/Phone/Device/AC/ACControl.cs b/ZigbeeApp/Shared/Phone/Device/AC/ACControl.cs
index ddd9dfc..36efb69 100644
--- a/ZigbeeApp/Shared/Phone/Device/AC/ACControl.cs
+++ b/ZigbeeApp/Shared/Phone/Device/AC/ACControl.cs
@@ -492,7 +492,7 @@
                 Width = Application.GetRealWidth(600),
                 Height = Application.GetRealHeight(60),
                 Gravity = Gravity.CenterHorizontal,
-                Text = device.CommonDevice.DeviceEpointName,
+                Text = Common.LocalDevice.Current.GetDeviceEpointName(device.CommonDevice),
                 TextColor = ZigbeeColor.Current.GXCTextBlackColor,
                 TextSize = 15,
                 IsBold=true
diff --git a/ZigbeeApp/Shared/Phone/Device/Category/Category.cs b/ZigbeeApp/Shared/Phone/Device/Category/Category.cs
index 67e7c78..867f080 100644
--- a/ZigbeeApp/Shared/Phone/Device/Category/Category.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Category/Category.cs
@@ -1088,7 +1088,7 @@
 
                                     var deviceRow = new CategoryFunctionRow(0, 35);
                                     deviceRow.Init(deviceUI.IconPath, deviceUI.OnlineIconPath);
-                                    deviceRow.SetTitle(deviceUI.CommonDevice.DeviceEpointName);
+                                    deviceRow.SetTitle(Common.LocalDevice.Current.GetDeviceEpointName(deviceUI.CommonDevice));
                                     deviceRow.SetStatuText(deviceUI.GetDeviceStatu());
                                     deviceRow.IsSelected = light.OnOffStatus == 1;
                                     deviceTypeRowLayout.AddChidren(deviceRow);
@@ -1186,7 +1186,7 @@
 
                                     var deviceRow = new CategoryFunctionRow(0, 35);
                                     deviceRow.Init(deviceUI.IconPath, deviceUI.OnlineIconPath);
-                                    deviceRow.SetTitle(deviceUI.CommonDevice.DeviceEpointName);
+                                    deviceRow.SetTitle(Common.LocalDevice.Current.GetDeviceEpointName(deviceUI.CommonDevice));
                                     deviceRow.IsSelected = airSwitch.OnOffStatus == 1;
                                     deviceRow.SetStatuText(deviceUI.GetDeviceStatu());
                                     deviceTypeRowLayout.AddChidren(deviceRow);
@@ -1287,7 +1287,7 @@
 
                                     var deviceRow = new CategoryFunctionRow(0, 35);
                                     deviceRow.Init(deviceUI.IconPath, deviceUI.OnlineIconPath);
-                                    deviceRow.SetTitle(deviceUI.CommonDevice.DeviceEpointName);
+                                    deviceRow.SetTitle(Common.LocalDevice.Current.GetDeviceEpointName(deviceUI.CommonDevice));
                                     deviceRow.SetStatuText(deviceUI.GetDeviceStatu());
                                     deviceRow.IsSelected = dimmableLight.OnOffStatus == 1;
                                     deviceTypeRowLayout.AddChidren(deviceRow);
@@ -1390,7 +1390,7 @@
 
                                     var deviceRow = new CategoryFunctionRow(0, 35);
                                     deviceRow.Init(deviceUI.IconPath, deviceUI.OnlineIconPath);
-                                    deviceRow.SetTitle(deviceUI.CommonDevice.DeviceEpointName);
+                                    deviceRow.SetTitle(Common.LocalDevice.Current.GetDeviceEpointName(deviceUI.CommonDevice));
                                     deviceRow.SetStatuText(deviceUI.GetDeviceStatu());
                                     deviceRow.IsSelected = ac.currentSystemMode != 1;
                                     deviceTypeRowLayout.AddChidren(deviceRow);
@@ -1493,7 +1493,7 @@
 
                                     var deviceRow = new CategoryFunctionForWinRow(0, 35);
                                     deviceRow.Init(deviceUI);
-                                    deviceRow.SetTitle(deviceUI.CommonDevice.DeviceEpointName);
+                                    deviceRow.SetTitle(Common.LocalDevice.Current.GetDeviceEpointName(deviceUI.CommonDevice));
                                     deviceRow.SetStatuText(deviceUI.GetDeviceStatu());
                                     deviceRow.IsSelected = rollerShade.WcdCurrentPositionLiftPercentage != 0;
                                     deviceRow.SetRollerShadeIcon(rollerShade.WcdType);
@@ -1555,7 +1555,7 @@
                             {
                                 var deviceRow = new CategoryFunctionRow(0, 35);
                                 deviceRow.Init(deviceUI.IconPath, deviceUI.OnlineIconPath);
-                                deviceRow.SetTitle(deviceUI.CommonDevice.DeviceEpointName);
+                                deviceRow.SetTitle(Common.LocalDevice.Current.GetDeviceEpointName(deviceUI.CommonDevice));
                                 deviceRow.SetStatuText(deviceUI.GetDeviceStatu());
                                 deviceRow.HideSwitchBtn(true);
                                 deviceTypeRowLayout.AddChidren(deviceRow);
@@ -1592,7 +1592,7 @@
                             {
                                 var deviceRow = new CategoryFunctionRow(0, 35);
                                 deviceRow.Init(deviceUI.IconPath, deviceUI.OnlineIconPath);
-                                deviceRow.SetTitle(deviceUI.CommonDevice.DeviceEpointName);
+                                deviceRow.SetTitle(Common.LocalDevice.Current.GetDeviceEpointName(deviceUI.CommonDevice));
                                 deviceRow.SetStatuText(deviceUI.GetDeviceStatu());
                                 deviceRow.IsSelected = (deviceUI.CommonDevice as IASZone).iASInfo?.Alarm1 == 1;
                                 deviceRow.HideSwitchBtn(true);
@@ -1660,7 +1660,7 @@
 
                                     var deviceRow = new CategoryFunctionRow(0, 35);
                                     deviceRow.Init(deviceUI.IconPath, deviceUI.OnlineIconPath);
-                                    deviceRow.SetTitle(deviceUI.CommonDevice.DeviceEpointName);
+                                    deviceRow.SetTitle(Common.LocalDevice.Current.GetDeviceEpointName(deviceUI.CommonDevice));
                                     deviceRow.SetStatuText(deviceUI.GetDeviceStatu());
                                     deviceRow.IsSelected = false;
                                     deviceRow.HideSwitchBtn(true);
@@ -1692,7 +1692,7 @@
                             {
                                 var deviceRow = new CategoryFunctionRow(0, 35);
                                 deviceRow.Init(deviceUI.IconPath, deviceUI.OnlineIconPath);
-                                deviceRow.SetTitle(deviceUI.CommonDevice.DeviceEpointName);
+                                deviceRow.SetTitle(Common.LocalDevice.Current.GetDeviceEpointName(deviceUI.CommonDevice));
                                 deviceRow.SetStatuText(deviceUI.GetDeviceStatu());
                                 deviceRow.HideSwitchBtn(true);
                                 deviceTypeRowLayout.AddChidren(deviceRow);
@@ -1777,7 +1777,7 @@
             if (Common.Room.CurrentRoom.IsLove)
             {
                 deviceRow.SetDeviceIcon(deviceUI.IconPath, deviceUI.OnlineIconPath);
-                deviceRow.SetTitle(deviceUI.CommonDevice.DeviceEpointName);
+                deviceRow.SetTitle(Common.LocalDevice.Current.GetDeviceEpointName(deviceUI.CommonDevice));
                 if (Common.Room.CurrentRoom.IsCollectInRoom(deviceUI.FileName) == false)
                 {
                     devListScrolView.RemoveViewByTag(deviceUI);
@@ -1803,7 +1803,7 @@
                 else
                 {
                     deviceRow.SetDeviceIcon(deviceUI.IconPath, deviceUI.OnlineIconPath);
-                    deviceRow.SetTitle(deviceUI.CommonDevice.DeviceEpointName);
+                    deviceRow.SetTitle(Common.LocalDevice.Current.GetDeviceEpointName(deviceUI.CommonDevice));
                 }
             }
         }
@@ -1820,7 +1820,7 @@
             if (Common.Room.CurrentRoom.IsLove)
             {
                 deviceRow.SetDeviceIcon(deviceUI.IconPath, deviceUI.OnlineIconPath);
-                deviceRow.SetTitle(deviceUI.CommonDevice.DeviceEpointName);
+                deviceRow.SetTitle(Common.LocalDevice.Current.GetDeviceEpointName(deviceUI.CommonDevice));
                 if (Common.Room.CurrentRoom.IsCollectInRoom(deviceUI.FileName) == false)
                 {
                     devListScrolView.RemoveViewByTag(deviceUI);
@@ -1846,7 +1846,7 @@
                 else
                 {
                     deviceRow.SetDeviceIcon(deviceUI.IconPath, deviceUI.OnlineIconPath);
-                    deviceRow.SetTitle(deviceUI.CommonDevice.DeviceEpointName);
+                    deviceRow.SetTitle(Common.LocalDevice.Current.GetDeviceEpointName(deviceUI.CommonDevice));
                 }
             }
         }
diff --git a/ZigbeeApp/Shared/Phone/Device/Category/CategoryAddScene.cs b/ZigbeeApp/Shared/Phone/Device/Category/CategoryAddScene.cs
index 728d0ea..0fdeede 100644
--- a/ZigbeeApp/Shared/Phone/Device/Category/CategoryAddScene.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Category/CategoryAddScene.cs
@@ -159,7 +159,7 @@
                     {
                         if (targetDevice.DeviceUI == null || targetDevice.DeviceUI.CommonDevice == null) continue;
                         devImgPath = targetDevice.DeviceUI.IconPath;
-                        devNameText = targetDevice.DeviceUI.CommonDevice.DeviceEpointName;
+                        devNameText = Common.LocalDevice.Current.GetDeviceEpointName(targetDevice.DeviceUI.CommonDevice);
 
                         var targetRow = new SceneTargetFunctionRow(13);
                         targetRow.Init();
@@ -1244,7 +1244,7 @@
                 Gravity = Gravity.CenterHorizontal,
                 TextColor = ZigbeeColor.Current.GXCTextBlackColor,
                 TextSize = 16,
-                Text = device.CommonDevice.DeviceEpointName
+                Text = Common.LocalDevice.Current.GetDeviceEpointName(device.CommonDevice)
             };
             titleFL.AddChidren(deviceName);
 
@@ -1400,7 +1400,7 @@
                 Gravity = Gravity.CenterHorizontal,
                 TextColor = ZigbeeColor.Current.GXCTextBlackColor,
                 TextSize = 16,
-                Text = device.CommonDevice.DeviceEpointName
+                Text = Common.LocalDevice.Current.GetDeviceEpointName(device.CommonDevice)
             };
             titleFL.AddChidren(deviceName);
 
@@ -1566,7 +1566,7 @@
                 TextColor = ZigbeeColor.Current.GXCTextBlackColor,
                 TextSize = 16,
                 TextAlignment = TextAlignment.CenterLeft,
-                Text = device.CommonDevice.DeviceEpointName
+                Text = Common.LocalDevice.Current.GetDeviceEpointName(device.CommonDevice)
             };
             titleFL.AddChidren(deviceName);
 
@@ -1739,7 +1739,7 @@
                 TextColor = ZigbeeColor.Current.GXCTextBlackColor,
                 TextSize = 16,
                 TextAlignment = TextAlignment.CenterLeft,
-                Text = device.CommonDevice.DeviceEpointName
+                Text = Common.LocalDevice.Current.GetDeviceEpointName(device.CommonDevice)
             };
             titleFL.AddChidren(deviceName);
 
diff --git a/ZigbeeApp/Shared/Phone/Device/Category/SelectDevice.cs b/ZigbeeApp/Shared/Phone/Device/Category/SelectDevice.cs
index 64eedf0..77d71a7 100644
--- a/ZigbeeApp/Shared/Phone/Device/Category/SelectDevice.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Category/SelectDevice.cs
@@ -449,7 +449,7 @@
 
                 var deviceRow = new FunctionRow(0, 35);
                 deviceRow.Init(device.IconPath, device.OnlineIconPath, true);
-                deviceRow.SetTitle(device.CommonDevice.DeviceEpointName);
+                deviceRow.SetTitle(Common.LocalDevice.Current.GetDeviceEpointName(device.CommonDevice));
                 deviceRow.IsSelected = true;
                 deviceRow.HideSwitchBtn(false);
                 deviceRow.NameBtn.BackgroundColor = ZigbeeColor.Current.GXCRedColor;
@@ -587,7 +587,7 @@
                 Gravity = Gravity.CenterHorizontal,
                 TextColor = ZigbeeColor.Current.GXCTextBlackColor,
                 TextSize = 16,
-                Text = device.CommonDevice.DeviceEpointName
+                Text = Common.LocalDevice.Current.GetDeviceEpointName(device.CommonDevice)
             };
             titleFL.AddChidren(deviceName);
 
@@ -743,7 +743,7 @@
                 Gravity = Gravity.CenterHorizontal,
                 TextColor = ZigbeeColor.Current.GXCTextBlackColor,
                 TextSize = 16,
-                Text = device.CommonDevice.DeviceEpointName
+                Text = Common.LocalDevice.Current.GetDeviceEpointName(device.CommonDevice)
             };
             titleFL.AddChidren(deviceName);
 
@@ -909,7 +909,7 @@
                 TextColor = ZigbeeColor.Current.GXCTextBlackColor,
                 TextSize = 16,
                 TextAlignment = TextAlignment.CenterLeft,
-                Text = device.CommonDevice.DeviceEpointName
+                Text = Common.LocalDevice.Current.GetDeviceEpointName(device.CommonDevice)
             };
             titleFL.AddChidren(deviceName);
 
@@ -1075,7 +1075,7 @@
                 TextColor = ZigbeeColor.Current.GXCTextBlackColor,
                 TextSize = 16,
                 TextAlignment = TextAlignment.CenterLeft,
-                Text = device.CommonDevice.DeviceEpointName
+                Text = Common.LocalDevice.Current.GetDeviceEpointName(device.CommonDevice)
             };
             titleFL.AddChidren(deviceName);
 
diff --git a/ZigbeeApp/Shared/Phone/Device/Category/SelectFloor.cs b/ZigbeeApp/Shared/Phone/Device/Category/SelectFloor.cs
index a45ccfe..69c0b29 100644
--- a/ZigbeeApp/Shared/Phone/Device/Category/SelectFloor.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Category/SelectFloor.cs
@@ -22,7 +22,7 @@
         /// <summary>
 		/// Init
 		/// </summary>
-		public void Init(int x,int y,CommonForm.Direction direction=CommonForm.Direction.Left)
+		public void Init(int x, int y, CommonForm.Direction direction = CommonForm.Direction.Left)
         {
             dialogBackground = new Dialog
             {
@@ -44,35 +44,30 @@
                 X = Application.GetRealWidth(x),
                 Y = Application.GetRealHeight(y),
                 Width = Application.GetMinRealAverage(449),
-                Height = Application.GetMinRealAverage(783),
-                UnSelectedImagePath="Item/SelectFloor_Left.png"
+                Height = Application.GetMinRealAverage(773),
+                UnSelectedImagePath = "Floor/SelectFloor_Left_4.png"
             };
             dialog.AddChidren(bg);
-            if (direction == CommonForm.Direction.Right)
-            {
-                bg.UnSelectedImagePath = "Item/SelectFloor_Right.png";
-            }
 
             var backgroundFL = new FrameLayout
             {
-                X = Application.GetRealWidth(x+10),
-                Y = Application.GetRealHeight(y+23),
-                Width = Application.GetMinRealAverage(449-20),
-                Height = Application.GetMinRealAverage(783-23-10),
-                BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor,
+                X = Application.GetRealWidth(x),
+                Y = Application.GetRealHeight(y + 23),
+                Width = Application.GetMinRealAverage(449),
+                Height = Application.GetMinRealAverage(773 - 23)
             };
             dialog.AddChidren(backgroundFL);
 
             var tip = new Button
             {
                 X = Application.GetRealWidth(80),
-                Width = Application.GetRealWidth(350),
-                Height = Application.GetRealHeight(150),
+                Width = Application.GetMinRealAverage(350),
+                Height = Application.GetMinRealAverage(150),
                 TextColor = ZigbeeColor.Current.GXCTextBlackColor,
                 TextAlignment = TextAlignment.CenterLeft,
                 TextID = R.MyInternationalizationString.SelectFloor,
-                TextSize=16,
-                IsBold=true
+                TextSize = 14,
+                IsBold = true
             };
             backgroundFL.AddChidren(tip);
 
@@ -80,12 +75,40 @@
             {
                 Y = tip.Bottom,
                 Width = Application.GetMinRealAverage(449),
-                Height = Application.GetMinRealAverage(600)
+                Height = Application.GetMinRealAverage(600),
+                VerticalScrollBarEnabled = false
             };
             backgroundFL.AddChidren(floorLayout);
 
-            if (Config.Instance.Home.FloorDics.Count > 0)
+            var floorCount = Config.Instance.Home.FloorDics.Count;
+
+            if (floorCount > 0)
             {
+                string directStr = string.Empty;
+                if (direction == CommonForm.Direction.Right)
+                {
+                    directStr = "Right";
+                }
+                else
+                {
+                    directStr = "Left";
+                }
+
+                if (floorCount > 5)
+                {
+                    bg.UnSelectedImagePath = $"Floor/SelectFloor_{directStr}_5.png";
+                    bg.Height = Application.GetMinRealAverage(150*6+23);
+                    backgroundFL.Height = Application.GetMinRealAverage(150 * 6);
+                    floorLayout.Height = Application.GetMinRealAverage(150 * 5);
+                }
+                else
+                {
+                    bg.UnSelectedImagePath = $"Floor/SelectFloor_{directStr}_{floorCount}.png";
+                    bg.Height = Application.GetMinRealAverage(150 * (floorCount + 1)+23);
+                    backgroundFL.Height = Application.GetMinRealAverage(150 * (floorCount + 1));
+                    floorLayout.Height = Application.GetMinRealAverage(150 * floorCount);
+                }
+
                 foreach (var floor in Config.Instance.Home.FloorDics)
                 {
                     AddFloor(floorLayout, floor);
@@ -97,14 +120,16 @@
         /// AddFloor
         /// </summary>
         /// <param name="verticalScrolView"></param>
-        private void AddFloor(VerticalScrolViewLayout verticalScrolView, KeyValuePair<string, string> floor)
+        private void AddFloor(VerticalScrolViewLayout verticalScrolView, KeyValuePair<string, string> floor,bool isLast=false)
         {
             var frow = new CommonForm.LeftIconButtonRow(449, 150);
+            frow.Width = Application.GetMinRealAverage(449);
+            frow.Height = Application.GetMinRealAverage(150);
             frow.Tag = floor.Key;
             frow.Init("Floor/Floor.png", "Floor/FloorSelected.png", floor.Value);
             verticalScrolView.AddChidren(frow);
 
-            if(string.IsNullOrEmpty(CurFloorId))
+            if (string.IsNullOrEmpty(CurFloorId))
             {
                 if (Config.Instance.Home.CurrentFloorId == floor.Key)
                 {
@@ -127,10 +152,10 @@
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="mouseEventArgs"></param>
-        private void SelectFloor_MouseUpEvent(object sender,MouseEventArgs mouseEventArgs)
+        private void SelectFloor_MouseUpEvent(object sender, MouseEventArgs mouseEventArgs)
         {
             (sender as CommonForm.LeftIconButtonRow).IsSelected = true;
-            if(changeFloor)
+            if (changeFloor)
             {
                 Config.Instance.Home.CurrentFloorId = (sender as CommonForm.LeftIconButtonRow).Tag.ToString();
                 Config.Instance.Home.Save(false);
diff --git a/ZigbeeApp/Shared/Phone/Device/Category/SelectHouse.cs b/ZigbeeApp/Shared/Phone/Device/Category/SelectHouse.cs
index 0849ce4..37dc7ef 100644
--- a/ZigbeeApp/Shared/Phone/Device/Category/SelectHouse.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Category/SelectHouse.cs
@@ -34,27 +34,24 @@
                 X = Application.GetRealWidth(35),
                 Y = Application.GetRealHeight(256),
                 Width = Application.GetMinRealAverage(449),
-                Height = Application.GetMinRealAverage(475),
-                UnSelectedImagePath = "Item/SelectHouse.png"
+                Height = Application.GetMinRealAverage(773),
+                UnSelectedImagePath = "Floor/SelectFloor_Left_4.png"
             };
             dialog.AddChidren(bg);
 
             var changeHomeFL = new FrameLayout()
             {
                 X = Application.GetRealWidth(35),
-                Y = Application.GetRealHeight(256),
-                Height = Application.GetMinRealAverage(449),
-                Width = Application.GetMinRealAverage(475),
-                Radius = CommonPage.BigFormRadius,
-                //BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor
+                Y = Application.GetRealHeight(256+23),
+                Width = Application.GetMinRealAverage(449),
+                Height = Application.GetMinRealAverage(773 - 23)
             };
             dialog.AddChidren(changeHomeFL);
 
             var changeHomeBtn = new Button()
             {
                 X = Application.GetRealWidth(80),
-                Y=Application.GetRealHeight(20),
-                Width = Application.GetRealWidth(350),
+                Width = Application.GetMinRealAverage(350),
                 Height = Application.GetMinRealAverage(150),
                 TextColor = ZigbeeColor.Current.GXCTextBlackColor,
                 TextID = R.MyInternationalizationString.ChangeHome,
@@ -67,13 +64,30 @@
             var scrolView = new VerticalScrolViewLayout()
             {
                 Y = changeHomeBtn.Bottom,
-                Height = Application.GetMinRealAverage(300),
+                Width = Application.GetMinRealAverage(449),
+                Height = Application.GetMinRealAverage(600),
                 VerticalScrollBarEnabled = false
             };
             changeHomeFL.AddChidren(scrolView);
 
+            var houseCount = Config.Instance.HomeFilePathList.Count;
             if (Config.Instance.HomeFilePathList.Count > 0)
             {
+                if (houseCount > 5)
+                {
+                    bg.UnSelectedImagePath = $"Floor/SelectFloor_Left_5.png";
+                    bg.Height = Application.GetMinRealAverage(150 * 6 + 23);
+                    changeHomeFL.Height = Application.GetMinRealAverage(150 * 6);
+                    scrolView.Height = Application.GetMinRealAverage(150 * 5);
+                }
+                else
+                {
+                    bg.UnSelectedImagePath = $"Floor/SelectFloor_Left_{houseCount}.png";
+                    bg.Height = Application.GetMinRealAverage(150 * (houseCount + 1) + 23);
+                    changeHomeFL.Height = Application.GetMinRealAverage(150 * (houseCount + 1));
+                    scrolView.Height = Application.GetMinRealAverage(150 * houseCount);
+                }
+
                 foreach (var housePath in Config.Instance.HomeFilePathList)
                 {
                     var home = House.GetHouseByFilePath(housePath);
@@ -93,6 +107,8 @@
         private void AddFloor(VerticalScrolViewLayout verticalScrolView, House house)
         {
             var frow = new CommonForm.LeftIconButtonRow(449, 150);
+            frow.Width = Application.GetMinRealAverage(449);
+            frow.Height = Application.GetMinRealAverage(150);
             frow.Tag = house.FileName;
             frow.Init("Item/House.png", "Item/HouseSelected.png", house.Name);
             verticalScrolView.AddChidren(frow);
diff --git a/ZigbeeApp/Shared/Phone/Device/CommonForm/DeviceDetailInfo.cs b/ZigbeeApp/Shared/Phone/Device/CommonForm/DeviceDetailInfo.cs
index 8a99190..9384b38 100644
--- a/ZigbeeApp/Shared/Phone/Device/CommonForm/DeviceDetailInfo.cs
+++ b/ZigbeeApp/Shared/Phone/Device/CommonForm/DeviceDetailInfo.cs
@@ -199,7 +199,7 @@
             var nameRow = new DeviceInfoEditRow(12);
             nameRow.Init();
             nameRow.SetTipTitle($"{Language.StringByID(R.MyInternationalizationString.FunctionName)} : ");
-            nameRow.SetTitle(string.IsNullOrEmpty(device.CommonDevice.DeviceEpointName) ? Language.StringByID(R.MyInternationalizationString.UNKnown) : device.CommonDevice.DeviceEpointName);
+            nameRow.SetTitle(string.IsNullOrEmpty(Common.LocalDevice.Current.GetDeviceEpointName(device.CommonDevice)) ? Language.StringByID(R.MyInternationalizationString.UNKnown) : Common.LocalDevice.Current.GetDeviceEpointName(device.CommonDevice));
             nameFL.AddChidren(nameRow);
 
 
diff --git a/ZigbeeApp/Shared/Phone/Device/Curtain/RollerShadeControl.cs b/ZigbeeApp/Shared/Phone/Device/Curtain/RollerShadeControl.cs
index b0675e9..fbeff98 100644
--- a/ZigbeeApp/Shared/Phone/Device/Curtain/RollerShadeControl.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Curtain/RollerShadeControl.cs
@@ -384,7 +384,7 @@
                 Width = Application.GetRealWidth(500),
                 Height = Application.GetRealHeight(60),
                 Gravity = Gravity.CenterHorizontal,
-                Text = device.CommonDevice.DeviceEpointName,
+                Text = Common.LocalDevice.Current.GetDeviceEpointName(device.CommonDevice),
                 TextColor = ZigbeeColor.Current.GXCTextBlackColor,
                 TextSize = 15,
                 IsBold=true
diff --git a/ZigbeeApp/Shared/Phone/Device/Light/AirSwitchControl.cs b/ZigbeeApp/Shared/Phone/Device/Light/AirSwitchControl.cs
index 8927f17..1aa2240 100644
--- a/ZigbeeApp/Shared/Phone/Device/Light/AirSwitchControl.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Light/AirSwitchControl.cs
@@ -348,7 +348,7 @@
                 Width = Application.GetRealWidth(500),
                 Height = Application.GetRealHeight(60),
                 Gravity = Gravity.CenterHorizontal,
-                Text = device.CommonDevice.DeviceEpointName,
+                Text = Common.LocalDevice.Current.GetDeviceEpointName(device.CommonDevice),
                 TextColor = ZigbeeColor.Current.GXCTextBlackColor,
                 TextSize = 15,
                 IsBold = true
diff --git a/ZigbeeApp/Shared/Phone/Device/Light/DimmableLightControl.cs b/ZigbeeApp/Shared/Phone/Device/Light/DimmableLightControl.cs
index d2f5ca1..0695856 100644
--- a/ZigbeeApp/Shared/Phone/Device/Light/DimmableLightControl.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Light/DimmableLightControl.cs
@@ -371,7 +371,7 @@
                 Width = Application.GetRealWidth(500),
                 Height = Application.GetRealHeight(60),
                 Gravity = Gravity.CenterHorizontal,
-                Text = device.CommonDevice.DeviceEpointName,
+                Text = Common.LocalDevice.Current.GetDeviceEpointName(device.CommonDevice),
                 TextColor = ZigbeeColor.Current.GXCTextBlackColor,
                 TextSize = 15,
                 IsBold=true
diff --git a/ZigbeeApp/Shared/Phone/Device/Light/LightControl.cs b/ZigbeeApp/Shared/Phone/Device/Light/LightControl.cs
index bcbcbbc..8e5497c 100644
--- a/ZigbeeApp/Shared/Phone/Device/Light/LightControl.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Light/LightControl.cs
@@ -327,7 +327,7 @@
                 Width=Application.GetRealWidth(500),
                 Height = Application.GetRealHeight(60),
                 Gravity = Gravity.CenterHorizontal,
-                Text = device.CommonDevice.DeviceEpointName,
+                Text = Common.LocalDevice.Current.GetDeviceEpointName(device.CommonDevice),
                 TextColor = ZigbeeColor.Current.GXCTextBlackColor,
                 TextSize=15,
                 IsBold=true
diff --git a/ZigbeeApp/Shared/Phone/Device/Light/OnOffControl.cs b/ZigbeeApp/Shared/Phone/Device/Light/OnOffControl.cs
index e833131..bbc4894 100644
--- a/ZigbeeApp/Shared/Phone/Device/Light/OnOffControl.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Light/OnOffControl.cs
@@ -348,7 +348,7 @@
                 Width = Application.GetRealWidth(500),
                 Height = Application.GetRealHeight(60),
                 Gravity = Gravity.CenterHorizontal,
-                Text = device.CommonDevice.DeviceEpointName,
+                Text = Common.LocalDevice.Current.GetDeviceEpointName(device.CommonDevice),
                 TextColor = ZigbeeColor.Current.GXCTextBlackColor,
                 TextSize = 15,
                 IsBold=true
diff --git a/ZigbeeApp/Shared/Phone/Device/Light/PlugControl.cs b/ZigbeeApp/Shared/Phone/Device/Light/PlugControl.cs
index 6af3c76..c03683d 100644
--- a/ZigbeeApp/Shared/Phone/Device/Light/PlugControl.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Light/PlugControl.cs
@@ -327,7 +327,7 @@
                 Width = Application.GetRealWidth(500),
                 Height = Application.GetRealHeight(60),
                 Gravity = Gravity.CenterHorizontal,
-                Text = device.CommonDevice.DeviceEpointName,
+                Text = Common.LocalDevice.Current.GetDeviceEpointName(device.CommonDevice),
                 TextColor = ZigbeeColor.Current.GXCTextBlackColor,
                 TextSize = 15,
                 IsBold=true
diff --git a/ZigbeeApp/Shared/Phone/Device/Room/RoomManagement.cs b/ZigbeeApp/Shared/Phone/Device/Room/RoomManagement.cs
index a6c927f..6005e89 100644
--- a/ZigbeeApp/Shared/Phone/Device/Room/RoomManagement.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Room/RoomManagement.cs
@@ -147,71 +147,91 @@
             };
             AddChidren(bodyFrameLayout);
 
-            var roomScrolView = new VerticalScrolViewLayout { };
-            bodyFrameLayout.AddChidren(roomScrolView);
             try
             {
-                var roomList = Common.Room.CurrentRoom.GetRoomsByFloorId(floorId);
-                if (roomList == null || roomList.Count == 0)
+                if (Common.Room.Lists.Count == 1)
                 {
                     return;
                 }
-                for (int i = 0; i < roomList.Count + 1; i++)
+                var roomScrolView = new VerticalScrolViewLayout { };
+                bodyFrameLayout.AddChidren(roomScrolView);
+                var roomList = Common.Room.CurrentRoom.GetRoomsByFloorId(floorId);
+                if (roomList == null || roomList.Count == 0)
                 {
-                    int xx = 43 + i % 2 * (20 + 487);
-                    int yy = 0;
-                    if (i == 0 || i == 1)
+                    itemView = new FrameLayout()
                     {
-                        if (i % 2 == 0)
+                        Height = Application.GetRealHeight(354 + 58)
+                    };
+                    roomScrolView.AddChidren(itemView);
+
+                    var roomView = new RoomNoNameMainView(34, 58);
+                    itemView.AddChidren(roomView);
+                    roomView.Init();
+
+                    roomView.Icon.MouseUpEventHandler += ShowUnallocatedRoom_MouseUpEvent;
+                    roomView.RoomNameButton.MouseUpEventHandler += ShowUnallocatedRoom_MouseUpEvent;
+                    roomView.iconFL.MouseUpEventHandler += ShowUnallocatedRoom_MouseUpEvent;
+                }
+                else
+                {
+                    for (int i = 0; i < roomList.Count + 1; i++)
+                    {
+                        int xx = 43 + i % 2 * (20 + 487);
+                        int yy = 0;
+                        if (i == 0 || i == 1)
+                        {
+                            if (i % 2 == 0)
+                            {
+                                itemView = new FrameLayout()
+                                {
+                                    Height = Application.GetRealHeight(354 + 58)
+                                };
+                                roomScrolView.AddChidren(itemView);
+                            }
+                            yy = 58;
+                        }
+                        else if (i % 2 == 0)
                         {
                             itemView = new FrameLayout()
                             {
-                                Height = Application.GetRealHeight(354 + 58)
+                                Height = Application.GetRealHeight(354)
                             };
                             roomScrolView.AddChidren(itemView);
                         }
-                        yy = 58;
-                    }
-                    else if (i % 2 == 0)
-                    {
-                        itemView = new FrameLayout()
-                        {
-                            Height = Application.GetRealHeight(354)
-                        };
-                        roomScrolView.AddChidren(itemView);
-                    }
 
-                    if (i < roomList.Count)
-                    {
-                        var room = roomList[i];
-                        var roomView = new RoomMainView(xx, yy);
-                        itemView.AddChidren(roomView);
-                        roomView.Init(this, room);
-                        roomView.SetRoomName(room.Name);
-                        roomView.SetRoomIcon(room.BackgroundImageType == 0 ? room.BackgroundImage : System.IO.Path.Combine(Config.Instance.FullPath, room.BackgroundImage));
-                        roomView.ClickBtn.MouseUpEventHandler += (sender, e) =>
+                        if (i < roomList.Count)
                         {
-                            if (CanClick == false)
+                            var room = roomList[i];
+                            var roomView = new RoomMainView(xx, yy);
+                            itemView.AddChidren(roomView);
+                            roomView.Init(this, room);
+                            roomView.SetRoomName(room.Name);
+                            roomView.SetRoomIcon(room.BackgroundImageType == 0 ? room.BackgroundImage : System.IO.Path.Combine(Config.Instance.FullPath, room.BackgroundImage));
+                            roomView.ClickBtn.MouseUpEventHandler += (sender, e) =>
                             {
-                                return;
-                            }
-                            CommonPage.Instance.CloseLeftMenu();
-                            Common.Room.CurrentRoom = room;
-                            Config.Instance.Home.CurrentFloorId = room.FloorId;
-                            UserPage.Instance.Fresh();
-                        };
-                    }
-                    else
-                    {
-                        var roomView = new RoomNoNameMainView(xx, yy);
-                        itemView.AddChidren(roomView);
-                        roomView.Init();
+                                if (CanClick == false)
+                                {
+                                    return;
+                                }
+                                CommonPage.Instance.CloseLeftMenu();
+                                Common.Room.CurrentRoom = room;
+                                Config.Instance.Home.CurrentFloorId = room.FloorId;
+                                UserPage.Instance.Fresh();
+                            };
+                        }
+                        else
+                        {
+                            var roomView = new RoomNoNameMainView(xx, yy);
+                            itemView.AddChidren(roomView);
+                            roomView.Init();
 
-                        roomView.Icon.MouseUpEventHandler += ShowUnallocatedRoom_MouseUpEvent;
-                        roomView.RoomNameButton.MouseUpEventHandler += ShowUnallocatedRoom_MouseUpEvent;
-                        roomView.iconFL.MouseUpEventHandler += ShowUnallocatedRoom_MouseUpEvent;
+                            roomView.Icon.MouseUpEventHandler += ShowUnallocatedRoom_MouseUpEvent;
+                            roomView.RoomNameButton.MouseUpEventHandler += ShowUnallocatedRoom_MouseUpEvent;
+                            roomView.iconFL.MouseUpEventHandler += ShowUnallocatedRoom_MouseUpEvent;
+                        }
                     }
                 }
+                
             }
             catch (Exception ex)
             {
diff --git a/ZigbeeApp/Shared/Phone/Device/Room/UnallocatedRoom.cs b/ZigbeeApp/Shared/Phone/Device/Room/UnallocatedRoom.cs
index b957f8d..6916f59 100644
--- a/ZigbeeApp/Shared/Phone/Device/Room/UnallocatedRoom.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Room/UnallocatedRoom.cs
@@ -378,7 +378,7 @@
 
                 var deviceRow = new SelectFunctionView(0, 35);
                 deviceRow.Init(deviceUI.IconPath, deviceUI.OnlineIconPath);
-                deviceRow.SetTitle(deviceUI.CommonDevice.DeviceEpointName);
+                deviceRow.SetTitle(Common.LocalDevice.Current.GetDeviceEpointName(deviceUI.CommonDevice));
                 deviceTypeRowLayout.AddChidren(deviceRow);
 
                 EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
diff --git a/ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs b/ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs
index 8cacd09..1b7606d 100644
--- a/ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs
+++ b/ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs
@@ -1010,7 +1010,7 @@
                                         functionView.Init();
                                         functionView.SetDeviceImage(device.IconPath, device.OnlineIconPath);
                                         functionView.SetStatuText(device.GetDeviceStatu());
-                                        functionView.SetDeviceName(rollerShade.DeviceEpointName);
+                                        functionView.SetDeviceName(Common.LocalDevice.Current.GetDeviceEpointName(rollerShade));
                                         functionView.IsSelected = rollerShade.WcdCurrentPositionLiftPercentage == 100;
                                         functionView.SetCollect(true);
 
@@ -1120,7 +1120,7 @@
                                         functionView.Tag = device;
                                         functionView.SetDeviceImage(device.IconPath, device.OnlineIconPath);
                                         functionView.SetStatuText(device.GetDeviceStatu());
-                                        functionView.SetDeviceName(device.CommonDevice.DeviceEpointName);
+                                        functionView.SetDeviceName(Common.LocalDevice.Current.GetDeviceEpointName(device.CommonDevice));
                                         functionView.IsSelected = light.OnOffStatus == 1;
                                         functionView.SetCollect(Room.CurrentRoom.IsCollectInRoom(device.FileName));
 
@@ -1239,7 +1239,7 @@
                                         functionView.Tag = device;
                                         functionView.SetDeviceImage(device.IconPath, device.OnlineIconPath);
                                         functionView.SetStatuText(device.GetDeviceStatu());
-                                        functionView.SetDeviceName(airSwitch.DeviceEpointName);
+                                        functionView.SetDeviceName(Common.LocalDevice.Current.GetDeviceEpointName(airSwitch));
                                         functionView.IsSelected = airSwitch.OnOffStatus == 1;
                                         functionView.SetCollect(Room.CurrentRoom.IsCollectInRoom( device.FileName));
 
@@ -1349,7 +1349,7 @@
                                         functionView.Tag = device;
                                         functionView.SetDeviceImage(device.IconPath, device.OnlineIconPath);
                                         functionView.SetStatuText(device.GetDeviceStatu());
-                                        functionView.SetDeviceName(device.CommonDevice.DeviceEpointName);
+                                        functionView.SetDeviceName(Common.LocalDevice.Current.GetDeviceEpointName(device.CommonDevice));
                                         functionView.IsSelected = ac.currentSystemMode != 0;
                                         functionView.SetCollect(Room.CurrentRoom.IsCollectInRoom(device.FileName));
 
@@ -1460,7 +1460,7 @@
                                         functionView.Tag = device;
                                         functionView.SetDeviceImage(device.IconPath, device.OnlineIconPath);
                                         functionView.SetStatuText(device.GetDeviceStatu());
-                                        functionView.SetDeviceName(device.CommonDevice.DeviceEpointName);
+                                        functionView.SetDeviceName(Common.LocalDevice.Current.GetDeviceEpointName(device.CommonDevice));
                                         functionView.IsSelected = dimmableLight.OnOffStatus == 1;
                                         functionView.SetCollect(Room.CurrentRoom.IsCollectInRoom(device.FileName));
 
@@ -1556,7 +1556,7 @@
                                     lightView.Tag = device;
                                     lightView.SetDeviceImage(device.IconPath, device.OnlineIconPath);
                                     lightView.SetStatuText(device.GetDeviceStatu());
-                                    lightView.SetDeviceName(device.CommonDevice.DeviceEpointName);
+                                    lightView.SetDeviceName(Common.LocalDevice.Current.GetDeviceEpointName(device.CommonDevice));
                                     lightView.IsSelected = ias.iASInfo?.Alarm1 == 1;
                                     lightView.SetCollect(Room.CurrentRoom.IsCollectInRoom(device.FileName));
                                     lightView.CanControl(false);
@@ -1616,7 +1616,7 @@
                                         lightView.Tag = device;
                                         lightView.SetDeviceImage(device.IconPath, device.OnlineIconPath);
                                         lightView.SetStatuText(device.GetDeviceStatu());
-                                        lightView.SetDeviceName(device.CommonDevice.DeviceEpointName);
+                                        lightView.SetDeviceName(Common.LocalDevice.Current.GetDeviceEpointName(device.CommonDevice));
                                         lightView.IsSelected = false;
                                         lightView.SetCollect(Room.CurrentRoom.IsCollectInRoom(device.FileName));
                                         lightView.CanControl(false);
@@ -1642,7 +1642,7 @@
                                     lightView.Tag = device;
                                     lightView.SetDeviceImage(device.IconPath, device.OnlineIconPath);
                                     lightView.SetStatuText(device.GetDeviceStatu());
-                                    lightView.SetDeviceName(device.CommonDevice.DeviceEpointName);
+                                    lightView.SetDeviceName(Common.LocalDevice.Current.GetDeviceEpointName(device.CommonDevice));
                                     lightView.IsSelected = false;
                                     lightView.SetCollect(Room.CurrentRoom.IsCollectInRoom(device.FileName));
                                     lightView.CanControl(false);
@@ -1673,7 +1673,7 @@
                                     lightView.Tag = device;
                                     lightView.SetDeviceImage(device.IconPath, device.OnlineIconPath);
                                     lightView.SetStatuText(device.GetDeviceStatu());
-                                    lightView.SetDeviceName(device.CommonDevice.DeviceEpointName);
+                                    lightView.SetDeviceName(Common.LocalDevice.Current.GetDeviceEpointName(device.CommonDevice));
                                     lightView.CanControl(false);
                                     //lightView.IsSelected = device.CommonDevice.IsOnline == 1;
                                     lightView.SetCollect(Room.CurrentRoom.IsCollectInRoom(device.FileName));
@@ -1711,7 +1711,7 @@
             if (Common.Room.CurrentRoom.IsLove)
             {
                 functionView.SetDeviceImage(device.IconPath, device.OnlineIconPath);
-                functionView.SetDeviceName(device.CommonDevice.DeviceEpointName);
+                functionView.SetDeviceName(Common.LocalDevice.Current.GetDeviceEpointName(device.CommonDevice));
                 if (Room.CurrentRoom.IsCollectInRoom(device.FileName) == false)
                 {
                     ShowFunction();
@@ -1728,7 +1728,7 @@
                 else
                 {
                     functionView.SetDeviceImage(device.IconPath, device.OnlineIconPath);
-                    functionView.SetDeviceName(device.CommonDevice.DeviceEpointName);
+                    functionView.SetDeviceName(Common.LocalDevice.Current.GetDeviceEpointName(device.CommonDevice));
                     functionView.SetCollect(Room.CurrentRoom.IsCollectInRoom(device.FileName));
                 }
             }

--
Gitblit v1.8.0