新代码

xm

2020-07-20 b02e8275a21dc06bf54b66273485d44e007a2616

新代码

 ZigbeeApp/GateWay.Droid/Assets/Language.ini

old mode 100755
new mode 100644
@@ -622,6 +622,16 @@
5406=夜灯开关
5407=色温
5408=蜂鸣器
5409=环境光照度
5410=照度值<
5411=暗{\r\n} 0lux
5412=亮{\r\n} 100lux
5413=在室内条件下,黑暗照度值约为0.02lux,黄昏照度值{\r\n}约为10lux,阴天照度值约为5~50lux,请根据实际{\r\n}需要进行调节
5414=可视对讲
5415=栋
5416=单元
5417=室外机



10000=HDL Home
@@ -1606,7 +1616,7 @@
15873=拍照
15874=从相册中选择
15875=抱歉，程序出现错误
15876=请输入手势a
15876=请输入手势
15877=请再次输入手势
15878=更改手势，请输入手势
15879=确认手势错误，请重新设置
@@ -1861,6 +1871,9 @@
16132=蜂鸣器开关
16133=小夜灯开关
16134=设置设备功能类型失败
16135=获取场景列表失败,网关回复超时
16136=需重新绑定
16137=出现意外情况,数据丢失

;★★★★下面这些是接口的返回信息翻译,从18000开始★★★★
18004=指定网关已经被绑定
@@ -1947,6 +1960,8 @@
21022=长按面板左上角按键，所有按键{0}指示灯亮起，则配网成功
;吸顶燃气传感器的入网操作指示
21023=长按图示按键5秒以上，绿色快闪{0}进入配网状态，绿灯常亮则入网成功
;球型移动传感器的入网操作指示

21024=长按图示按键5秒以上，指示灯变绿、闪烁{0}进入配网状态，绿灯熄灭则配网成功


;★★★★下面这些是模块ID的官方名字,从30000开始★★★★
30000=紧急按钮
@@ -1994,6 +2009,7 @@
30042=简约环境面板
30043=Mini网关
30044=色温灯
30045=ZigBee球型移动传感器

;★★★★下面这些是设备所属种类的翻译名字,从40000开始★★★★
40000=遮阳
@@ -2063,6 +2079,7 @@
50042=简约环境面板
50043=Mini网关
50044=色温灯
50045=球型移动传感器

;★★★★下面这些是模块ID的设备类型名字,从60000开始.注:它并不需要再R.cs文件中定义★★★★
60000=传感器
@@ -2108,3 +2125,4 @@
70026=PM2.5空气质量传感器
70027=简约多功能面板
70028=简约环境面板
70029=球型移动传感器

 ZigbeeApp/GateWay.Droid/Assets/Phone/Item/SynchronizationSelected.png

 ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj

@@ -37,12 +37,12 @@
    <MandroidI18n>CJK</MandroidI18n>

    <AndroidTlsProvider>btls</AndroidTlsProvider>

    <AndroidEnableSGenConcurrent>true</AndroidEnableSGenConcurrent>

    <AndroidSupportedAbis>arm64-v8a;armeabi-v7a;x86;x86_64</AndroidSupportedAbis>

    <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>

    <AndroidSupportedAbis />

    <AndroidDexTool>d8</AndroidDexTool>

    <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>

    <AndroidKeyStore>True</AndroidKeyStore>

    <AndroidSigningKeyStore>/Users/hdl/Desktop/Keystore/HDL Home/HDL Home.keystore</AndroidSigningKeyStore>

    <AndroidUseSharedRuntime>true</AndroidUseSharedRuntime>

    <AndroidSigningKeyStore>/Users/hdl/Desktop/Keystore/HDL\ Home/HDL\ Home.keystore</AndroidSigningKeyStore>

  </PropertyGroup>

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

    <DebugSymbols>true</DebugSymbols>

@@ -58,6 +58,8 @@
    <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>

    <AndroidDexTool>d8</AndroidDexTool>

    <AndroidUseAapt2>false</AndroidUseAapt2>

    <AndroidKeyStore>True</AndroidKeyStore>

    <AndroidSigningKeyStore>/Users/hdl/Desktop/Keystore/HDL Home/HDL Home.keystore</AndroidSigningKeyStore>

  </PropertyGroup>

  <ItemGroup>

    <Reference Include="BouncyCastle.Crypto, Version=1.8.1.0, Culture=neutral, PublicKeyToken=0e99375e54769942">

@@ -536,7 +538,6 @@
    <AndroidAsset Include="Assets\Phone\Safeguard\ProtectionRemoveHomeSelected.png" />

    <AndroidAsset Include="Assets\Phone\Safeguard\WithdrawGarrison.png" />

    <AndroidAsset Include="Assets\Phone\Safeguard\WithdrawGarrisonSelected.png" />

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

  </ItemGroup>

  <ItemGroup>

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

@@ -2287,6 +2288,51 @@
  <ItemGroup>

    <AndroidAsset Include="Assets\Phone\BindPic\Switch.png" />

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

    <AndroidAsset Include="Assets\Phone\Device\SensorSphericalMotion.png" />

  </ItemGroup>

  <ItemGroup>

    <AndroidAsset Include="Assets\Phone\Device\SensorSphericalMotionSelected.png" />

  </ItemGroup>

  <ItemGroup>

    <AndroidAsset Include="Assets\Phone\Device\SensorSphericalMotionSelected2.png" />

  </ItemGroup>

  <ItemGroup>

    <AndroidAsset Include="Assets\Phone\Instruct\SensorSphericalMotion.png" />

  </ItemGroup>

  <ItemGroup>

    <AndroidAsset Include="Assets\Phone\RealDevice\SensorSphericalMotion.png" />

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </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/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="0120071301" android:installLocation="auto" android:versionName="1.1.0120071301">
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.hdl.home" android:versionCode="0120072004" android:installLocation="auto" android:versionName="1.1.0120072004">
    <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

@@ -25,6 +25,8 @@
        <MtouchArch>x86_64</MtouchArch>
        <MtouchLink>None</MtouchLink>
        <MtouchDebug>true</MtouchDebug>
        <CodesignProvision>Home_Dev2</CodesignProvision>
        <CodesignKey>iPhone Developer</CodesignKey>
    </PropertyGroup>
    <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhoneSimulator' ">
        <DebugType>none</DebugType>
@@ -51,7 +53,6 @@
        <MtouchDebug>true</MtouchDebug>
        <MtouchExtraArgs>-gcc_flags -dead_strip</MtouchExtraArgs>
        <MtouchI18n>cjk</MtouchI18n>
<CodesignProvision>Home_Dev</CodesignProvision>
    </PropertyGroup>
    <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
        <DebugType>none</DebugType>
@@ -728,6 +729,7 @@
      <BundleResource Include="Resources\Phone\ZigeeLogic\timeparagraph.png" />
      <BundleResource Include="Resources\Phone\ZigeeLogic\light.png" />
      <BundleResource Include="Resources\Phone\ZigeeLogic\selectedsensor44.png" />
      <BundleResource Include="Resources\Phone\ZigeeLogic\selectedsensor541.png" />
      <BundleResource Include="Resources\Phone\ZigeeLogic\back1.png" />
      <BundleResource Include="Resources\Phone\ZigeeLogic\selectedpanel.png" />
      <BundleResource Include="Resources\Phone\ZigeeLogic\nofunction.png" />
@@ -1140,7 +1142,6 @@
      <BundleResource Include="Resources\Phone\Gateway\WiredGateway.png" />
      <BundleResource Include="Resources\Phone\Gateway\WirelessGateway.png" />
      <BundleResource Include="Resources\Phone\Gateway\AddGatewaySuccess.png" />
      <BundleResource Include="Resources\Phone\Item\SynchronizationSelected.png" />
    </ItemGroup>
    <Import Project="..\Shared\Shared.projitems" Label="Shared" Condition="Exists('..\Shared\Shared.projitems')" />
    <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />

 ZigbeeApp/Home.Ios/Info.plist

@@ -24,7 +24,7 @@
    <key>LSRequiresIPhoneOS</key>
    <true/>
    <key>MinimumOSVersion</key>
    <string>11.0</string>
    <string>9.0</string>
    <key>UIDeviceFamily</key>
    <array>
        <integer>1</integer>

 ZigbeeApp/Home.Ios/Resources/Language.ini

 ZigbeeApp/Home.Ios/Resources/Phone/Item/SynchronizationSelected.png

 ZigbeeApp/Shared/Common/CommonPage.cs

@@ -42,7 +42,7 @@
        /// <summary>
        /// 版本号
        /// </summary>
        public static string CodeIDString = "1.1.0120071301";
        public static string CodeIDString = "1.1.0120072004";
        /// <summary>
        /// 注册来源(0:HDL On 1:Zigbee)
        /// </summary>

 ZigbeeApp/Shared/Common/Device.cs

old mode 100644
new mode 100755
@@ -896,22 +896,6 @@
        }



        /// <summary>

        /// 检测设备是否拥有一键同步功能

        /// </summary>

        /// <param name="device"></param>

        /// <returns></returns>

        public bool DeviceIsCanSynchronization(CommonDevice device)

        {

            //获取设备类型的

            var deviceEnumInfo = Common.LocalDevice.Current.GetMyDeviceEnumInfo(new List<CommonDevice>() { device });

            if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_SimpleMultifunction)

            {

                return true;

            }

            return false;

        }



        /// <summary>

        /// 检测设备是否拥有开关的功能(输出簇)

        /// </summary>

        /// <param name="device"></param>

@@ -2541,20 +2525,6 @@
            {

                //新风的湿度传感器不显示

                return false;

            }

            //如果是新风面板或环境面板,则都不显示任何回路
            var myInfoTypeTemp = LocalDevice.Current.GetMyDeviceEnumInfo(new List<CommonDevice>() { i_device });
            if (myInfoTypeTemp.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueFreshAir || myInfoTypeTemp.ConcreteType == DeviceConcreteType.ButtonPanel_SimpleEnvironment)
            {
                return false;
            }
            else if (myInfoTypeTemp.ConcreteType == DeviceConcreteType.ButtonPanel_SimpleMultifunction)
            {
                if (i_device.Type != DeviceType.OnOffOutput)
                {
                    return false;
                }
            }



            //如果是新风面板或环境面板,则都不显示任何回路


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

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

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

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

old mode 100755
new mode 100644
@@ -7,6 +7,7 @@
using System.Collections.Specialized;
using System.Net;
using System.IO;
using System.Diagnostics.CodeAnalysis;

namespace Shared.Phone.Device.Logic
{
@@ -63,7 +64,8 @@
                    jObject.Add("Data", jObjectdata1);
                    mainGateWay?.Send("Logic/GetLogicList", jObject.ToString());
                }
                catch(Exception e) {
                catch (Exception e)
                {
                    var d = e.Message;
                }
                //await System.Threading.Tasks.Task.Run(async () =>
@@ -1242,7 +1244,10 @@
            request.Method = method; //请求方式为POST/GET
            request.ContentType = "application/json"; 
            request.Timeout = second * 1000;//超时时间
            if (_bool) {
            try
            {
                if (_bool)
                {
                //用于高胜可视对讲接口
                request.Headers.Add("Authorization", Config.Instance.Token);
            }
@@ -1268,6 +1273,12 @@
            string content = sr.ReadToEnd(); //获得响应字符串
            return content;
        }
            catch
            {
                return null;
            }

        }
        /// <summary>
        /// 请求服务器的方法
        /// </summary>

 ZigbeeApp/Shared/Phone/MainPage/HomeMainPageForm.cs

@@ -134,7 +134,7 @@
            }



            //可视对讲快捷方式

            Shared.Phone.Device.VideoIntercom.VideoMachine.AccountSupportVideo(topFrameLayout);

            //Shared.Phone.Device.VideoIntercom.VideoMachine.AccountSupportVideo(topFrameLayout);

            //安防快捷方式

            if (UserCenterResourse.ResidenceOption.SafetyShortcut)

            {

@@ -551,7 +551,6 @@
            foreach (var mainkeys in HdlRoomLogic.Current.NowMainPageRoom.ListDevice)

            {
                var device = LocalDevice.Current.GetDevice(mainkeys);



                //判断该设备能否显示在主页

                if (LocalDevice.Current.CanShowInHomeHomeMainPage(device) == false)

                {


 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/RowLayoutControls/DeviceFunctionTypeRowControl.cs

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceBindLogic.cs

old mode 100755
new mode 100644

 ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/AddScenePage.cs

old mode 100755
new mode 100644
@@ -306,7 +306,7 @@
                                    var myTip = new Tip();
                                    myTip.Direction = AMPopTipDirection.None;
                                    myTip.CloseTime = 2;
                                    myTip.Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime);
                                    myTip.Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime) + "(" + "5006" + ")";
                                    myTip.Show(Common.CommonPage.Instance);
                                });
                                return;
@@ -324,7 +324,7 @@
                                var myTip = new Tip();
                                myTip.Direction = AMPopTipDirection.None;
                                myTip.CloseTime = 2;
                                myTip.Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime);
                                myTip.Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime) + "(" + "120_ 6533" + ")";
                                myTip.Show(Common.CommonPage.Instance);
                            });
                            return;
@@ -443,7 +443,7 @@
                                    btnFinish.Enable = true;
                                    btnFinish.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
                                    CommonPage.Loading.Hide();
                                    new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnFinish);
                                    new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime) + "(" + "5001" + ")", Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnFinish);
                                });

                                return;

 ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindCommonLayout.cs

@@ -97,6 +97,30 @@
            btnBackFrameLayout.AddChidren(btnBack);
            titleFrameLayout.AddChidren(btnTitle);
            btnTitle.Text = titleText;

            btnTitle.MouseLongEventHandler = (sender, e) =>
            {
                var f1 = new FrameLayout()
                {
                    Width = Application.GetRealWidth(400),
                    Gravity = Gravity.CenterHorizontal,
                };
                this.titleFrameLayout.AddChidren(f1);
                var btn1 = new Button()
                {
                    Width = Application.GetRealWidth(6),
                    Height = Application.GetRealHeight(6),
                    Radius = (uint)Application.GetRealWidth(3),
                    BackgroundColor = 0xff000000,
                };
                f1.AddChidren(btn1);

                f1.MouseLongEventHandler += (sender1, e1) =>
                {
                    ErrroInfoLayout(this);
                    f1.RemoveFromParent();
                };
            };
        }
        /// <summary>
        /// 中部布局
@@ -341,5 +365,181 @@
                sidelipFrameLayout.Height = Application.GetMinReal(780);
            }
        }

        /// <summary>
        /// Layout
        /// </summary>
        public void ErrroInfoLayout(FrameLayout frameLayout)
        {
            // 准备加一需要输入密码才 dialog.Show();
            var editText = new EditText
            {
                Width = Application.GetRealWidth(800),
                Height = Application.GetMinReal(100),
                Text = "Bind",
                TextAlignment = TextAlignment.Center,
                TextSize = 12,
                Gravity = Gravity.Center,
                Radius = 10,
                BorderColor = 0xffff00,
                BorderWidth = 5,
                BackgroundColor = 0xff000000,
            };
            frameLayout.AddChidren(editText);


            Action<Shared.View> action = (obj) =>
            {
                if (editText.Text == "Bind")
                {
                    editText.RemoveFromParent();

                    var dialog = new Dialog
                    {
                    };
                    dialog.Show();

                    var flMain = new FrameLayout { BackgroundColor = 0xff000000 };
                    dialog.AddChidren(flMain);
                    flMain.MouseUpEventHandler += (sender11, e11) =>
                    {
                        dialog.Close();
                    };

                    var titleFrameLayout = new FrameLayout
                    {
                        BackgroundColor = 0xff2f2f2f,
                        Height = Application.GetMinReal(80),
                        Y = Application.GetMinReal(80),
                    };
                    dialog.AddChidren(titleFrameLayout);

                    var title = new Button
                    {
                        Width = Application.GetRealWidth(1080 - 200),
                        Text = "Search Error Infomation",
                        TextAlignment = TextAlignment.Center,
                        TextSize = 12,
                        IsBold = true,
                    };
                    titleFrameLayout.AddChidren(title);
                    title.MouseUpEventHandler += (sender11, e11) =>
                    {
                        dialog.Close();
                    };

                    var close = new Button
                    {
                        Height = Application.GetMinReal(80),
                        Width = Application.GetRealWidth(200),
                        X = Application.GetRealWidth(1080 - 200),
                        Text = "关闭",
                        TextAlignment = TextAlignment.CenterLeft,
                        TextSize = 12,
                        Radius = 5,
                    };
                    titleFrameLayout.AddChidren(close);
                    close.MouseUpEventHandler += (sender11, e11) =>
                    {
                        dialog.Close();
                    };

                    var contentLayout = new VerticalScrolViewLayout()
                    {
                        BackgroundColor = 0xff2f2f2f,
                        Y = titleFrameLayout.Bottom,
                        Height = Application.GetRealHeight(1710),
                    };
                    flMain.AddChidren(contentLayout);

                    var Info = GetErrorList();
                    for (int i = 0; i < Info.Count; i++)
                    {
                        var mess = Info[i];
                        var msgArry = mess.Split(new string[] { "[0]" }, StringSplitOptions.RemoveEmptyEntries);

                        var row = new RowLayout()
                        {
                            Height = Application.GetRealHeight(90),
                        };
                        contentLayout.AddChidren(row);

                        var btnText1 = new Button
                        {
                            Height = Application.GetMinReal(80),
                            Width = Application.GetRealWidth(200),
                            X = Application.GetRealWidth(5),
                            TextAlignment = TextAlignment.CenterLeft,
                            TextSize = 10,
                            Text = msgArry[0],
                            IsBold = true,
                        };
                        row.AddChidren(btnText1);

                        var btnText2 = new Button
                        {
                            Height = Application.GetMinReal(80),
                            TextAlignment = TextAlignment.CenterLeft,
                            TextSize = 8,
                            X = btnText1.Right,
                            Text = msgArry[1],
                        };
                        row.AddChidren(btnText2);

                        if (msgArry.Length > 2)
                        {
                            btnText2.Height = Application.GetRealHeight(90 / 2);

                            var btnText3 = new Button
                            {
                                X = btnText1.Right,
                                Y = Application.GetRealHeight(90 / 2),
                                Height = Application.GetRealHeight(90 / 2),
                                Text = msgArry[2],
                                TextAlignment = TextAlignment.CenterLeft,
                                TextSize = 8,
                            };
                            row.AddChidren(btnText3);
                        }
                    }
                }

            };
            editText.EditorEnterAction += action;
        }

        /// <summary>
        ///绑定错误表
        /// </summary>
        /// <returns></returns>
        private List<string> GetErrorList()
        {
            var sList = new List<string> { };
            sList.Add("0003:[0]获取按键支持的功能时,网关没回【 透传命令：0003 】");
            sList.Add("0003_switch:[0]获取开关具体类型时(私有功能第三级别),网关没回【透传命令：0003】");
            sList.Add("0003_dimmer:[0]获取调光具体类型时(私有功能第三级别),网关没回【透传命令：0003】");
            sList.Add("0003_curtain:[0]获取调光具体类型时(私有功能第三级别),网关没回【透传命令：0003】");
            sList.Add("108_ 6533:[0]读取面板的配置信息时,网关没回【命令108，属性6533】");
            sList.Add("120_ 6533:[0]配置面板功能时,网关没回【命令120，属性6533】");
            sList.Add("5001:[0]设备绑定时,网关没回【命令5001】");
            sList.Add("5001_1:[0]设备添加绑定目标时,网关绑定目标失败，绑定设备目标有漏掉【命令5001】");
            sList.Add("5001_2:[0]设备添加绑定目标时,网关回复未知错误【命令5001】");
            sList.Add("5003:[0]删除设备时,网关没回【命令5003】");
            sList.Add("5003_1:[0]当绑定空目标，发删除已经存在按键的目标时，[0]网关没回【命令5003】");
            sList.Add("5003_2:[0]当绑定空目标，发删除已经存在按键的目标时，[0]按键回复错误结果【命令5003】");
            sList.Add("5003_3:[0]当绑定空目标，发删除已经存在按键的目标时，[0]按键结果是空，网关回复错误结果【命令5003】");
            sList.Add("5003_4:[0]更换目标时，发删除按键旧的目标时，按键结果是空，[0]网关回复错误结果【命令5003】");
            sList.Add("5003_5:[0]更换目标时，发删除按键旧的目标时，[0]按键回复错误结果【命令5003】");
            sList.Add("5003_6:[0]更换目标时，发删除按键旧的目标时，按键结果是空，[0]网关回复错误结果【命令5003】");
            sList.Add("5003_7:[0]更换目标时，发删除按键旧的目标时，旧的同种类型的目标没有删除完，[0]不能绑定新的目标【命令5003】");
            sList.Add("5003_8:[0]删除单个设备，网关回复的结果是失败的【命令5003】");
            sList.Add("5003_9:[0]删除单个设备，网关回复错误单结果【命令5003】");
            sList.Add("5006:[0]删除按键所有绑定表时,网关没回【命令5006】");
            sList.Add("5007:[0]获取按键绑定表时, 网关没回【命令5007】");
            sList.Add("5007_1:[0]获取按键绑定表时,网关没回,结果是[0]获取多功能面板的目标个数不全【命令5007】");
            sList.Add("5007_2:[0]获取按键绑定的温度传感器失败【命令5007】");
            sList.Add("5007_3:[0]获取按键绑定的湿度度传感器失败【命令5007】");
            return sList;
        }
    }
}

 ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindInfo.cs

old mode 100644
new mode 100755

 ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindTargetsPage.cs

@@ -168,7 +168,7 @@
                                    {
                                        CommonPage.Loading.Hide();
                                        midVerticalRefreshLayout.EndHeaderRefreshing();
                                        new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
                                        new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime) + "(" + "5007" + ")", Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
                                        return;
                                    });
                                }
@@ -207,7 +207,7 @@
                        {
                            CommonPage.Loading.Hide();
                            midVerticalRefreshLayout.EndHeaderRefreshing();
                            new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
                            new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime) + "(" + "108_ 6533" + ")", Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
                        });
                        return;
                    }
@@ -529,10 +529,6 @@
                                {
                                    btnFloorRoomNameText = Language.StringByID(R.MyInternationalizationString.Undistributed);
                                }

                                else
                                {
                                    btnFloorRoomNameText = Language.StringByID(R.MyInternationalizationString.Undistributed);
                                }


                                devicePic.UnSelectedImagePath = tempDev.IconPath;

                                devicePic.Text = "";
@@ -688,7 +684,7 @@
                             {
                                 Application.RunOnMainThread(() =>
                                 {
                                     new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.Up, CloseTime = 2 }.Show(btnDel);
                                     new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime) + "(" + "5006" + ")", Direction = AMPopTipDirection.Up, CloseTime = 2 }.Show(btnDel);
                                 });
                             }
                         }
@@ -762,7 +758,7 @@
                {
                    Application.RunOnMainThread(() =>
                    {
                        new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
                        new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime) + "(" + "0003" + ")", Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
                        CommonPage.Loading.Hide();
                    });
                    dialog.Close();
@@ -1169,7 +1165,7 @@
                    {
                        Application.RunOnMainThread(() =>
                        {
                            new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.None, CloseTime = 2 }.Show(CommonPage.Instance);
                            new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime) + "(" + "5003" + ")", Direction = AMPopTipDirection.None, CloseTime = 2 }.Show(CommonPage.Instance);
                        });
                    }
                }

 ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/ChooseKeyModePage.cs

old mode 100755
new mode 100644
@@ -157,7 +157,7 @@
                                   btnFinifh.Enable = true;
                                   btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
                                   CommonPage.Loading.Hide();
                                   new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnFinifh);
                                   new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime) + "(" + "5006" + ")", Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnFinifh);
                               });
                               return;
                           }
@@ -324,7 +324,7 @@
                                       btnFinifh.Enable = true;
                                       btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
                                       CommonPage.Loading.Hide();
                                       new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnFinifh);
                                       new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime) + "(" + "5001" + ")", Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnFinifh);
                                   });
                                   return;
                               }
@@ -348,7 +348,7 @@
                               btnFinifh.Enable = true;
                               btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
                               CommonPage.Loading.Hide();
                               new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.Up, CloseTime = 2 }.Show(btnFinifh);
                               new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime) + "(" + "120_ 6533" + ")", Direction = AMPopTipDirection.Up, CloseTime = 2 }.Show(btnFinifh);
                           });
                           return;
                       }
@@ -382,7 +382,7 @@
                    typeDetailModeList = await GetAddSwitchMode();
                    if (typeDetailModeList == null)
                    {
                        new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
                        new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime) + "(" + "0003_switch" + ")", Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
                    }
                    else
                    {
@@ -394,7 +394,7 @@
                    typeDetailModeList = await GetAddDimmerMode();
                    if (typeDetailModeList == null)
                    {
                        new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
                        new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime) + "(" + "0003_dimmer" + ")", Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
                    }
                    else
                    {
@@ -406,7 +406,7 @@
                    typeDetailModeList = await GetAddCurtainMode();
                    if (typeDetailModeList == null)
                    {
                        new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
                        new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime) + "(" + "0003_curtain" + ")", Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
                    }
                    else
                    {
@@ -642,7 +642,7 @@
                {
                    Application.RunOnMainThread(() =>
                    {
                        new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
                        new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime) + "(" + "0003_switch" + ")", Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
                    });
                    return;
                }
@@ -789,7 +789,7 @@
                {
                    Application.RunOnMainThread(() =>
                    {
                        new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
                        new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime) + "(" + "0003_dimmer" + ")", Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
                    });
                    return;
                }
@@ -968,12 +968,12 @@
            if (typeDetailModeList == null)
            {
                //再次动态获取按键支持的类
                typeDetailModeList = await GetAddSwitchMode();
                typeDetailModeList = await GetAddCurtainMode();
                if (typeDetailModeList == null)
                {
                    Application.RunOnMainThread(() =>
                    {
                        new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
                        new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime) + "(" + "0003_curtain" + ")", Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
                    });
                    return;
                }

 ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/MutilfunctionPanelMethod.cs

 ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/PaneTargetsBaseForm.cs

@@ -180,6 +180,7 @@
                RemoveFromParent();
            };
            this.btnTitle.Width = Application.GetRealWidth(1080 - 161 - 300);

            this.btnBack.MouseUpEventHandler += eHandlerBack;
            this.btnBackFrameLayout.MouseUpEventHandler += eHandlerBack;
            this.MidFrameLayout(this);
@@ -715,7 +716,7 @@
                            canFresh = false;
                            midVerticalScrolViewLayout.EndHeaderRefreshing();
                            CommonPage.Loading.Hide();
                            new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
                            new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime) + "(" + "5007" + ")", Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);

                            this.midFrameLayout.RemoveAll();

@@ -901,7 +902,7 @@
                        Application.RunOnMainThread(() => { CommonPage.Loading.Start(""); });
                        if (btnTipPic.IsSelected)
                        {
                            //删除情况1:绑定空目标必须取消按键中已经存在的目标
                            //当绑定空目标，要删除已经存在按键的目标
                            if (oldTargetList.Count != 0)
                            {
                                //删除按键中已经绑定的目标个数【删除成功个数】
@@ -920,7 +921,7 @@
                                    {
                                        Application.RunOnMainThread(() =>
                                        {
                                            new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.BindFailed), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(CommonPage.Instance);
                                            new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.BindFailed) + "(" + "5003_1" + ")", Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(CommonPage.Instance);
                                            CommonPage.Loading.Hide();

                                            ShowReLoadView();
@@ -968,7 +969,7 @@
                                                    {
                                                        Application.RunOnMainThread(() =>
                                                        {
                                                            new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.BindFailed), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(CommonPage.Instance);
                                                            new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.BindFailed) + "(" + "5003_3" + ")", Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(CommonPage.Instance);
                                                            btnFinifh.Enable = true;
                                                            btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
                                                            CommonPage.Loading.Hide();
@@ -1000,7 +1001,7 @@
                                            {
                                                Application.RunOnMainThread(() =>
                                                {
                                                    new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.BindFailed), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(CommonPage.Instance);
                                                    new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.BindFailed) + "(" + "5003_2" + ")", Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(CommonPage.Instance);
                                                    btnFinifh.Enable = true;
                                                    btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
                                                    CommonPage.Loading.Hide();
@@ -1082,7 +1083,7 @@
                                {
                                    Application.RunOnMainThread(() =>
                                    {
                                        new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.BindFailed), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(CommonPage.Instance);
                                        new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.BindFailed) + "(" + "5003_4" + ")", Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(CommonPage.Instance);
                                        CommonPage.Loading.Hide();

                                        ShowReLoadView();
@@ -1109,7 +1110,7 @@
                                                {
                                                    Application.RunOnMainThread(() =>
                                                    {
                                                        new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.BindFailed), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(CommonPage.Instance);
                                                        new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.BindFailed) + "(" + "5003_6" + ")", Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(CommonPage.Instance);
                                                        btnFinifh.Enable = true;
                                                        btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
                                                        CommonPage.Loading.Hide();
@@ -1131,7 +1132,7 @@
                                        {
                                            Application.RunOnMainThread(() =>
                                            {
                                                new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.BindFailed), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(CommonPage.Instance);
                                                new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.BindFailed) + "(" + "5003_5" + ")", Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(CommonPage.Instance);
                                                btnFinifh.Enable = true;
                                                btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
                                                CommonPage.Loading.Hide();
@@ -1147,7 +1148,7 @@
                            {
                                Application.RunOnMainThread(() =>
                                {
                                    new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.BindFailed), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(CommonPage.Instance);
                                    new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.BindFailed) + "(" + "5003_7" + ")", Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(CommonPage.Instance);
                                    btnFinifh.Enable = true;
                                    btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
                                    CommonPage.Loading.Hide();
@@ -1225,7 +1226,7 @@
                            Application.RunOnMainThread(() =>
                            {
                                CommonPage.Loading.Hide();
                                new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(CommonPage.Instance);
                                new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime) + "(" + "5001" + ")", Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(CommonPage.Instance);

                                ShowReLoadView();
                                ReLoadAction += () =>
@@ -1265,7 +1266,7 @@
                                    new Tip()
                                    {
                                        MaxWidth = 150,
                                        Text = Language.StringByID(R.MyInternationalizationString.BindFailed),
                                        Text = Language.StringByID(R.MyInternationalizationString.BindFailed) + "(" + "5001_1" + ")",
                                        Direction = AMPopTipDirection.None,
                                        CloseTime = 1
                                    }.Show(CommonPage.Instance);
@@ -1281,7 +1282,7 @@
                                    new Tip()
                                    {
                                        MaxWidth = 150,
                                        Text = Language.StringByID(R.MyInternationalizationString.BindUnknownError),
                                        Text = Language.StringByID(R.MyInternationalizationString.BindUnknownError) + "(" + "5001_2" + ")",
                                        Direction = AMPopTipDirection.None,
                                        CloseTime = 1
                                    }.Show(CommonPage.Instance);

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

@@ -14,6 +14,7 @@
    public class DeviceMacInfoEditorForm : EditorCommonForm

    {

        #region ■ 变量声明___________________________



        /// <summary>

        /// 设备对象

        /// </summary>

@@ -1163,7 +1164,7 @@
                    {

                        Application.RunOnMainThread(() =>

                        {

                            new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);

                            new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime) + "(" + "5007_2" + ")", Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);

                        });

                        return;

                    }

@@ -1175,7 +1176,7 @@
                    {

                        Application.RunOnMainThread(() =>

                        {

                            new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);

                            new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime) + "(" + "5007_3" + ")", Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);

                        });

                        return;

                    }

@@ -1565,23 +1566,6 @@
                });
            }



            //同步

            deviceMenu = Language.StringByID(R.MyInternationalizationString.Synchronization);

            if (Common.LocalDevice.Current.DeviceIsCanFixedPosition(listNewDevice[0]))

            {

                frame.AddRowMenu(deviceMenu, "", "Item/SynchronizationSelected.png", () =>

                {

                    //如果当前住宅是虚拟住宅,此功能无效

                    if (Common.Config.Instance.Home.IsVirtually == true)

                    {

                        return;

                    }



                    //同步指定设备

                    this.SynchronizationDevice();

                });

            }



        }



        /// <summary>

@@ -1596,32 +1580,6 @@


                //删除设备

                bool result = await Common.LocalDevice.Current.DeleteDevice(listNewDevice);

                //关闭进度条

                this.CloseProgressBar();

                if (result == false)

                {

                    return;

                }

                HdlThreadLogic.Current.RunMain(() =>

                {

                    //关闭界面

                    this.CloseForm();

                });

            });

        }

        /// <summary>

        /// 同步指定设备

        /// </summary>

        private void SynchronizationDevice()

        {

            HdlThreadLogic.Current.RunThread(async () =>

            {

                //打开进度条

                this.ShowProgressBar();



                //同步设备

                bool result = await Common.LocalDevice.Current.SynchronizationDevice(listNewDevice);

                //关闭进度条

                this.CloseProgressBar();

                if (result == false)


 ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelBackLighWithSensorForm.cs

old mode 100755
new mode 100644
@@ -449,20 +449,24 @@
            uint backColor = this.GetColorByRGB((byte)R1, (byte)G1, (byte)B1);



            //颜色外框

            var btnColorLine = new FrameLayoutStatuControl();

            btnColorLine.Width = Application.GetRealHeight(79);

            btnColorLine.Height = this.GetPictrueRealSize(79);

            btnColorLine.X = btnColorView.Right + Application.GetRealHeight(18);

            btnColorLine.Radius = (uint)this.GetPictrueRealSize(79) / 2;

            btnColorLine.BorderWidth = 1;

            btnColorLine.BorderColor = 0xffcccccc;

            frameColor.AddChidren(btnColorLine, ChidrenBindMode.BindEvent);

            var frameColorLine = new FrameLayoutStatuControl();

            frameColorLine.UseClickStatu = false;

            frameColorLine.Height = this.GetPictrueRealSize(79);

            frameColorLine.Width = this.GetPictrueRealSize(79);

            frameColorLine.X = btnColorView.Right + Application.GetRealHeight(18);

            frameColorLine.Radius = (uint)this.GetPictrueRealSize(79) / 2;

            frameColorLine.BorderWidth = 1;

            frameColorLine.BorderColor = 0xffcccccc;

            frameColor.AddChidren(frameColorLine, ChidrenBindMode.NotBind);



            var btnColor = new NormalViewControl(this.GetPictrueRealSize(69), this.GetPictrueRealSize(69), false);

            //分两步计算，不然有可能它得出的结果有误差导致不居中

            int btnColorWidth = frameColorLine.Height - this.GetPictrueRealSize(7) - this.GetPictrueRealSize(7);

            var btnColor = new NormalViewControl(btnColorWidth, btnColorWidth, false);

            btnColor.Gravity = Gravity.Center;

            btnColor.Radius = (uint)this.GetPictrueRealSize(69) / 2;

            btnColor.Radius = (uint)btnColorWidth / 2;

            btnColor.BackgroundColor = backColor;

            btnColorLine.AddChidren(btnColor, ChidrenBindMode.BindEvent);

            frameColorLine.AddChidren(btnColor, ChidrenBindMode.NotBind);

            frameColor.ChangedChidrenBindMode(frameColorLine, ChidrenBindMode.BindEvent);



            //变更滑动条的颜色

            seekBar1.ProgressBarColor = backColor;

@@ -475,31 +479,6 @@
            btnRight.Y += this.GetPictrueRealSize(8);



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

            {

                PanelColor(btnColor, seekBar1, R1, G1, B1);

            };

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

            {

                PanelColor(btnColor, seekBar1, R1, G1, B1);

            };

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

            {

                PanelColor(btnColor, seekBar1, R1, G1, B1);

            };

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

            {

                PanelColor(btnColor, seekBar1, R1, G1, B1);

            };

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

            {

                PanelColor(btnColor, seekBar1, R1, G1, B1);

            };

        }



        /// <summary>

        /// PanelColorBefore

        /// </summary>

        private void PanelColor(NormalViewControl btnColor, SeekBarControl seekBar1, int R1, int G1, int B1)

        {

            var form = new PanelColorSelectForm();

            form.AddForm(R1, G1, B1);

@@ -516,6 +495,7 @@
                btnColor.BackgroundColor = this.GetColorByRGB((byte)Rcolor, (byte)Gcolor, (byte)Bcolor);

                //变更滑动条的颜色

                seekBar1.ProgressBarColor = btnColor.BackgroundColor;

                };

            };

        }



@@ -536,6 +516,7 @@
            btnClick.TextColor = UserCenterColor.Current.TextGrayColor3;

            btnClick.TextID = R.MyInternationalizationString.uAfterClick;

            listview.AddChidren(btnClick);


            //背景

            var frameBack = new FrameLayout();

            frameBack.Y = Application.GetRealHeight(608);

@@ -594,7 +575,6 @@
            frameColor.Y = Application.GetRealHeight(26);

            frameColor.X = listview.Width - ControlCommonResourse.XXLeft - Application.GetRealHeight(262);

            frameBack.AddChidren(frameColor);



            //颜色

            var btnColorView = new NormalViewControl(Application.GetRealHeight(110), this.GetPictrueRealSize(49), false);

            btnColorView.Gravity = Gravity.CenterVertical;

@@ -611,20 +591,24 @@
            uint backColor = this.GetColorByRGB((byte)R1, (byte)G1, (byte)B1);



            //颜色外框

            var btnColorLine = new FrameLayoutStatuControl();

            btnColorLine.Width = Application.GetRealHeight(79);

            btnColorLine.Height = this.GetPictrueRealSize(79);

            btnColorLine.X = btnColorView.Right + Application.GetRealHeight(18);

            btnColorLine.Radius = (uint)this.GetPictrueRealSize(79) / 2;

            btnColorLine.BorderWidth = 1;

            btnColorLine.BorderColor = 0xffcccccc;

            frameColor.AddChidren(btnColorLine, ChidrenBindMode.BindEvent);

            var frameColorLine = new FrameLayoutStatuControl();

            frameColorLine.UseClickStatu = false;

            frameColorLine.Height = this.GetPictrueRealSize(79);

            frameColorLine.Width = this.GetPictrueRealSize(79);

            frameColorLine.X = btnColorView.Right + Application.GetRealHeight(18);

            frameColorLine.Radius = (uint)this.GetPictrueRealSize(79) / 2;

            frameColorLine.BorderWidth = 1;

            frameColorLine.BorderColor = 0xffcccccc;

            frameColor.AddChidren(frameColorLine, ChidrenBindMode.NotBind);



            var btnColor = new NormalViewControl(this.GetPictrueRealSize(69), this.GetPictrueRealSize(69), false);

            //分两步计算，不然有可能它得出的结果有误差导致不居中

            int btnColorWidth = frameColorLine.Height - this.GetPictrueRealSize(7) - this.GetPictrueRealSize(7);

            var btnColor = new NormalViewControl(btnColorWidth, btnColorWidth, false);

            btnColor.Gravity = Gravity.Center;

            btnColor.Radius = (uint)this.GetPictrueRealSize(69) / 2;

            btnColor.Radius = (uint)btnColorWidth / 2;

            btnColor.BackgroundColor = backColor;

            btnColorLine.AddChidren(btnColor, ChidrenBindMode.BindEvent);

            frameColorLine.AddChidren(btnColor, ChidrenBindMode.NotBind);

            frameColor.ChangedChidrenBindMode(frameColorLine, ChidrenBindMode.BindEvent);



            //变更滑动条的颜色

            seekBar1.ProgressBarColor = backColor;

@@ -637,31 +621,6 @@
            btnRight.Y += this.GetPictrueRealSize(8);



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

            {

                PanelAfterColor(btnColor, seekBar1, R1, G1, B1);

            };

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

            {

                PanelAfterColor(btnColor, seekBar1, R1, G1, B1);

            };

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

            {

                PanelAfterColor(btnColor, seekBar1, R1, G1, B1);

            };

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

            {

                PanelAfterColor(btnColor, seekBar1, R1, G1, B1);

            };

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

            {

                PanelAfterColor(btnColor, seekBar1, R1, G1, B1);

            };

        }



        /// <summary>

        /// PanelColorBefore

        /// </summary>

        private void PanelAfterColor(NormalViewControl btnColor, SeekBarControl seekBar1, int R1, int G1, int B1)

        {

            var form = new PanelColorSelectForm();

            form.AddForm(R1, G1, B1);

@@ -679,6 +638,7 @@
                //变更滑动条的颜色

                seekBar1.ProgressBarColor = btnColor.BackgroundColor;

            };

            };

        }

        #endregion




 ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelBrightnessAdjustForm.cs

old mode 100755
new mode 100644
@@ -327,8 +327,8 @@
            frameColor.UseClickStatu = false;

            frameColor.Width = Application.GetRealHeight(262);

            frameColor.Height = this.GetPictrueRealSize(79);

            frameColor.Gravity = Gravity.CenterVertical;

            frameColor.X = frameBack.Width - ControlCommonResourse.XXLeft - Application.GetRealHeight(262);

            frameColor.Y = Application.GetRealHeight(26);

            frameColor.X = listview.Width - ControlCommonResourse.XXLeft - Application.GetRealHeight(262);

            frameBack.AddChidren(frameColor);



            //颜色

@@ -347,20 +347,24 @@
            uint backColor = this.GetColorByRGB((byte)R1, (byte)G1, (byte)B1);



            //颜色外框

            var btnColorLine = new FrameLayoutStatuControl();

            btnColorLine.Width = Application.GetRealHeight(79);

            btnColorLine.Height = this.GetPictrueRealSize(79);

            btnColorLine.X = btnColorView.Right + Application.GetRealHeight(18);

            btnColorLine.Radius = (uint)this.GetPictrueRealSize(79) / 2;

            btnColorLine.BorderWidth = 1;

            btnColorLine.BorderColor = 0xffcccccc;

            frameColor.AddChidren(btnColorLine, ChidrenBindMode.BindEvent);

            var frameColorLine = new FrameLayoutStatuControl();

            frameColorLine.UseClickStatu = false;

            frameColorLine.Height = this.GetPictrueRealSize(79);

            frameColorLine.Width = this.GetPictrueRealSize(79);

            frameColorLine.X = btnColorView.Right + Application.GetRealHeight(18);

            frameColorLine.Radius = (uint)this.GetPictrueRealSize(79) / 2;

            frameColorLine.BorderWidth = 1;

            frameColorLine.BorderColor = 0xffcccccc;

            frameColor.AddChidren(frameColorLine, ChidrenBindMode.NotBind);



            var btnColor = new NormalViewControl(this.GetPictrueRealSize(69), this.GetPictrueRealSize(69), false);

            //分两步计算，不然有可能它得出的结果有误差导致不居中

            int btnColorWidth = frameColorLine.Height - this.GetPictrueRealSize(7) - this.GetPictrueRealSize(7);

            var btnColor = new NormalViewControl(btnColorWidth, btnColorWidth, false);

            btnColor.Gravity = Gravity.Center;

            btnColor.Radius = (uint)this.GetPictrueRealSize(69) / 2;

            btnColor.Radius = (uint)btnColorWidth / 2;

            btnColor.BackgroundColor = backColor;

            btnColorLine.AddChidren(btnColor, ChidrenBindMode.BindEvent);

            frameColorLine.AddChidren(btnColor, ChidrenBindMode.NotBind);

            frameColor.ChangedChidrenBindMode(frameColorLine, ChidrenBindMode.BindEvent);


            var btnRight = new NormalViewControl(this.GetPictrueRealSize(58), this.GetPictrueRealSize(58), false);

            btnRight.UnSelectedImagePath = "Item/RightNext.png";

@@ -370,31 +374,6 @@
            btnRight.Y += this.GetPictrueRealSize(8);



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

            {

                PanelColor(btnColor, R1, G1, B1);

            };

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

            {

                PanelColor(btnColor, R1, G1, B1);

            };

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

            {

                PanelColor(btnColor, R1, G1, B1);

            };

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

            {

                PanelColor(btnColor, R1, G1, B1);

            };

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

            {

                PanelColor(btnColor, R1, G1, B1);

            };

        }



        /// <summary>

        /// PanelColorSelectForm

        /// </summary>

        private void PanelColor(NormalViewControl btnColor, int R1, int G1, int B1)

        {

            var form = new PanelColorSelectForm();

            form.AddForm(R1, G1, B1);

@@ -410,8 +389,8 @@


                btnColor.BackgroundColor = this.GetColorByRGB((byte)Rcolor, (byte)Gcolor, (byte)Bcolor);

            };

            };

        }



        #endregion



        #region ■ 节能模式行_________________________


 ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirBackLightSettionForm.cs

 ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirButtonSettionForm.cs

@@ -166,7 +166,7 @@

                        Application.RunOnMainThread(() =>
                        {
                            new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
                            new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime) + "(" + "5007" + ")", Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
                        });
                    }
                }

 ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelSimpleEnvironmentButtonSettionForm.cs

@@ -164,7 +164,7 @@

                        Application.RunOnMainThread(() =>
                        {
                            new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
                            new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime) + "(" + "5007" + ")", Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
                        });
                    }
                }

 ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelSimpleMutilfunctionAddTargetsForm.cs

@@ -1265,7 +1265,7 @@
                        new Tip()
                        {
                            MaxWidth = 150,
                            Text = Language.StringByID(R.MyInternationalizationString.BindFailed),
                            Text = Language.StringByID(R.MyInternationalizationString.BindFailed) + "(" + "5001_1" + ")",
                            Direction = AMPopTipDirection.Up,
                            CloseTime = 1
                        }.Show(btnFinifh);
@@ -1282,7 +1282,7 @@
                        new Tip()
                        {
                            MaxWidth = 150,
                            Text = Language.StringByID(R.MyInternationalizationString.BindUnknownError),
                            Text = Language.StringByID(R.MyInternationalizationString.BindUnknownError) + "(" + "5001_2" + ")",
                            Direction = AMPopTipDirection.Up,
                            CloseTime = 1
                        }.Show(btnFinifh);

 ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelSimpleMutilfunctionTargetsForm.cs

@@ -633,7 +633,7 @@
                                    RefreshBindListUI();
                                    midVerticalScrolViewLayout.EndHeaderRefreshing();
                                    CommonPage.Loading.Hide();
                                    new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
                                    new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime) + "(" + "5007_1" + ")", Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
                                });
                                break;
                            }
@@ -756,7 +756,7 @@
                    {
                        Application.RunOnMainThread(() =>
                        {
                            new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.None, CloseTime = 2 }.Show(CommonPage.Instance);
                            new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime) + "(" + "5003" + ")", Direction = AMPopTipDirection.None, CloseTime = 2 }.Show(CommonPage.Instance);
                            CommonPage.Loading.Hide();
                        });
                        return;
@@ -785,7 +785,7 @@
                                    {
                                        Application.RunOnMainThread(() =>
                                        {
                                            new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.None, CloseTime = 2 }.Show(CommonPage.Instance);
                                            new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.uDeviceDeleteFail) + "(" + "5003_8" + ")", Direction = AMPopTipDirection.None, CloseTime = 2 }.Show(CommonPage.Instance);
                                            CommonPage.Loading.Hide();
                                        });
                                        return;
@@ -796,7 +796,7 @@
                            {
                                Application.RunOnMainThread(() =>
                                {
                                    new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.None, CloseTime = 2 }.Show(CommonPage.Instance);
                                    new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime) + "(" + "5003_9" + ")", Direction = AMPopTipDirection.None, CloseTime = 2 }.Show(CommonPage.Instance);
                                    CommonPage.Loading.Hide();
                                });
                                return;

 ZigbeeApp/Shared/Phone/ZigBee/Common/Application.cs

old mode 100644
new mode 100755
@@ -7,6 +7,7 @@
using Shared.Common;
using ZigBee.Device;


namespace ZigBee.Common
{
    public static class Application

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

old mode 100644
new mode 100755

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

old mode 100644
new mode 100755

 ZigbeeApp/Shared/R.cs

 ZigbeeApp/Shared/Shared.projitems

old mode 100755
new mode 100644
@@ -234,7 +234,6 @@
    <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Panel\PanelFangyueEnvironmentButtonSettionForm.cs" />

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

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

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

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

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

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