2019-12-10-01

WJC

2019-12-10 4e0d1c906e69af41905b5376da15773be0fca547

2019-12-10-01

标题字体加粗，文字显示不全等等，请合并代码；

 .DS_Store

Binary files differ

 ZigbeeApp/GateWay.Droid/Application.cs

old mode 100755
new mode 100644
@@ -97,7 +97,7 @@
            var req = new SendAuth.Req { Scope = "snsapi_userinfo", State = "ZigbeeApp" };
            api.SendReq(req);
        }
        /// <summary>
        /// 所有初始化全部在这个方法实现
        /// </summary>
        void initAll()
        {
            BaseActivity.IsEnnableGPS = false;
        /// <summary>
        /// 所有初始化全部在这个方法实现
        /// </summary>
        void initAll()
        {
          //  Shared.Application.IsGpsEnable = false;
            //设置极光调试模式，为false时只打印警告信息
            // System.Console.WriteLine($"AAA : {System.DateTime.Now.ToString()}");
#if Release
            JPushInterface.SetDebugMode(false);

 ZigbeeApp/GateWay.Droid/Assets/Phone/ZigeeLogic/progressbtn2.png

 ZigbeeApp/GateWay.Droid/Assets/Phone/ZigeeLogic/progressbtn_2.png

 ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj

@@ -189,6 +189,9 @@
    <Reference Include="Shared.Droid.Smartrefresh">

      <HintPath>..\Shared\DLL\Android\Shared.Droid.Smartrefresh.dll</HintPath>

    </Reference>

    <Reference Include="Xamarin.Android.Support.Design">

      <HintPath>..\Shared\DLL\Android\Xamarin.Android.Support.Design.dll</HintPath>

    </Reference>

  </ItemGroup>

  <ItemGroup>

    <Compile Include="Application.cs" />

@@ -541,6 +544,8 @@
    <AndroidAsset Include="Assets\Phone\Safeguard\WithdrawGarrisonSelected.png" />

    <AndroidAsset Include="Assets\Phone\ZigeeLogic\selectedsensor0.png" />

    <AndroidAsset Include="Assets\Phone\ZigeeLogic\sensor0.png" />

    <AndroidAsset Include="Assets\Phone\ZigeeLogic\progressbtn_2.png" />

    <AndroidAsset Include="Assets\Phone\ZigeeLogic\progressbtn2.png" />

  </ItemGroup>

  <ItemGroup>

    <AndroidAsset Include="Assets\Phone\Item\InputAccountIcon.png" />


 ZigbeeApp/GateWay.Droid/Properties/AndroidManifest.xml

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.hdl.home" android:versionCode="2019111401" android:installLocation="auto" android:versionName="1.0.19111401">
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.hdl.home" android:versionCode="2019121001" android:installLocation="auto" android:versionName="1.0.1912101">
    <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" />

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

Diff too large

 ZigbeeApp/Home.Ios/Home.IOS.csproj

@@ -717,6 +717,8 @@
      <BundleResource Include="Resources\Phone\Gateway\AddGatewaySuccess.png" />
      <BundleResource Include="Resources\Phone\ZigeeLogic\selectedsensor0.png" />
      <BundleResource Include="Resources\Phone\ZigeeLogic\sensor0.png" />
      <BundleResource Include="Resources\Phone\ZigeeLogic\progressbtn2.png" />
      <BundleResource Include="Resources\Phone\ZigeeLogic\progressbtn_2.png" />
    </ItemGroup>
    <ItemGroup>
      <ProjectReference Include="..\Elian.iOS\Elian.iOS.csproj">

 ZigbeeApp/Home.Ios/Resources/Phone/ZigeeLogic/progressbtn2.png

 ZigbeeApp/Home.Ios/Resources/Phone/ZigeeLogic/progressbtn_2.png

 ZigbeeApp/Home.Ios/mono_crash.mem.1860.1.blob

Binary files differ

 ZigbeeApp/Home.Ios/mono_crash.mem.1860.10efa45c0.blob

Binary files differ

 ZigbeeApp/Home.Ios/mono_crash.mem.1860.700001b8a000.blob

Binary files differ

 ZigbeeApp/Home.Ios/mono_crash.mem.1860.700001e93000.blob

Binary files differ

 ZigbeeApp/Home.Ios/mono_crash.mem.1860.700002096000.blob

Binary files differ

 ZigbeeApp/Home.Ios/mono_crash.mem.1860.700002299000.blob

Binary files differ

 ZigbeeApp/Home.Ios/mono_crash.mem.1860.70000249c000.blob

Binary files differ

 ZigbeeApp/Home.Ios/mono_crash.mem.1860.70000269f000.blob

Binary files differ

 ZigbeeApp/Home.Ios/mono_crash.mem.1860.7000028a2000.blob

Binary files differ

 ZigbeeApp/Home.Ios/mono_crash.mem.1860.700002aa5000.blob

Binary files differ

 ZigbeeApp/Shared/DLL/Android/Shared.Droid.HDLWidget.dll

old mode 100755
new mode 100644
Binary files differ

 ZigbeeApp/Shared/DLL/Android/Shared.Droid.Smartrefresh.dll

old mode 100755
new mode 100644
Binary files differ

 ZigbeeApp/Shared/DLL/Android/Shared.Droid.dll

old mode 100755
new mode 100644
Binary files differ

 ZigbeeApp/Shared/DLL/Android/Xamarin.Android.Support.Design.dll

Binary files differ

 ZigbeeApp/Shared/DLL/IOS/Shared.IOS.TBL.dll

old mode 100755
new mode 100644
Binary files differ

 ZigbeeApp/Shared/DLL/IOS/Shared.IOS.dll

old mode 100755
new mode 100644
Binary files differ

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

@@ -36,6 +36,7 @@
                Height = Application.GetRealHeight(69),
                Y = Application.GetRealHeight(92),
                TextID = MyInternationalizationString.selection,
                IsBold = true,
            };
            topRowLayout.AddChidren(titleName);


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

@@ -47,6 +47,7 @@
                Height = Application.GetRealHeight(69),
                Y = Application.GetRealHeight(92),
                TextID = MyInternationalizationString.addscene,
                IsBold = true,
            };
            topRowLayout.AddChidren(titleName);


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

@@ -30,6 +30,7 @@
                Height = Application.GetRealHeight(69),
                Y = Application.GetRealHeight(92),
                TextID = MyInternationalizationString.custompush,
                IsBold = true,
            };
            topRowLayout.AddChidren(titleName);

@@ -74,7 +75,7 @@
            {
                Width = Application.GetRealWidth(1080),
                Height = Application.GetRealHeight(600),
                TextAlignment = TextAlignment.CenterLeft,
                TextAlignment = TextAlignment.TopLeft,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
                Text = Common.Logic.CurrentLogic.LogicCustomPushText,

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

@@ -39,6 +39,7 @@
                Height = Application.GetRealHeight(69),
                Y = Application.GetRealHeight(92),
                TextID = MyInternationalizationString.cycle,
                IsBold = true,
            };
            topRowLayout.AddChidren(titleName);


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

@@ -20,6 +20,7 @@
        public void Show(int isInt = 0, bool edit = false)
        {


            #region  最上面的布局代码
            var topRowLayout = new RowLayout
            {
@@ -39,6 +40,7 @@
                Height = Application.GetRealHeight(69),
                Y = Application.GetRealHeight(92),
                TextID = MyInternationalizationString.adddelay,
                IsBold = true,
            };
            topRowLayout.AddChidren(titleName);

@@ -109,9 +111,9 @@
            color.AddChidren(btnicon);
            var titleText = new Button
            {
                Width = Application.GetMinRealAverage(480),
                Width = Application.GetMinRealAverage(580),
                Height = Application.GetMinRealAverage(60),
                X = Application.GetRealWidth(300),
                X = Application.GetRealWidth(250),
                Y = blancolor.Bottom + Application.GetRealHeight(50),
                TextID = MyInternationalizationString.createtimetext,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,

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

@@ -49,6 +49,7 @@
                Height = Application.GetRealHeight(69),
                Y = Application.GetRealHeight(92),
                TextID = MyInternationalizationString.devicestate,
                IsBold = true,
            };
            topRowLayout.AddChidren(titleName);

@@ -1239,6 +1240,7 @@
                                        Width = Application.GetRealWidth(600),
                                        TextAlignment = TextAlignment.CenterLeft,
                                        TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                                        TextSize = 14,
                                    };
                                    timeoutrowlayout.AddChidren(btntimeout);

@@ -1453,20 +1455,23 @@
                        };
                        devicefra.AddChidren(Btntemperaturevalue);

                        var horizontalSeekBarVol = new HorizontalSeekBar
                        var horizontalSeekBarVol = new DiyImageSeekBar
                        {
                            Width = Application.GetRealWidth(920),
                            Height = Application.GetRealHeight(80),
                            Radius = (uint)Application.GetRealHeight(25),
                            Y = timetype.Bottom + Application.GetRealHeight(70 + 60 + 70),
                            X = Application.GetRealWidth(80),
                            ProgressColor = ZigbeeColor.Current.LogicProgressColorSelected,
                            Max = 100,
                            SleepTime = 1000,
                            ThumbRadius = 9,
                            Width = Application.GetRealWidth(920),
                            Height = Application.GetRealHeight(160),
                            IsProgressTextShow = false,//显示百分比
                            IsClickable = true,//进度条是否滑动
                            ProgressBarColor = ZigbeeColor.Current.LogicProgressColorSelected,//选中进度条颜色
                            ThumbImagePath = "ZigeeLogic/progressbtn_2.png",//进度条按钮图标
                            ThumbImageHeight = Application.GetRealHeight(56),//进度条按钮图标的高度（默认正方形：宽和高一样）
                            ProgressTextColor = ZigbeeColor.Current.LogicBtnCancelColor,//进度条原颜色
                            //ProgressTextSize = 13,//显示百分比字体大小 
                            SeekBarViewHeight = Application.GetRealHeight(10),//进度条的高度
                        };
                        devicefra.AddChidren(horizontalSeekBarVol);
                        horizontalSeekBarVol.MouseUpEventHandler += (sender, e) =>
                        horizontalSeekBarVol.OnProgressChangedEvent += (sender, e) =>
                        {
                            SelectedDeviceStatuscondition = "TemperatureSensor";
                            if (temperatureSensor.SensorDiv == 1)

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

@@ -37,6 +37,7 @@
                Height = Application.GetRealHeight(69),
                Y = Application.GetRealHeight(92),
                TextID = MyInternationalizationString.addaction,
                IsBold = true,
            };
            topRowLayout.AddChidren(titleName);


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

@@ -35,6 +35,7 @@
                Height = Application.GetRealHeight(69),
                Y = Application.GetRealHeight(92),
                TextID = MyInternationalizationString.addaction,
                IsBold = true,
            };
            topRowLayout.AddChidren(titleName);


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

@@ -36,6 +36,7 @@
                Height = Application.GetRealHeight(69),
                Y = Application.GetRealHeight(92),
                TextID = MyInternationalizationString.userlist,
                IsBold = true,
                //Text = "选择用户",
            };
            topRowLayout.AddChidren(titleName);

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

@@ -46,6 +46,7 @@
                Height = Application.GetRealHeight(69),
                Y = Application.GetRealHeight(92),
                TextID = MyInternationalizationString.devicestate,
                IsBold = true,
            };
            topRowLayout.AddChidren(titleName);

@@ -1054,18 +1055,18 @@
                            LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
                        };
                        openframelayout.AddChidren(horizontalSeekBarRow);
                        var horizontalSeekBarVol = new HorizontalSeekBar
                        var horizontalSeekBarVol = new DiyImageSeekBar
                        {
                            Width = Application.GetRealWidth(920),
                            Height = Application.GetRealHeight(80),
                            Radius = (uint)Application.GetRealHeight(25),
                            Y = Application.GetRealHeight(25),
                            //Gravity = Gravity.CenterVertical,
                            ProgressColor = ZigbeeColor.Current.LogicProgressColorSelected,
                            Max = 100,
                            SleepTime = 1000,
                            ThumbRadius = 9,
                            IsCanMove = false
                            Height = Application.GetRealHeight(160),
                            IsProgressTextShow = true,//显示百分比
                            IsClickable = false,//进度条是否滑动
                            ProgressBarColor = ZigbeeColor.Current.LogicProgressColorSelected,//选中进度条颜色
                            ThumbImagePath = "ZigeeLogic/progressbtn2.png",//进度条按钮图标
                            ThumbImageHeight = Application.GetRealHeight(56),//进度条按钮图标的高度（默认正方形：宽和高一样）
                            ProgressTextColor = ZigbeeColor.Current.LogicBtnCancelColor,//进度条原颜色
                            ProgressTextSize = 13,//显示百分比字体大小 
                            SeekBarViewHeight = Application.GetRealHeight(10),//进度条的高度
                        };
                        horizontalSeekBarRow.AddChidren(horizontalSeekBarVol);

@@ -1140,7 +1141,7 @@
                        #endregion

                        int Progressvalue = 100;
                        horizontalSeekBarVol.ProgressChanged += (sender, e) =>
                        horizontalSeekBarVol.OnProgressChangedEvent += (sender, e) =>
                        {
                            SelectedDeviceStatusaction = "yes";
                            Progressvalue = horizontalSeekBarVol.Progress;
@@ -1162,8 +1163,8 @@
                        EventHandler<MouseEventArgs> openclick = (sender, e) =>
                        {
                            SelectedDeviceStatusaction = "yes";
                            horizontalSeekBarVol.IsCanMove = true;
                            horizontalSeekBarVol.ProgressColor = ZigbeeColor.Current.LogicProgressColorSelected;
                            horizontalSeekBarVol.IsClickable = true;
                            horizontalSeekBarVol.ProgressBarColor = ZigbeeColor.Current.LogicProgressColorSelected;
                            openBtnSelected.Visible = true;
                            closeBtnSelected.Visible = false;
                            takebackBtnSelected.Visible = false;
@@ -1190,8 +1191,8 @@
                        EventHandler<MouseEventArgs> closeclick = (sender, e) =>
                        {
                            SelectedDeviceStatusaction = "yes";
                            horizontalSeekBarVol.IsCanMove = false;
                            horizontalSeekBarVol.ProgressColor = ZigbeeColor.Current.LogicProgressColor;
                            horizontalSeekBarVol.IsClickable = false;
                            horizontalSeekBarVol.ProgressBarColor = ZigbeeColor.Current.LogicProgressColor;
                            openBtnSelected.Visible = false;
                            closeBtnSelected.Visible = true;
                            takebackBtnSelected.Visible = false;
@@ -1215,8 +1216,8 @@
                        EventHandler<MouseEventArgs> takebackclick = (sender, e) =>
                        {
                            SelectedDeviceStatusaction = "yes";
                            horizontalSeekBarVol.IsCanMove = false;
                            horizontalSeekBarVol.ProgressColor = ZigbeeColor.Current.LogicProgressColor;
                            horizontalSeekBarVol.IsClickable = false;
                            horizontalSeekBarVol.ProgressBarColor = ZigbeeColor.Current.LogicProgressColor;
                            openBtnSelected.Visible = false;
                            closeBtnSelected.Visible = false;
                            takebackBtnSelected.Visible = true;
@@ -1258,8 +1259,8 @@
                                        openBtnSelected.Visible = false;
                                        closeBtnSelected.Visible = true;
                                        takebackBtnSelected.Visible = false;
                                        horizontalSeekBarVol.IsCanMove = false;
                                        horizontalSeekBarVol.ProgressColor = ZigbeeColor.Current.LogicProgressColor;
                                        horizontalSeekBarVol.IsClickable = false;
                                        horizontalSeekBarVol.ProgressBarColor = ZigbeeColor.Current.LogicProgressColor;
                                    }
                                    else if (value["Data1"] == "2")
                                    {
@@ -1267,8 +1268,8 @@
                                        openBtnSelected.Visible = false;
                                        closeBtnSelected.Visible = false;
                                        takebackBtnSelected.Visible = true;
                                        horizontalSeekBarVol.IsCanMove = false;
                                        horizontalSeekBarVol.ProgressColor = ZigbeeColor.Current.LogicProgressColor;
                                        horizontalSeekBarVol.IsClickable = false;
                                        horizontalSeekBarVol.ProgressBarColor = ZigbeeColor.Current.LogicProgressColor;
                                    }

                                }
@@ -1279,8 +1280,8 @@
                                    openBtnSelected.Visible = true;
                                    closeBtnSelected.Visible = false;
                                    takebackBtnSelected.Visible = false;
                                    horizontalSeekBarVol.IsCanMove = true;
                                    horizontalSeekBarVol.ProgressColor = ZigbeeColor.Current.LogicProgressColorSelected;
                                    horizontalSeekBarVol.IsClickable = true;
                                    horizontalSeekBarVol.ProgressBarColor = ZigbeeColor.Current.LogicProgressColorSelected;
                                    horizontalSeekBarVol.Progress = int.Parse(value["Data1"]) * 100 / 254;
                                    Progressvalue = horizontalSeekBarVol.Progress;

@@ -1352,18 +1353,18 @@
                            LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
                        };
                        openframelayout.AddChidren(horizontalSeekBarRow);
                        var horizontalSeekBarVol = new HorizontalSeekBar
                        var horizontalSeekBarVol = new DiyImageSeekBar
                        {
                            Width = Application.GetRealWidth(920),
                            Height = Application.GetRealHeight(80),
                            Radius = (uint)Application.GetRealHeight(25),
                            Y = Application.GetRealHeight(25),
                            //Gravity = Gravity.CenterVertical,
                            ProgressColor = ZigbeeColor.Current.LogicProgressColorSelected,
                            Max = 100,
                            SleepTime = 1000,
                            ThumbRadius = 9,
                            IsCanMove = false
                            Height = Application.GetRealHeight(160),
                            IsProgressTextShow = true,//显示百分比
                            IsClickable = false,//进度条是否滑动
                            ProgressBarColor = ZigbeeColor.Current.LogicProgressColorSelected,//选中进度条颜色
                            ThumbImagePath = "ZigeeLogic/progressbtn2.png",//进度条按钮图标
                            ThumbImageHeight = Application.GetRealHeight(56),//进度条按钮图标的高度（默认正方形：宽和高一样）
                            ProgressTextColor = ZigbeeColor.Current.LogicBtnCancelColor,//进度条原颜色
                            ProgressTextSize = 13,//显示百分比字体大小 
                            SeekBarViewHeight = Application.GetRealHeight(10),//进度条的高度
                        };
                        horizontalSeekBarRow.AddChidren(horizontalSeekBarVol);

@@ -1405,7 +1406,7 @@

                        #endregion
                        int Progressvalue = 100;
                        horizontalSeekBarVol.ProgressChanged += (sender, e) =>
                        horizontalSeekBarVol.OnProgressChangedEvent += (sender, e) =>
                        {
                            SelectedDeviceStatusaction = "yes";
                            Progressvalue = horizontalSeekBarVol.Progress;
@@ -1425,8 +1426,8 @@
                        EventHandler<MouseEventArgs> openclick = (sender, e) =>
                        {
                            SelectedDeviceStatusaction = "yes";
                            horizontalSeekBarVol.IsCanMove = true;
                            horizontalSeekBarVol.ProgressColor = ZigbeeColor.Current.LogicProgressColorSelected;
                            horizontalSeekBarVol.IsClickable = true;
                            horizontalSeekBarVol.ProgressBarColor = ZigbeeColor.Current.LogicProgressColorSelected;
                            openBtnSelected.Visible = true;
                            closeBtnSelected.Visible = false;
                            horizontalSeekBarVol.Progress = Progressvalue;
@@ -1450,8 +1451,8 @@
                        EventHandler<MouseEventArgs> closeclick = (sender, e) =>
                        {
                            SelectedDeviceStatusaction = "yes";
                            horizontalSeekBarVol.IsCanMove = false;
                            horizontalSeekBarVol.ProgressColor = ZigbeeColor.Current.LogicProgressColor;
                            horizontalSeekBarVol.IsClickable = false;
                            horizontalSeekBarVol.ProgressBarColor = ZigbeeColor.Current.LogicProgressColor;
                            openBtnSelected.Visible = false;
                            closeBtnSelected.Visible = true;

@@ -1492,8 +1493,8 @@
                                        }
                                        switchdictionary.Add("Data1", "5");
                                        switchdictionary.Add("Data2", value["Data2"]);
                                        horizontalSeekBarVol.IsCanMove = true;
                                        horizontalSeekBarVol.ProgressColor = ZigbeeColor.Current.LogicProgressColorSelected;
                                        horizontalSeekBarVol.IsClickable = true;
                                        horizontalSeekBarVol.ProgressBarColor = ZigbeeColor.Current.LogicProgressColorSelected;
                                        openBtnSelected.Visible = true;
                                        closeBtnSelected.Visible = false;
                                        horizontalSeekBarVol.Progress = int.Parse(value["Data2"]);
@@ -1508,8 +1509,8 @@
                                        switchdictionary.Add("Data1", "1");
                                        openBtnSelected.Visible = false;
                                        closeBtnSelected.Visible = true;
                                        horizontalSeekBarVol.IsCanMove = false;
                                        horizontalSeekBarVol.ProgressColor = ZigbeeColor.Current.LogicProgressColor;
                                        horizontalSeekBarVol.IsClickable = false;
                                        horizontalSeekBarVol.ProgressBarColor = ZigbeeColor.Current.LogicProgressColor;
                                    }

                                }

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

@@ -45,6 +45,7 @@
                Height = Application.GetRealHeight(69),
                Y = Application.GetRealHeight(92),
                TextID = MyInternationalizationString.addscene,
                IsBold = true,
            };
            topRowLayout.AddChidren(titleName);


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

@@ -40,6 +40,7 @@
                Height = Application.GetRealHeight(69),
                Y = Application.GetRealHeight(92),
                TextID = MyInternationalizationString.selection,
                IsBold = true,
            };
            topRowLayout.AddChidren(titleName);
            if (Common.Logic.CurrentLogic.LogicId != 0)

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

@@ -35,6 +35,7 @@
                Height = Application.GetRealHeight(69),
                Y = Application.GetRealHeight(92),
                TextID = MyInternationalizationString.linkageevent,
                IsBold = true,
            };
            topRowLayout.AddChidren(titleName);


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

@@ -37,6 +37,7 @@
                Height = Application.GetRealHeight(69),
                Y = Application.GetRealHeight(92),
                Text = titlename,
                IsBold = true,
            };
            topRowLayout.AddChidren(titleName);


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

@@ -27,6 +27,7 @@
                TextID = MyInternationalizationString.cycle,
                TextSize = 16,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                IsBold = true,
            };
            topFrameLayout.AddChidren(titleName);


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

@@ -38,6 +38,7 @@
                Height = Application.GetRealHeight(69),
                Y = Application.GetRealHeight(92),
                Text = name,
                IsBold = true,
            };
            topRowLayout.AddChidren(titleName);


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

@@ -40,6 +40,7 @@
                Height = Application.GetRealHeight(69),
                Y = Application.GetRealHeight(92),
                TextID = MyInternationalizationString.selection,
                IsBold = true,
            };
            topRowLayout.AddChidren(titleName);
            if (Common.Logic.CurrentLogic.LogicId != 0)

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

@@ -25,7 +25,6 @@
        Button clicktextcolcrbutton = new Button();
        public void Show()
        {

            UserView.HomePage.Instance.ScrollEnabled = false;
            this.BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor;
            #region  最上面的布局代码
@@ -47,6 +46,7 @@
                Height = Application.GetRealHeight(69),
                Y = Application.GetRealHeight(92),
                TextID = MyInternationalizationString.devicestate,
                IsBold = true,
            };
            topRowLayout.AddChidren(titleName);

@@ -1052,22 +1052,22 @@
                            LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
                        };
                        openframelayout.AddChidren(horizontalSeekBarRow);
                        var horizontalSeekBarVol = new HorizontalSeekBar
                        var horizontalSeekBarVol = new DiyImageSeekBar
                        {
                            Width = Application.GetRealWidth(920),
                            Height = Application.GetRealHeight(80),
                            Radius = (uint)Application.GetRealHeight(25),
                            Y = Application.GetRealHeight(25),
                            //Gravity = Gravity.CenterVertical,
                            ProgressColor = ZigbeeColor.Current.LogicProgressColorSelected,
                            Max = 100,
                            SleepTime = 1000,
                            ThumbRadius = 9,
                            IsCanMove = false
                            Height = Application.GetRealHeight(160),
                            IsProgressTextShow = true,//显示百分比
                            IsClickable = false,//进度条是否滑动
                            ProgressBarColor = ZigbeeColor.Current.LogicProgressColorSelected,//选中进度条颜色
                            ThumbImagePath = "ZigeeLogic/progressbtn2.png",//进度条按钮图标
                            ThumbImageHeight = Application.GetRealHeight(56),//进度条按钮图标的高度（默认正方形：宽和高一样）
                            ProgressTextColor = ZigbeeColor.Current.LogicBtnCancelColor,//进度条原颜色
                            ProgressTextSize = 13,//显示百分比字体大小 
                            SeekBarViewHeight = Application.GetRealHeight(10),//进度条的高度

                        };
                        horizontalSeekBarRow.AddChidren(horizontalSeekBarVol);

                        #endregion
                         #endregion

                        #region  关
                        var closeframelayout = new FrameLayout
@@ -1138,7 +1138,7 @@
                        #endregion

                        int Progressvalue = 100;
                        horizontalSeekBarVol.ProgressChanged += (sender, e) =>
                        horizontalSeekBarVol.OnProgressChangedEvent += (sender, e) =>
                        {
                            SelectedDeviceStatusaction = "yes";
                            Progressvalue = horizontalSeekBarVol.Progress;
@@ -1160,8 +1160,8 @@
                        EventHandler<MouseEventArgs> openclick = (sender, e) =>
                        {
                            SelectedDeviceStatusaction = "yes";
                            horizontalSeekBarVol.IsCanMove = true;
                            horizontalSeekBarVol.ProgressColor = ZigbeeColor.Current.LogicProgressColorSelected;
                            horizontalSeekBarVol.IsClickable = true;
                            horizontalSeekBarVol.ProgressBarColor = ZigbeeColor.Current.LogicProgressColorSelected;
                            openBtnSelected.Visible = true;
                            closeBtnSelected.Visible = false;
                            takebackBtnSelected.Visible = false;
@@ -1188,8 +1188,8 @@
                        EventHandler<MouseEventArgs> closeclick = (sender, e) =>
                        {
                            SelectedDeviceStatusaction = "yes";
                            horizontalSeekBarVol.IsCanMove = false;
                            horizontalSeekBarVol.ProgressColor = ZigbeeColor.Current.LogicProgressColor;
                            horizontalSeekBarVol.IsClickable = false;
                            horizontalSeekBarVol.ProgressBarColor = ZigbeeColor.Current.LogicProgressColor;
                            openBtnSelected.Visible = false;
                            closeBtnSelected.Visible = true;
                            takebackBtnSelected.Visible = false;
@@ -1213,8 +1213,8 @@
                        EventHandler<MouseEventArgs> takebackclick = (sender, e) =>
                        {
                            SelectedDeviceStatusaction = "yes";
                            horizontalSeekBarVol.IsCanMove = false;
                            horizontalSeekBarVol.ProgressColor = ZigbeeColor.Current.LogicProgressColor;
                            horizontalSeekBarVol.IsClickable = false;
                            horizontalSeekBarVol.ProgressBarColor = ZigbeeColor.Current.LogicProgressColor;
                            openBtnSelected.Visible = false;
                            closeBtnSelected.Visible = false;
                            takebackBtnSelected.Visible = true;
@@ -1256,8 +1256,8 @@
                                        openBtnSelected.Visible = false;
                                        closeBtnSelected.Visible = true;
                                        takebackBtnSelected.Visible = false;
                                        horizontalSeekBarVol.IsCanMove = false;
                                        horizontalSeekBarVol.ProgressColor = ZigbeeColor.Current.LogicProgressColor;
                                        horizontalSeekBarVol.IsClickable = false;
                                        horizontalSeekBarVol.ProgressBarColor = ZigbeeColor.Current.LogicProgressColor;
                                    }
                                    else if (value["Data1"] == "2")
                                    {
@@ -1265,8 +1265,8 @@
                                        openBtnSelected.Visible = false;
                                        closeBtnSelected.Visible = false;
                                        takebackBtnSelected.Visible = true;
                                        horizontalSeekBarVol.IsCanMove = false;
                                        horizontalSeekBarVol.ProgressColor = ZigbeeColor.Current.LogicProgressColor;
                                        horizontalSeekBarVol.IsClickable = false;
                                        horizontalSeekBarVol.ProgressBarColor = ZigbeeColor.Current.LogicProgressColor;
                                    }

                                }
@@ -1277,8 +1277,8 @@
                                    openBtnSelected.Visible = true;
                                    closeBtnSelected.Visible = false;
                                    takebackBtnSelected.Visible = false;
                                    horizontalSeekBarVol.IsCanMove = true;
                                    horizontalSeekBarVol.ProgressColor = ZigbeeColor.Current.LogicProgressColorSelected;
                                    horizontalSeekBarVol.IsClickable = true;
                                    horizontalSeekBarVol.ProgressBarColor = ZigbeeColor.Current.LogicProgressColorSelected;
                                    horizontalSeekBarVol.Progress = int.Parse(value["Data1"])*100/254;
                                    Progressvalue = horizontalSeekBarVol.Progress;

@@ -1350,18 +1350,18 @@
                            LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
                        };
                        openframelayout.AddChidren(horizontalSeekBarRow);
                        var horizontalSeekBarVol = new HorizontalSeekBar
                        var horizontalSeekBarVol = new DiyImageSeekBar
                        {
                            Width = Application.GetRealWidth(920),
                            Height = Application.GetRealHeight(80),
                            Radius = (uint)Application.GetRealHeight(25),
                            Y = Application.GetRealHeight(25),
                            //Gravity = Gravity.CenterVertical,
                            ProgressColor = ZigbeeColor.Current.LogicProgressColorSelected,
                            Max = 100,
                            SleepTime = 1000,
                            ThumbRadius = 9,
                            IsCanMove = false
                            Height = Application.GetRealHeight(160),
                            IsProgressTextShow = true,//显示百分比
                            IsClickable = false,//进度条是否滑动
                            ProgressBarColor = ZigbeeColor.Current.LogicProgressColorSelected,//选中进度条颜色
                            ThumbImagePath = "ZigeeLogic/progressbtn2.png",//进度条按钮图标
                            ThumbImageHeight = Application.GetRealHeight(56),//进度条按钮图标的高度（默认正方形：宽和高一样）
                            ProgressTextColor = ZigbeeColor.Current.LogicBtnCancelColor,//进度条原颜色
                            ProgressTextSize = 14,//显示百分比字体大小 
                            SeekBarViewHeight = Application.GetRealHeight(10),//进度条的高度
                        };
                        horizontalSeekBarRow.AddChidren(horizontalSeekBarVol);

@@ -1403,7 +1403,7 @@

                        #endregion
                        int Progressvalue = 100;
                        horizontalSeekBarVol.ProgressChanged += (sender, e) =>
                        horizontalSeekBarVol.OnProgressChangedEvent += (sender, e) =>
                        {
                            SelectedDeviceStatusaction = "yes";
                            Progressvalue = horizontalSeekBarVol.Progress;
@@ -1423,8 +1423,8 @@
                        EventHandler<MouseEventArgs> openclick = (sender, e) =>
                        {
                            SelectedDeviceStatusaction = "yes";
                            horizontalSeekBarVol.IsCanMove = true;
                            horizontalSeekBarVol.ProgressColor = ZigbeeColor.Current.LogicProgressColorSelected;
                            horizontalSeekBarVol.IsClickable = true;
                            horizontalSeekBarVol.ProgressBarColor = ZigbeeColor.Current.LogicProgressColorSelected;
                            openBtnSelected.Visible = true;
                            closeBtnSelected.Visible = false;
                            horizontalSeekBarVol.Progress = Progressvalue;
@@ -1448,8 +1448,8 @@
                        EventHandler<MouseEventArgs> closeclick = (sender, e) =>
                        {
                            SelectedDeviceStatusaction = "yes";
                            horizontalSeekBarVol.IsCanMove = false;
                            horizontalSeekBarVol.ProgressColor = ZigbeeColor.Current.LogicProgressColor;
                            horizontalSeekBarVol.IsClickable = false;
                            horizontalSeekBarVol.ProgressBarColor = ZigbeeColor.Current.LogicProgressColor;
                            openBtnSelected.Visible = false;
                            closeBtnSelected.Visible = true;

@@ -1490,8 +1490,8 @@
                                        }
                                        switchdictionary.Add("Data1", "5");
                                        switchdictionary.Add("Data2", value["Data2"]);
                                        horizontalSeekBarVol.IsCanMove = true;
                                        horizontalSeekBarVol.ProgressColor = ZigbeeColor.Current.LogicProgressColorSelected;
                                        horizontalSeekBarVol.IsClickable = true;
                                        horizontalSeekBarVol.ProgressBarColor = ZigbeeColor.Current.LogicProgressColorSelected;
                                        openBtnSelected.Visible = true;
                                        closeBtnSelected.Visible = false;
                                        horizontalSeekBarVol.Progress = int.Parse(value["Data2"]);
@@ -1506,8 +1506,8 @@
                                        switchdictionary.Add("Data1", "1");
                                        openBtnSelected.Visible = false;
                                        closeBtnSelected.Visible = true;
                                        horizontalSeekBarVol.IsCanMove = false;
                                        horizontalSeekBarVol.ProgressColor = ZigbeeColor.Current.LogicProgressColor;
                                        horizontalSeekBarVol.IsClickable = false;
                                        horizontalSeekBarVol.ProgressBarColor = ZigbeeColor.Current.LogicProgressColor;
                                    }

                                }

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

@@ -32,6 +32,7 @@
                TextID = MyInternationalizationString.automation,
                TextSize = 16,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                IsBold = true,
            };
            topFrameLayout.AddChidren (titleName);


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

@@ -36,6 +36,7 @@
                TextID = MyInternationalizationString.automation,
                TextSize = 16,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                IsBold = true,
            };
            topFrameLayout.AddChidren (titleName);


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

@@ -43,6 +43,7 @@
                Height = Application.GetRealHeight(69),
                Y = Application.GetRealHeight(92),
                TextID = MyInternationalizationString.userlist,
                IsBold = true,
            };
            topRowLayout.AddChidren(titleName);


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

@@ -40,6 +40,7 @@
                Height = Application.GetRealHeight(69),
                Y = Application.GetRealHeight(92),
                TextID = MyInternationalizationString.securitymode,
                IsBold = true,
            };
            topRowLayout.AddChidren(titleName);


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

old mode 100755
new mode 100644
@@ -42,6 +42,7 @@
                //Text = "时间条件",
                TextID = MyInternationalizationString.Timecondition,
                TextSize = 17,
                IsBold = true,
            };
            topFrameLayout.AddChidren (titleName);


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

@@ -33,6 +33,7 @@
                TextID = MyInternationalizationString.automation,
                TextSize = 16,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                IsBold = true,
            };
            topFrameLayout.AddChidren (titleName);


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

@@ -33,6 +33,7 @@
                TextID = MyInternationalizationString.automation,
                TextSize = 16,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                IsBold = true,
            };
            topFrameLayout.AddChidren (titleName);


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

@@ -46,6 +46,7 @@
                Height = Application.GetRealHeight(69),
                Y = Application.GetRealHeight(92),
                TextID = MyInternationalizationString.devicestate,
                IsBold = true,
            };
            topRowLayout.AddChidren(titleName);


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

@@ -47,6 +47,7 @@
                Height = Application.GetRealHeight(69),
                Y = Application.GetRealHeight(92),
                TextID = MyInternationalizationString.devicestate,
                IsBold = true,
            };
            topRowLayout.AddChidren(titleName);


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

@@ -36,6 +36,7 @@
                Height = Application.GetRealHeight(69),
                Y = Application.GetRealHeight(92),
                Text = name,
                IsBold = true,
            };
            topRowLayout.AddChidren(titleName);


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

@@ -44,6 +44,7 @@
                Height = Application.GetRealHeight(69),
                Y = Application.GetRealHeight(92),
                TextID = MyInternationalizationString.selection,
                IsBold = true,
            };
            topRowLayout.AddChidren(titleName);
            if (Common.Logic.CurrentLogic.LogicId != 0)

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

@@ -40,6 +40,7 @@
                Height = Application.GetRealHeight(69),
                Y = Application.GetRealHeight(92),
                TextID = MyInternationalizationString.addtime,
                IsBold = true,
            };
            topRowLayout.AddChidren(titleName);


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

@@ -88,6 +88,7 @@
                Height = Application.GetRealHeight(69),
                Y = Application.GetRealHeight(92),
                TextID = MyInternationalizationString.addtime,
                IsBold = true,
            };
            topRowLayout.AddChidren(titleName);


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

@@ -37,6 +37,7 @@
                Height = Application.GetRealHeight(69),
                Y = Application.GetRealHeight(92),
                Text = titlename,
                IsBold = true,
            };
            topRowLayout.AddChidren(titleName);


 ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs

old mode 100755
new mode 100644
@@ -937,7 +937,9 @@
                Height = Application.GetRealHeight(200),
                Text = Language.StringByID(R.MyInternationalizationString.NoFunction).Replace("{\\r\\n}", "\r\n"),
                TextColor = ZigbeeColor.Current.GXCPlaceHolderTextColor,
                IsMoreLines = true
                IsMoreLines = true,
                TextAlignment=TextAlignment.Center,

            };
            functionSceneBodyView.AddChidren(noFunctionTip);
        }