Merge branch 'temp-wxr' into WJC

陈嘉乐

2021-03-17 dbc23459fdf4e8b74a5f955fbb9fc631b4babc70

 HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs

@@ -80,15 +80,18 @@
            if (Pir.pirDeviceList.Count != 0)
            {

                if (function != null)
                {
                    var pir = function as Pir;
                    Pir.currPir = pir;
                }
                else
                {
                    Pir.currPir = Pir.pirDeviceList[0];
                }
                //if (function != null)
                //{
                //    Pir pir = new Pir();
                //    pir.name = function.name;
                //    pir.deviceId = function.deviceId;
                //    pir.sid = function.sid;
                //    Pir.currPir = pir;
                //}
                //else
                //{
                //    Pir.currPir = Pir.pirDeviceList[0];
                //}
                //默认第一个红外宝
                int sum = 0;
                for (int i = 0; i < Pir.pirDeviceList.Count; i++)
@@ -96,7 +99,7 @@
                    //查找
                    sum += Pir.pirDeviceList[i].FunctioList.Count;
                }
                deviceNameBtn.Text = Pir.currPir.name;
                deviceNameBtn.Text = Pir.pirDeviceList[0].name;
                mainView.numberDeviceBtn.Text = Pir.pirDeviceList.Count.ToString() + Language.StringByID(StringId.ge);
                mainView.currDeviceNumberControlBtn.Text = sum.ToString() + Language.StringByID(StringId.ge);
            }