合并了全部的代码

黄学彪

2019-11-18 4ce5177289b1d34e467de9d8790836559cc5a09e

合并了全部的代码

 ZigbeeApp/GateWay.Droid/Assets/Language.ini

@@ -1657,6 +1657,8 @@
15973=消息中心
15974=确认删除消息?
15975=正在上传备份文件
15976=确认删除全部消息?
15977=确认标记全部消息为已读?

;★★★★下面这些是接口的返回信息翻译,从18000开始★★★★

18004=指定网关已经被绑定


 ZigbeeApp/GateWay.Droid/Assets/Phone/RoomIcon/0.JPG

 ZigbeeApp/GateWay.Droid/Assets/Phone/RoomIcon/1.JPG

 ZigbeeApp/GateWay.Droid/Assets/Phone/RoomIcon/2.JPG

 ZigbeeApp/GateWay.Droid/Assets/Phone/RoomIcon/3.JPG

 ZigbeeApp/GateWay.Droid/Assets/Phone/RoomIcon/4.JPG

 ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj

old mode 100644
new mode 100755
@@ -38,8 +38,12 @@
    <AndroidTlsProvider>btls</AndroidTlsProvider>

    <AndroidEnableSGenConcurrent>true</AndroidEnableSGenConcurrent>

    <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>

    <AndroidSupportedAbis />

    <AndroidDexTool>d8</AndroidDexTool>

    <AotAssemblies>false</AotAssemblies>

    <EnableLLVM>false</EnableLLVM>

    <AndroidEnableProfiledAot>false</AndroidEnableProfiledAot>

    <BundleAssemblies>false</BundleAssemblies>

  </PropertyGroup>

  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">

    <DebugSymbols>true</DebugSymbols>

@@ -53,7 +57,10 @@
    <MandroidI18n>cjk</MandroidI18n>

    <DefineConstants>Android,Release</DefineConstants>

    <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>

    <AotAssemblies>false</AotAssemblies>

    <EnableLLVM>false</EnableLLVM>

    <AndroidEnableProfiledAot>false</AndroidEnableProfiledAot>

    <BundleAssemblies>false</BundleAssemblies>

    <AndroidDexTool>d8</AndroidDexTool>

    <AndroidUseAapt2>false</AndroidUseAapt2>

  </PropertyGroup>

@@ -1220,6 +1227,21 @@
  <ItemGroup>

    <AndroidAsset Include="Assets\Phone\Account\Back.png" />

  </ItemGroup>

  <ItemGroup>

    <AndroidAsset Include="Assets\Phone\RoomIcon\0.JPG" />

  </ItemGroup>

  <ItemGroup>

    <AndroidAsset Include="Assets\Phone\RoomIcon\1.JPG" />

  </ItemGroup>

  <ItemGroup>

    <AndroidAsset Include="Assets\Phone\RoomIcon\2.JPG" />

  </ItemGroup>

  <ItemGroup>

    <AndroidAsset Include="Assets\Phone\RoomIcon\3.JPG" />

  </ItemGroup>

  <ItemGroup>

    <AndroidAsset Include="Assets\Phone\RoomIcon\4.JPG" />

  </ItemGroup>

  <Import Project="..\Shared\Shared.projitems" Label="Shared" Condition="Exists('..\Shared\Shared.projitems')" />

  <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />

  <Import Project="..\packages\Xamarin.Android.Support.Annotations.26.0.2\build\MonoAndroid80\Xamarin.Android.Support.Annotations.targets" Condition="Exists('..\packages\Xamarin.Android.Support.Annotations.26.0.2\build\MonoAndroid80\Xamarin.Android.Support.Annotations.targets')" />


 ZigbeeApp/GateWay.Droid/GateWay.Droid.sln

File was deleted

 ZigbeeApp/GateWay.Droid/Properties/AndroidManifest.xml

old mode 100644
new mode 100755
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.hdl.home" android:versionCode="2019111401" android:installLocation="auto" android:versionName="1.0.19111401">
    <uses-sdk android:minSdkVersion="26" android:targetSdkVersion="26" />
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.hdl.home" android:versionCode="2019111801" android:installLocation="auto" android:versionName="1.0.19111801">
    <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" />
    <!--8.0权限-->

 ZigbeeApp/GateWay.Droid/Resources/Resource.designer.cs

old mode 100644
new mode 100755
Diff too large

 ZigbeeApp/GateWay.Ios/Resources/Language.ini

@@ -1657,6 +1657,8 @@
15973=消息中心
15974=确认删除消息?
15975=正在上传备份文件
15976=确认删除全部消息?
15977=确认标记全部消息为已读?

;★★★★下面这些是接口的返回信息翻译,从18000开始★★★★

18004=指定网关已经被绑定


 ZigbeeApp/Shared/Common/House.cs

@@ -319,11 +319,6 @@
                            Config.Instance.HomeId = GetHouseIdByFilePath(Config.Instance.HomeFilePathList[0]);
                        }
                        Config.Instance.Save();
                        //检测住宅对象
                        if (Config.Instance.Home.Id == string.Empty)

                        {

                            Config.Instance.Home = House.GetHouseByHouseId(Config.Instance.HomeId);

                        }
                    }
                }
            }

 ZigbeeApp/Shared/Common/Room.cs

@@ -132,12 +132,6 @@
        public bool IsSharedRoom = false;

        /// <summary>
        /// 是否可以刷新房间数据了
        /// 需要等初始化本地设备数据后在可以初始化房间数据
        /// </summary>
        public static bool CanInitAllRoom;

        /// <summary>
        /// 获取喜爱房间的所有设备路径
        /// </summary>
        /// <value>The love room device list.</value>
@@ -282,10 +276,6 @@
        /// </summary>
        public static void InitAllRoom()
        {
            //if (CanInitAllRoom == false)
            //{
            //    return;
            //}
            Lists.Clear();
            if (Config.Instance.Home.RoomFilePathList.Contains("Room_Favorite.json") == false)
            {
@@ -305,7 +295,7 @@
                {
                    if (room.IsSharedRoom)
                    {
                        room.Name = $"({Language.StringByID(R.MyInternationalizationString.Shared)}){room.Name}";
                        room.Name = $"{room.Name}";
                    }
                    Lists.Add(room);
                }
@@ -339,7 +329,6 @@
                }

            }

            homeTemp.Save(false);

            CanInitAllRoom = true;

            InitAllRoom();

        }


 ZigbeeApp/Shared/Phone/Device/Account/AccountLogin.cs

@@ -367,9 +367,8 @@
                        {
                            return;
                        }
                        this.RemoveFromParent();

                        UserPage.Instance.Fresh();
                        HomePage.Instance.ShowLoginLoadView();

                        new System.Threading.Thread(async () =>
                        {
@@ -398,12 +397,13 @@
                            var homes = await House.GetHomeLists();
                            //刷新个人中心的内存及线程
                            await UserCenter.UserCenterLogic.InitUserCenterMenmoryAndThread();
                            Shared.Common.Room.CanInitAllRoom = true;
                            Shared.Common.Room.InitAllRoom();
                            Application.RunOnMainThread(() =>
                            {
                                UserPage.Instance.Fresh();
                                CommonPage.Loading.Hide();
                                this.RemoveFromParent();
                                CommonPage.Instance.RemoveViewByTag("Login");
                                UserPage.Instance.Fresh();
                            });
                        })
                        { IsBackground = true }.Start();
@@ -510,20 +510,18 @@
                                if (re)
                                {
                                    //直接登录
                                    //this.RemoveFromParent();

                                    //UserPage.Instance.Fresh();
                                    HomePage.Instance.ShowLoginLoadView();
                                    //启动ZigBee
                                    ZigBee.Common.Application.Init();
                                    var resultRegID = await Shared.Common.CommonPage.Instance.PushRegID();
                                    var homes = await House.GetHomeLists();
                                    //刷新个人中心的内存及线程
                                    await UserCenter.UserCenterLogic.InitUserCenterMenmoryAndThread();
                                    Shared.Common.Room.CanInitAllRoom = true;
                                    Shared.Common.Room.InitAllRoom();
                                    Application.RunOnMainThread(() =>
                                    {
                                        this.RemoveFromParent();
                                        CommonPage.Instance.RemoveViewByTag("Login");
                                        UserPage.Instance.Fresh();
                                    });
                                }
@@ -572,7 +570,6 @@
                            var homes = await House.GetHomeLists();
                            //刷新个人中心的内存及线程
                            await UserCenter.UserCenterLogic.InitUserCenterMenmoryAndThread();
                            Shared.Common.Room.CanInitAllRoom = true;
                            Shared.Common.Room.InitAllRoom();
                            Application.RunOnMainThread(() =>
                            {

 ZigbeeApp/Shared/Phone/Device/Account/AccountLoginByCode.cs

@@ -298,11 +298,8 @@
                    {
                        return;
                    }
                    this.RemoveFromParent();
                    Application.MainPage?.RemoveViewByTag("Login");

                    UserPage.Instance.Fresh();

                    HomePage.Instance.ShowLoginLoadView();
                    new System.Threading.Thread(async () =>
                    {
                        //启动ZigBee
@@ -331,10 +328,11 @@
                        //刷新个人中心的内存及线程
                        await UserCenter.UserCenterLogic.InitUserCenterMenmoryAndThread();

                        Shared.Common.Room.CanInitAllRoom = true;
                        Shared.Common.Room.InitAllRoom();
                        Application.RunOnMainThread(() =>
                        {
                            this.RemoveFromParent();
                            CommonPage.Instance.RemoveViewByTag("Login");
                            UserPage.Instance.Fresh();
                            CommonPage.Loading.Hide();
                        });

 ZigbeeApp/Shared/Phone/Device/Account/AccountRegisterSuccess.cs

@@ -103,7 +103,8 @@
                {
                    try
                    {
                        UserPage.Instance.Fresh();
                        HomePage.Instance.ShowLoginLoadView();

                        CommonPage.Loading.Start(Language.StringByID(R.MyInternationalizationString.Logining));
                        Action action = async () => {
                            var loginSuccess = await HomePage.Instance.LoginByPWDAsync(account, password);
@@ -123,16 +124,15 @@
                                    //刷新个人中心的内存及线程
                                    await UserCenter.UserCenterLogic.InitUserCenterMenmoryAndThread();

                                    Shared.Common.Room.CanInitAllRoom = true;
                                    Shared.Common.Room.InitAllRoom();

                                    Application.RunOnMainThread(() =>
                                    {
                                        UserPage.Instance.Fresh();
                                        CommonPage.Loading.Hide();
                                        this.RemoveFromParent();
                                        CommonPage.Instance.RemoveViewByTag("Register");
                                        CommonPage.Instance.RemoveViewByTag("Login");
                                        UserPage.Instance.Fresh();
                                    });
                                })
                                { IsBackground = true }.Start();

 ZigbeeApp/Shared/Phone/Device/Category/Category.cs

@@ -1399,7 +1399,7 @@
                                rollerShadeControl.Show(deviceUI, room);
                            };
                        }
                        else
                        else if(deviceUI.CommonDevice.Type == ZigBee.Device.DeviceType.DoorLock)
                        {
                            var deviceTypeRowLayout = new RowLayout()
                            {
@@ -1425,6 +1425,38 @@
                                HomePage.Instance.PageIndex += 1;
                                userDoorLockPage.Show();
                            };

                            var editBtn = new CommonForm.RowLayoutEditButton()
                            {
                                Tag = deviceUI
                            };
                            deviceTypeRowLayout.AddRightView(editBtn);
                            editBtn.MouseUpEventHandler += deviceDetailHandler;

                            var delBtn = new Device.CommonForm.RowLayoutDeleteButton()
                            {
                                Tag = deviceUI
                            };
                            deviceTypeRowLayout.AddRightView(delBtn);
                            delBtn.MouseUpEventHandler += delEvent;
                        }
                        else
                        {
                            var deviceTypeRowLayout = new RowLayout()
                            {
                                Height = Application.GetRealHeight(129 + 35),
                                LineColor = ZigbeeColor.Current.GXCBackgroundColor,
                                Tag = deviceUI
                            };
                            deviceListScrolView.AddChidren(deviceTypeRowLayout);

                            var deviceRow = new CategoryFunctionRow(0, 35);
                            deviceRow.Init(deviceUI.IconPath, deviceUI.OnlineIconPath);
                            deviceRow.SetTitle(deviceUI.CommonDevice.DeviceEpointName);
                            deviceRow.SetOnLineStatu(deviceUI.CommonDevice.IsOnline == 1);
                            deviceRow.SetStatuText(deviceUI.GetDeviceStatu());
                            deviceRow.HideSwitchBtn(true);
                            deviceTypeRowLayout.AddChidren(deviceRow);

                            var editBtn = new CommonForm.RowLayoutEditButton()
                            {
@@ -1895,6 +1927,7 @@
                TextID = MyInternationalizationString.logictemplate,
                Gravity = Gravity.CenterVertical,
                TextColor = ZigbeeColor.Current.LogicBtnSelectedColor,
                TextSize=15,
            };
            bjFrameLayout.AddChidren(recommendtextBtn);

@@ -1965,6 +1998,7 @@
                            Y = Application.GetRealHeight(246 - 23 - 80),
                            TextAlignment = TextAlignment.CenterLeft,
                            TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor,
                            TextSize = 14,
                        };
                        frameLayout.AddChidren(logicnameBtn);

@@ -2075,6 +2109,7 @@
                    Y = Application.GetRealHeight(30),
                    TextAlignment = TextAlignment.CenterLeft,
                    TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                    TextSize = 14,
                };
                logicRowlayout.AddChidren(logicnameBtn);


 ZigbeeApp/Shared/Phone/Device/Category/CategoryAddScene.cs

@@ -132,14 +132,7 @@
                    }
                    else if (targetDevice.Type == 2)
                    {
                        if(targetDevice.DelayTime<60)
                        {
                            devNameText = $"{targetDevice.DelayTime} {Language.StringByID(R.MyInternationalizationString.Second)}";
                        }
                        else
                        {
                            devNameText = $"{targetDevice.DelayTime / 60} {Language.StringByID(R.MyInternationalizationString.Minute)} {targetDevice.DelayTime % 60} {Language.StringByID(R.MyInternationalizationString.Second)}";
                        }
                        devNameText = CommonFormResouce.GetTimeString(targetDevice.DelayTime);
                        devNameText += Language.StringByID(R.MyInternationalizationString.Later);
                        var targetRow = new SceneTargetTimeRow(23);
                        targetRowLayout.AddChidren(targetRow);

 ZigbeeApp/Shared/Phone/Device/Category/CategorySceneSelectAirSwitchSetting.cs

File was deleted

 ZigbeeApp/Shared/Phone/Device/Category/CategorySceneSelectCurtainSetting.cs

File was deleted

 ZigbeeApp/Shared/Phone/Device/Category/CategorySceneSelectDevice.cs

File was deleted

 ZigbeeApp/Shared/Phone/Device/Category/CategorySceneSelectDeviceByRoom.cs

File was deleted

 ZigbeeApp/Shared/Phone/Device/Category/CategorySceneSelectLightSetting.cs

File was deleted

 ZigbeeApp/Shared/Phone/Device/Category/CategorySceneSelectRoomList.cs

File was deleted

 ZigbeeApp/Shared/Phone/Device/Category/CategorySceneSelectedDimmableLightSetting.cs

File was deleted

 ZigbeeApp/Shared/Phone/Device/Category/CategorySceneSelectedScene.cs

File was deleted

 ZigbeeApp/Shared/Phone/Device/CommonForm/CommonFormResouce.cs

@@ -196,20 +196,36 @@
        /// <returns></returns>
        public static string GetTimeString(int second)
        {
            string tStr;
            if (second / 3600 > 0)
            string timeStr=string.Empty;
            int hour = second / 3600;
            int minu = second % 3600 / 60;
            int sec = second % 60;
            if (hour > 0)
            {
                tStr = $"{second / 3600}{Language.StringByID(R.MyInternationalizationString.Hour)}";
                timeStr += $"{hour}{Language.StringByID(R.MyInternationalizationString.Hour)}";
                if (minu>0)
                {
                    timeStr += $"{minu}{Language.StringByID(R.MyInternationalizationString.Minute)}";
                }
                if(sec>0)
                {
                    timeStr += $"{sec}{Language.StringByID(R.MyInternationalizationString.Second)}";
                }
                return timeStr;
            }
            else if (second / 60 > 0)
            else if (minu > 0)
            {
                tStr = $"{second / 60}{Language.StringByID(R.MyInternationalizationString.Minute)}";
                timeStr += $"{minu}{Language.StringByID(R.MyInternationalizationString.Minute)}";
                if(sec>0)
                {
                    timeStr += $"{sec}{Language.StringByID(R.MyInternationalizationString.Second)}";
                }
                return timeStr;
            }
            else
            {
                tStr = $"{second}{Language.StringByID(R.MyInternationalizationString.Second)}";
                return $"{sec}{Language.StringByID(R.MyInternationalizationString.Second)}";
            }
            return tStr;
        }
    }


 ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs

@@ -28,7 +28,7 @@
            this.AddChidren(topRowLayout);

            var titleName = new Button {
                TextSize = 16,
                TextSize = 17,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                TextAlignment = TextAlignment.CenterLeft,
                X = Application.GetRealWidth(176),
@@ -108,6 +108,7 @@
                Text = Language.StringByID(MyInternationalizationString.timecondition),
                TextAlignment = TextAlignment.CenterLeft,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                TextSize=15,
            };
            timerow.AddChidren(btntime);

@@ -169,6 +170,7 @@
                TextID = MyInternationalizationString.device,
                TextAlignment = TextAlignment.CenterLeft,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                TextSize = 15,
            };
            devicerow.AddChidren(btndevice);

@@ -232,6 +234,7 @@
                TextAlignment = TextAlignment.CenterLeft,
                TextID = MyInternationalizationString.security,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                TextSize = 15,
            };
            securityrow.AddChidren(btnsecurity);

@@ -292,6 +295,7 @@
                TextAlignment = TextAlignment.CenterLeft,
                TextID = MyInternationalizationString.location,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                TextSize = 15,
            };
            locationrow.AddChidren(btnlocation);

@@ -332,6 +336,7 @@
                X = Application.GetRealWidth(60),
                TextID = MyInternationalizationString.automation,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                TextSize = 15,
            };
            existencerowlayout.AddChidren(btnexistence);

@@ -410,6 +415,7 @@
                Width = Application.GetRealWidth(200),
                X = Application.GetRealWidth(80),
                TextAlignment = TextAlignment.CenterLeft,
                TextSize = 14,
            };
            timetype.AddChidren(Btncancel);
            Btncancel.MouseUpEventHandler += (sender16, e16) =>
@@ -437,6 +443,7 @@
                Width = Application.GetRealWidth(200),
                TextAlignment = TextAlignment.CenterRight,
                X = Btntitle.Right + Application.GetRealWidth(100),
                TextSize = 14,

            };
            timetype.AddChidren(Btncomplete);
@@ -471,6 +478,7 @@
                TextID = MyInternationalizationString.logicathomegarrison,
                TextAlignment = TextAlignment.CenterLeft,
                TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                TextSize = 14,
            };
            athomedefenceRowLayout.AddChidren(btnathomedefence);

@@ -504,6 +512,7 @@
                TextID = MyInternationalizationString.logicremovehomegarrison,
                TextAlignment = TextAlignment.CenterLeft,
                TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                TextSize = 14,
            };
            leavehomedefenceRowLayout.AddChidren(leavehomebtndefence);
            var leavehomedefenceSelected = new SelectedButton();
@@ -535,6 +544,7 @@
                TextID = MyInternationalizationString.withdrawal,
                TextAlignment = TextAlignment.CenterLeft,
                TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                TextSize = 14,
            };
            withdrawalRowLayout.AddChidren(btnwithdrawal);
            var withdrawalSelected = new SelectedButton();
@@ -750,6 +760,7 @@
                Width = Application.GetRealWidth(200),
                X = Application.GetRealWidth(80),
                TextAlignment = TextAlignment.CenterLeft,
                TextSize = 14,
            };
            typeRow.AddChidren(Btncancel);
            Btncancel.MouseUpEventHandler += (sender16, e16) =>
@@ -777,6 +788,7 @@
                Width = Application.GetRealWidth(200),
                TextAlignment = TextAlignment.CenterRight,
                X = Btntitle.Right + Application.GetRealWidth(100),
                TextSize = 14,

            };
            typeRow.AddChidren(Btncomplete);
@@ -808,6 +820,7 @@
                TextID = MyInternationalizationString.athome,
                TextAlignment = TextAlignment.CenterLeft,
                TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                TextSize = 14,


            };
@@ -840,6 +853,7 @@
                TextID = MyInternationalizationString.leavehome,
                TextAlignment = TextAlignment.CenterLeft,
                TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                TextSize = 14,
            };
            leavehomeRowLayout.AddChidren(btnleavehome);
            var leavehomeSelected = new SelectedButton();
@@ -1033,6 +1047,7 @@
                Width = Application.GetRealWidth(200),
                X = Application.GetRealWidth(80),
                TextAlignment = TextAlignment.CenterLeft,
                TextSize = 14,
            };
            timetype.AddChidren(Btncancel);
            Btncancel.MouseUpEventHandler += (sender16, e16) =>
@@ -1060,6 +1075,7 @@
                Width = Application.GetRealWidth(200),
                TextAlignment = TextAlignment.CenterRight,
                X = Btntitle.Right + Application.GetRealWidth(100),
                TextSize = 14,

            };
            timetype.AddChidren(Btncomplete);
@@ -1093,6 +1109,7 @@
                TextAlignment = TextAlignment.CenterLeft,
                TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                //Text="立即执行",
                TextSize = 14,
            };
            timerow.AddChidren(Btntimepoint);

@@ -1126,6 +1143,7 @@
                TextAlignment = TextAlignment.CenterLeft,
                TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                //Text = "时间范围",
                TextSize = 14,
            };
            time1row.AddChidren(Btntime);


 ZigbeeApp/Shared/Phone/Device/Logic/AddScenePage.cs

@@ -39,7 +39,7 @@

            var titleName = new Button
            {
                TextSize = 16,
                TextSize = 17,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                TextAlignment = TextAlignment.CenterLeft,
                X = Application.GetRealWidth(160),
@@ -88,6 +88,7 @@
                Y = Application.GetRealHeight(92),
                //TextID = MyInternationalizationString.customroom,
                Text = Config.Instance.Home.GetCurrentFloorName,
                TextSize = 14,
            };
            topRowLayout.AddChidren(foolrname);
            var dropdown = new Button
@@ -134,7 +135,7 @@
            };
            this.AddChidren(saveframeLayout);

          var  btnsave = new Button
            var btnsave = new Button
            {
                X = Application.GetRealWidth(85),
                Height = Application.GetRealHeight(130),
@@ -143,6 +144,7 @@
                BackgroundColor = ZigbeeColor.Current.LogicBtnSaveBackgroundColor,
                TextID = MyInternationalizationString.Save,
                TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor,
                TextSize = 16,
            };
            saveframeLayout.AddChidren(btnsave);

@@ -200,6 +202,7 @@
                    TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                    X = Application.GetRealWidth(80),
                    TextID = MyInternationalizationString.selecfoolr,
                    TextSize = 14,
                };
                foolrbjicon.AddChidren(btnfoolrtext);

@@ -241,6 +244,7 @@
                        TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
                        Tag = foolr.Key,
                        X = btnfoolricon.Right + Application.GetRealWidth(12),
                        TextSize = 14,
                    };
                    foolrRowLayout.AddChidren(btnfoolrname);
                    if (foolrname.Text == foolr.Value)
@@ -414,6 +418,7 @@
                    TextAlignment = TextAlignment.CenterLeft,
                    TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                    SelectedTextColor = ZigbeeColor.Current.LogicAddColor,
                    TextSize = 14,
                };
                sceneRow.AddChidren(scenename);


 ZigbeeApp/Shared/Phone/Device/Logic/CustomText.cs

@@ -22,7 +22,7 @@

            var titleName = new Button
            {
                TextSize = 16,
                TextSize = 17,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                TextAlignment = TextAlignment.CenterLeft,
                X = Application.GetRealWidth(176),
@@ -78,6 +78,7 @@
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
                Text = Common.Logic.CurrentLogic.LogicCustomPushText,
                TextSize = 14,
            };
            middle.AddChidren(textBox);

@@ -91,7 +92,8 @@
                BackgroundColor = ZigbeeColor.Current.LogicBtnSaveBackgroundColor,
                TextID = MyInternationalizationString.confrim,
                TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor,
            };
                 TextSize = 16,
             };
            middle.AddChidren(btnsave);

                     

 ZigbeeApp/Shared/Phone/Device/Logic/Cycle.cs

@@ -31,7 +31,7 @@

            var titleName = new Button
            {
                TextSize = 16,
                TextSize = 17,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                TextAlignment = TextAlignment.CenterLeft,
                X = Application.GetRealWidth(176),
@@ -96,6 +96,7 @@
                BackgroundColor = ZigbeeColor.Current.LogicBtnSaveBackgroundColor,
                TextID = MyInternationalizationString.Save,
                TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor,
                TextSize = 16,
            };
            middle.AddChidren(btnsave);

@@ -135,6 +136,7 @@
                Text = Language.StringByID(MyInternationalizationString.executeonce),
                TextAlignment = TextAlignment.CenterLeft,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                TextSize = 15,
            };
            onceRow.AddChidren(onceTextBtn);

@@ -181,6 +183,7 @@
                TextID = MyInternationalizationString.everyday,
                TextAlignment = TextAlignment.CenterLeft,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                TextSize = 15,
            };
            everydayRow.AddChidren(everydayTxetBtn);

@@ -225,6 +228,7 @@
                TextAlignment = TextAlignment.CenterLeft,
                TextID = MyInternationalizationString.weekly,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                TextSize = 15,
            };
            weekRow.AddChidren(weekTextBtn);

@@ -274,6 +278,7 @@
                TextAlignment = TextAlignment.CenterLeft,
                TextID = MyInternationalizationString.monthly,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                TextSize = 15,
            };
            monthlyRow.AddChidren(monthlyTextBtn);

@@ -323,6 +328,7 @@
                TextAlignment = TextAlignment.CenterLeft,
                TextID = MyInternationalizationString.everyyear,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                TextSize = 15,
            };
            yearRow.AddChidren(yearTextBtn);


 ZigbeeApp/Shared/Phone/Device/Logic/DelayTime.cs

@@ -32,7 +32,7 @@

            var titleName = new Button
            {
                TextSize = 16,
                TextSize = 17,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                TextAlignment = TextAlignment.CenterLeft,
                X = Application.GetRealWidth(176),
@@ -117,6 +117,8 @@
                Y = blancolor.Bottom + Application.GetRealHeight(50),
                TextID =MyInternationalizationString.createtimetext,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                TextSize = 15,

            };
            middle.AddChidren(titleText);


 ZigbeeApp/Shared/Phone/Device/Logic/DeviceStateCondition.cs

@@ -40,7 +40,7 @@

            var titleName = new Button
            {
                TextSize = 16,
                TextSize = 17,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                TextAlignment = TextAlignment.CenterLeft,
                X = Application.GetRealWidth(160),
@@ -90,6 +90,7 @@
                Y = Application.GetRealHeight(92),
                //TextID = MyInternationalizationString.customroom,
                Text = Config.Instance.Home.GetCurrentFloorName,
                TextSize = 14,
            };
            topRowLayout.AddChidren(foolrname);
            var dropdown = new Button
@@ -189,6 +190,7 @@
                    TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                    X = Application.GetRealWidth(80),
                    TextID = MyInternationalizationString.selecfoolr,
                    TextSize = 14,
                };
                foolrbjicon.AddChidren(btnfoolrtext);

@@ -230,6 +232,7 @@
                        TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
                        Tag = foolr.Key,
                        X = btnfoolricon.Right + Application.GetRealWidth(12),
                        TextSize = 14,
                    };
                    foolrRowLayout.AddChidren(btnfoolrname);
                    if (foolrname.Text == foolr.Value)
@@ -634,6 +637,7 @@
                    TextAlignment = TextAlignment.CenterLeft,
                    TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                    SelectedTextColor = ZigbeeColor.Current.LogicAddColor,
                    TextSize = 14,
                };
                deviceRow.AddChidren(devicename);
                switch (common.CommonDevice.Type)
@@ -768,6 +772,7 @@
                Width = Application.GetRealWidth(200),
                X = Application.GetRealWidth(80),
                TextAlignment = TextAlignment.CenterLeft,
                TextSize = 14,
            };
            timetype.AddChidren(Btncancel);
            Btncancel.MouseUpEventHandler += (sender16, e16) =>
@@ -796,6 +801,7 @@
                Width = Application.GetRealWidth(200),
                TextAlignment = TextAlignment.CenterRight,
                X = Btntitle.Right + Application.GetRealWidth(50),
                TextSize = 14,

            };
            timetype.AddChidren(Btncomplete);
@@ -856,6 +862,7 @@
                            TextID = MyInternationalizationString.open,
                            TextAlignment = TextAlignment.CenterLeft,
                            TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                            TextSize = 14,
                        };
                        openrowlayout.AddChidren(btnopen);

@@ -886,6 +893,7 @@
                            Width = Application.GetRealWidth(600),
                            TextAlignment = TextAlignment.CenterLeft,
                            TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                            TextSize = 14,
                        };
                        closerowlayout.AddChidren(btnclose);

@@ -981,6 +989,7 @@
                            Height = Application.GetRealHeight(180),
                            //SelectedBackgroundColor = 0xfffe5e00,
                            TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                            TextSize = 14,
                        };
                        openrowlayout.AddChidren(btnopen);

@@ -1011,6 +1020,7 @@
                            Width = Application.GetRealWidth(300),
                            Height = Application.GetRealHeight(180),
                            TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                            TextSize = 14,
                        };
                        closerowlayout.AddChidren(btnclose);

@@ -1107,6 +1117,7 @@
                            TextID = MyInternationalizationString.open,
                            TextAlignment = TextAlignment.CenterLeft,
                            TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                            TextSize = 14,
                        };
                        openrowlayout.AddChidren(btnopen);

@@ -1137,6 +1148,7 @@
                            Width = Application.GetRealWidth(600),
                            TextAlignment = TextAlignment.CenterLeft,
                            TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                            TextSize = 14,
                        };
                        closerowlayout.AddChidren(btnclose);

@@ -1408,6 +1420,7 @@
                            TextAlignment = TextAlignment.CenterLeft,
                            TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                            Text = Language.StringByID(MyInternationalizationString.OnOffSwitch) + common.DeviceEpoint.ToString(),
                            TextSize = 14,
                            //SelectedBackgroundColor = 0xfffe5e00,
                        };
                        buttonRow.AddChidren(button);
@@ -1459,6 +1472,7 @@
                            TextAlignment = TextAlignment.CenterLeft,
                            X = Application.GetRealWidth(80),
                            Y = timetype.Bottom + Application.GetRealHeight(70),
                            TextSize = 14,
                        };
                        devicefra.AddChidren(Btntemperaturevalue);


 ZigbeeApp/Shared/Phone/Device/Logic/DeviceTarget.cs

@@ -29,7 +29,7 @@

            var titleName = new Button
            {
                TextSize = 16,
                TextSize = 17,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                TextAlignment = TextAlignment.CenterLeft,
                X = Application.GetRealWidth(176),
@@ -111,6 +111,7 @@
                TextID = MyInternationalizationString.device,
                TextAlignment = TextAlignment.CenterLeft,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
               TextSize=15,
            };
            devicerow.AddChidren(btndevice);

@@ -176,6 +177,7 @@
                TextID = MyInternationalizationString.scene,
                TextAlignment = TextAlignment.CenterLeft,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                TextSize = 15,
            };
            sceneRowLayout.AddChidren (scene);

@@ -237,6 +239,7 @@
                TextAlignment = TextAlignment.CenterLeft,
                TextID = MyInternationalizationString.securitymode,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                TextSize = 15,
            };
            securityrow.AddChidren(btnsecurity);

@@ -280,7 +283,7 @@
                Width = Application.GetRealWidth(400),
                TextID = MyInternationalizationString.Alreadyautomated,
                //Text = "已有自动化",
                TextSize = 16,
                TextSize = 15,
                TextAlignment = TextAlignment.CenterLeft,
                X = Application.GetRealWidth(40),
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
@@ -346,6 +349,7 @@
                TextAlignment = TextAlignment.CenterLeft,
                TextID = MyInternationalizationString.delayed,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                TextSize = 15,
            };
            delayedRowLayout.AddChidren(delayed);


 ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddAction.cs

@@ -27,7 +27,7 @@

            var titleName = new Button
            {
                TextSize = 16,
                TextSize = 17,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                TextAlignment = TextAlignment.CenterLeft,
                X = Application.GetRealWidth(176),
@@ -109,6 +109,7 @@
                TextID = MyInternationalizationString.device,
                TextAlignment = TextAlignment.CenterLeft,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                TextSize = 15,
            };
            devicerow.AddChidren(btndevice);

@@ -175,6 +176,7 @@
                TextID = MyInternationalizationString.scene,
                TextAlignment = TextAlignment.CenterLeft,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                TextSize = 15,
            };
            sceneRowLayout.AddChidren(scene);


 ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs

@@ -27,7 +27,7 @@

            var titleName = new Button
            {
                TextSize = 16,
                TextSize = 17,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                TextAlignment = TextAlignment.CenterLeft,
                X = Application.GetRealWidth(176),
@@ -137,6 +137,7 @@
                    Width = Application.GetRealWidth(600),
                    Height = Application.GetRealHeight(130),
                    Tag = Send.LockList[i],
                    TextSize = 14,
                };
                userRow.AddChidren(usernameBtn);

@@ -203,6 +204,7 @@
            {
                Height = Application.GetRealHeight(140),
                LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,

            };
            lockcolorfra1.AddChidren(lockRow);
            var Btncancel = new Button
@@ -213,6 +215,7 @@
                Width = Application.GetRealWidth(200),
                X = Application.GetRealWidth(80),
                TextAlignment = TextAlignment.CenterLeft,
                TextSize = 14,
            };
            lockRow.AddChidren(Btncancel);
            Btncancel.MouseUpEventHandler += (sender16, e16) =>
@@ -241,6 +244,7 @@
                Width = Application.GetRealWidth(200),
                TextAlignment = TextAlignment.CenterRight,
                X = Btntitle.Right + Application.GetRealWidth(100),
                TextSize = 14,

            };
            lockRow.AddChidren(Btncomplete);
@@ -277,6 +281,7 @@
                    TextAlignment = TextAlignment.CenterLeft,
                    TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                    Text = userIdmode.ModeName,
                    TextSize = 14,
                };
                doorlockRow.AddChidren(doorlockBtn);
                //(0按键/3卡/15指纹)

 ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockAddDevice.cs

@@ -39,7 +39,7 @@

            var titleName = new Button
            {
                TextSize = 16,
                TextSize = 17,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                TextAlignment = TextAlignment.CenterLeft,
                X = Application.GetRealWidth(160),
@@ -89,6 +89,7 @@
                Y = Application.GetRealHeight(92),
                //TextID = MyInternationalizationString.customroom,
                Text = Config.Instance.Home.GetCurrentFloorName,
                TextSize = 14,
            };
            topRowLayout.AddChidren(foolrname);
            var dropdown = new Button
@@ -191,6 +192,7 @@
                    TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                    X = Application.GetRealWidth(80),
                    TextID = MyInternationalizationString.selecfoolr,
                    TextSize = 14,
                };
                foolrbjicon.AddChidren(btnfoolrtext);

@@ -232,6 +234,7 @@
                        TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
                        Tag = foolr.Key,
                        X = btnfoolricon.Right + Application.GetRealWidth(12),
                        TextSize = 14,
                    };
                    foolrRowLayout.AddChidren(btnfoolrname);
                    if (foolrname.Text == foolr.Value)
@@ -610,6 +613,7 @@
                    TextAlignment = TextAlignment.CenterLeft,
                    TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                    SelectedTextColor = ZigbeeColor.Current.LogicAddColor,
                    TextSize = 14,
                };
                deviceRow.AddChidren(devicename);
                switch (common.CommonDevice.Type)
@@ -721,6 +725,7 @@
                Width = Application.GetRealWidth(200),
                X = Application.GetRealWidth(80),
                TextAlignment = TextAlignment.CenterLeft,
                TextSize = 14,
            };
            timetype.AddChidren(Btncancel);
            Btncancel.MouseUpEventHandler += (sender16, e16) =>
@@ -749,6 +754,7 @@
                Width = Application.GetRealWidth(200),
                TextAlignment = TextAlignment.CenterRight,
                X = Btntitle.Right + Application.GetRealWidth(50),
                TextSize = 14,

            };
            timetype.AddChidren(Btncomplete);
@@ -833,6 +839,7 @@
                            TextID = MyInternationalizationString.open,
                            TextAlignment = TextAlignment.CenterLeft,
                            TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                            TextSize = 14,
                        };
                        openrowlayout.AddChidren(btnopen);

@@ -863,6 +870,7 @@
                            Width = Application.GetRealWidth(600),
                            TextAlignment = TextAlignment.CenterLeft,
                            TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                            TextSize = 14,
                        };
                        closerowlayout.AddChidren(btnclose);

@@ -893,6 +901,7 @@
                            Width = Application.GetRealWidth(600),
                            TextAlignment = TextAlignment.CenterLeft,
                            TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                            TextSize = 14,
                        };
                        takebackrowlayout.AddChidren(btntakeback);

@@ -1043,6 +1052,7 @@
                            TextID = MyInternationalizationString.open,
                            TextAlignment = TextAlignment.CenterLeft,
                            TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                            TextSize = 14,
                        };
                        openrowlayout.AddChidren(btnopen);

@@ -1099,6 +1109,7 @@
                            Width = Application.GetRealWidth(600),
                            TextAlignment = TextAlignment.CenterLeft,
                            TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                            TextSize = 14,
                        };
                        closerowlayout.AddChidren(btnclose);

@@ -1130,6 +1141,7 @@
                            Width = Application.GetRealWidth(600),
                            TextAlignment = TextAlignment.CenterLeft,
                            TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                            TextSize = 14,
                        };
                        takebackrowlayout.AddChidren(btntakeback);

@@ -1337,6 +1349,7 @@
                            TextID = MyInternationalizationString.open,
                            TextAlignment = TextAlignment.CenterLeft,
                            TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                            TextSize = 14,
                        };
                        openrowlayout.AddChidren(btnopen);

@@ -1394,6 +1407,7 @@
                            Width = Application.GetRealWidth(600),
                            TextAlignment = TextAlignment.CenterLeft,
                            TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                            TextSize = 14,
                        };
                        closerowlayout.AddChidren(btnclose);

@@ -1571,6 +1585,7 @@
                                TextID = MyInternationalizationString.open,
                                TextAlignment = TextAlignment.CenterLeft,
                                TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                                TextSize = 14,
                            };
                            openrowlayout.AddChidren(btnopen);

@@ -1601,6 +1616,7 @@
                                Width = Application.GetRealWidth(600),
                                TextAlignment = TextAlignment.CenterLeft,
                                TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                                TextSize = 14,
                            };
                            closerowlayout.AddChidren(btnclose);

@@ -1631,6 +1647,7 @@
                                Width = Application.GetRealWidth(600),
                                TextAlignment = TextAlignment.CenterLeft,
                                TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                                TextSize = 14,
                            };
                            takebackrowlayout.AddChidren(btntakeback);

@@ -1790,6 +1807,7 @@
                            TextID = MyInternationalizationString.open,
                            TextAlignment = TextAlignment.CenterLeft,
                            TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                            TextSize = 14,
                        };
                        openrowlayout.AddChidren(btnopen);

@@ -1877,6 +1895,7 @@
                            Width = Application.GetRealWidth(600),
                            TextAlignment = TextAlignment.CenterLeft,
                            TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                            TextSize = 14,
                        };
                        closerowlayout.AddChidren(btnclose);


 ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockAddScene.cs

@@ -37,7 +37,7 @@

            var titleName = new Button
            {
                TextSize = 16,
                TextSize = 17,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                TextAlignment = TextAlignment.CenterLeft,
                X = Application.GetRealWidth(160),
@@ -86,6 +86,7 @@
                Y = Application.GetRealHeight(92),
                //TextID = MyInternationalizationString.customroom,
                Text = Config.Instance.Home.GetCurrentFloorName,
                TextSize = 14,
            };
            topRowLayout.AddChidren(foolrname);
            var dropdown = new Button
@@ -141,6 +142,7 @@
                BackgroundColor = ZigbeeColor.Current.LogicBtnSaveBackgroundColor,
                TextID = MyInternationalizationString.Save,
                TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor,
                TextSize = 16,
            };
            saveframeLayout.AddChidren(btnsave);

@@ -196,6 +198,7 @@
                    TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                    X = Application.GetRealWidth(80),
                    TextID = MyInternationalizationString.selecfoolr,
                    TextSize = 14,
                };
                foolrbjicon.AddChidren(btnfoolrtext);

@@ -237,6 +240,7 @@
                        TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
                        Tag = foolr.Key,
                        X = btnfoolricon.Right + Application.GetRealWidth(12),
                        TextSize = 14,
                    };
                    foolrRowLayout.AddChidren(btnfoolrname);
                    if (foolrname.Text == foolr.Value)
@@ -412,6 +416,7 @@
                    TextAlignment = TextAlignment.CenterLeft,
                    TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                    SelectedTextColor = ZigbeeColor.Current.LogicAddColor,
                    TextSize = 14,
                };
                sceneRow.AddChidren(scenename);


 ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs

@@ -32,7 +32,7 @@

            var titleName = new Button
            {
                TextSize = 16,
                TextSize = 17,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                TextAlignment = TextAlignment.CenterLeft,
                X = Application.GetRealWidth(176),
@@ -109,6 +109,7 @@
                TextID = MyInternationalizationString.automationname,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                Y = Application.GetRealHeight(35),
                TextSize = 15,
            };
            logicnamefl.AddChidren(text);

@@ -120,7 +121,7 @@
                X = text.Right,
                TextAlignment = TextAlignment.CenterLeft,
                TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
                TextSize = 13,
                TextSize = 14,
                Text = Common.Logic.CurrentLogic.LogicName,
                //TextID=MyInternationalizationString.automation1,
            };
@@ -163,7 +164,7 @@
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                Width = Application.GetRealWidth(300),
                Height = Application.GetRealHeight(60),
                TextSize = 16,
                TextSize = 15,
                Gravity = Gravity.CenterVertical,
            });

@@ -229,11 +230,12 @@
                    var addtextbtn = new Button
                    {
                        Height = Application.GetRealHeight(58),
                        Width = Application.GetRealWidth(300),
                        Width = Application.GetRealWidth(500),
                        Y = Application.GetRealHeight(45 + 30),
                        TextColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
                        TextID = MyInternationalizationString.selectunlockingmode,
                        X = Application.GetRealWidth(390),
                        TextSize = 14,
                    };
                    addfl.AddChidren(addtextbtn);

@@ -300,6 +302,7 @@
                                    TextAlignment = TextAlignment.CenterLeft,
                                    Text = deviceinof.DeviceEpointName,
                                    TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                                    TextSize = 14,
                                };
                                conditionsRowLayout.AddChidren(btndevice);

@@ -345,6 +348,7 @@
                                    TextAlignment = TextAlignment.CenterRight,
                                    X = Application.GetRealWidth(400),
                                    TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
                                    TextSize = 14,
                                };
                                conditionsRowLayout.AddChidren(devicestatus);

@@ -456,7 +460,7 @@
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                Width = Application.GetRealWidth(300),
                Height = Application.GetRealHeight(60),
                TextSize = 16,
                TextSize = 15,
                Gravity = Gravity.CenterVertical,
            };
            targetRowLayout.AddChidren(btntargettitle);
@@ -526,6 +530,7 @@
                        TextColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
                        TextID = MyInternationalizationString.lockaddaction,
                        X = Application.GetRealWidth(390),
                        TextSize = 14,
                    };
                    addfl.AddChidren(addtextbtn);
                    EventHandler<MouseEventArgs> addfunctionclick = (sender, e) =>
@@ -596,6 +601,7 @@
                                    TextAlignment = TextAlignment.CenterLeft,
                                    Text = deviceinof.DeviceEpointName,
                                    TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                                    TextSize = 14,
                                };
                                actionsrowLayout.AddChidren(btndevicename);

@@ -621,6 +627,7 @@
                                    TextAlignment = TextAlignment.CenterRight,
                                    X = Application.GetRealWidth(450),
                                    TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
                                    TextSize = 14,
                                };
                                actionsrowLayout.AddChidren(devicestatus);

@@ -911,6 +918,7 @@
                                    TextAlignment = TextAlignment.CenterLeft,
                                    Text = sceneinof.Name,
                                    TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                                    TextSize = 14,
                                };
                                actionsrowLayout.AddChidren(btndevicename);

@@ -1001,6 +1009,7 @@
                Height = Application.GetRealHeight(60),
                Gravity = Gravity.CenterVertical,
                TextID = MyInternationalizationString.pushswitch,
                TextSize = 14,
            };
            pushswitchRowlayout.AddChidren(btnswitchtxet);

@@ -1053,6 +1062,7 @@
                Width = Application.GetRealWidth(300),
                Height = Application.GetRealHeight(60),
                Gravity = Gravity.CenterVertical,
                TextSize = 14,
            };
            custompushRowLayout.AddChidren(btncustompush);

@@ -1098,6 +1108,7 @@
                BackgroundColor = ZigbeeColor.Current.LogicBtnSaveBackgroundColor,
                TextID = MyInternationalizationString.Save,
                TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor,
                TextSize = 16,
            };
            saveFrameLayout.AddChidren(btnsave);
            btnsave.MouseUpEventHandler += async (sender, e) =>

 ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs

@@ -27,7 +27,7 @@

            var titleName = new Button
            {
                TextSize = 16,
                TextSize = 17,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                TextAlignment = TextAlignment.CenterLeft,
                X = Application.GetRealWidth(176),
@@ -164,6 +164,7 @@
                    TextAlignment = TextAlignment.CenterLeft,
                    TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                    Gravity = Gravity.CenterVertical,
                    TextSize = 15,
                };
                logicRowlayout.AddChidren(logicnameBtn);


 ZigbeeApp/Shared/Phone/Device/Logic/EverymonthPage.cs

@@ -29,7 +29,7 @@

            var titleName = new Button
            {
                TextSize = 16,
                TextSize = 17,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                TextAlignment = TextAlignment.CenterLeft,
                X = Application.GetRealWidth(176),
@@ -97,6 +97,7 @@
                BackgroundColor = ZigbeeColor.Current.LogicBtnSaveBackgroundColor,
                TextID = MyInternationalizationString.Save,
                TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor,
                TextSize = 16,
            };
            middle.AddChidren(saveBtn);


 ZigbeeApp/Shared/Phone/Device/Logic/IgnoreTime.cs

@@ -30,7 +30,7 @@

            var titleName = new Button
            {
                TextSize = 16,
                TextSize = 17,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                TextAlignment = TextAlignment.CenterLeft,
                X = Application.GetRealWidth(176),
@@ -115,6 +115,7 @@
                    TextAlignment = TextAlignment.CenterLeft,
                    TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                    Tag = intvalue,
                    TextSize = 14,
                };
                timeRow.AddChidren(timeBtn);

@@ -196,6 +197,7 @@
                BackgroundColor = ZigbeeColor.Current.LogicBtnSaveBackgroundColor,
                TextID = MyInternationalizationString.Save,
                TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor,
                TextSize = 16,
            };
            saveFrameLayout.AddChidren(btnsave);
            btnsave.MouseUpEventHandler += (sender, e) =>

 ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs

@@ -32,7 +32,7 @@

            var titleName = new Button
            {
                TextSize = 16,
                TextSize = 17,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                TextAlignment = TextAlignment.CenterLeft,
                X = Application.GetRealWidth(176),
@@ -112,6 +112,7 @@
                TextID = MyInternationalizationString.automationname,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                Y = Application.GetRealHeight(35),
                TextSize = 15,
            };
            logicnamefl.AddChidren(text);

@@ -123,7 +124,7 @@
                X = text.Right,
                TextAlignment = TextAlignment.CenterLeft,
                TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
                TextSize = 13,
                TextSize = 14,
                Text = Common.Logic.CurrentLogic.LogicName,
                //TextID=MyInternationalizationString.automation1,
            };
@@ -166,7 +167,7 @@
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                Width = Application.GetRealWidth(300),
                Height = Application.GetRealHeight(60),
                TextSize = 16,
                TextSize = 15,
                Gravity = Gravity.CenterVertical,
            });

@@ -277,6 +278,7 @@
                        TextColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
                        TextID = MyInternationalizationString.addconditions,
                        X = Application.GetRealWidth(390),
                        TextSize = 14,
                    };
                    addfl.AddChidren(addtextbtn);

@@ -343,6 +345,7 @@
                                    TextAlignment = TextAlignment.CenterLeft,
                                    Gravity = Gravity.CenterVertical,
                                    TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
                                    TextSize = 14,
                                };
                                conditionsRowLayout.AddChidren(timevalue);

@@ -354,6 +357,7 @@
                                    Gravity = Gravity.CenterVertical,
                                    TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
                                    X = conditionsRowLayout.Width - Application.GetRealWidth(400),
                                    TextSize = 14,
                                };
                                conditionsRowLayout.AddChidren(timeTxet);

@@ -454,6 +458,7 @@
                                    Text = conditions["StartHour"] + ":" + s1 + "-" + conditions["StopHour"] + ":" + s2,
                                    //TextColor = 0xff121212,
                                    TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
                                    TextSize = 14,
                                };
                                conditionsRowLayout.AddChidren(timevalue);
                                var timeTxet = new Button
@@ -464,6 +469,7 @@
                                    TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
                                    X = conditionsRowLayout.Width - Application.GetRealWidth(400),
                                    TextID = MyInternationalizationString.timeframe,
                                    TextSize = 14,
                                };
                                conditionsRowLayout.AddChidren(timeTxet);

@@ -501,6 +507,7 @@
                                    TextAlignment = TextAlignment.CenterLeft,
                                    Text = deviceinof.DeviceEpointName,
                                    TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                                    TextSize = 14,
                                };
                                conditionsRowLayout.AddChidren(btndevice);

@@ -555,6 +562,7 @@
                                    TextAlignment = TextAlignment.CenterRight,
                                    X = Application.GetRealWidth(400),
                                    TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
                                    TextSize = 14,
                                };
                                conditionsRowLayout.AddChidren(devicestatus);

@@ -773,6 +781,7 @@
                                    Gravity = Gravity.CenterVertical,
                                    Text = logicinof.LogicName,
                                    TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                                    TextSize = 14,
                                    //TextColor = 0xff121212,
                                };
                                conditionsRowLayout.AddChidren(btnlogic);
@@ -803,6 +812,7 @@
                                    TextAlignment = TextAlignment.CenterRight,
                                    X = Application.GetRealWidth(500),
                                    TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
                                    TextSize = 14,
                                };
                                conditionsRowLayout.AddChidren(logicstatus);

@@ -827,6 +837,7 @@
                                    TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                                    //TextColor = 0xff121212,
                                    TextID = MyInternationalizationString.security,
                                    TextSize = 14,
                                };
                                //conditionsRowLayout.AddChidren(btnsecurity);

@@ -859,6 +870,7 @@
                                    Gravity = Gravity.CenterVertical,
                                    TextAlignment = TextAlignment.CenterLeft,
                                    TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
                                    TextSize = 14,
                                };
                                conditionsRowLayout.AddChidren(securitystatus);

@@ -886,15 +898,16 @@
                            break;
                        case 7:
                            {
                                
                                conditionIcon.UnSelectedImagePath = "ZigeeLogic/position.png";
                                var btnlocation = new Button
                                {
                                    Width = Application.GetRealWidth(700),
                                    TextAlignment = TextAlignment.CenterLeft,
                                    Gravity = Gravity.CenterVertical,
                                    //Text = "地理位置",
                                    TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                                    //TextColor = 0xff121212,
                                    TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
                                    TextID = MyInternationalizationString.geographicalposition,
                                    TextSize = 14,
                                };
                                conditionsRowLayout.AddChidren(btnlocation);

@@ -922,6 +935,7 @@
                                    TextAlignment = TextAlignment.CenterRight,
                                    X = Application.GetRealWidth(500),
                                    TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
                                    TextSize = 14,
                                };
                                conditionsRowLayout.AddChidren(locationstatus);
                                foreach (var radius in Common.Logic.CurrentLogic.Accounts)
@@ -1005,7 +1019,7 @@
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                Width = Application.GetRealWidth(300),
                Height = Application.GetRealHeight(60),
                TextSize = 16,
                TextSize = 15,
                Gravity = Gravity.CenterVertical,
            };
            targetRowLayout.AddChidren(btntargettitle);
@@ -1075,6 +1089,7 @@
                        TextColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
                        TextID = MyInternationalizationString.addfunction,
                        X = Application.GetRealWidth(390),
                        TextSize = 14,
                    };
                    addfl.AddChidren(addtextbtn);
                    EventHandler<MouseEventArgs> addfunctionclick = (sender, e) =>
@@ -1145,6 +1160,7 @@
                                    TextAlignment = TextAlignment.CenterLeft,
                                    Text = deviceinof.DeviceEpointName,
                                    TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                                    TextSize = 14,
                                };
                                actionsrowLayout.AddChidren(btndevicename);

@@ -1170,6 +1186,7 @@
                                    TextAlignment = TextAlignment.CenterRight,
                                    X = Application.GetRealWidth(450),
                                    TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
                                    TextSize = 14,
                                };
                                actionsrowLayout.AddChidren(devicestatus);

@@ -1459,6 +1476,7 @@
                                    TextAlignment = TextAlignment.CenterLeft,
                                    Text = sceneinof.Name,
                                    TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                                    TextSize = 14,
                                };
                                actionsrowLayout.AddChidren(btndevicename);

@@ -1497,6 +1515,7 @@
                                    Gravity = Gravity.CenterVertical,
                                    Text = logicinof.LogicName,
                                    TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                                    TextSize = 14,
                                    //TextColor = 0xff121212,
                                };
                                actionsrowLayout.AddChidren(btnlogic);
@@ -1528,6 +1547,7 @@
                                    X = Application.GetRealWidth(1080 - 330),
                                    TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                                    TextAlignment = TextAlignment.CenterRight,
                                    TextSize = 14,
                                };
                                actionsrowLayout.AddChidren(logicstatus);

@@ -1551,6 +1571,7 @@
                                    TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                                    //TextColor = 0xff121212,
                                    TextID = MyInternationalizationString.security,
                                    TextSize = 14,
                                };
                                //actionsrowLayout.AddChidren(btnsecurity);

@@ -1579,6 +1600,7 @@
                                    Gravity = Gravity.CenterVertical,
                                    TextAlignment = TextAlignment.CenterLeft,
                                    TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
                                    TextSize = 14,
                                };
                                actionsrowLayout.AddChidren(securitystatus);

@@ -1626,6 +1648,7 @@
                                    Width = Application.GetRealWidth(500),
                                    TextAlignment = TextAlignment.CenterLeft,
                                    TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
                                    TextSize = 14,
                                };
                                actionsrowLayout.AddChidren(delaytimeBtn);
                                if (Minutes != 0)
@@ -1733,6 +1756,7 @@
                Width = Application.GetRealWidth(300),
                Height = Application.GetRealHeight(60),
                Gravity = Gravity.CenterVertical,
                TextSize = 14,
            };
            weekRowLayout.AddChidren(settxet);
            var btnweektext = new Button
@@ -1745,6 +1769,7 @@
                TextID = MyInternationalizationString.everyday,
                Y = Application.GetRealHeight(35),
                X = settxet.Right,
                TextSize = 14,
            };
            weekRowLayout.AddChidren(btnweektext);

@@ -1805,6 +1830,7 @@
                Height = Application.GetRealHeight(60),
                Gravity = Gravity.CenterVertical,
                TextID = MyInternationalizationString.pushswitch,
                TextSize = 14,
            };
            pushswitchRowlayout.AddChidren(btnswitchtxet);

@@ -1857,6 +1883,7 @@
                Width = Application.GetRealWidth(300),
                Height = Application.GetRealHeight(60),
                Gravity = Gravity.CenterVertical,
                TextSize = 14,
            };
            custompushRowLayout.AddChidren(btncustompush);

@@ -1902,6 +1929,7 @@
                BackgroundColor = ZigbeeColor.Current.LogicBtnSaveBackgroundColor,
                TextID = MyInternationalizationString.Save,
                TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor,
                TextSize=16,
            };
            saveFrameLayout.AddChidren(btnsave);
            btnsave.MouseUpEventHandler += async (sender, e) =>
@@ -2251,6 +2279,7 @@
                Width = Application.GetRealWidth(200),
                X = Application.GetRealWidth(80),
                TextAlignment = TextAlignment.CenterLeft,
                TextSize = 14,
            };
            timetype.AddChidren(Btncancel);
            Btncancel.MouseUpEventHandler += (sender16, e16) =>
@@ -2278,6 +2307,7 @@
                Width = Application.GetRealWidth(200),
                TextAlignment = TextAlignment.CenterRight,
                X = Btntitle.Right + Application.GetRealWidth(100),
                TextSize = 14,

            };
            timetype.AddChidren(Btncomplete);
@@ -2313,6 +2343,7 @@
                TextID = MyInternationalizationString.Allconditions,
                TextAlignment = TextAlignment.CenterLeft,
                TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                TextSize = 14,

            };
            androw.AddChidren(andbtn);
@@ -2348,6 +2379,7 @@
                TextID = MyInternationalizationString.anycondition,
                TextAlignment = TextAlignment.CenterLeft,
                TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                TextSize = 14,
            };
            orrow.AddChidren(orbtn);


 ZigbeeApp/Shared/Phone/Device/Logic/LogicDevicePage.cs

@@ -40,7 +40,7 @@

            var titleName = new Button
            {
                TextSize = 16,
                TextSize = 17,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                TextAlignment = TextAlignment.CenterLeft,
                X = Application.GetRealWidth(160),
@@ -90,6 +90,7 @@
                Y = Application.GetRealHeight(92),
                //TextID = MyInternationalizationString.customroom,
                Text = Config.Instance.Home.GetCurrentFloorName,
                TextSize = 14,
            };
            topRowLayout.AddChidren(foolrname);
            var dropdown = new Button
@@ -192,6 +193,7 @@
                    TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                    X = Application.GetRealWidth(80),
                    TextID = MyInternationalizationString.selecfoolr,
                    TextSize = 14,
                };
                foolrbjicon.AddChidren(btnfoolrtext);

@@ -233,6 +235,7 @@
                        TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
                        Tag = foolr.Key,
                        X = btnfoolricon.Right + Application.GetRealWidth(12),
                        TextSize = 14,
                    };
                    foolrRowLayout.AddChidren(btnfoolrname);
                    if (foolrname.Text == foolr.Value)
@@ -611,6 +614,7 @@
                    TextAlignment = TextAlignment.CenterLeft,
                    TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                    SelectedTextColor = ZigbeeColor.Current.LogicAddColor,
                    TextSize = 14,
                };
                deviceRow.AddChidren(devicename);
                switch (common.CommonDevice.Type)
@@ -724,6 +728,8 @@
                Width = Application.GetRealWidth(200),
                X = Application.GetRealWidth(80),
                TextAlignment = TextAlignment.CenterLeft,
                TextSize = 14,

            };
            timetype.AddChidren(Btncancel);
            Btncancel.MouseUpEventHandler += (sender16, e16) =>
@@ -752,6 +758,7 @@
                Width = Application.GetRealWidth(200),
                TextAlignment = TextAlignment.CenterRight,
                X = Btntitle.Right + Application.GetRealWidth(50),
                TextSize = 14,

            };
            timetype.AddChidren(Btncomplete);
@@ -836,6 +843,7 @@
                            TextID = MyInternationalizationString.open,
                            TextAlignment = TextAlignment.CenterLeft,
                            TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                            TextSize = 14,
                        };
                        openrowlayout.AddChidren(btnopen);

@@ -866,6 +874,7 @@
                            Width = Application.GetRealWidth(600),
                            TextAlignment = TextAlignment.CenterLeft,
                            TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                            TextSize = 14,
                        };
                        closerowlayout.AddChidren(btnclose);

@@ -896,6 +905,7 @@
                            Width = Application.GetRealWidth(600),
                            TextAlignment = TextAlignment.CenterLeft,
                            TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                            TextSize = 14,
                        };
                        takebackrowlayout.AddChidren(btntakeback);

@@ -1046,6 +1056,7 @@
                            TextID = MyInternationalizationString.open,
                            TextAlignment = TextAlignment.CenterLeft,
                            TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                            TextSize = 14,
                        };
                        openrowlayout.AddChidren(btnopen);

@@ -1102,6 +1113,7 @@
                            Width = Application.GetRealWidth(600),
                            TextAlignment = TextAlignment.CenterLeft,
                            TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                            TextSize = 14,
                        };
                        closerowlayout.AddChidren(btnclose);

@@ -1133,6 +1145,7 @@
                            Width = Application.GetRealWidth(600),
                            TextAlignment = TextAlignment.CenterLeft,
                            TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                            TextSize = 14,
                        };
                        takebackrowlayout.AddChidren(btntakeback);

@@ -1340,6 +1353,7 @@
                            TextID = MyInternationalizationString.open,
                            TextAlignment = TextAlignment.CenterLeft,
                            TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                            TextSize = 14,
                        };
                        openrowlayout.AddChidren(btnopen);

@@ -1397,6 +1411,7 @@
                            Width = Application.GetRealWidth(600),
                            TextAlignment = TextAlignment.CenterLeft,
                            TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                            TextSize = 14,
                        };
                        closerowlayout.AddChidren(btnclose);

@@ -1573,6 +1588,7 @@
                                TextID = MyInternationalizationString.open,
                                TextAlignment = TextAlignment.CenterLeft,
                                TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                                TextSize = 14,
                            };
                            openrowlayout.AddChidren(btnopen);

@@ -1603,6 +1619,7 @@
                                Width = Application.GetRealWidth(600),
                                TextAlignment = TextAlignment.CenterLeft,
                                TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                                TextSize = 14,
                            };
                            closerowlayout.AddChidren(btnclose);

@@ -1633,6 +1650,7 @@
                                Width = Application.GetRealWidth(600),
                                TextAlignment = TextAlignment.CenterLeft,
                                TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                                TextSize = 14,
                            };
                            takebackrowlayout.AddChidren(btntakeback);

@@ -1792,6 +1810,7 @@
                            TextID = MyInternationalizationString.open,
                            TextAlignment = TextAlignment.CenterLeft,
                            TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                            TextSize = 14,
                        };
                        openrowlayout.AddChidren(btnopen);

@@ -1879,6 +1898,7 @@
                            Width = Application.GetRealWidth(600),
                            TextAlignment = TextAlignment.CenterLeft,
                            TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                            TextSize = 14,
                        };
                        closerowlayout.AddChidren(btnclose);


 ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs

@@ -34,7 +34,7 @@

            var titleName = new Button
            {
                TextSize = 16,
                TextSize = 17,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                TextAlignment = TextAlignment.CenterLeft,
                X = Application.GetRealWidth(176),
@@ -132,6 +132,7 @@
                    Text = user.UserName,
                    TextAlignment = TextAlignment.CenterLeft,
                    TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                    TextSize = 14,
                };
                userRow.AddChidren(userBtn);

@@ -189,6 +190,7 @@
                        Width = Application.GetRealWidth(200),
                        X = Application.GetRealWidth(80),
                        TextAlignment = TextAlignment.CenterLeft,
                        TextSize = 14,
                    };
                    lockRow.AddChidren(Btncancel);
                    Btncancel.MouseUpEventHandler += (sender16, e16) =>
@@ -217,6 +219,7 @@
                        Width = Application.GetRealWidth(200),
                        TextAlignment = TextAlignment.CenterRight,
                        X = Btntitle.Right + Application.GetRealWidth(100),
                        TextSize = 14,

                    };
                    lockRow.AddChidren(Btncomplete);
@@ -251,6 +254,7 @@
                            TextAlignment = TextAlignment.CenterLeft,
                            TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                            Text= userifon.ModeName,
                            TextSize = 14,
                        };
                        doorlockRow.AddChidren(doorlockBtn);
                        //(1按键/3卡/15指纹)

 ZigbeeApp/Shared/Phone/Device/Logic/SecurityMode.cs

@@ -32,7 +32,7 @@

            var titleName = new Button
            {
                TextSize = 16,
                TextSize = 17,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                TextAlignment = TextAlignment.CenterLeft,
                X = Application.GetRealWidth(176),
@@ -130,6 +130,8 @@
                Text = Language.StringByID(MyInternationalizationString.logicathomegarrison),
                TextAlignment = TextAlignment.CenterLeft,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                TextSize = 15,

            };
            athomedefenceRowLayout.AddChidren(btnathomedefence);
            var athomedefenceSelected = new SelectedButton(789);
@@ -174,6 +176,7 @@
                Text = Language.StringByID(MyInternationalizationString.logicremovehomegarrison),
                TextAlignment = TextAlignment.CenterLeft,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                TextSize = 15,

            };
            leavehomedefenceRowLayout.AddChidren(leavehomebtndefence);
@@ -223,6 +226,7 @@
                TextAlignment = TextAlignment.CenterLeft,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                TextID = MyInternationalizationString.withdrawal,
                TextSize = 15,

            };
            withdrawalRowLayout.AddChidren(btnwithdrawal);
@@ -267,6 +271,7 @@
                TextID = MyInternationalizationString.urgentwithdrawal,
                TextAlignment = TextAlignment.CenterLeft,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                TextSize = 15,
            };
            urgentwithdrawalRowLayout.AddChidren(btnurgentwithdrawal);


 ZigbeeApp/Shared/Phone/Device/Logic/Send.cs

@@ -841,7 +841,7 @@

        public static async System.Threading.Tasks.Task<string> ReadUserList(string doorlockMac)
        {
            string s = null; 
            string s = null;
            var str = await WebClientAsync(0, CommonPage.RequestHttpsHost+"/App/GetHomePager");//不同区域域名前缀不一样
           // var str = await WebClientAsync(0, "https://global.hdlcontrol.com/HangZhouHdlCloudApi/App/GetHomePager");
            var jObject = JObject.Parse(str);
@@ -886,7 +886,7 @@
            }
            return s;
        }
     

        public static async System.Threading.Tasks.Task<string> ReadUserDoorLock(Residential residential)
        {

@@ -922,7 +922,7 @@
            if (value == 0)
            {
                postValues.Add("RequestVersion", CommonPage.RequestVersion);
                postValues.Add("ReqDto.LoginAccessToken", Config.Instance.Token);

                postValues.Add("ReqDto.LoginAccessToken", Config.Instance.Token);
                postValues.Add("ReqDto.PageSetting.PageSize", Int32.MaxValue.ToString());//

            }
@@ -939,7 +939,7 @@
                postValues.Add("LoginAccessToken", residential.Token);
                postValues.Add("HomeId", residential.Id);
                postValues.Add("DoorLockId", residential.doorlockmac);//门锁Mac
                postValues.Add("IsOtherAccountCtrl", residential.IsOtherAccountCtrl.ToString());

                postValues.Add("IsOtherAccountCtrl", residential.IsOtherAccountCtrl.ToString());
                postValues.Add("PageSetting.PageSize", Int32.MaxValue.ToString());
            }
            System.Net.WebClient webClient = new System.Net.WebClient();
@@ -972,7 +972,7 @@
            public string doorlockmac;
        }

        public class MembershipIfon 
        public class MembershipIfon
        {
            /// <summary>
            /// 识别用户身份
@@ -1036,12 +1036,10 @@

        }


        /// <summary>
        /// 门锁列表
        /// </summary>
        public static List<MembershipIfon> LockList = new List<MembershipIfon>();

        /// <summary>
        /// 当前门锁
        /// </summary>

 ZigbeeApp/Shared/Phone/Device/Logic/TemplateDeviceAction.cs

@@ -39,7 +39,7 @@

            var titleName = new Button
            {
                TextSize = 16,
                TextSize = 17,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                TextAlignment = TextAlignment.CenterLeft,
                X = Application.GetRealWidth(160),
@@ -89,6 +89,7 @@
                Y = Application.GetRealHeight(92),
                //TextID = MyInternationalizationString.customroom,
                Text = Config.Instance.Home.GetCurrentFloorName,
                TextSize = 14,
            };
            topRowLayout.AddChidren(foolrname);
            var dropdown = new Button
@@ -190,6 +191,7 @@
                    TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                    X = Application.GetRealWidth(80),
                    TextID = MyInternationalizationString.selecfoolr,
                    TextSize = 14,
                };
                foolrbjicon.AddChidren(btnfoolrtext);

@@ -231,6 +233,7 @@
                        TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
                        Tag = foolr.Key,
                        X = btnfoolricon.Right + Application.GetRealWidth(12),
                        TextSize = 14,
                    };
                    foolrRowLayout.AddChidren(btnfoolrname);
                    if (foolrname.Text == foolr.Value)
@@ -606,6 +609,7 @@
                    TextAlignment = TextAlignment.CenterLeft,
                    TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                    SelectedTextColor = ZigbeeColor.Current.LogicAddColor,
                    TextSize = 14,
                };
                deviceRow.AddChidren(devicename);
                switch (common.CommonDevice.Type)
@@ -719,6 +723,7 @@
                Width = Application.GetRealWidth(200),
                X = Application.GetRealWidth(80),
                TextAlignment = TextAlignment.CenterLeft,
                TextSize = 14,
            };
            timetype.AddChidren(Btncancel);
            Btncancel.MouseUpEventHandler += (sender16, e16) =>
@@ -747,6 +752,7 @@
                Width = Application.GetRealWidth(200),
                TextAlignment = TextAlignment.CenterRight,
                X = Btntitle.Right + Application.GetRealWidth(50),
                TextSize = 14,

            };
            timetype.AddChidren(Btncomplete);
@@ -831,6 +837,7 @@
                            TextID = MyInternationalizationString.open,
                            TextAlignment = TextAlignment.CenterLeft,
                            TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                            TextSize = 14,
                        };
                        openrowlayout.AddChidren(btnopen);

@@ -861,6 +868,7 @@
                            Width = Application.GetRealWidth(600),
                            TextAlignment = TextAlignment.CenterLeft,
                            TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                            TextSize = 14,
                        };
                        closerowlayout.AddChidren(btnclose);

@@ -891,6 +899,7 @@
                            Width = Application.GetRealWidth(600),
                            TextAlignment = TextAlignment.CenterLeft,
                            TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                            TextSize = 14,
                        };
                        takebackrowlayout.AddChidren(btntakeback);

@@ -1041,6 +1050,7 @@
                            TextID = MyInternationalizationString.open,
                            TextAlignment = TextAlignment.CenterLeft,
                            TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                            TextSize = 14,
                        };
                        openrowlayout.AddChidren(btnopen);

@@ -1097,6 +1107,7 @@
                            Width = Application.GetRealWidth(600),
                            TextAlignment = TextAlignment.CenterLeft,
                            TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                            TextSize = 14,
                        };
                        closerowlayout.AddChidren(btnclose);

@@ -1128,6 +1139,7 @@
                            Width = Application.GetRealWidth(600),
                            TextAlignment = TextAlignment.CenterLeft,
                            TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                            TextSize = 14,
                        };
                        takebackrowlayout.AddChidren(btntakeback);

@@ -1335,6 +1347,7 @@
                            TextID = MyInternationalizationString.open,
                            TextAlignment = TextAlignment.CenterLeft,
                            TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                            TextSize = 14,
                        };
                        openrowlayout.AddChidren(btnopen);

@@ -1392,6 +1405,7 @@
                            Width = Application.GetRealWidth(600),
                            TextAlignment = TextAlignment.CenterLeft,
                            TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                            TextSize = 14,
                        };
                        closerowlayout.AddChidren(btnclose);

@@ -1569,6 +1583,7 @@
                                TextID = MyInternationalizationString.open,
                                TextAlignment = TextAlignment.CenterLeft,
                                TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                                TextSize = 14,
                            };
                            openrowlayout.AddChidren(btnopen);

@@ -1599,6 +1614,7 @@
                                Width = Application.GetRealWidth(600),
                                TextAlignment = TextAlignment.CenterLeft,
                                TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                                TextSize = 14,
                            };
                            closerowlayout.AddChidren(btnclose);

@@ -1629,6 +1645,7 @@
                                Width = Application.GetRealWidth(600),
                                TextAlignment = TextAlignment.CenterLeft,
                                TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                                TextSize = 14,
                            };
                            takebackrowlayout.AddChidren(btntakeback);

@@ -1788,6 +1805,7 @@
                            TextID = MyInternationalizationString.open,
                            TextAlignment = TextAlignment.CenterLeft,
                            TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                            TextSize = 14,
                        };
                        openrowlayout.AddChidren(btnopen);

@@ -1875,6 +1893,7 @@
                            Width = Application.GetRealWidth(600),
                            TextAlignment = TextAlignment.CenterLeft,
                            TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                            TextSize = 14,
                        };
                        closerowlayout.AddChidren(btnclose);


 ZigbeeApp/Shared/Phone/Device/Logic/TemplateDeviceCondition.cs

@@ -40,7 +40,7 @@

            var titleName = new Button
            {
                TextSize = 16,
                TextSize = 17,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                TextAlignment = TextAlignment.CenterLeft,
                X = Application.GetRealWidth(160),
@@ -90,6 +90,7 @@
                Y = Application.GetRealHeight(92),
                // TextID = MyInternationalizationString.customroom,
                Text = Config.Instance.Home.GetCurrentFloorName,
                TextSize = 14,
            };
            topRowLayout.AddChidren(foolrname);
            var dropdown = new Button
@@ -187,6 +188,7 @@
                    TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                    X = Application.GetRealWidth(80),
                    TextID = MyInternationalizationString.selecfoolr,
                    TextSize = 14,
                };
                foolrbjicon.AddChidren(btnfoolrtext);

@@ -228,6 +230,7 @@
                        TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
                        Tag = foolr.Key,
                        X = btnfoolricon.Right + Application.GetRealWidth(12),
                        TextSize = 14,
                    };
                    foolrRowLayout.AddChidren(btnfoolrname);
                    if (foolrname.Text == foolr.Value)
@@ -634,6 +637,7 @@
                    TextAlignment = TextAlignment.CenterLeft,
                    TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                    SelectedTextColor = ZigbeeColor.Current.LogicAddColor,
                    TextSize = 14,
                };
                deviceRow.AddChidren(devicename);
                switch (common.CommonDevice.Type)
@@ -753,6 +757,7 @@
                Width = Application.GetRealWidth(200),
                X = Application.GetRealWidth(80),
                TextAlignment = TextAlignment.CenterLeft,
                TextSize = 14,
            };
            timetype.AddChidren(Btncancel);
            Btncancel.MouseUpEventHandler += (sender16, e16) =>
@@ -781,6 +786,7 @@
                Width = Application.GetRealWidth(200),
                TextAlignment = TextAlignment.CenterRight,
                X = Btntitle.Right + Application.GetRealWidth(50),
                TextSize = 14,

            };
            timetype.AddChidren(Btncomplete);
@@ -806,254 +812,6 @@
            }
            switch (common.Type)
            {
                ///灯光
                case DeviceType.OnOffOutput:
                    {
                        dictionary(deviceConditionsInfo, "Cluster_ID", "6");
                        dictionary(deviceConditionsInfo, "AttriButeId", "0");
                        dictionary(deviceConditionsInfo, "Range", "1");
                        dictionary(deviceConditionsInfo, "AttriButeData2", "0");

                        #region  灯光View



                        var openframelayout = new FrameLayout
                        {
                            Height = Application.GetRealHeight(160),
                            Y = timetype.Bottom + Application.GetRealHeight(20),
                        };
                        devicefra.AddChidren(openframelayout);

                        var openrowlayout = new RowLayout
                        {
                            Y = Application.GetRealHeight(30),
                            Width = Application.GetRealWidth(920),
                            Height = Application.GetRealHeight(130),
                            X = Application.GetRealWidth(80),
                            LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
                        };
                        openframelayout.AddChidren(openrowlayout);

                        var btnopen = new Button
                        {
                            Width = Application.GetRealWidth(600),
                            TextID = MyInternationalizationString.open,
                            TextAlignment = TextAlignment.CenterLeft,
                            TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                        };
                        openrowlayout.AddChidren(btnopen);

                        var openBtnSelected = new SelectedButton();
                        openrowlayout.AddChidren(openBtnSelected);


                        var closeframelayout = new FrameLayout
                        {
                            Height = Application.GetRealHeight(160),
                            Y = openframelayout.Bottom,
                        };
                        devicefra.AddChidren(closeframelayout);
                        var closerowlayout = new RowLayout
                        {
                            Y = Application.GetRealHeight(30),
                            Width = Application.GetRealWidth(920),
                            Height = Application.GetRealHeight(130),
                            X = Application.GetRealWidth(80),
                            LineColor = ZigbeeColor.Current.LogicBackgroundColor,
                        };
                        closeframelayout.AddChidren(closerowlayout);

                        var btnclose = new Button
                        {
                            //Text = "关",
                            TextID = MyInternationalizationString.close,
                            Width = Application.GetRealWidth(600),
                            TextAlignment = TextAlignment.CenterLeft,
                            TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                        };
                        closerowlayout.AddChidren(btnclose);

                        var closeBtnSelected = new SelectedButton();
                        closerowlayout.AddChidren(closeBtnSelected);
                        #endregion

                        ///点击确认事件
                        EventHandler<MouseEventArgs> openclick = (sender, e) =>
                        {
                            openBtnSelected.Visible = true;
                            closeBtnSelected.Visible = false;
                            btnopen.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
                            btnclose.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
                            SelectedDeviceStatuscondition = "OnOffOutput";
                            dictionary(deviceConditionsInfo, "AttriButeData1", "1");//默认值


                        };
                        openrowlayout.MouseUpEventHandler += openclick;
                        btnopen.MouseUpEventHandler += openclick;
                        openBtnSelected.MouseUpEventHandler += openclick;
                        openframelayout.MouseUpEventHandler += openclick;
                        ///点击取消事件
                        EventHandler<MouseEventArgs> closeclick = (sender, e) =>
                        {
                            btnopen.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
                            btnclose.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
                            openBtnSelected.Visible = false;
                            closeBtnSelected.Visible = true;
                            SelectedDeviceStatuscondition = "OnOffOutput";
                            dictionary(deviceConditionsInfo, "AttriButeData1", "0");//默认值

                        };
                        closerowlayout.MouseUpEventHandler += closeclick;
                        btnclose.MouseUpEventHandler += closeclick;
                        closeBtnSelected.MouseUpEventHandler += closeclick;
                        closeframelayout.MouseUpEventHandler += closeclick;
                        if (edit && devices != null)
                        {
                            if (devices["AttriButeId"] == "0")
                            {
                                if (devices["AttriButeData1"] == "1")
                                {
                                    btnopen.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
                                    btnclose.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
                                    openBtnSelected.Visible = true;
                                    closeBtnSelected.Visible = false;
                                }
                                else
                                {
                                    btnopen.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
                                    btnclose.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
                                    openBtnSelected.Visible = false;
                                    closeBtnSelected.Visible = true;

                                }
                            }
                        }
                    }
                    break;
                case DeviceType.WindowCoveringDevice:
                    {

                        dictionary(deviceConditionsInfo, "Cluster_ID", "258");
                        dictionary(deviceConditionsInfo, "AttriButeId", "8");
                        dictionary(deviceConditionsInfo, "Range", "0");
                        dictionary(deviceConditionsInfo, "AttriButeData2", "0");

                        #region 窗帘View
                        devicefra.Y = Application.GetRealHeight(1920 - 30 - 720);
                        devicefra.Height = Application.GetRealHeight(720);
                        var windowCoveringfra = new FrameLayout
                        {
                            Y = Application.GetRealHeight(180),
                            Height = Application.GetRealHeight(180 * 2 + 30),
                        };
                        devicefra.AddChidren(windowCoveringfra);

                        var openrowlayout = new RowLayout
                        {
                            Height = Application.GetRealHeight(180),
                        };
                        windowCoveringfra.AddChidren(openrowlayout);

                        var btnopen = new Button
                        {
                            //Text = "开",
                            TextID = MyInternationalizationString.open,
                            TextAlignment = TextAlignment.CenterLeft,
                            X = Application.GetRealWidth(50),
                            Width = Application.GetRealWidth(300),
                            Height = Application.GetRealHeight(180),
                            //SelectedBackgroundColor = 0xfffe5e00,
                            TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                        };
                        openrowlayout.AddChidren(btnopen);

                        var openBtnSelected = new Button
                        {
                            X = Application.GetRealWidth(1000 - 150),
                            Width = Application.GetMinRealAverage(110),
                            Height = Application.GetMinRealAverage(110),
                            UnSelectedImagePath = "Item/YesSelected.png",
                            Visible = false,
                            Gravity = Gravity.CenterVertical
                        };
                        openrowlayout.AddChidren(openBtnSelected);

                        var closerowlayout = new RowLayout
                        {
                            Y = openrowlayout.Bottom,
                            Height = Application.GetRealHeight(180),
                        };
                        windowCoveringfra.AddChidren(closerowlayout);

                        var btnclose = new Button
                        {
                            //Text = "关",
                            TextID = MyInternationalizationString.close,
                            TextAlignment = TextAlignment.CenterLeft,
                            X = Application.GetRealWidth(50),
                            Width = Application.GetRealWidth(300),
                            Height = Application.GetRealHeight(180),
                            TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                        };
                        closerowlayout.AddChidren(btnclose);

                        var closeBtnSelected = new Button
                        {
                            X = Application.GetRealWidth(1000 - 150),
                            Width = Application.GetMinRealAverage(110),
                            Height = Application.GetMinRealAverage(110),
                            UnSelectedImagePath = "Item/YesSelected.png",
                            Visible = false,
                            Gravity = Gravity.CenterVertical
                        };
                        closerowlayout.AddChidren(closeBtnSelected);
                        #endregion

                        ///点击确认事件
                        EventHandler<MouseEventArgs> openclick = (sender, e) =>
                        {
                            SelectedDeviceStatuscondition = "WindowCoveringDevice";
                            openBtnSelected.Visible = true;
                            closeBtnSelected.Visible = false;
                            dictionary(deviceConditionsInfo, "AttriButeData1", "95");//默认值

                        };
                        openrowlayout.MouseUpEventHandler += openclick;
                        btnopen.MouseUpEventHandler += openclick;
                        openBtnSelected.MouseUpEventHandler += openclick;
                        ///点击取消事件
                        EventHandler<MouseEventArgs> closeclick = (sender, e) =>
                        {
                            SelectedDeviceStatuscondition = "WindowCoveringDevice";
                            openBtnSelected.Visible = false;
                            closeBtnSelected.Visible = true;
                            dictionary(deviceConditionsInfo, "AttriButeData1", "5");//默认值

                        };
                        closerowlayout.MouseUpEventHandler += closeclick;
                        btnclose.MouseUpEventHandler += closeclick;
                        closeBtnSelected.MouseUpEventHandler += closeclick;

                        if (edit && devices != null)
                        {
                            if (devices["AttriButeId"] == "8")
                            {
                                if (int.Parse(devices["AttriButeData1"]) > 5)
                                {
                                    openBtnSelected.Visible = true;
                                    closeBtnSelected.Visible = false;
                                }
                                else
                                {
                                    openBtnSelected.Visible = false;
                                    closeBtnSelected.Visible = true;
                                }
                            }
                        }
                    }
                    break;
                case DeviceType.IASZone:
                    {

@@ -1092,6 +850,7 @@
                            TextID = MyInternationalizationString.open,
                            TextAlignment = TextAlignment.CenterLeft,
                            TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                            TextSize = 14,
                        };
                        openrowlayout.AddChidren(btnopen);

@@ -1122,6 +881,7 @@
                            Width = Application.GetRealWidth(600),
                            TextAlignment = TextAlignment.CenterLeft,
                            TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                            TextSize = 14,
                        };
                        closerowlayout.AddChidren(btnclose);

@@ -1357,75 +1117,6 @@

                        }

                    }
                    break;
                case DeviceType.OnOffSwitch:
                    {

                        dictionary(deviceConditionsInfo, "Cluster_ID", "1282");
                        dictionary(deviceConditionsInfo, "AttriButeId", "1283");
                        dictionary(deviceConditionsInfo, "Range", "0");//按键特殊
                        dictionary(deviceConditionsInfo, "AttriButeData1", "0");
                        dictionary(deviceConditionsInfo, "AttriButeData2", "0");

                        devicefra.Y = Application.GetRealHeight(1920 - 140 - 160 - 20 - 50);
                        devicefra.Height = Application.GetRealHeight(140 + 160 + 20 + 50);
                        var OnOffOutputfra = new FrameLayout
                        {
                            Height = Application.GetRealHeight(160),
                            Y = timetype.Bottom + Application.GetRealHeight(20),
                        };
                        devicefra.AddChidren(OnOffOutputfra);

                        var buttonRow = new RowLayout
                        {
                            Y = Application.GetRealHeight(30),
                            Width = Application.GetRealWidth(920),
                            Height = Application.GetRealHeight(130),
                            X = Application.GetRealWidth(80),
                            LineColor = ZigbeeColor.Current.LogicBackgroundColor,
                        };
                        OnOffOutputfra.AddChidren(buttonRow);

                        var button = new Button
                        {
                            Width = Application.GetRealWidth(600),
                            TextAlignment = TextAlignment.CenterLeft,
                            TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                            Text = Language.StringByID(MyInternationalizationString.OnOffSwitch) + common.DeviceEpoint.ToString(),
                            //SelectedBackgroundColor = 0xfffe5e00,
                        };
                        buttonRow.AddChidren(button);

                        var buttonSelected = new SelectedButton();
                        buttonRow.AddChidren(buttonSelected);
                        EventHandler<MouseEventArgs> buttonclick = (sender, e) =>
                        {
                            buttonSelected.Visible = true;
                            SelectedDeviceStatuscondition = "OnOffSwitch";
                            button.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;

                        };
                        buttonRow.MouseUpEventHandler += buttonclick;
                        button.MouseUpEventHandler += buttonclick;
                        buttonSelected.MouseUpEventHandler += buttonclick;
                        OnOffOutputfra.MouseUpEventHandler += buttonclick;

                        if (edit && devices != null)
                        {
                            buttonSelected.Visible = true;
                            button.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
                        }

                    }
                    break;
                case DeviceType.DoorLock:
                    {
                        flMain.RemoveFromParent();
                        var memberList = new MemberList();
                        UserView.HomePage.Instance.AddChidren(memberList);
                        UserView.HomePage.Instance.PageIndex += 1;
                        memberList.Show(common);
                    }
                    break;


 ZigbeeApp/Shared/Phone/Device/Logic/TemplateIgnore.cs

@@ -28,7 +28,7 @@

            var titleName = new Button
            {
                TextSize = 16,
                TextSize = 17,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                TextAlignment = TextAlignment.CenterLeft,
                X = Application.GetRealWidth(176),
@@ -113,6 +113,7 @@
                    TextAlignment = TextAlignment.CenterLeft,
                    TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                    Tag = intvalue,
                    TextSize = 15,
                };
                timeRow.AddChidren(timeBtn);

@@ -194,6 +195,7 @@
                BackgroundColor = ZigbeeColor.Current.LogicBtnSaveBackgroundColor,
                TextID = MyInternationalizationString.Save,
                TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor,
                TextSize = 16,
            };
            saveFrameLayout.AddChidren(btnsave);
            btnsave.MouseUpEventHandler += (sender, e) =>

 ZigbeeApp/Shared/Phone/Device/Logic/TemplatePage.cs

@@ -36,7 +36,7 @@

            var titleName = new Button
            {
                TextSize = 16,
                TextSize = 17,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                TextAlignment = TextAlignment.CenterLeft,
                X = Application.GetRealWidth(176),
@@ -131,6 +131,7 @@
                TextID = MyInternationalizationString.automationname,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                Y = Application.GetRealHeight(35),
                TextSize = 15,
            };
            logicnamefl.AddChidren(text);

@@ -142,7 +143,7 @@
                X = text.Right,
                TextAlignment = TextAlignment.CenterLeft,
                TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
                TextSize = 13,
                TextSize = 14,
                Text = Common.Logic.CurrentLogic.LogicName,
                //TextID=MyInternationalizationString.automation1,
            };
@@ -185,7 +186,7 @@
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                Width = Application.GetRealWidth(300),
                Height = Application.GetRealHeight(60),
                TextSize = 16,
                TextSize = 15,
                Gravity = Gravity.CenterVertical,
            });

@@ -301,6 +302,7 @@
                        TextColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
                        TextID = MyInternationalizationString.addconditions,
                        X = Application.GetRealWidth(390),
                        TextSize = 14,
                    };
                    addfl.AddChidren(addtextbtn);

@@ -374,6 +376,7 @@
                                    TextAlignment = TextAlignment.CenterLeft,
                                    Text = deviceinof.DeviceEpointName,
                                    TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                                    TextSize = 14,
                                };
                                conditionsRowLayout.AddChidren(btndevice);

@@ -416,6 +419,7 @@
                                    TextAlignment = TextAlignment.CenterRight,
                                    X = Application.GetRealWidth(400),
                                    TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
                                    TextSize = 14,
                                };
                                conditionsRowLayout.AddChidren(devicestatus);

@@ -532,7 +536,7 @@
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                Width = Application.GetRealWidth(300),
                Height = Application.GetRealHeight(60),
                TextSize = 16,
                TextSize = 15,
                Gravity = Gravity.CenterVertical,
            };
            targetRowLayout.AddChidren(btntargettitle);
@@ -602,6 +606,7 @@
                        TextColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
                        TextID = MyInternationalizationString.addfunction,
                        X = Application.GetRealWidth(390),
                        TextSize = 14,
                    };
                    addfl.AddChidren(addtextbtn);
                    EventHandler<MouseEventArgs> addfunctionclick = (sender, e) =>
@@ -672,6 +677,7 @@
                                    TextAlignment = TextAlignment.CenterLeft,
                                    Text = deviceinof.DeviceEpointName,
                                    TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                                    TextSize = 14,
                                };
                                actionsrowLayout.AddChidren(btndevicename);

@@ -697,6 +703,7 @@
                                    TextAlignment = TextAlignment.CenterRight,
                                    X = Application.GetRealWidth(450),
                                    TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
                                    TextSize = 14,
                                };
                                actionsrowLayout.AddChidren(devicestatus);

@@ -1033,6 +1040,7 @@
                Width = Application.GetRealWidth(300),
                Height = Application.GetRealHeight(60),
                Gravity = Gravity.CenterVertical,
                TextSize = 14,
            };
            weekRowLayout.AddChidren(settxet);
            var btnweektext = new Button
@@ -1045,6 +1053,7 @@
                TextID = MyInternationalizationString.everyday,
                Y = Application.GetRealHeight(35),
                X = settxet.Right,
                TextSize = 14,
            };
            weekRowLayout.AddChidren(btnweektext);

@@ -1105,6 +1114,7 @@
                Height = Application.GetRealHeight(60),
                Gravity = Gravity.CenterVertical,
                TextID = MyInternationalizationString.pushswitch,
                TextSize = 14,
            };
            pushswitchRowlayout.AddChidren(btnswitchtxet);

@@ -1157,6 +1167,7 @@
                Width = Application.GetRealWidth(300),
                Height = Application.GetRealHeight(60),
                Gravity = Gravity.CenterVertical,
                TextSize = 14,
            };
            custompushRowLayout.AddChidren(btncustompush);

@@ -1559,6 +1570,7 @@
                Width = Application.GetRealWidth(200),
                X = Application.GetRealWidth(80),
                TextAlignment = TextAlignment.CenterLeft,
                TextSize = 14,
            };
            timetype.AddChidren(Btncancel);
            Btncancel.MouseUpEventHandler += (sender16, e16) =>
@@ -1586,6 +1598,7 @@
                Width = Application.GetRealWidth(200),
                TextAlignment = TextAlignment.CenterRight,
                X = Btntitle.Right + Application.GetRealWidth(100),
                TextSize = 14,

            };
            timetype.AddChidren(Btncomplete);
@@ -1621,6 +1634,7 @@
                TextID = MyInternationalizationString.Allconditions,
                TextAlignment = TextAlignment.CenterLeft,
                TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                TextSize = 14,

            };
            androw.AddChidren(andbtn);
@@ -1656,6 +1670,7 @@
                TextID = MyInternationalizationString.anycondition,
                TextAlignment = TextAlignment.CenterLeft,
                TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                TextSize = 14,
            };
            orrow.AddChidren(orbtn);


 ZigbeeApp/Shared/Phone/Device/Logic/TimePage.cs

@@ -32,7 +32,7 @@

            var titleName = new Button
            {
                TextSize = 16,
                TextSize = 17,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                TextAlignment = TextAlignment.CenterLeft,
                X = Application.GetRealWidth(176),
@@ -98,6 +98,7 @@
                BackgroundColor = ZigbeeColor.Current.LogicBtnSaveBackgroundColor,
                TextID = MyInternationalizationString.Save,
                TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor,
                TextSize = 16,
            };
            fra.AddChidren(btnsave);
            #endregion
@@ -129,7 +130,8 @@
                Text = Language.StringByID(MyInternationalizationString.type),
                TextAlignment = TextAlignment.CenterLeft,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                Width = Application.GetRealWidth(265)
                Width = Application.GetRealWidth(265),
                TextSize = 14,
            };
            typeRowlayout.AddChidren(btnTypeTextTitle);
            
@@ -142,6 +144,7 @@
                TextAlignment = TextAlignment.CenterRight,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                TextID = MyInternationalizationString.timeframe,
                TextSize = 14,
            };
            typeRowlayout.AddChidren(btnimmediateexecution);

@@ -183,7 +186,8 @@
                Text = Language.StringByID(MyInternationalizationString.starttime),
                TextAlignment = TextAlignment.CenterLeft,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                Width = Application.GetRealWidth(265)
                Width = Application.GetRealWidth(265),
                TextSize = 14,

            };
            timestartrow.AddChidren(btnstarttimetext);
@@ -196,6 +200,7 @@
                TextAlignment = TextAlignment.CenterRight,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                Tag = "0",
                TextSize = 14,
            };
            timestartrow.AddChidren(btnstarttime);

@@ -235,6 +240,7 @@
                TextAlignment = TextAlignment.CenterLeft,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                Width = Application.GetRealWidth(265),
                TextSize = 14,

            };
            timeendrow.AddChidren(btnendtimetext);

 ZigbeeApp/Shared/Phone/Device/Logic/TimePoint.cs

@@ -80,7 +80,7 @@

            var titleName = new Button
            {
                TextSize = 16,
                TextSize = 17,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                TextAlignment = TextAlignment.CenterLeft,
                X = Application.GetRealWidth(176),
@@ -165,7 +165,8 @@
                Text = Language.StringByID(MyInternationalizationString.type),
                TextAlignment = TextAlignment.CenterLeft,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                Width = Application.GetRealWidth(265)
                Width = Application.GetRealWidth(265),
                TextSize = 14,
            };
            typeRowlayout.AddChidren(btnTypeTextTitle);

@@ -179,6 +180,7 @@
                TextAlignment = TextAlignment.CenterRight,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                TextID=MyInternationalizationString.immediateexecution,
                TextSize = 14,
            };
            typeRowlayout.AddChidren(btnimmediateexecution);

@@ -223,7 +225,8 @@
                Text = Language.StringByID(MyInternationalizationString.moment),
                TextAlignment = TextAlignment.CenterLeft,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                Width=Application.GetRealWidth(265)
                Width=Application.GetRealWidth(265),
                TextSize = 14,
            };
            rowSelectedTimeType.AddChidren(btnTimeText);
            
@@ -236,6 +239,7 @@
                Width = Application.GetRealWidth(630),
                TextAlignment = TextAlignment.CenterRight,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                TextSize = 14,
            };
            rowSelectedTimeType.AddChidren(btnTimeTpye);

@@ -380,7 +384,8 @@
                    Text = Language.StringByID(MyInternationalizationString.Advancedelay),
                    TextAlignment = TextAlignment.CenterLeft,
                    TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                    Width = Application.GetRealWidth(265)
                    Width = Application.GetRealWidth(265),
                    TextSize = 14,
                };
                rowDelayType.AddChidren(btnDelayTimeText);

@@ -394,6 +399,7 @@
                    TextAlignment = TextAlignment.CenterRight,
                    TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                    Text = textvalue,
                    TextSize = 14,
                };
                rowDelayType.AddChidren(btnDelayTime);

@@ -517,6 +523,7 @@
                BackgroundColor =ZigbeeColor.Current.LogicBtnSaveBackgroundColor,
                TextID = MyInternationalizationString.Save,
                TextColor= ZigbeeColor.Current.LogicBtnSaveTextColor,
                TextSize = 16,
            };
            fra.AddChidren(btnsave);
            btnsave.MouseUpEventHandler += (sender, e) =>
@@ -627,6 +634,7 @@
                Width = Application.GetRealWidth(200),
                X = Application.GetRealWidth(80),
                TextAlignment = TextAlignment.CenterLeft,
                TextSize = 14,
            };
            timetype.AddChidren(Btncancel);
            Btncancel.MouseUpEventHandler += (sender16, e16) =>
@@ -654,6 +662,7 @@
                Width = Application.GetRealWidth(200),
                TextAlignment = TextAlignment.CenterRight,
                X = Btntitle.Right + Application.GetRealWidth(100),
                TextSize = 14,

            };
            timetype.AddChidren(Btncomplete);
@@ -685,6 +694,7 @@
                TextID = MyInternationalizationString.sunrise,
                TextAlignment = TextAlignment.CenterLeft,
                TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                TextSize = 14,
            };
            sunriseRow.AddChidren(btnsunrisetext);

@@ -718,6 +728,7 @@
                TextID = MyInternationalizationString.sunset,
                TextAlignment = TextAlignment.CenterLeft,
                TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                TextSize = 14,
            };
            sunsetRow.AddChidren(btnsunsettext);

@@ -753,6 +764,7 @@
                TextID = MyInternationalizationString.noon,
                TextAlignment = TextAlignment.CenterLeft,
                TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                TextSize = 14,
            };
            noonRow.AddChidren(btnnoontext);

@@ -785,6 +797,7 @@
                TextID = MyInternationalizationString.logiccustom,
                TextAlignment = TextAlignment.CenterLeft,
                TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                TextSize = 14,
            };
            logiccustomRow.AddChidren(btnlogiccustomtext);


 ZigbeeApp/Shared/Phone/Device/Logic/WeekPage.cs

@@ -29,7 +29,7 @@

            var titleName = new Button
            {
                TextSize = 16,
                TextSize = 17,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                TextAlignment = TextAlignment.CenterLeft,
                X = Application.GetRealWidth(176),
@@ -92,6 +92,7 @@
                BackgroundColor = ZigbeeColor.Current.LogicBtnSaveBackgroundColor,
                TextID = MyInternationalizationString.Save,
                TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor,
                TextSize = 16,
            };
            saveFramelayout.AddChidren(saveBtn);

@@ -189,6 +190,7 @@
                    TextAlignment = TextAlignment.CenterLeft,
                    Text = name,
                    TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                    TextSize = 15,
                };
                weekRow.AddChidren(weekTextBtn);


 ZigbeeApp/Shared/Phone/Device/Room/AddDeviceList.cs

File was deleted

 ZigbeeApp/Shared/Phone/Device/Room/AddDevicesSameTypeList.cs

File was deleted

 ZigbeeApp/Shared/Phone/Device/Room/AddDevieDetailFromAddFunction.cs

File was deleted

 ZigbeeApp/Shared/Phone/Device/Room/AddRoom.cs

File was deleted

 ZigbeeApp/Shared/Phone/Device/Room/AddRoomContent.cs

File was deleted

 ZigbeeApp/Shared/Phone/Device/Room/AddRoomScene.cs

File was deleted

 ZigbeeApp/Shared/Phone/Device/Room/AddRoomSelectPicByLocal.cs

@@ -50,40 +50,38 @@
            };
            this.AddChidren(midFl);

            for (int i = 0; i < 25; i++)

            int k = 1;
            for (int j = 0; j < 2; j++)
            {
                var RoomRowView = new FrameLayout()
                var itemView = new FrameLayout()
                {
                    Height = Application.GetRealHeight(600),
                    Width = Application.GetRealWidth(CommonPage.AppRealWidth - CommonPage.XLeft * 2),
                    Gravity=Gravity.CenterHorizontal,
                    BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor,
                    Radius = CommonPage.BigFormRadius,
                    Height = Application.GetRealHeight(311 + CommonPage.XLeft)
                };
                midFl.AddChidren(RoomRowView);

                var backGroundBtn = new Button()
                midFl.AddChidren(itemView);
                for (int i = 0; i < 2; i++)
                {
                    Y = Application.GetRealHeight(50),
                    Width = Application.GetMinRealAverage(CommonPage.AppRealWidth - CommonPage.XLeft * 2),
                    Height = Application.GetMinRealAverage(550),
                    UnSelectedImagePath = "Room/r" + (i).ToString() + ".png",
                    Radius = CommonPage.BigFormRadius,
                    Gravity=Gravity.CenterHorizontal
                };
                RoomRowView.AddChidren(backGroundBtn);

                backGroundBtn.MouseUpEventHandler += (sender, e) =>
                {
                    if (AddRoom.room.BackgroundImageType == 1 || AddRoom.room.BackgroundImageType == 2)
                    var icon = new Button()
                    {
                        AddRoom.OldBackgroundImagePath = AddRoom.room.BackgroundImage;
                    }
                    //AddRoom.room.BackgroundImage = backGroundBtn.UnSelectedImagePath;
                    action?.Invoke(backGroundBtn.UnSelectedImagePath);
                    this.RemoveFromParent();
                };
                        X = Application.GetRealWidth(CommonPage.XLeft + i * (467 + 32)),
                        Width = Application.GetMinRealAverage(467),
                        Height = Application.GetMinRealAverage(311),
                        Gravity = Gravity.CenterVertical,
                        UnSelectedImagePath = $"RoomIcon/{k}.JPG",
                    };
                    itemView.AddChidren(icon);
                    k++;

                    EventHandler<MouseEventArgs> selectIcon = (sender, e) =>
                    {
                        action?.Invoke(icon.UnSelectedImagePath);
                        action = null;
                        this.RemoveFromParent();
                    };
                    icon.MouseUpEventHandler += selectIcon;
                }
            }

            #endregion
        }
    }

 ZigbeeApp/Shared/Phone/Device/Room/EditRoom.cs

@@ -33,7 +33,17 @@
        /// <summary>
        /// IconPathType
        /// </summary>
        public int IconPathType = 0;
        public int IconPathType;
        /// <summary>
        /// OldBackgroundImagePath
        /// </summary>
        private string OldBackgroundImagePath;

        /// <summary>
        /// OldIconPathType
        /// </summary>
        public int OldIconPathType;


        #endregion

@@ -49,6 +59,11 @@
        {
            room = r;
            IconPathType = r.BackgroundImageType;
            OldIconPathType= r.BackgroundImageType;
            if (IconPathType != 1)
            {
                OldBackgroundImagePath = r.BackgroundImage;
            }
            AddTop();

            AddBodyView();
@@ -383,6 +398,10 @@
                var tradeTime = DateTime.Now.ToString("yyyyMMddHHmmss", DateTimeFormatInfo.InvariantInfo);
                var fileName = $"Room_{tradeTime}";
                room.Name = nameRow.NameText.Text.Trim();
                if (OldIconPathType != 1)
                {
                    Shared.IO.FileUtils.DeleteFile(OldBackgroundImagePath);
                }
                if (IconPathType == 0)
                {
                    room.BackgroundImage = backGround.UnSelectedImagePath;
@@ -394,6 +413,7 @@
                }
                room.BackgroundImageType = IconPathType;
                room.Save();
                action?.Invoke();
                RemoveFromParent();
            };


 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/ProgressFormBar.cs

@@ -72,14 +72,6 @@
        /// </summary>

        private void InitProgressFormBar()

        {

            var nowForm = UserView.HomePage.Instance.GetChildren(UserView.HomePage.Instance.ChildrenCount - 1);

            if (nowForm == null || (nowForm is ViewGroup) == false)

            {

                //这种情况应该不存在

                var alert = new ShowMsgControl(ShowMsgType.Error, "ERROR:Not Found The ActionForm!");

                alert.Show();

                return;

            }

            //安卓可以点击系统的返回键

            this.oldScrollEnabled = UserView.HomePage.Instance.ScrollEnabled;

            UserView.HomePage.Instance.ScrollEnabled = false;

@@ -94,7 +86,7 @@
            //容器

            bodyFrameLayout = new FrameLayout();

            bodyFrameLayout.BackgroundColor = UserCenterColor.Current.DialogBackColor;

            ((ViewGroup)nowForm).AddChidren(bodyFrameLayout);

            Common.CommonPage.Instance.AddChidren(bodyFrameLayout);



            var frameBack = new FrameLayout();

            frameBack.Width = Application.GetRealWidth(674);


 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/FrameLayoutControls/FrameRowControl.cs

@@ -268,7 +268,7 @@
            {

                i_width = Application.GetRealWidth(i_width);

            }

            var btnContr = AddMostRightView(i_text, i_width, ControlCommonResourse.NormalControlHeight, false);

            var btnContr = AddMostRightView(i_text, i_width, this.Height, false);

            this.AddChidren(btnContr, ChidrenBindMode.BindEventOnly);

            if (chidrenYaxis != 0)

            {

@@ -295,7 +295,7 @@
            }

            var btnContr = new NormalViewControl(i_width, i_height, false);

            btnContr.X = this.Width - ControlCommonResourse.XXLeft - i_width - rightIconSize + RightOffset;

            btnContr.Height = this.Height;

            btnContr.Height = i_height;

            btnContr.TextAlignment = TextAlignment.CenterRight;

            btnContr.TextColor = UserCenterColor.Current.TextGrayColor1;

            btnContr.Text = i_text;


 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ListViewLayoutControls/VerticalFrameControl.cs

@@ -18,7 +18,18 @@
        /// <summary>

        /// 桌布控件

        /// </summary>

        private FrameLayout frameTable = null;

        private FrameLayout m_frameTable = null;

        /// <summary>

        /// 桌布控件

        /// </summary>

        public FrameLayout frameTable

        {

            get

            {

                if (m_frameTable == null) { this.InitFrameTable(); }

                return m_frameTable;

            }

        }



        #endregion



@@ -38,14 +49,14 @@
        /// </summary>

        private void InitFrameTable()

        {

            if (this.frameTable != null)

            if (this.m_frameTable != null)

            {

                return;

            }

            this.frameTable = new FrameLayout();

            this.frameTable.Width = this.Width;

            this.frameTable.Height = this.Height;

            this.AddChidren(this.frameTable);

            this.m_frameTable = new FrameLayout();

            this.m_frameTable.Width = this.Width;

            this.m_frameTable.Height = this.Height;

            this.AddChidren(this.m_frameTable);

        }



        #endregion

@@ -61,16 +72,16 @@
            //初始化桌布控件

            this.InitFrameTable();



            var child = this.frameTable.GetChildren(this.frameTable.ChildrenCount - 1);

            var child = this.m_frameTable.GetChildren(this.m_frameTable.ChildrenCount - 1);

            if (child != null)

            {

                frame.Y = child.Bottom + rowSpace;

            }

            this.frameTable.AddChidren(frame);

            this.m_frameTable.AddChidren(frame);

            //调整桌布高度

            if (this.frameTable.Height < frame.Bottom)

            if (this.m_frameTable.Height < frame.Bottom)

            {

                this.frameTable.Height = frame.Bottom;

                this.m_frameTable.Height = frame.Bottom;

            }

        }



@@ -101,14 +112,15 @@
        /// </summary>

        public void AdjustTableHeight()

        {

            var child = this.frameTable?.GetChildren(this.frameTable.ChildrenCount - 1);

            var child = this.m_frameTable?.GetChildren(this.m_frameTable.ChildrenCount - 1);

            if (child != null)

            {

                //调整桌布高度

                if (this.frameTable.Height < child.Bottom)

                {

                    this.frameTable.Height = child.Bottom;

                }

                this.m_frameTable.Height = child.Bottom;

                //if (this.m_frameTable.Height < child.Bottom)

                //{

                //    this.m_frameTable.Height = child.Bottom;

                //}

            }

        }



@@ -119,7 +131,7 @@
        public void AdjustRealHeightByBottomButton(int correctionsValue = 0)

        {

            var btnTemp = new BottomClickButton();

            if (btnTemp.Yaxis >= this.frameTable.Height + correctionsValue)

            if (btnTemp.Yaxis >= this.m_frameTable.Height + correctionsValue)

            {

                //没有超过

                return;


 ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceListMainForm.cs

@@ -798,6 +798,11 @@
            if (this.dicRowInfo.ContainsKey(deviceAddr) == false)

            {

                var localDevice = Common.LocalDevice.Current.GetDevicesByMac(deviceAddr);

                if (localDevice.Count == 0)

                {

                    //入网之后，又把它删了

                    return;

                }

                var rowNewInfo = new DeviceObjRowInfo();

                rowNewInfo.DeviceMac = deviceAddr;

                rowNewInfo.MacName = Common.LocalDevice.Current.GetDeviceMacName(localDevice[0]);

@@ -806,8 +811,6 @@


                //创建新的行

                this.AddDeviceMenuRow(deviceAddr);



                return;

            }

        }




 ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs

@@ -748,7 +748,7 @@
            btnNewVersion.UnSelectedImagePath = "Item/NewVersion.png";

            btnNewVersion.Visible = false;

            btnNewVersion.X = Application.GetRealWidth(242);

            btnNewVersion.Y= Application.GetRealHeight(23);

            btnNewVersion.Y = Application.GetRealHeight(23);

            rowUpDate.AddChidren(btnNewVersion, ChidrenBindMode.BindEventOnly);



            rowUpDate.ButtonClickEvent += (sender, e) =>

@@ -818,7 +818,7 @@
        /// 设备重命名

        /// </summary>

        /// <param name="i_deviceName">deviceName.</param>

        private async void DeviceReName(string i_deviceName,bool closeForm)

        private async void DeviceReName(string i_deviceName, bool closeForm)

        {

            //开启进度条

            this.ShowProgressBar();


 ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs

@@ -109,19 +109,107 @@
        }

        /// <summary>
        ///  获取门锁包含设备信息和账户信息
        ///  获取所有账户和门锁包含的信息
        /// </summary>
        public static async System.Threading.Tasks.Task<Dictionary<int, LocaDoorLockObj>> GetDoorLockAllAcountUserlist(ZigBee.Device.DoorLock doorLock)
        {
            return await System.Threading.Tasks.Task.Run((Func<System.Threading.Tasks.Task<Dictionary<int, LocaDoorLockObj>>>)(async () =>
            {
                doorLock.localDoorLockUserList.Clear();
                //1、读取门锁信息
                var getDoorLockInfo = await doorLock.GetDoorlockUserInfoAsync();

                //本地门锁列表处理
                foreach (var curAccountObj in doorLock.localAllAccountList)
                {
                    if (getDoorLockInfo == null)
                    {
                        doorLock.IsFailedToGetDoorLockInfo[curAccountObj.SubAccountDistributedMark] = true;
                    }
                    else
                    {
                        doorLock.IsFailedToGetDoorLockInfo[curAccountObj.SubAccountDistributedMark] = false;
                    }
                }
                // 用户信息处理
                if (getDoorLockInfo != null && getDoorLockInfo.doorLockUserDetailData != null)
                {
                    var dataList = getDoorLockInfo.doorLockUserDetailData.UserObjList;
                    foreach (var doorData in dataList)
                    {
                        var localDoorLockObj1 = new ZigBee.Device.DoorLock.LocaDoorLockObj()
                        {
                            UserID = doorData.UserId,
                            UnlockType = doorData.UserType
                        };
                        if ((doorLock.localDoorLockUserList.ContainsKey(localDoorLockObj1.UserID)) == false)
                        {
                            doorLock.localDoorLockUserList.Add(localDoorLockObj1.UserID, localDoorLockObj1);
                        }
                    }
                    //2、读取云端门锁信息  
                    var getDoorLockInfoList = await Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetDoorLockAllAccountInfolist(doorLock);
                    if (getDoorLockInfoList != null)
                    {
                        foreach (var curDoorLockUser in getDoorLockInfoList.PageData)
                        {
                            if (curDoorLockUser.DoorLockLocalUserId == null || curDoorLockUser.DoorLockLocalUserId == "")
                            {
                                continue;
                            }
                            if (doorLock.localDoorLockUserList.ContainsKey(int.Parse(curDoorLockUser.DoorLockLocalUserId)))
                            {
                                var doorLockObj = new ZigBee.Device.DoorLock.LocaDoorLockObj() { };
                                doorLockObj.UserID = int.Parse(curDoorLockUser.DoorLockLocalUserId);
                                doorLockObj.UnlockType = curDoorLockUser.OpenLockMode;
                                doorLockObj.PrimaryId = curDoorLockUser.Id;
                                doorLockObj.EntryTime = curDoorLockUser.EntryTime;
                                doorLockObj.UserName = curDoorLockUser.UserIdRemarks;
                                doorLockObj.ConnectedAccount = curDoorLockUser.CloudAccountId;
                                doorLock.localDoorLockUserList[int.Parse(curDoorLockUser.DoorLockLocalUserId)] = doorLockObj;
                            }
                            else
                            {
                                if (curDoorLockUser.DoorLockLocalUserId != null)
                                {
                                    //门锁中没有，云端有用户ID，后台删除云端这些ID
                                    var deleteDoorLockData = new ZigBee.Device.DoorLock.DeleteDoorLockData();
                                    if (UserCenterResourse.UserInfo.AuthorityNo != 1)
                                    {
                                        deleteDoorLockData.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
                                        deleteDoorLockData.IsOtherAccountCtrl = true;
                                    }
                                    if (doorLock.DeviceAddr != null)
                                    {
                                        deleteDoorLockData.DoorLockId = doorLock.DeviceAddr + "_" + doorLock.DeviceEpoint;
                                    }
                                    deleteDoorLockData.DoorLockLocalUserId = curDoorLockUser.DoorLockLocalUserId;
                                    deleteDoorLockData.PrimaryId = curDoorLockUser.Id;
                                    deleteDoorLockData.DelDoorLockDelType = 2;
                                    var result = await ZigBee.Device.DoorLock.SendDoorLockToServer("DoorLock/DelDoorLock", deleteDoorLockData);
                                }
                            }
                        }
                        doorLock.ReSave();
                    }
                }
                return doorLock.localDoorLockUserList;
            }));
        }

        /// <summary>
        ///  获取当前账户中门锁信息
        /// </summary>
        public static async System.Threading.Tasks.Task<Dictionary<int, LocaDoorLockObj>> GetLocaDoorLocklist(ZigBee.Device.DoorLock doorLock, Shared.Phone.UserCenter.MemberInfoRes curAccountObj)
        {
            return await System.Threading.Tasks.Task.Run((Func<System.Threading.Tasks.Task<Dictionary<int, LocaDoorLockObj>>>)(async () =>
             {
                 //  读取设备中的信息
                 //读取设备中的信息
                 doorLock.localDoorLockUserList.Clear();
                 var getDoorLockInfo = await doorLock.GetDoorlockUserInfoAsync();
                 if (getDoorLockInfo == null)
                 {
                     doorLock.IsFailedToGetDoorLockInfo[curAccountObj.SubAccountDistributedMark] = true;

                 }
                 else
                 {
@@ -197,7 +285,7 @@
        }

        /// <summary>
        ///  获取云端存储的门锁信息
        ///  获取当前账户中云端存储的门锁信息
        /// </summary>
        public static async System.Threading.Tasks.Task<Dictionary<int, LocaDoorLockObj>> GetCloudLocalDoorLocklist(ZigBee.Device.DoorLock doorLock, string subAccountDistributedMark)
        {
@@ -248,7 +336,7 @@
        }

        /// <summary>
        ///  获取云端存储的当前账户的门锁信息
        ///  获取云端存储的当前账户的门锁信
        /// </summary>
        public static async System.Threading.Tasks.Task<List<ZigBee.Device.DoorLock.CloudDoorLockObj>> GetAccountDoorLockUserList(ZigBee.Device.DoorLock doorLock, string subAccountDistributedMark)
        {
@@ -304,6 +392,31 @@
        }

        /// <summary>
        ///  获取当前账户门锁的所有信息
        /// </summary>
        public static async System.Threading.Tasks.Task<ZigBee.Device.DoorLock.GetDoorLockDataRes> GetDoorLockAllAccountInfolist(ZigBee.Device.DoorLock doorLock)
        {
            return await System.Threading.Tasks.Task.Run((Func<System.Threading.Tasks.Task<ZigBee.Device.DoorLock.GetDoorLockDataRes>>)(async () =>
            {
                //  读取云端门锁设备中的信息
                var localDoorLockObj = new ZigBee.Device.DoorLock.GetDoorLockData() { };

                if (UserCenterResourse.UserInfo.AuthorityNo != 1)
                {
                    localDoorLockObj.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
                    localDoorLockObj.IsOtherAccountCtrl = true;
                }
                if (doorLock.DeviceAddr != null)
                {
                    localDoorLockObj.DoorLockId = doorLock.DeviceAddr + "_" + doorLock.DeviceEpoint;
                }

                var getDoorLockInfoList = await ZigBee.Device.DoorLock.GetDoorLockInfoFromServer("DoorLock/GetDoorLockPager", localDoorLockObj);
                return getDoorLockInfoList;
            }));
        }

        /// <summary>
        ///  获取云端存储的门锁成员信息
        /// </summary>
        public static async System.Threading.Tasks.Task<Dictionary<int, LocaDoorLockObj>> GetLocaDoorLockAccountlist(ZigBee.Device.DoorLock doorLock, Shared.Phone.UserCenter.MemberInfoRes curAccountObj)

 ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MasterManagementPage.cs

@@ -28,7 +28,7 @@
                Application.RunOnMainThread(() => { CommonPage.Loading.Start("Loading..."); });
                try
                {
                    await Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetLocaDoorLocklist(doorLock, accountObj);
                    //await Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetLocaDoorLocklist(doorLock, accountObj);
                }
                catch { }
                finally

 ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MemberFrozenPage.cs

@@ -755,7 +755,7 @@
                Application.RunOnMainThread(() => { CommonPage.Loading.Start("Loading..."); });
                try
                {
                    await Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetLocaDoorLocklist(doorLock, curAccountObj);
                    //await Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetLocaDoorLocklist(doorLock, curAccountObj);
                }
                catch { }
                finally

 ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UnLockMethod.cs

@@ -63,7 +63,15 @@
                Application.RunOnMainThread(() => { CommonPage.Loading.Start("Loading..."); });
                try
                {
                    await Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetLocaDoorLocklist(doorLock, curAccountObj);
                    var list = await Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetDoorLockAllAcountUserlist(doorLock);
                    if (doorLock.IsFailedToGetDoorLockInfo[curAccountObj.SubAccountDistributedMark] == true)
                    {
                        //数据如果在门锁上面是空的时候，数据也是没有的
                        Application.RunOnMainThread(() =>
                        {
                            new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
                        });
                    }
                }
                catch { }
                finally
@@ -115,7 +123,7 @@
            {
                if (doorLock.IsFreezeAccount[curAccountObj.SubAccountDistributedMark] == true)
                {
                    new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.AccountIsFreezed), Direction = AMPopTipDirection.None , CloseTime = 1 }.Show(Common.CommonPage.Instance);
                    new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.AccountIsFreezed), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
                }
                else
                {

 ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UndistributeDoorlockUserPage.cs

@@ -32,6 +32,28 @@
                Application.RunOnMainThread(() => { CommonPage.Loading.Start("Loading..."); });
                try
                {
                    //await Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetLocaDoorLocklist(doorLock, curAccountObj);
                    var list = await Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetDoorLockAllAcountUserlist(doorLock);
                }
                catch { }
                finally
                {
                    Application.RunOnMainThread(() =>
                    {
                        RefreshList();
                        CommonPage.Loading.Hide();
                    });
                }
            });
        }

        void ReadDoorLockUserInfo1()
        {
            System.Threading.Tasks.Task.Run(async () =>
            {
                Application.RunOnMainThread(() => { CommonPage.Loading.Start("Loading..."); });
                try
                {
                    var getDoorLockInfo = await doorLock.GetDoorlockUserInfoAsync();
                    if (getDoorLockInfo != null && getDoorLockInfo.doorLockUserDetailData != null)
                    {
@@ -120,6 +142,7 @@
                    }
                    else
                    {
                        //数据如果在门锁上面是空的时候，数据也是没有的
                        Application.RunOnMainThread(() =>
                        {
                            new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
@@ -148,12 +171,16 @@
            EventHandler<MouseEventArgs> eHandlerBack = (sender, e) =>
            {
                RemoveFromParent();
             };
            };
            this.btnBack.MouseUpEventHandler += eHandlerBack;
            this.btnBackFrameLayout.MouseUpEventHandler += eHandlerBack;
            this.MidFrameLayout(this);

            ReadDoorLockUserInfo();
            MidFrameLayoutContent();
            if (doorLock.localDoorLockUserList.Count == 0)
            {
                ReadDoorLockUserInfo();
            }
            RefreshList();
        }

        public void MidFrameLayoutContent()
@@ -207,8 +234,6 @@
                Height = Application.GetRealHeight(1921 - 184 - 115 - 1),
            };
            this.midFrameLayout.AddChidren(bodyView);

            RefreshList();
        }

        void RefreshList()

 ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs

@@ -7,12 +7,12 @@
    public class UserDoorLockPage : DoorLockCommonLayout, ZigBee.Common.IStatus
    {

        public UserDoorLockPage(Shared.Common.Room room ,DeviceUI doorLock)
        public UserDoorLockPage(Shared.Common.Room room, DeviceUI doorLock)
        {
            this.doorLock = doorLock.CommonDevice as ZigBee.Device.DoorLock;
            currentRoom = room;
            deviceUI = doorLock;
             BackgroundColor = Shared.Common.ZigbeeColor.Current.GXCTopViewBackgroundColor;
            BackgroundColor = Shared.Common.ZigbeeColor.Current.GXCTopViewBackgroundColor;
            ZigBee.Device.ZbGateway.StatusList.Add(this);
        }


 ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserManagement.cs

@@ -34,7 +34,7 @@
        VerticalScrolViewLayout midVerticalScrolViewLayout;
        #endregion

        void ReadAccountList()
        void ReadAccountDoorLockInfoList()
        {
            System.Threading.Tasks.Task.Run(async () =>
            {
@@ -46,9 +46,10 @@
                    {
                        doorLock.localAllAccountList.Clear();
                        doorLock.localAllAccountList = localAccountListTemp;

                        //初始化权限信息
                        foreach (var sub in localAccountListTemp)
                        {
                            //初始化权限信息
                            if (doorLock.IsFreezeAccount.ContainsKey(sub.SubAccountDistributedMark) == false)
                            {
                                doorLock.IsFreezeAccount.Add(sub.SubAccountDistributedMark, false);
@@ -62,6 +63,9 @@
                                doorLock.IsFailedToGetDoorLockInfo.Add(sub.SubAccountDistributedMark, false);
                            }
                        }

                        //获取本地门锁列表
                        var list = await Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetDoorLockAllAcountUserlist(doorLock);
                        doorLock.ReSave();
                    }
                    else
@@ -141,7 +145,7 @@
            {
            };
            this.midFrameLayout.AddChidren(midVerticalScrolViewLayout);
            ReadAccountList();
            ReadAccountDoorLockInfoList();
        }

        async void MidFrameLayoutContent()

 ZigbeeApp/Shared/Phone/UserCenter/UserMain/MessageManagementForm.cs

@@ -15,6 +15,10 @@
        /// 列表控件

        /// </summary>

        private VerticalFrameControl listView = null;

        /// <summary>

        /// 全部的行

        /// </summary>

        private Dictionary<string, RowLayoutControl> dicAllRow = null;



        #endregion



@@ -47,6 +51,8 @@
        /// </summary>

        private async void InitMiddleData()

        {

            this.dicAllRow = new Dictionary<string, RowLayoutControl>();



            //打开进度条

            this.ShowProgressBar();

            var result = await UserCenterLogic.GetResponseDataByRequestHttps("ZigbeeUsers/GetPushMessageRecord", false, "");

@@ -62,7 +68,7 @@
            //关闭进度条

            this.CloseProgressBar();

            

            HdlThreadLogic.Current.RunMain(() =>

            HdlThreadLogic.Current.RunMainInThread(() =>

            {

                //初始化中部控件

                this.InitMiddleFrame(dicData);

@@ -75,16 +81,19 @@
        /// <param name="dicData"></param>

        private void InitMiddleFrame(Dictionary<string, List<MessageRecordInfo>> dicData)

        {

            int index = 0;

            foreach (var keys in dicData.Keys)

            {

                var listData = dicData[keys];

                HdlThreadLogic.Current.RunMain(() =>

                {

                    index++;

                    //容器

                    var framBack = new FrameListControl(23);

                    framBack.Name = keys;

                    framBack.Name = index.ToString();

                    framBack.Height = Application.GetRealHeight(100);

                    framBack.BackgroundColor = UserCenterColor.Current.White;

                    listView.AddChidrenFrame(framBack);



                    //日期

                    string strMonth = Language.StringByID(R.MyInternationalizationString.Month);

@@ -103,6 +112,12 @@
                    {

                        //添加信息行

                        this.AddMsgRowControl(framBack, listData[i], i != listData.Count - 1);

                    }

                    //调整高度

                    listView.AdjustChidrenFrameHeight(framBack, Application.GetRealHeight(23));

                    if (index == dicData.Count)

                    {

                        listView.AdjustTableHeight();

                    }

                });

            }

@@ -138,10 +153,14 @@
            //全部已读

            menuContr.AddMenu(Language.StringByID(R.MyInternationalizationString.uAllRead), () =>

            {

                //设置全部为已读

                this.SetAllTickIsRead();

            });

            //全部删除

            menuContr.AddMenu(Language.StringByID(R.MyInternationalizationString.uAllDelete), () =>

            {

                //删除全部的消息

                this.DeleteAllMsg();

            });

        }



@@ -159,11 +178,13 @@
        {

            var rowControl = new RowLayoutControl(frameList.rowSpace / 2);

            frameList.AddChidren(rowControl);

           
            rowControl.Name = frameList.ChildrenCount.ToString();

            rowControl.MainKeys = recordInfo.RegId;

            this.dicAllRow[frameList.Name + "-" + rowControl.Name] = rowControl;



            //图标(现在测试)

            var btnIcon = rowControl.frameTable.AddLeftIcon(81);

            btnIcon.UnSelectedImagePath = "Item/Satety.png";

            btnIcon.UnSelectedImagePath = "Item/Safety.png";



            //消息类型

            var btnMsgObject = rowControl.frameTable.AddLeftCaption("测试:消息类型", 600);

@@ -180,7 +201,7 @@
            //消息

            var btnMsg = rowControl.frameTable.AddMostRightView(recordInfo.MsgContent, 600, 60);

            btnMsg.TextColor = UserCenterColor.Current.TextGrayColor3;

            btnMsg.Y = Application.GetRealHeight(6) + rowControl.frameTable.chidrenYaxis;

            btnMsg.Y = Application.GetRealHeight(5) + rowControl.frameTable.chidrenYaxis;

            rowControl.frameTable.AddChidren(btnMsg, ChidrenBindMode.BindEventOnly);

            //时间

            var btnTime = rowControl.frameTable.AddMostRightView(recordInfo.MsgContent, 200, 50);

@@ -207,7 +228,7 @@
            btnDelete.ButtonClickEvent += (sender, e) =>

            {

                //确认删除消息?

                string msg = Language.StringByID(R.MyInternationalizationString.uDeleteRoomMsg);

                string msg = Language.StringByID(R.MyInternationalizationString.uDeleteMessageMsg);

                this.ShowMassage(ShowMsgType.Confirm, msg, async () =>

                {

                    await this.DeleteMsg(recordInfo.RegId, frameList, rowControl);

@@ -215,7 +236,7 @@
            };



            //点击

            rowControl.frameTable.ButtonClickEvent += (sender, e) =>

            rowControl.frameTable.ButtonClickEvent += async (sender, e) =>

            {

                if (recordInfo.IsRead == 1)

                {

@@ -228,8 +249,11 @@
                //消息

                btnMsg.TextColor = UserCenterColor.Current.TextGrayColor1;

                btnNewTip.RemoveFromParent();

                //标记已读(不管它成功不成功)

                this.SetTickIsRead(recordInfo.RegId);

                if (sender != null)

                {

                    //标记已读(不管它成功不成功)

                    await this.SetTickIsRead(recordInfo.RegId);

                }

            };

        }



@@ -241,10 +265,53 @@
        /// 标记已读

        /// </summary>

        /// <param name="strId"></param>

        private async void SetTickIsRead(string strId)

        private async System.Threading.Tasks.Task<bool> SetTickIsRead(string strId)

        {

            var pra = new { Id = strId };

            //await UserCenterLogic.GetResultStatuByRequestHttps("ZigbeeUsers/TickIsRead", true, pra);

            await UserCenterLogic.GetResultStatuByRequestHttps("ZigbeeUsers/TickIsRead", true, pra);

            return true;

        }



        /// <summary>

        /// 设置全部为已读

        /// </summary>

        private void SetAllTickIsRead()

        {

            if (dicAllRow.Count == 0)

            {

                return;

            }

            //确认标记全部消息为已读?

            this.ShowMassage(ShowMsgType.Confirm, Language.StringByID(R.MyInternationalizationString.uUnTipAllMessageMsg), () =>

            {

                HdlThreadLogic.Current.RunThread(async () =>

                {

                    //打开进度条

                    this.ShowProgressBar();

                    foreach (var contr in this.dicAllRow.Values)

                    {

                        //标识全部为已读

                        var result = await this.SetTickIsRead(contr.MainKeys);

                        if (result == false)

                        {

                            //关闭进度条

                            this.CloseProgressBar();

                            return;

                        }

                    }

                    //关闭进度条

                    this.CloseProgressBar();



                    HdlThreadLogic.Current.RunMain(() =>

                    {

                        //设置全部状态

                        foreach (var contr in this.dicAllRow.Values)

                        {

                            contr.frameTable.ButtonClickEvent?.Invoke(null, null);

                        }

                    });

                });

            });

        }



        #endregion

@@ -260,18 +327,64 @@
        private async System.Threading.Tasks.Task<bool> DeleteMsg(string strId, FrameListControl frameList, RowLayoutControl rowContr)

        {

            var pra = new { Id = strId };

            //var result = await UserCenterLogic.GetResultStatuByRequestHttps("ZigbeeUsers/DeletePushMessage", true, pra);

            //if (result == true && frameList != null)

            var result = await UserCenterLogic.GetResultStatuByRequestHttps("ZigbeeUsers/DeletePushMessage", true, pra);

            if (result == true && frameList != null)

            {

                HdlThreadLogic.Current.RunMain(() =>

                {

                    rowContr.RemoveFromParent();

                    //移除缓存

                    this.dicAllRow.Remove(frameList.Name + "-" + rowContr.Name);

                    //调整控件位置

                    this.AdjustControlLocation(frameList);

                    this.AdjustControlLocation(frameList, rowContr);

                });

            }

            //return result;

            return true;

            return result;

        }



        /// <summary>

        /// 删除全部的消息

        /// </summary>

        private void DeleteAllMsg()

        {

            if (dicAllRow.Count == 0)

            {

                return;

            }

            //确认删除全部消息?

            this.ShowMassage(ShowMsgType.Confirm, Language.StringByID(R.MyInternationalizationString.uDeleteAllMessageMsg), () =>

            {

                HdlThreadLogic.Current.RunThread(async () =>

                {

                    //打开进度条

                    this.ShowProgressBar();

                    foreach (var contr in this.dicAllRow.Values)

                    {

                        //删除全部消息

                        var result = await this.DeleteMsg(contr.MainKeys, null, null);

                        if (result == false)

                        {

                            //关闭进度条

                            this.CloseProgressBar();

                            return;

                        }

                    }

                    //关闭进度条

                    this.CloseProgressBar();



                    HdlThreadLogic.Current.RunMain(() =>

                    {

                        bodyFrameLayout.RemoveAll();

                        listView = new VerticalFrameControl(35);

                        listView.Height = bodyFrameLayout.Height;

                        bodyFrameLayout.AddChidren(listView);

                        HdlThreadLogic.Current.RunThread(() =>

                        {

                            //初始化中部信息

                            this.InitMiddleData();

                        });

                    });

                });

            });

        }



        #endregion

@@ -282,25 +395,19 @@
        /// 调整控件位置

        /// </summary>

        /// <param name="frameList"></param>

        private void AdjustControlLocation(FrameListControl frameList)

        private void AdjustControlLocation(FrameListControl frameList, RowLayoutControl removeRow)

        {

            int nowHeight = frameList.Height;

            int changedHeight = 0;

            if (frameList.ChildrenCount <= 1)

            int changedHeight = frameList.GetChildren(frameList.ChildrenCount - 1).Height;

            if (frameList.ChildrenCount <= 2)

            {

                //已经删完了,只剩下标题日期了

                frameList.RemoveFromParent();

                changedHeight = nowHeight;

                changedHeight = frameList.Height;

            }

            else

            {

                frameList.Height = frameList.GetChildren(frameList.ChildrenCount - 1).Bottom;

                changedHeight = nowHeight - frameList.Height;

            }

            //先调整各自容器的Y轴坐标

            bool canChangedLoaction = false;

            for (int i = 0; i < this.listView.ChildrenCount; i++)

            for (int i = 0; i < this.listView.frameTable.ChildrenCount; i++)

            {

                var myView = this.listView.GetChildren(i);

                var myView = this.listView.frameTable.GetChildren(i);

                if (myView.Name == frameList.Name)

                {

                    //它之后的控件全部往上移动

@@ -311,6 +418,38 @@
                {

                    myView.Y -= changedHeight;

                }

            }

            //调整父容器大小

            this.listView.AdjustTableHeight();





            if (frameList.ChildrenCount <= 2)

            {

                //已经删完了,只剩下标题日期了

                frameList.RemoveFromParent();

            }

            else

            {

                //这个容器里面被移除的行的下面的全部行,往上移动

                bool changedFlage = false;

                for (int i = 0; i < frameList.ChildrenCount; i++)

                {

                    var myView = frameList.GetChildren(i);

                    if (myView.Name == removeRow.Name)

                    {

                        //它之后的控件全部往上移动

                        changedFlage = true;

                        continue;

                    }

                    if (changedFlage == true)

                    {

                        myView.Y -= changedHeight;

                    }

                }

                //移除指定的行

                removeRow.RemoveFromParent();

                //容器大小减少

                frameList.Height -= changedHeight;

            }

        }



@@ -345,12 +484,16 @@
                var listData = dicTemp[listSortKeys[i]];

                foreach (var data2 in listData)

                {

                    string[] myArry = data2.MsgTime.Split(new string[] { " " }, StringSplitOptions.RemoveEmptyEntries);

                    if (dicData.ContainsKey(myArry[1]) == false)

                    string[] myArry = data2.MsgTime.Split(new string[] { "T" }, StringSplitOptions.RemoveEmptyEntries);

                    if (myArry.Length != 2)

                    {

                        dicData[myArry[1]] = new List<MessageRecordInfo>();

                        continue;

                    }

                    dicData[myArry[1]].Add(data2);

                    if (dicData.ContainsKey(myArry[0]) == false)

                    {

                        dicData[myArry[0]] = new List<MessageRecordInfo>();

                    }

                    dicData[myArry[0]].Add(data2);

                }

            }

            return dicData;


 ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserMainForm.cs

@@ -451,7 +451,7 @@
            }



            //刷新信息提示控件

            this.msgControl.RefreshStatu();

            this.msgControl?.RefreshStatu();



            //初始化主菜单的控件

            this.InitMainMenuInfoControl(frameWhiteBack);


 ZigbeeApp/Shared/Phone/UserView/HomePage.cs

@@ -49,10 +49,9 @@
                }
            };

            //*******待改*****
            UserPage.Instance.Fresh();
            if (Config.Instance.IsLogin)
            {
                ShowLoginLoadView();
                CommonPage.Loading.Start();
                Action action = async () =>
                {
@@ -70,11 +69,11 @@
                            //刷新个人中心的内存及线程
                            await UserCenter.UserCenterLogic.InitUserCenterMenmoryAndThread();

                            Room.CanInitAllRoom = true;
                            Room.InitAllRoom();

                            Application.RunOnMainThread(() =>
                            {
                                CommonPage.Instance.RemoveViewByTag("Login");
                                UserPage.Instance.Fresh(); 
                                CommonPage.Loading.Hide();
                            });
@@ -103,11 +102,11 @@
                            //刷新个人中心的内存及线程
                            await UserCenter.UserCenterLogic.InitUserCenterMenmoryAndThread();

                            Room.CanInitAllRoom = true;
                            Room.InitAllRoom();

                            Application.RunOnMainThread(() =>
                            {
                                CommonPage.Instance.RemoveViewByTag("Login");
                                UserPage.Instance.Fresh();
                                CommonPage.Loading.Hide();
                            });
@@ -127,6 +126,14 @@
            }
        }


        public void ShowLoginLoadView()
        {
            var loginLoad = new LoginLoading { };
            CommonPage.Instance.AddChidren(loginLoad);
            loginLoad.Show();
        }

        /// <summary>
        /// Logins the by PWDA sync.
        /// </summary>

 ZigbeeApp/Shared/Phone/UserView/LoginLoading.cs

New file
@@ -0,0 +1,106 @@
using System;
using Shared.Common;
using Shared.Phone.Device.CommonForm;

namespace Shared.Phone.UserView
{
    public class LoginLoading : FrameLayout
    {
        public LoginLoading()
        {
            BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor;
            Tag = "Login";
        }
        /// <summary>
        /// show
        /// </summary>
        public void Show()
        {
            var topFrameLayout = new FrameLayout()
            {
                Y = Application.GetRealHeight(60),
                Height = Application.GetRealHeight(127),
                BackgroundColor = ZigbeeColor.Current.GXCGrayBackgroundColor,
            };
            AddChidren(topFrameLayout);

            var floor = new Button
            {
                X = Application.GetRealWidth(CommonFormResouce.X_Left),
                Width = Application.GetMinRealAverage(69),
                Height = Application.GetMinRealAverage(69),
                Gravity = Gravity.CenterVertical,
                UnSelectedImagePath = "Item/Floor.png"
            };
            topFrameLayout.AddChidren(floor);

            var messageBtn = new Button()
            {
                X = Application.GetRealWidth(953),
                Width = Application.GetMinRealAverage(69),
                Height = Application.GetMinRealAverage(69),
                Gravity = Gravity.CenterVertical,
                UnSelectedImagePath = "Item/Message.png",
                SelectedImagePath = "Item/MessageSelected.png"
            };
            topFrameLayout.AddChidren(messageBtn);

            var roomBG = new Button()
            {
                Y = Application.GetRealHeight(302),
                Width = Application.GetRealWidth(CommonPage.AppRealWidth - CommonPage.XLeft * 2),
                Height = Application.GetMinRealAverage(550),
                Gravity = Gravity.CenterHorizontal,
                UnSelectedImagePath = "RoomIcon/1.JPG",
            };
            AddChidren(roomBG);


            var functionSceneView = new FrameLayout()
            {
                Y = Application.GetRealHeight(861),
                Width = Application.GetRealWidth(832),
                Height = Application.GetRealHeight(167),
                Gravity = Gravity.CenterHorizontal,
                BackgroundImagePath = "Item/SceneFunctionBG.png"
            };
            AddChidren(functionSceneView);

            var sceneBtn = new Button()
            {
                X = Application.GetRealWidth(30),
                Y = Application.GetRealHeight(12),
                Width = Application.GetRealWidth(350),
                Height = Application.GetRealHeight(100),
                TextColor = ZigbeeColor.Current.GXCTextGrayColor3,
                SelectedTextColor = ZigbeeColor.Current.GXCTextWhiteColor,
                TextID = R.MyInternationalizationString.Scence,
                IsSelected = true
            };
            functionSceneView.AddChidren(sceneBtn);

            var functionBtn = new Button()
            {
                X = Application.GetRealWidth(430),
                Y = Application.GetRealHeight(12),
                Width = Application.GetRealWidth(360),
                Height = Application.GetRealHeight(100),
                TextColor = ZigbeeColor.Current.GXCTextGrayColor3,
                SelectedTextColor = ZigbeeColor.Current.GXCTextWhiteColor,
                TextID = R.MyInternationalizationString.Function,
                IsSelected = false
            };
            functionSceneView.AddChidren(functionBtn);

            var functionSceneBodyView = new FrameLayout()
            {
                Y = functionSceneView.Bottom,
                Height = Application.GetRealHeight(750),
                Gravity = Gravity.CenterHorizontal,
                BackgroundColor = ZigbeeColor.Current.GXCGrayBackgroundColor
            };
            AddChidren(functionSceneBodyView);

        }
    }
}

 ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs

@@ -73,7 +73,7 @@
        private readonly int sleepSpan = 300;


        private FrameLayout itemView=new FrameLayout();
        private FrameLayout itemView = new FrameLayout();
        /// <summary>
        /// floorBtn
        /// </summary>
@@ -320,7 +320,7 @@
                                        {
                                            case 0:
                                                //此属性表明当前亮度程度
                                                dimmableLight.Level = attriButeList[0].AttriButeData ;
                                                dimmableLight.Level = attriButeList[0].AttriButeData;
                                                dimmableLight.LastDateTime = DateTime.Now;
                                                (rowFL.GetChildren(0) as FunctionMainView).IsSelected = true;
                                                (rowFL.GetChildren(0) as FunctionMainView).StatuButton.Text = deviceUI.GetDeviceStatu();
@@ -393,7 +393,7 @@
            #region topview
            var topFrameLayout = new FrameLayout()
            {
                Y=Application.GetRealHeight(60),
                Y = Application.GetRealHeight(60),
                Height = Application.GetRealHeight(127),
                BackgroundColor = ZigbeeColor.Current.GXCGrayBackgroundColor,
            };
@@ -411,13 +411,13 @@

            floorBtn = new Button
            {
                X=floor.Right,
                Width=Application.GetRealWidth(500),
                Height=Application.GetRealHeight(100),
                X = floor.Right,
                Width = Application.GetRealWidth(500),
                Height = Application.GetRealHeight(100),
                Gravity = Gravity.CenterVertical,
                TextAlignment =TextAlignment.CenterLeft,
                TextColor=ZigbeeColor.Current.GXCTextColor,
                Text=Config.Instance.Home.GetCurrentFloorName
                TextAlignment = TextAlignment.CenterLeft,
                TextColor = ZigbeeColor.Current.GXCTextColor,
                Text = Config.Instance.Home.GetCurrentFloorName
            };
            topFrameLayout.AddChidren(floorBtn);

@@ -428,13 +428,13 @@
                Height = Application.GetMinRealAverage(69),
                Gravity = Gravity.CenterVertical,
                UnSelectedImagePath = "Item/Message.png",
                SelectedImagePath="Item/MessageSelected.png"
                SelectedImagePath = "Item/MessageSelected.png"
            };
            topFrameLayout.AddChidren(messageBtn);

            var residecneName = new Button()
            {
                X=Application.GetRealWidth(CommonFormResouce.X_Left),
                X = Application.GetRealWidth(CommonFormResouce.X_Left),
                Y = Application.GetRealHeight(161),
                Width = Application.GetRealWidth(700),
                Height = Application.GetRealHeight(95),
@@ -443,9 +443,9 @@
                TextSize = 24,
                TextColor = ZigbeeColor.Current.GXCTextBlackColor
            };
            if(Config.Instance.Home.IsOthreShare)
            if (Config.Instance.Home.IsOthreShare)
            {
                residecneName.Text = $"({Language.StringByID(R.MyInternationalizationString.Shared)}){Config.Instance.Home.Name}";
                residecneName.Text = $"{Config.Instance.Home.Name}";
            }
            AddChidren(residecneName);

@@ -513,7 +513,7 @@
                    var scrolView = new VerticalScrolViewLayout()
                    {
                        Y = changeHomeBtn.Bottom,
                        Height = Application.GetMinRealAverage(305-10)
                        Height = Application.GetMinRealAverage(305 - 10)
                    };
                    changeHomeFL.AddChidren(scrolView);

@@ -533,7 +533,7 @@
                        scrolView.AddChidren(rowView);
                        var pointBtn = new Device.CommonForm.SelectedStatuButton()
                        {
                            X=Application.GetRealWidth(80),
                            X = Application.GetRealWidth(80),
                            Width = Application.GetMinRealAverage(80),
                            Height = Application.GetMinRealAverage(80),
                            Gravity = Gravity.CenterVertical,
@@ -552,9 +552,9 @@
                            SelectedTextColor = ZigbeeColor.Current.GXCTextBlackColor,
                            IsSelected = home.Id == Config.Instance.Home.Id
                        };
                        if(home.IsOthreShare)
                        if (home.IsOthreShare)
                        {
                            nameBtn.Text = $"({Language.StringByID(R.MyInternationalizationString.Shared)}){home.Name}";
                            nameBtn.Text = $"{home.Name}";
                        }
                        rowView.AddChidren(nameBtn);

@@ -570,9 +570,9 @@
                            nameBtn.IsSelected = true;

                            residecneName.Text = home.Name;
                            if(home.IsOthreShare)
                            if (home.IsOthreShare)
                            {
                                nameBtn.Text = $"({Language.StringByID(R.MyInternationalizationString.Shared)}){home.Name}";
                                nameBtn.Text = $"{home.Name}";
                            }
                            clickCheckBtn = pointBtn;
                            clickNameBtn = nameBtn;
@@ -591,7 +591,7 @@
                            residecneName.Text = home.Name;
                            if (home.IsOthreShare)
                            {
                                residecneName.Text = nameBtn.Text = $"({Language.StringByID(R.MyInternationalizationString.Shared)}){home.Name}";
                                residecneName.Text = nameBtn.Text = $"{home.Name}";
                            }
                        }
                        else
@@ -613,7 +613,7 @@

            #endregion

            if(CanBindGateway()==false)
            if (CanBindGateway() == false)
            {
                var roomPageView = new PageLayout()
                {
@@ -627,69 +627,20 @@
                AddChidren(roomPageView);

                //当前房间
                if (Shared.Common.Room.CanInitAllRoom == true)
                //Room.CurrentRoom = Room.CurrentRoom == null ? Room.Lists[0] : Room.CurrentRoom;
                var rList = Room.CurrentRoom.GetRoomsByCurrentFloorIdAppendLoveRoom();
                Room.CurrentRoom = rList[0];
                foreach (var room in rList)
                {
                    //Room.CurrentRoom = Room.CurrentRoom == null ? Room.Lists[0] : Room.CurrentRoom;
                    Room.CurrentRoom = Room.Lists[0];
                    foreach (var room in Room.CurrentRoom.GetRoomsByCurrentFloorIdAppendLoveRoom())
                    {
                        var roomBackView = new FrameLayout()
                        {
                            BackgroundImagePath = room.BackgroundImage
                        };
                        roomPageView.AddChidren(roomBackView);
                        var roomBG = new Button()
                        {
                            //UnSelectedImagePath = "Room/HomeBG.png",
                            UnSelectedImagePath = room.BackgroundImage
                        };
                        roomBackView.AddChidren(roomBG);
                        var roomName = new Button()
                        {
                            X = Application.GetRealWidth(20),
                            Y = Application.GetRealHeight(20),
                            Width = Application.GetRealWidth(500),
                            Height = Application.GetRealHeight(80),
                            Text = room.Name,
                            TextAlignment = TextAlignment.CenterLeft,
                            TextColor = ZigbeeColor.Current.GXCTextWhiteColor,
                            TextSize = 18,
                        };
                        roomBackView.AddChidren(roomName);
                        var roomListBtn = new Device.CommonForm.SelectedStatuButton()
                        {
                            X = roomPageView.Width - Application.GetRealWidth(100 + 20),
                            Y = Application.GetRealHeight(20),
                            Width = Application.GetMinRealAverage(100),
                            Height = Application.GetMinRealAverage(100),
                            UnSelectedImagePath = "Item/List.png",
                        };
                        roomBackView.AddChidren(roomListBtn);

                        roomListBtn.MouseUpEventHandler += (send, e) =>
                        {
                            var editRoom = new Device.Room.EditRoom();
                            HomePage.Instance.AddChidren(editRoom);
                            HomePage.Instance.PageIndex += 1;
                            editRoom.Show(room);
                            editRoom.action += () =>
                            {
                                Show();
                            };
                        };
                    }
                }
                else
                {
                    Room.CurrentRoom = Room.Lists[0];
                    var roomBackView = new FrameLayout()
                    {
                        BackgroundImagePath = "Room/r0.png"
                        BackgroundImagePath = room.BackgroundImage
                    };
                    roomPageView.AddChidren(roomBackView);
                    var roomBG = new Button()
                    {
                        UnSelectedImagePath = "Room/HomeBG.png",
                        //UnSelectedImagePath = room.BackgroundImage
                    };
                    roomBackView.AddChidren(roomBG);
                    var roomName = new Button()
@@ -698,30 +649,44 @@
                        Y = Application.GetRealHeight(20),
                        Width = Application.GetRealWidth(500),
                        Height = Application.GetRealHeight(80),
                        Text = Language.StringByID(R.MyInternationalizationString.Favorite),
                        Text = room.Name,
                        TextAlignment = TextAlignment.CenterLeft,
                        TextColor = ZigbeeColor.Current.GXCTextWhiteColor,
                        TextSize = 18
                        TextSize = 18,
                    };
                    roomBackView.AddChidren(roomName);
                    var roomListBtn = new Button()
                    var roomListBtn = new Device.CommonForm.SelectedStatuButton()
                    {
                        X = roomPageView.Width - Application.GetRealWidth(100 + 20),
                        Y = Application.GetRealHeight(20),
                        Width = Application.GetMinRealAverage(100),
                        Height = Application.GetMinRealAverage(100),
                        UnSelectedImagePath = "Item/List.png"
                        UnSelectedImagePath = "Item/List.png",
                    };
                    roomBackView.AddChidren(roomListBtn);

                    roomListBtn.MouseUpEventHandler += (send, e) =>
                    {
                        var editRoom = new Device.Room.EditRoom();
                        HomePage.Instance.AddChidren(editRoom);
                        HomePage.Instance.PageIndex += 1;
                        editRoom.Show(room);
                        editRoom.action += () =>
                        {
                            Show();
                        };
                    };
                }



                var functionSceneView = new FrameLayout()
                {
                    Y = Application.GetRealHeight(861),
                    Width=Application.GetRealWidth(832),
                    Width = Application.GetRealWidth(832),
                    Height = Application.GetRealHeight(167),
                    Gravity=Gravity.CenterHorizontal,
                    BackgroundImagePath="Item/SceneFunctionBG.png"
                    Gravity = Gravity.CenterHorizontal,
                    BackgroundImagePath = "Item/SceneFunctionBG.png"
                };
                AddChidren(functionSceneView);

@@ -759,7 +724,7 @@
                    Y = functionSceneView.Bottom,
                    Height = Application.GetRealHeight(750),
                    Gravity = Gravity.CenterHorizontal,
                    BackgroundColor=ZigbeeColor.Current.GXCGrayBackgroundColor
                    BackgroundColor = ZigbeeColor.Current.GXCGrayBackgroundColor
                };
                AddChidren(functionSceneBodyView);

@@ -783,7 +748,7 @@
                roomPageView.PageChange += (sender, e) =>
                {
                    //切换当前房间
                    Room.CurrentRoom = Room.CurrentRoom == null ? Room.Lists[0] : Room.Lists[roomPageView.PageIndex];
                    Room.CurrentRoom = rList[roomPageView.PageIndex];
                    RefreshBodyView();
                };
            }
@@ -802,10 +767,6 @@
        /// </summary>
        public void RefreshBodyView()
        {
            if (Room.CanInitAllRoom == false)
            {
                return;
            }
            functionSceneBodyView.RemoveAll();
            if (functionBtn.IsSelected)
            {
@@ -822,7 +783,7 @@
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="mouseEventArgs"></param>
        public void SelectFloor(object sender,MouseEventArgs mouseEventArgs)
        public void SelectFloor(object sender, MouseEventArgs mouseEventArgs)
        {
            var floorFL = new Phone.Device.Category.SelectFloor();
            AddChidren(floorFL);
@@ -957,11 +918,11 @@

            var noFunctionTip = new Button()
            {
                Y=noFunction.Bottom,
                Y = noFunction.Bottom,
                Height = Application.GetRealHeight(200),
                Text = Language.StringByID(R.MyInternationalizationString.NoFunction).Replace("{\\r\\n}","\r\n"),
                Text = Language.StringByID(R.MyInternationalizationString.NoFunction).Replace("{\\r\\n}", "\r\n"),
                TextColor = ZigbeeColor.Current.GXCPlaceHolderTextColor,
                IsMoreLines=true
                IsMoreLines = true
            };
            functionSceneBodyView.AddChidren(noFunctionTip);
        }
@@ -985,9 +946,9 @@
            else
            {
                deviceVerticalScrolViewLayout = new VerticalScrolViewLayout { };
                

                functionSceneBodyView.AddChidren(deviceVerticalScrolViewLayout);
               for(int i=0;i<deviceList.Count;i++)
                for (int i = 0; i < deviceList.Count; i++)
                {
                    int t = i % 2;
                    int tt = i / 2;
@@ -1019,8 +980,8 @@
                            if (e1)
                            {
                                Room.CurrentRoom.DeleteDevice(device.FileName);
                                    //RefreshBodyView();
                                    deviceVerticalScrolViewLayout.RemoveViewByTag((sender as Button).Tag);
                                //RefreshBodyView();
                                deviceVerticalScrolViewLayout.RemoveViewByTag((sender as Button).Tag);
                            }
                        };
                    };
@@ -1175,14 +1136,14 @@
                            }
                        }

                        var lightView = new FunctionMainView(xx,yy);
                        var lightView = new FunctionMainView(xx, yy);
                        itemView.AddChidren(lightView);
                        lightView.Init();
                        lightView.SetDeviceImage(device.IconPath, device.OnlineIconPath);
                        lightView.SetStatuText(device.GetDeviceStatu());
                        lightView.SetDeviceName(device.CommonDevice.DeviceEpointName);
                        lightView.IsSelected = light.OnOffStatus==1;
                        lightView.SetCollect(Room.CurrentRoom.IsCollectInRoom(Room.CurrentRoom,device.FileName));
                        lightView.IsSelected = light.OnOffStatus == 1;
                        lightView.SetCollect(Room.CurrentRoom.IsCollectInRoom(Room.CurrentRoom, device.FileName));

                        var dev = Room.LoveRoomDeviceUIFilePathList.Find((obj) => obj == device.FileName);
                        if (dev == null)
@@ -1665,7 +1626,7 @@

                        lightView.CardBG.MouseUpEventHandler += (sender, e) =>
                        {
                            var userDoorLockPage = new UserDoorLockPage(Room.CurrentRoom,device);
                            var userDoorLockPage = new UserDoorLockPage(Room.CurrentRoom, device);
                            HomePage.Instance.AddChidren(userDoorLockPage);
                            HomePage.Instance.PageIndex += 1;
                            userDoorLockPage.Show();
@@ -1720,11 +1681,11 @@
            functionSceneBodyView.AddChidren(noScene);
            var noScenceTip = new Button()
            {
                Y=noScene.Bottom,
                Y = noScene.Bottom,
                Height = Application.GetRealHeight(200),
                Text =Language.StringByID(R.MyInternationalizationString.NoScene).Replace("{\\r\\n}","\r\n"),
                Text = Language.StringByID(R.MyInternationalizationString.NoScene).Replace("{\\r\\n}", "\r\n"),
                TextColor = ZigbeeColor.Current.GXCPlaceHolderTextColor,
                IsMoreLines=true
                IsMoreLines = true
            };
            functionSceneBodyView.AddChidren(noScenceTip);
        }
@@ -1748,7 +1709,7 @@
            {
                var sceneScrolView = new VerticalScrolViewLayout { };
                functionSceneBodyView.AddChidren(sceneScrolView);
                for(int i=0;i<sceneList.Count;i++)
                for (int i = 0; i < sceneList.Count; i++)
                {
                    var scene = sceneList[i];
                    int xx = 43 + i % 2 * (20 + 487);
@@ -1781,7 +1742,7 @@
                    }
                    else
                    {
                        sceneView.SetTimeText(scene.SceneDelayTime.ToString());
                        sceneView.SetTimeText(CommonFormResouce.GetTimeString(scene.SceneDelayTime));
                    }

                    sceneView.TimeButton.MouseUpEventHandler += (sender, e) =>
@@ -1793,7 +1754,7 @@
                        timeSelect.TimeAction = (t) =>
                        {
                            scene.SceneDelayTime = t;
                            if(t>0)
                            if (t > 0)
                            {
                                sceneView.SetTimeText(CommonFormResouce.GetTimeString(scene.SceneDelayTime));
                            }
@@ -1808,15 +1769,15 @@
                    //调用场景
                    EventHandler<MouseEventArgs> sceneUpHandler = async (sender, e) =>
                    {
                            //1成功 0失败
                            //后面补上相关提示
                            // Error参数含义
                            //<para>1：网关无法解析命令数据。</para>
                            //<para>2：协调器正在升级或备份/恢复数据
                            //<para>3：操作设备/组/场景不存在</para>
                            //<para>4：其他错误</para>
                            //<para>5：数据传输错误（在某次客户端向网关发送数据的过程中，网关在合理时间范围内接收客户端数据不完整导致该错误发生。如客户端向网关一次发送100个字节的数据，但网关等待接收了一秒只接收了80个字节。发生该错误，网关将主动关闭客户端连接）</para>
                            var sceneOpenAllData = await ZigBee.Device.Scene.ControlSceneAsync(scene.Id, scene.SceneDelayTime);
                        //1成功 0失败
                        //后面补上相关提示
                        // Error参数含义
                        //<para>1：网关无法解析命令数据。</para>
                        //<para>2：协调器正在升级或备份/恢复数据
                        //<para>3：操作设备/组/场景不存在</para>
                        //<para>4：其他错误</para>
                        //<para>5：数据传输错误（在某次客户端向网关发送数据的过程中，网关在合理时间范围内接收客户端数据不完整导致该错误发生。如客户端向网关一次发送100个字节的数据，但网关等待接收了一秒只接收了80个字节。发生该错误，网关将主动关闭客户端连接）</para>
                        var sceneOpenAllData = await ZigBee.Device.Scene.ControlSceneAsync(scene.Id, scene.SceneDelayTime);
                        if (sceneOpenAllData == null || sceneOpenAllData.sceneOpenData == null)
                        {
                            return;
@@ -1866,7 +1827,7 @@

                    sceneView.CollectButton.MouseUpEventHandler += collectionEvent;
                    sceneView.MouseUpEventHandler += sceneUpHandler;
                    sceneView.SceneIcon.MouseUpEventHandler+= sceneUpHandler;
                    sceneView.SceneIcon.MouseUpEventHandler += sceneUpHandler;
                    sceneView.SceneNameButton.MouseUpEventHandler += sceneUpHandler;

                }

 ZigbeeApp/Shared/Phone/ZigBee/Device/Panel.cs

@@ -64,6 +64,47 @@
        /// </summary>
        public string curSelectSceneID = "";

        /// <summary>
        /// 本地楼层房间绑定列表
        /// </summary>
        public Dictionary<int, FloorRoomBindObj> FloorRoomBindObjList = new Dictionary<int, FloorRoomBindObj> { };
        /// <summary>
        /// 绑定的楼层房间信息
        /// </summary>
        [System.Serializable]
        public class FloorRoomBindObj
        {
            /// <summary>
            /// 楼层ID
            /// </summary>
            public string floodID;
            /// <summary>
            /// 楼层名称
            /// </summary>
            public string floodName;
            /// <summary>
            /// 房间ID
            /// </summary>
            public string roomID;
            /// <summary>
            /// 房间名称
            /// </summary>
            public string roomName;
            /// <summary>
            /// 绑定目标ID
            /// </summary>
            public string BindID;
            /// <summary>
            /// 绑定目标名称
            /// </summary>
            public string BindName;
            /// <summary>
            /// 图片路径
            /// </summary>
            public string IconPath = "";

        }

        // <summary>
        /// 按键中被绑定的目标列表
        /// </summary>

 ZigbeeApp/Shared/R.cs

@@ -4990,7 +4990,15 @@
        /// <summary>
        /// 正在上传备份文件
        /// </summary>
        public const int uBackupFileUploading = 15975;
        public const int uBackupFileUploading = 15975;

        /// <summary>

        /// 确认删除全部消息?

        /// </summary>

        public const int uDeleteAllMessageMsg = 15976;

        /// <summary>

        /// 确认标记全部消息为已读?

        /// </summary>

        public const int uUnTipAllMessageMsg = 15977;



        //★★★★下面这些是接口的返回信息翻译,从18000开始★★★★

        /// <summary>


 ZigbeeApp/Shared/Shared.projitems

@@ -28,15 +28,7 @@
    <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Account\PhoneZone.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\AC\ACControl.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\AC\ACControlBase.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Category\CategorySceneSelectAirSwitchSetting.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Category\CategorySceneSelectCurtainSetting.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Category\CategorySceneSelectDevice.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Category\CategorySceneSelectDeviceByRoom.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Category\CategorySceneSelectedDimmableLightSetting.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Category\CategorySceneSelectedScene.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Category\CategorySceneSelectImgByLocal.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Category\CategorySceneSelectLightSetting.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Category\CategorySceneSelectRoomList.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Category\SelectDelayTime.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Category\SelectDevice.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Category\SelectFloor.cs" />

@@ -354,6 +346,7 @@
    <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Password\EditorAccountPasswordForm.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Suggestion\FeedbackForm.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\UserMain\SecondAuthenticationForm.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\UserView\LoginLoading.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\ZigBee\Device\AC.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\ZigBee\Device\DimmableLight.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\ZigBee\Device\DoorLock.cs" />

@@ -390,11 +383,8 @@
    <Compile Include="$(MSBuildThisFileDirectory)Common\SendDataToServer.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\UserView\UserHomeView.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Common\Room.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Room\AddRoom.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Room\RoomManagement.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Room\AddRoomSelectPicByLocal.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Room\AddRoomContent.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Room\AddDeviceList.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\CompoundControls\ProgressBar.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\CompoundControls\SearchEditText.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\RowLayoutControls\RowLayoutControl.cs" />

@@ -402,10 +392,7 @@
    <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Direction\AddDeviceTypeListForm.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\DeviceMacInfoEditorForm.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\DeviceAddSuccessForm.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Room\AddDevicesSameTypeList.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Room\AddDevieDetailFromAddFunction.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Common\DeviceUI.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Room\AddRoomScene.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Safety\SafetyManagementMainForm.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\FrameLayoutControls\FrameRowControl.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Category\Category.cs" />