先上传个版本吧

黄学彪

2020-02-21 bd46c57c77c276014db3192a4e2cc96e23c93202

先上传个版本吧

 ZigbeeApp/GateWay.Droid/Application.cs

@@ -98,7 +98,9 @@
            api.SendReq(req);
        }
        /// <summary>
        /// 所有初始化全部在这个方法实现
        /// </summary>
        void initAll()
        {
            Shared.Application.IsGpsEnable = false;
            string checkFile = System.IO.Path.Combine(Shared.IO.FileUtils.RootPath, Shared.Phone.UserCenter.DirNameResourse.OpenGbsFile);

            Shared.Application.IsGpsEnable = System.IO.File.Exists(checkFile);

            //设置极光调试模式，为false时只打印警告信息
            // System.Console.WriteLine($"AAA : {System.DateTime.Now.ToString()}");
#if Release
            JPushInterface.SetDebugMode(false);

 ZigbeeApp/GateWay.Droid/Assets/Language.ini

@@ -1034,7 +1034,7 @@
15223=添加备份
15224=编辑备份
15225=备注
15226=请输入备注名称
15226=请输入备份名称
15227=恢复文件成功

15246=报警目标设置
15247=当该防区报警时，以下目标将会响应

 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="2020011501" android:installLocation="auto" android:versionName="1.0.20011501">
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.hdl.home" android:versionCode="2020011801" android:installLocation="auto" android:versionName="1.0.20011801">
    <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/Home.Ios/Resources/Language.ini

@@ -1034,7 +1034,7 @@
15223=添加备份
15224=编辑备份
15225=备注
15226=请输入备注名称
15226=请输入备份名称
15227=恢复文件成功

15246=报警目标设置
15247=当该防区报警时，以下目标将会响应

 ZigbeeApp/Shared/Common/CommonPage.cs

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

 ZigbeeApp/Shared/Common/Device.cs

@@ -2338,12 +2338,12 @@
    #region ■ 自定义设备类型_________________________



    /// <summary>

    /// <para>仅限底层使用：设备的具体【设备类型】,自定义与模块id关联的枚举(值为LocalDevice里面dicDeviceModelIdEnum所指定的值)</para>

    /// <para>仅限底层使用：设备的具体【设备类型】,自定义与模块id关联的枚举(值为LocalDevice里面dicDeviceModelIdEnum所指定的DeviceConcreteType值)</para>

    /// <para>变量名可以作为【设备类型】图片,这个值是瞎写的,没什么特殊意义</para>

    /// </summary>

    public enum DeviceConcreteType

    {

        //定义规则：【设备类型】图片名字=LocalDevice里面dicDeviceModelIdEnum所指定的值

        //定义规则：【设备类型】图片名字=LocalDevice里面dicDeviceModelIdEnum所指定的DeviceConcreteType值



        /// <summary>

        /// 未知设备

@@ -2578,7 +2578,7 @@
    }



    /// <summary>

    /// <para>仅限底层使用：设备所属的【设备种类】,自定义与模块id关联的枚举(值为LocalDevice里面dicDeviceModelIdEnum所指定的值)</para>

    /// <para>仅限底层使用：设备所属的【设备种类】,自定义与模块id关联的枚举(值为LocalDevice里面dicDeviceModelIdEnum所指定的DeviceBeloneType值)</para>

    /// <para>这个值是瞎写的,没什么特殊意义</para>

    /// </summary>

    public enum DeviceBeloneType


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

Binary files differ

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

Binary files differ

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

Binary files differ

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

Binary files differ

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/IMessageCommon.cs

@@ -669,7 +669,7 @@
                //在册的Msg

                return Language.StringByID(dicMsg[requestName][statuCode]);

            }

            return "ERROR:" + statuCode;

            return "Error:" + statuCode;

        }

    }

}


 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterColor.cs

@@ -137,84 +137,20 @@
        /// </summary>
        public uint TextOrangeColor = 0xfffc744b;

        /// <summary>
        /// ☆行控件选择状态时的背景色
        /// ☆行控件选择状态时的背景色(0xfffbfbfb)
        /// </summary>
        public uint RowSelectBackColor = 0xfffbfbfb;




        /// <summary>
        /// 灰色
        /// </summary>
        public uint Gray = 0xff6b6b6b;
        /// <summary>
        /// 深灰色(稍微)
        /// </summary>
        public uint DeepGray1 = 0xffd4d4d4;
        /// <summary>
        /// 选中的颜色(蓝色)
        /// </summary>
        public uint SelectTextColor = 0xff00aaf0;
        /// <summary>
        /// 深蓝色
        /// </summary>
        public uint DeepBlue = 0xff3699e2;
        /// <summary>
        /// 按钮的初始背景色
        /// </summary>
        public uint ClickButtonColor = 0xff3699e2;
        /// <summary>
        /// 按钮按下的背景色(灰色)
        /// </summary>
        public uint ButtonClickColor = 0xffadadad;
        /// <summary>
        /// 红色(0xfff62f48)
        /// </summary>
        public uint Red = 0xfff62f48;
        /// <summary>
        /// 橘色
        /// </summary>
        public uint Orange = 0xffff870f;
        /// <summary>
        /// 绿色
        /// </summary>
        public uint Green = 0xff09ff09;
        /// <summary>
        /// 浅蓝色
        /// </summary>
        public uint WathetBlue = 0xffa2ffff;
        /// <summary>
        /// 浅紫色
        /// </summary>
        public uint purply = 0xfff4b7f1;
        /// <summary>
        /// 1明细(BodyFramelayout)里面的标题控件的颜色(0xff000000)
        /// </summary>
        public uint DetailTitleTextColor = 0xff000000;
        /// <summary>
        /// 线的颜色
        /// </summary>
        public uint Line = 0xffadadad;

        /// <summary>
        /// 蓝色字体
        /// </summary>
        public uint TextBlueColor = 0xff3699e2;
        /// <summary>
        /// 1灰色字体颜色(0xff999999)
        /// </summary>
        public uint TextGrayColor = 0xff999999;
        /// <summary>
        /// RowLayout的编辑按钮的背景色
        /// </summary>
        public uint RowEditorButtonColor = 0xffff870f;
        /// <summary>
        /// RowLayout的删除按钮的背景色
        /// </summary>
        public uint RowDeleteButtonColor = 0xfff32514;
        public uint RowSelectBackColor = 0xfffbfbfb;

        /// <summary>

        /// 粉红色(远程连接的背景色)

        /// </summary>
        public uint RemoteLinkPink = 0xffffb9b9;
        /// ☆错误提示的颜色(0xfff75858)

        /// </summary>

        public uint ErrorColor = 0xfff75858;

        /// <summary>

        /// 灰色(0xff6b6b6b) 其他地方似乎在用,建议不要使用

        /// </summary>

        public uint Gray = 0xff6b6b6b;

        /// <summary>

        /// 红色(0xfff62f48) 其他地方似乎在用,建议不要使用

        /// </summary>

        public uint Red = 0xfff62f48;

    }
}

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs

@@ -447,6 +447,10 @@
        /// 固件分布式唯一,也是下载时的[下载固件的唯一标识]参数

        /// </summary>

        public string DistributedMark = string.Empty;

        /// <summary>

        /// 日期(后面追加的 utc时间)

        /// </summary>

        public string CreatedOnUtc = string.Empty;

    }



    /// <summary>

@@ -508,6 +512,10 @@
        /// 镜像类型

        /// </summary>

        public string ImagType = string.Empty;

        /// <summary>

        /// 日期(后面追加的 utc时间)

        /// </summary>

        public string CreatedOnUtc = string.Empty;

    }



    #endregion


 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Base/TextInputBase.cs

@@ -111,11 +111,17 @@
        {

            if (e.Focus == false)

            {

                btnLineTemp.BackgroundColor = UserCenterColor.Current.ButtomLine;

                if (btnLineTemp != null)

                {

                    btnLineTemp.BackgroundColor = UserCenterColor.Current.ButtomLine;

                }

            }

            else

            {

                btnLineTemp.BackgroundColor = UserCenterColor.Current.TextFrameSelectColor;

                if (btnLineTemp != null)

                {

                    btnLineTemp.BackgroundColor = UserCenterColor.Current.TextFrameSelectColor;

                }

            }

        }




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

@@ -20,9 +20,13 @@
        /// </summary>

        public Action<string> FinishInputEvent = null;

        /// <summary>

        /// 密码输入类型

        /// 密码输入类型(它与NumberInputOnly不共存)

        /// </summary>

        public bool SecureTextEntry = false;

        /// <summary>

        /// 输入键盘指定为数字键盘(默认为true,它与SecureTextEntry不共存)

        /// </summary>

        public bool NumberInputOnly = true;

        /// <summary>

        /// 验证码长度

        /// </summary>

@@ -74,6 +78,10 @@
                {

                    txtCode.SecureTextEntry = true;

                }

                else if (NumberInputOnly == true)

                {

                    txtCode.IsNumberKeyboardType = true;

                }

                txtCode.Name = i.ToString();

                txtCode.TextAlignment = TextAlignment.Center;

                frameCode.AddChidren(txtCode);


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

@@ -30,6 +30,10 @@
        /// 右边图标控件的大小

        /// </summary>

        private int rightIconSize = 0;

        /// <summary>

        /// 底线控件

        /// </summary>

        private NormalViewControl btnBottomLine = null;



        #endregion


@@ -55,6 +59,11 @@
        /// </summary>
        public virtual NormalViewControl AddBottomLine()

        {

            if (this.btnBottomLine != null)

            {

                //已经添加了底线

                return btnBottomLine;

            }

            int lineWidth = this.Width - ControlCommonResourse.XXLeft * 2 - LeftOffset - RightOffset;

            int XX = ControlCommonResourse.XXLeft + LeftOffset;

            if (leftIconSize > 0)

@@ -62,13 +71,13 @@
                lineWidth = lineWidth - leftIconSize - Application.GetRealWidth(35);

                XX = XX + leftIconSize + Application.GetRealWidth(35);

            }

            var btnLine = new NormalViewControl(lineWidth, ControlCommonResourse.BottomLineHeight, false);

            btnLine.X = XX;

            btnLine.Y = this.Height - ControlCommonResourse.BottomLineHeight;

            btnLine.BackgroundColor = UserCenterColor.Current.ButtomLine;

            base.AddChidren(btnLine);

            this.btnBottomLine = new NormalViewControl(lineWidth, ControlCommonResourse.BottomLineHeight, false);

            btnBottomLine.X = XX;

            btnBottomLine.Y = this.Height - ControlCommonResourse.BottomLineHeight;

            btnBottomLine.BackgroundColor = UserCenterColor.Current.ButtomLine;

            base.AddChidren(btnBottomLine);



            return btnLine;

            return btnBottomLine;

        }



        #endregion


 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/NormalControls/DetailTitleControl.cs

File was deleted

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

File was deleted

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/Base/CommonFormBase.cs

@@ -51,6 +51,9 @@
        /// <param name="parameter">启动参数：参数由指定画面的ShowForm函数所指定</param>
        public virtual void AddForm(params object[] parameter)
        {

            //关闭输入法界面

            this.CloseInputPanel();



            return;

        }



@@ -76,6 +79,8 @@
        /// </summary>

        public virtual void CloseFormBefore()

        {

            //关闭输入法界面

            this.CloseInputPanel();

        }



        /// <summary>

@@ -264,6 +269,13 @@
            return UserCenterResourse.NowActionFormID == this.FormID;

        }



        /// <summary>

        /// 关闭输入法界面(未实现)

        /// </summary>

        public void CloseInputPanel()

        {

        }



        #endregion


        #region ■ 反射方法___________________________

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/Base/DialogCommonForm.cs

@@ -62,6 +62,8 @@
        /// <param name="parameter">启动参数：参数由指定画面的ShowForm函数所指定</param>

        public override void AddForm(params object[] parameter)

        {

            base.AddForm(parameter);



            //检测能否追加画面

            if (UserCenterLogic.CheckCanAddForm(this) == false)

            {


 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/Base/EditorCommonForm.cs

@@ -169,6 +169,8 @@
        /// <param name="parameter">启动参数：参数由指定画面的ShowForm函数所指定</param>

        public override void AddForm(params object[] parameter)

        {

            base.AddForm(parameter);



            //检测能否追加画面
            if (UserCenterLogic.CheckCanAddForm(this) == false)
            {
@@ -194,14 +196,14 @@
        /// </summary>
        public override void CloseFormBefore()
        {

            base.CloseFormBefore();



            //左滑使能

            this.ScrollEnabled = true;



            this.m_parameter = null;

            //清空bodyFrame
            this.ClearBodyFrame();


            base.CloseFormBefore();
            this.ClearBodyFrame();
        }


        #endregion

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

@@ -184,6 +184,7 @@
                    info.Name = data.Name;

                    info.HardwareVersion = hardCode;

                    info.ImagType = imgType;

                    info.CreatedOnUtc = data.CreatedOnUtc;

                    imgTypeInfo.listVeison.Add(info);

                    //固件的信息处理

                    DoAdjustFirmwareInformation(info, data.Remarks);


 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Resourse/DirectoryFileNameResourse.cs

@@ -122,6 +122,10 @@
        /// 检测引导的【文件】

        /// </summary>

        public const string GuideFile = "cad1afb384fb482de753fc37ebe84f9e";

        /// <summary>

        /// 打开Gbs的判断【文件】(临时)

        /// </summary>

        public const string OpenGbsFile = "cd8f75492cb65ef0951442460336db62";



        /// <summary>

        /// 显示功能菜单的【标识文件】,不加密


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

@@ -99,11 +99,13 @@
            var btnIcon = rowlayout.AddLeftIcon();

            btnIcon.UnSelectedImagePath = unSelPath;

            //指定的设备

            rowlayout.AddLeftCaption(info.ShowName, 800);

            rowlayout.AddTopView(info.ShowName, 800);

            //向右的图标

            rowlayout.AddRightArrow();

            //固件信息

            rowlayout.AddMostRightView(Common.LocalDevice.Current.AppendVersion(info.FirmwareVersion), 300);

            string firmwareText = Common.LocalDevice.Current.AppendVersion(info.FirmwareVersion);

            firmwareText += "        " + UserCenterLogic.ConvertUtcTimeToLocalTime(info.CreatedOnUtc).ToString("yyyy/MM/dd HH:mm:ss");

            rowlayout.AddBottomView(firmwareText, 800);

            //底线

            rowlayout.AddBottomLine();




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

@@ -227,8 +227,12 @@
                this.AddDirectionAndLimitRow();

                //添加【手拉控制】行(开合帘专用)

                this.AddHandPullControlRow();

                //添加【按键设置】行(面板专用)

                this.AddPanelSettionRow();

                //添加【按键设置】行(方悦专用) --这个有可能和面板重叠

                if (this.AddFangyuePanelSettionRow() == false)

                {

                    //添加【按键设置】行(面板专用)

                    this.AddPanelSettionRow();

                }

                //添加【功能设置】行

                this.AddFunctionSettionRow();

                //添加【干接点设置】行

@@ -452,7 +456,7 @@
        #region ■ 按键设置(面板)_____________________



        /// <summary>

        /// 添加【按键设置】行

        /// 添加【按键设置】行(面板)

        /// </summary>

        private void AddPanelSettionRow()

        {

@@ -472,26 +476,59 @@
            btnFunction.AddBottomLine();

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

            {

                if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueTwo

                || deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueFour

                || deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueEight)

                {

                    //方悦面板的按键配置

                    var form = new DevicePanel.PanelFangyueButtonSettionForm();

                    form.AddForm(listNewDevice[0]);

                }

                else if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueEnvironment)

                {

                    //方悦环境面板的按键配置

                    var form = new DevicePanel.PanelFangyueEnvironmentButtonSettionForm();

                    form.AddForm(listNewDevice[0]);

                }

                else

                {

                    var form = new DevicePanel.PanelButtonSettionForm();

                    form.AddForm(listNewDevice[0]);

                }

                var form = new DevicePanel.PanelButtonSettionForm();

                form.AddForm(listNewDevice[0]);

            };

        }



        #endregion



        #region ■ 按键设置(方悦)_____________________



        /// <summary>

        /// 添加【按键设置】行(方悦)

        /// </summary>

        private bool AddFangyuePanelSettionRow()

        {

            if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueTwo

                || deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueFour

                || deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueEight

                || deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueEnvironment

                || deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueNewWind)

            {

                //按键设置

                string caption = Language.StringByID(R.MyInternationalizationString.uPanelSettion);

                var btnFunction = new FrameRowControl(listview.rowSpace / 2);

                listview.AddChidren(btnFunction);

                btnFunction.AddLeftCaption(caption, 600);

                //向右图标

                btnFunction.AddRightArrow();

                //底线

                btnFunction.AddBottomLine();

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

                {

                    if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueTwo

                    || deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueFour

                    || deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueEight)

                    {

                        //方悦面板的按键配置

                        var form = new DevicePanel.PanelFangyueButtonSettionForm();

                        form.AddForm(listNewDevice[0]);

                    }

                    else if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueEnvironment)

                    {

                        //方悦环境面板的按键配置

                        var form = new DevicePanel.PanelFangyueEnvironmentButtonSettionForm();

                        form.AddForm(listNewDevice[0]);

                    }

                    else

                    {

                        //方悦新风面板的按键配置

                    }

                };

                return true;

            }

            return false;

        }



        #endregion

@@ -604,7 +641,8 @@
            {

                return;

            }

            if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueEnvironment)

            if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueEnvironment

                || deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueNewWind)

            {

                //环境面板没有功能设置

                return;


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

@@ -190,8 +190,6 @@
                this.StartTopicTimeOutThread();

                return;

            }

            //中断主题超时线程

            this.topTimeOut = -100;



            lock (this.dicNewDevice)

            {

@@ -457,6 +455,7 @@
            }

            else if (topic == gatewayId + "/DeviceInComingRespon")

            {

                this.topTimeOut = topMaxTime;

                //网关最终上报节点设备信息

                this.SetDeviceProgressValue(6);

                return 1;

@@ -507,7 +506,7 @@
                    System.Threading.Thread.Sleep(1000);

                    this.topTimeOut--;

                }

                if (this.topTimeOut < 0 && this.topTimeOut >= -10)

                if (this.topTimeOut < 0)

                {

                    //响应超时,请重新入网

                    this.ShowMassage(ShowMsgType.Tip, Language.StringByID(R.MyInternationalizationString.uResponseTimeoutsAndReAccessNetwork));


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

@@ -586,7 +586,7 @@
                    return;

                }

                //不选择状态

                nowSelectControl.TextColor = UserCenterColor.Current.TextGrayColor;

                nowSelectControl.TextColor = UserCenterColor.Current.TextGrayColor1;

                //记录它的名字

                dicDeviceSaveName[nowSelectDevice.DeviceEpoint] = btnDeviceName.Text.Trim();

            }


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

@@ -246,7 +246,7 @@
            btnColor.Y = Application.GetRealHeight(5);

            btnColor.X = btnColorView.Right + Application.GetRealHeight(23);

            btnColor.Radius = (uint)Application.GetMinRealAverage(69) / 2;

            btnColor.BackgroundColor = UserCenterColor.Current.Red;

            btnColor.BackgroundColor = UserCenterColor.Current.ErrorColor;

            frameColor.AddChidren(btnColor, ChidrenBindMode.BindEventOnly);



            //变更滑动条的颜色


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

@@ -636,7 +636,7 @@
                    return;

                }

                //不选择状态

                nowSelectControl.TextColor = UserCenterColor.Current.TextGrayColor;

                nowSelectControl.TextColor = UserCenterColor.Current.TextGrayColor1;

                //记录它的名字

                dicDeviceSaveName[nowSelectDevice.DeviceEpoint] = btnDeviceName.Text.Trim();

            }


 ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessApSelectNetworkForm.cs

@@ -75,7 +75,7 @@
            btnMsg.Y = frameBack.Bottom + Application.GetRealHeight(23);

            btnMsg.TextSize = 12;

            btnMsg.Height = Application.GetRealHeight(40);

            btnMsg.TextColor = UserCenterColor.Current.Red;

            btnMsg.TextColor = UserCenterColor.Current.ErrorColor;

            bodyFrameLayout.AddChidren(btnMsg);



            //查看帮助


 ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessUdpSelectNetworkForm.cs

@@ -98,7 +98,7 @@
            btnMsg.Y = frameBack.Bottom + Application.GetRealHeight(23);

            btnMsg.TextSize = 12;

            btnMsg.Height = Application.GetRealHeight(40);

            btnMsg.TextColor = UserCenterColor.Current.Red;

            btnMsg.TextColor = UserCenterColor.Current.ErrorColor;

            bodyFrameLayout.AddChidren(btnMsg);



            //查看帮助


 ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayBackUpListForm.cs

@@ -326,8 +326,8 @@


            //编辑备份

            dialogForm.SetTitleText(Language.StringByID(R.MyInternationalizationString.uEditorBackup));

            //请输入备注名称

            dialogForm.SetTipText(Language.StringByID(R.MyInternationalizationString.uPleaseInpuBackup));

            //请输入备份名称

            dialogForm.SetTipText(Language.StringByID(R.MyInternationalizationString.uPleaseInpuBackupName));

            dialogForm.Text = fileInfo.BackupName;



            //按下确认按钮


 ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayUploadAndDownLoadForm.cs

@@ -95,8 +95,8 @@
                var dialogForm = new DialogInputControl();

                //上传数据

                dialogForm.SetTitleText(Language.StringByID(R.MyInternationalizationString.uUploadData));

                //请输入备注名称

                dialogForm.SetTipText(Language.StringByID(R.MyInternationalizationString.uPleaseInpuBackup));

                //请输入备份名称

                dialogForm.SetTipText(Language.StringByID(R.MyInternationalizationString.uPleaseInpuBackupName));

                //按下确认按钮

                dialogForm.ComfirmClickEvent += ((textValue) =>

                {


 ZigbeeApp/Shared/Phone/UserCenter/Gateway/Update/GatewayHistoryFirmwareVersionForm.cs

@@ -98,6 +98,7 @@


            HdlThreadLogic.Current.RunMainInThread(() =>

            {

                bool canAddTitle = true;

                int fVersion1 = upDatezbGateway.getGwInfo.LinuxFWVersion;

                string imageType1 = upDatezbGateway.getGwInfo.LinuxImageType.ToString();

                foreach (var data in listData1)

@@ -107,9 +108,15 @@
                        //同一个东西，不显示出来

                        continue;

                    }

                    if (canAddTitle == true)

                    {

                        this.AddTitleRowlayout("Linux模块");

                        canAddTitle = false;

                    }

                    this.AddRowlayout(data, FirmwareLevelType.Linux);

                }



                canAddTitle = true;

                int fVersion2 = upDatezbGateway.getGwInfo.ZbFWVersion;

                string imageType2 = upDatezbGateway.getGwInfo.ZbImageType.ToString();

                foreach (var data in listData2)

@@ -119,9 +126,15 @@
                        //同一个东西，不显示出来

                        continue;

                    }

                    if (canAddTitle == true)

                    {

                        this.AddTitleRowlayout("协调器模块");

                        canAddTitle = false;

                    }

                    this.AddRowlayout(data, FirmwareLevelType.Coordinator);

                }



                canAddTitle = true;

                string imageType3 = this.listVode[0].DriveImageType.ToString();

                foreach (var data in listData3)

                {

@@ -129,6 +142,11 @@
                    {

                        //同一个东西，不显示出来

                        continue;

                    }

                    if (canAddTitle == true)

                    {

                        this.AddTitleRowlayout("虚拟设备模块");

                        canAddTitle = false;

                    }

                    this.AddRowlayout(data, FirmwareLevelType.VirtualDevice);

                }

@@ -152,13 +170,12 @@
            rowlayout.AddChidren(btnIcon);



            //指定的网关

            var btnGateway = rowlayout.AddLeftCaption(info.ShowName, Application.GetRealWidth(800), rowlayout.Height / 2, false);

            rowlayout.AddChidren(btnGateway);

            rowlayout.AddTopView(info.ShowName, 800);



            //固件信息

            var btnVersion = rowlayout.AddLeftCaption(Common.LocalDevice.Current.AppendVersion(info.FirmwareVersion), Application.GetRealWidth(800), rowlayout.Height / 2, false);

            btnVersion.Y = btnGateway.Bottom;

            rowlayout.AddChidren(btnVersion);

            string firmwareText = Common.LocalDevice.Current.AppendVersion(info.FirmwareVersion);

            firmwareText += "        " + UserCenterLogic.ConvertUtcTimeToLocalTime(info.CreatedOnUtc).ToString("yyyy/MM/dd HH:mm:ss");

            rowlayout.AddBottomView(firmwareText, 800);



            //向右的图标

            rowlayout.AddRightArrow();

@@ -193,6 +210,19 @@
        }



        /// <summary>

        /// 添加标题行

        /// </summary>

        /// <param name="title"></param>

        private void AddTitleRowlayout(string title)

        {

            var rowlayout = new FrameRowControl();

            rowlayout.UseClickStatu = false;

            this.listView.AddChidren(rowlayout);



            rowlayout.AddLeftCaption(title, 800);

        }



        /// <summary>

        /// 界面关闭

        /// </summary>

        public override void CloseFormBefore()


 ZigbeeApp/Shared/Phone/UserCenter/HdlBackup/HdlBackupListForm.cs

@@ -484,8 +484,8 @@
            var dialogForm = new DialogInputControl();

            //编辑备份

            dialogForm.SetTitleText(Language.StringByID(R.MyInternationalizationString.uEditorBackup));

            //请输入备注名称

            dialogForm.SetTipText(Language.StringByID(R.MyInternationalizationString.uPleaseInpuBackup));

            //请输入备份名称

            dialogForm.SetTipText(Language.StringByID(R.MyInternationalizationString.uPleaseInpuBackupName));

            dialogForm.Text = fileInfo.BackupName;



            //按下确认按钮

@@ -519,8 +519,8 @@
            var dialogForm = new DialogInputControl();

            //添加备份

            dialogForm.SetTitleText(Language.StringByID(R.MyInternationalizationString.uAddBackup));

            //请输入备注名称

            dialogForm.SetTipText(Language.StringByID(R.MyInternationalizationString.uPleaseInpuBackup));

            //请输入备份名称

            dialogForm.SetTipText(Language.StringByID(R.MyInternationalizationString.uPleaseInpuBackupName));



            //按下确认按钮

            dialogForm.ComfirmClickEvent += ((textValue) =>

@@ -574,8 +574,8 @@
        {

            if (backName == string.Empty)

            {

                //请输入备注名称

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

                //请输入备份名称

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

                this.ShowMassage(ShowMsgType.Error, msg);

                return false;

            }


 ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionMainForm.cs

@@ -106,6 +106,7 @@
            listView.AddChidren(row1);

            row1.AddLeftCaption("清除缓存文件", 500);

            row1.AddRightArrow();

            row1.AddBottomLine();

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

            {

                this.ShowMassage(ShowMsgType.Confirm, "是否清除缓存文件", () =>

@@ -126,6 +127,36 @@
                });

            };



#if Android

            row1 = new FrameRowControl(listView.rowSpace / 2);

            row1.UseClickStatu = false;

            listView.AddChidren(row1);

            row1.AddLeftCaption("GBS定位", 500);

            row1.AddBottomLine();

            var btnGbsSwitch = row1.AddMostRightSwitchIcon();

            string checkFile = System.IO.Path.Combine(Shared.IO.FileUtils.RootPath, Shared.Phone.UserCenter.DirNameResourse.OpenGbsFile);

            if (System.IO.File.Exists(checkFile) == true)

            {

                btnGbsSwitch.IsSelected = true;

            }

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

            {

                this.ShowMassage(ShowMsgType.Confirm, "注意:开启或者关闭此功能会重启App", () =>

                {

                    btnGbsSwitch.IsSelected = !btnGbsSwitch.IsSelected;

                    if (btnGbsSwitch.IsSelected == true)

                    {

                        var file = System.IO.File.Create(checkFile);

                        file.Close();

                    }

                    else

                    {

                        System.IO.File.Delete(checkFile);

                    }

                    HDLUtils.RestartApp();

                });

            };

#endif

            row1 = new FrameRowControl(listView.rowSpace / 2);

            listView.AddChidren(row1);

            row1.AddLeftCaption("上传Log", 500);


 ZigbeeApp/Shared/Phone/UserCenter/Member/AddMemberInfoForm.cs

@@ -43,13 +43,6 @@
            //清空bodyFrame

            this.ClearBodyFrame();



            string iconPath = System.IO.Path.Combine(UserCenterResourse.Option.UserPictruePath, memberResult.DistributedMark + ".png");

            if (memberResult.HeadImage != null)

            {

                //写入头像内容

                Shared.IO.FileUtils.WriteFileByBytes(iconPath, memberResult.HeadImage);

            }



            //头像

            var btnUserIcon = new ImageView();

            btnUserIcon.Height = Application.GetMinRealAverage(207);

@@ -57,7 +50,7 @@
            btnUserIcon.Radius = (uint)Application.GetMinRealAverage(207) / 2;

            if (memberResult.HeadImage != null)

            {

                btnUserIcon.ImageBytes = Shared.IO.FileUtils.ReadFile(iconPath);

                btnUserIcon.ImageBytes = memberResult.HeadImage;

            }

            else

            {

@@ -174,14 +167,23 @@
            UserCenterResourse.ListMemberInfo.Add(memberInfoRes);

            UserCenterLogic.SaveLocalMemberListInfo();



            string iconPath = System.IO.Path.Combine(UserCenterResourse.Option.UserPictruePath, memberInfoRes.DistributedMark + ".png");

            if (memberResult.HeadImage != null)

            {

                //写入头像内容

                Shared.IO.FileUtils.WriteFileByBytes(iconPath, memberResult.HeadImage);

            }



            //成员添加成功

            var form = new AddMemberSuccessForm();

            form.AddForm(memberInfoRes, memberResult.DistributedMark);

            form.AddForm(memberInfoRes, memberInfoRes.DistributedMark);

            form.FormCloseEvent += (() =>

            {

                this.CloseForm();

                //关闭手动输入成员ID的画面

                this.CloseFormByFormName("AddMemberByIdForm");

                //添加成员

                this.LoadFormMethodByName("MemberListForm", "AddRowLayoutByOtherForm", memberInfoRes);

            });

        }




 ZigbeeApp/Shared/Phone/UserCenter/Member/AddMemberSuccessForm.cs

@@ -92,7 +92,7 @@
            var btnAuthority = new NormalViewControl(frame.Width, Application.GetRealHeight(50), false);

            btnAuthority.TextAlignment = TextAlignment.Center;

            btnAuthority.Y = Application.GetRealHeight(400);

            btnAuthority.TextColor = UserCenterColor.Current.TextGrayColor;

            btnAuthority.TextColor = UserCenterColor.Current.TextGrayColor1;

            btnAuthority.TextID = R.MyInternationalizationString.uMember;

            btnAuthority.TextSize = 12;

            frame.AddChidren(btnAuthority);


 ZigbeeApp/Shared/Phone/UserCenter/Member/MemberListForm.cs

@@ -126,7 +126,7 @@
            btnAuthority.TextAlignment = TextAlignment.Center;

            btnAuthority.Y = btnName.Bottom + Application.GetRealHeight(10);

            btnAuthority.TextSize = 12;

            btnAuthority.TextColor = UserCenterColor.Current.TextGrayColor;

            btnAuthority.TextColor = UserCenterColor.Current.TextGrayColor1;

            btnAuthority.Text = UserCenterResourse.UserInfo.AuthorityText;

            frameBack.AddChidren(btnAuthority);

        }

@@ -321,6 +321,23 @@
            };

        }



        /// <summary>

        /// 添加成员行(外部调用)

        /// </summary>

        /// <param name="info"></param>

        public void AddRowLayoutByOtherForm(MemberInfoRes info)

        {

            var myRow = listView.GetChildren(listView.ChildrenCount - 1);

            if (myRow != null)

            {

                //最后一行加底线

                ((FrameRowControl)myRow).AddBottomLine();

            }

            this.AddRowLayout(info, false);

            //调整列表控件的高度

            listView.AdjustRealHeight(Application.GetRealHeight(23));

        }



        #endregion



        #region ■ 获取成员头像_______________________

@@ -374,7 +391,7 @@
        #region ■ 删除指定行_________________________



        /// <summary>

        /// 删除指定行

        /// 删除指定行(外部调用)

        /// </summary>

        /// <param name="accountId"></param>

        public void DeleteRowByAccount(string accountId)

@@ -389,6 +406,9 @@
                if (row.MainKeys == accountId)

                {

                    row.RemoveFromParent();

                    //调整列表控件的高度

                    listView.AdjustRealHeight(Application.GetRealHeight(23));



                    break;

                }

            }

@@ -442,12 +462,6 @@
        {

            //清空共享文件夹

            HdlShardLogic.Current.ClearShardDirectory();



            this.listView.RemoveAll();

            listView.Height = bodyFrameLayout.Height - Application.GetRealHeight(567);



            //添加成员列表

            this.AddMemberListRowByData();



            return 1;

        }


 ZigbeeApp/Shared/Phone/UserCenter/Member/MemberManagementForm.cs

@@ -139,7 +139,7 @@
            btnAuthority.TextSize = 12;

            btnAuthority.Y = btnUserIcon.Bottom + Application.GetRealHeight(23);

            btnAuthority.Gravity = Gravity.CenterHorizontal;

            btnAuthority.TextColor = UserCenterColor.Current.TextGrayColor;

            btnAuthority.TextColor = UserCenterColor.Current.TextGrayColor1;

            btnAuthority.TextID = R.MyInternationalizationString.uMember;

            if (memberInfo.AccountType == 1)

            {

@@ -159,7 +159,7 @@
        private void InitInfoList()

        {

            //标题:成员权限

            var btnMenberTile = new DetailTitleControl(800, 60, true);

            var btnMenberTile = new NormalViewControl(800, 60, true);

            btnMenberTile.X = ControlCommonResourse.XXLeft;

            btnMenberTile.Y = Application.GetRealHeight(418);

            btnMenberTile.TextColor = UserCenterColor.Current.TextColor2;


 ZigbeeApp/Shared/Phone/UserCenter/Member/SubAccountLevelUpSuccessForm.cs

@@ -82,7 +82,7 @@
            var btnAuthority = new NormalViewControl(frame.Width, Application.GetRealHeight(50), false);

            btnAuthority.TextAlignment = TextAlignment.Center;
            btnAuthority.Y = Application.GetRealHeight(400);
            btnAuthority.TextColor = UserCenterColor.Current.TextGrayColor;

            btnAuthority.TextColor = UserCenterColor.Current.TextGrayColor1;

            if (memberInfo.AccountType == 1)

            {

                btnAuthority.TextID = R.MyInternationalizationString.Administrator;

@@ -125,7 +125,7 @@
                //该管理员已成为成员

                btnView.TextID = R.MyInternationalizationString.uSubAccountLevelIsDown;

            }

            btnView.TextColor = UserCenterColor.Current.TextGrayColor;

            btnView.TextColor = UserCenterColor.Current.TextGrayColor1;

            btnView.IsMoreLines = true;

            btnView.TextSize = 12;

            frame.AddChidren(btnView);

 ZigbeeApp/Shared/Phone/UserCenter/Residence/FloorListRoomForm.cs

@@ -138,13 +138,7 @@
            }



            //编辑

            var btnEditor = new NormalViewControl(Application.GetRealWidth(184), frameRow.Height, false);

            btnEditor.BackgroundColor = 0xff4a4a4a;

            btnEditor.TextSize = 12;

            btnEditor.TextColor = UserCenterColor.Current.White;

            btnEditor.TextAlignment = TextAlignment.Center;

            btnEditor.TextID = R.MyInternationalizationString.uEditor;

            frameRow.AddRightView(btnEditor);

            var btnEditor = frameRow.AddEditorControl();

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

            {

                var form = new EditorRoomInforForm();

@@ -152,13 +146,7 @@
            };



            //删除

            var btnDelete = new NormalViewControl(Application.GetRealWidth(184), frameRow.Height, false);

            btnDelete.BackgroundColor = 0xfff75858;

            btnDelete.TextSize = 12;

            btnDelete.TextColor = UserCenterColor.Current.White;

            btnDelete.TextAlignment = TextAlignment.Center;

            btnDelete.TextID = R.MyInternationalizationString.uDelete;

            frameRow.AddRightView(btnDelete);

            var btnDelete = frameRow.AddDeleteControl();

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

            {

                //确认删除房间?


 ZigbeeApp/Shared/Phone/UserCenter/Safety/CoercePswAddContactForm.cs

@@ -123,7 +123,7 @@
            var txtNote = new TextInputControl(Application.GetRealWidth(740), txtPhone.Height, false);

            txtNote.X = ControlCommonResourse.XXLeft;

            txtNote.Y = btnLine.Bottom + Application.GetRealHeight(60);

            txtNote.PlaceholderText = Language.StringByID(R.MyInternationalizationString.uPleaseInpuBackup);

            txtNote.PlaceholderText = Language.StringByID(R.MyInternationalizationString.uPlesaeInputNoteInformation);

            frameBack.AddChidren(txtNote);

            //取消图标

            var btnCancel2 = new MostRightIconControl(69, 69);

@@ -208,8 +208,8 @@
            }

            if (strNote == string.Empty)

            {

                //请输入备注名称

                btnErrorMsg.Text = Language.StringByID(R.MyInternationalizationString.uPleaseInpuBackup);

                //请输入备注内容

                btnErrorMsg.Text = Language.StringByID(R.MyInternationalizationString.uPlesaeInputNoteInformation);

                return false;

            }



@@ -236,13 +236,5 @@
        }



        #endregion











       


     
    }

}


 ZigbeeApp/Shared/Phone/UserCenter/Safety/GarrisonAreaDelayedSettionForm.cs

@@ -129,7 +129,7 @@
            row.AddBottomLine();

            //时间

            string second = Language.StringByID(R.MyInternationalizationString.Second);

            this.inDelayTimeControl = row.AddMostRightView(this.timeResponseData.EntranceDelayTime + " " + second, 200);

            this.inDelayTimeControl = row.AddMostRightView(this.GetTimeText(this.timeResponseData.EntranceDelayTime), 200);

            this.inDelayTimeControl.TextColor = UserCenterColor.Current.TextGrayColor1;



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

@@ -158,7 +158,7 @@
            row.AddRightArrow();

            //时间

            string second = Language.StringByID(R.MyInternationalizationString.Second);

            this.outDelayTimeControl = row.AddMostRightView(this.timeResponseData.GoOutDelayTime + " " + second, 200);

            this.outDelayTimeControl = row.AddMostRightView(this.GetTimeText(this.timeResponseData.GoOutDelayTime), 200);

            this.outDelayTimeControl.TextColor = UserCenterColor.Current.TextGrayColor1;



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

@@ -192,14 +192,15 @@
                this.timeResponseData.GoOutDelayTime = OutDelayTime;

                Application.RunOnMainThread(() =>

                {

                    string second = Language.StringByID(R.MyInternationalizationString.Second);

                    if (this.inDelayTimeControl != null)

                    {

                        this.inDelayTimeControl.Text = inDelayTime + " " + second;

                        //显示时间翻译文本

                        this.inDelayTimeControl.Text = this.GetTimeText(inDelayTime);

                    }

                    if (this.outDelayTimeControl != null)

                    {

                        this.outDelayTimeControl.Text = OutDelayTime + " " + second;

                        //显示时间翻译文本

                        this.outDelayTimeControl.Text = this.GetTimeText(OutDelayTime);

                    }

                });

            }

@@ -286,5 +287,34 @@
        }



        #endregion



        #region ■ 一般方法___________________________



        /// <summary>

        /// 获取时间的翻译文本

        /// </summary>

        /// <param name="timeSecond">秒</param>

        /// <returns></returns>

        private string GetTimeText(int timeSecond)

        {

            string textValue = string.Empty;

            //分

            int checkValue = timeSecond / 60;

            if (checkValue > 0)

            {

                string minu = Language.StringByID(R.MyInternationalizationString.uMinute);

                textValue = checkValue + minu;

            }

            //秒

            checkValue = timeSecond % 60;

            if (checkValue > 0)

            {

                string second = Language.StringByID(R.MyInternationalizationString.uSecond);

                textValue += checkValue + second;

            }

            return textValue;

        }



        #endregion

    }

}


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

@@ -171,7 +171,7 @@
            this.btnAuthority = new NormalViewControl(605, 60, true);

            btnAuthority.X = btnUserName.X;

            btnAuthority.Y = btnUserName.Bottom;

            btnAuthority.TextColor = UserCenterColor.Current.Gray;

            btnAuthority.TextColor = UserCenterColor.Current.TextGrayColor3;

            btnAuthority.TextSize = 12;

            if (UserCenterResourse.UserInfo != null)

            {


 ZigbeeApp/Shared/R.cs

@@ -2168,9 +2168,9 @@
        /// </summary>

        public const int uBackup = 15225;

        /// <summary>

        /// 请输入备注名称

        /// 请输入备份名称

        /// </summary>

        public const int uPleaseInpuBackup = 15226;

        public const int uPleaseInpuBackupName = 15226;

        /// <summary>

        /// 恢复文件成功

        /// </summary>


 ZigbeeApp/Shared/Shared.projitems

@@ -270,7 +270,6 @@
    <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\FrameLayoutControls\FrameLayoutControl.cs" />

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

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

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

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

    <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\BaseCommonControl\Base\ButtonBase.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\BaseCommonControl\Common\ClickButtonCommon.cs" />

@@ -281,7 +280,6 @@
    <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\FrameLayoutControls\FrameCaptionViewControl.cs" />

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

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

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

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

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

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