2

xm

2020-05-13 652c1986b854f54e0a6d38b4b538a9551c1e3151

2

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

Diff too large

 ZigbeeApp/Home.Ios/Resources/Language.ini

@@ -2053,8 +2053,7 @@
60008=转换器
60009=空调模块
60010=智能门锁
60011=新风模块
60012=新风模块
60011=新风模块 

;//★★★★下面这些是添加新设备界面那里显示的名字,从70000开始★★★★
70000=2按键面板

 ZigbeeApp/Shared/Phone/MainPage/ControlForm/Base/DeviceDetailCardCommonForm.cs

old mode 100755
new mode 100644
@@ -142,7 +142,7 @@
            frameRoomBlack.Height = Application.GetRealHeight(138);

            frameRoomBlack.Width = frameWhiteBack.Width;

            frameRoomBlack.BackgroundColor = 0xff232323;

            frameRoomBlack.Radius= (uint)Application.GetRealHeight(17);

            frameRoomBlack.Radius = (uint)Application.GetRealHeight(17);

            frameRoomBlack.Gravity = Gravity.BottomCenter;

            frameWhiteBack.AddChidren(frameRoomBlack);



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

        /// <param name="text"></param>

        public void SetStatuText(string text)

        {

        {
            this.btnStatu.Text = this.CurrentText + text;

        }




 ZigbeeApp/Shared/Phone/MainPage/ControlForm/DevicePmSensorDetailCardForm.cs

@@ -76,7 +76,7 @@
            var btnHumidityStatus = new NormalViewControl(193, 92, true);

            btnHumidityStatus.Y = Application.GetRealHeight(181);
            btnHumidityStatus.Text = "20";
            btnHumidityStatus.TextSize = 32;
            btnHumidityStatus.TextSize = 30;
            btnHumidityStatus.TextColor = ZigbeeColor.Current.XMWhite;
            btnHumidityStatus.TextAlignment = TextAlignment.CenterRight;
            frameHumidityPic.AddChidren(btnHumidityStatus);
@@ -113,7 +113,7 @@
            var btnTemperatureStatus = new NormalViewControl(193, 92, true);

            btnTemperatureStatus.Y = Application.GetRealHeight(181);
            btnTemperatureStatus.Text = "20";
            btnTemperatureStatus.TextSize = 32;
            btnTemperatureStatus.TextSize = 30;
            btnTemperatureStatus.TextColor = ZigbeeColor.Current.XMWhite;
            btnTemperatureStatus.TextAlignment = TextAlignment.CenterRight;
            frameTemperaturePic.AddChidren(btnTemperatureStatus);
@@ -149,8 +149,8 @@
            //PM2.5数据（第3个，listControl【2】）
            var btnPmStatus = new NormalViewControl(109 + 40, 92, true);

            btnPmStatus.Y = Application.GetRealHeight(181);
            btnPmStatus.Text = "35";
            btnPmStatus.TextSize = 32;
            btnPmStatus.Text = "155";
            btnPmStatus.TextSize = 30;
            btnPmStatus.TextColor = ZigbeeColor.Current.XMWhite;
            btnPmStatus.TextAlignment = TextAlignment.CenterRight;
            framePmPic.AddChidren(btnPmStatus);
@@ -236,31 +236,6 @@
        }
        #endregion

        #region ■ 设置方法 
        /// <summary>
        ///命令
        ///0:Off
        ///1:Low
        ///3:High
        ///4:On
        ///5:Auto
        /// 15:Manual
        /// </summary> 
        private void SetFanComand(int command)

        {

            //检测是否获取网关反馈的结果,如果网关没有回复,则会弹出消息

            this.StartCheckResponeResult(this.listControl, (result) =>

            {

                //接收到网关回复

                if (result == true)

                {
                }

            });


        }
        #endregion

        #region ■ 刷新状态_____________
        /// <summary>
        /// 刷新状态
@@ -271,8 +246,25 @@
            this.listControl[0].Text = pMSensor.currentTemperature.ToString();
            this.listControl[1].Text = pMSensor.currentHumidity.ToString();
            this.listControl[2].Text = pMSensor.currentPmData.ToString();
            //设置状态文字 
            this.SetStatuText(Language.StringByID(R.MyInternationalizationString.uOpen1));
            //设置状态文字
            this.btnStatu.Text = Language.StringByID(R.MyInternationalizationString.AirQuality) + "";
        }

        /// <summary>
        /// 质量等级
        /// </summary>
        private string QuailityType()
        {
            string curQuality = string.Empty;

            if (pMSensor.currentPmData <= 35 && pMSensor.currentPmData >= 0)
            {

            }
            this.listControl[2].Text = pMSensor.currentPmData.ToString();

            //设置状态文字
            return curQuality;
        }
        #endregion
    }