Merge remote-tracking branch 'origin/dev-tzy' into dev-2020xm

xm

2020-05-07 c1de48884fa145a16a0f8bcee93274dcfaa0ff82

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

@@ -37,6 +37,10 @@
        /// </summary>
        public string currentSelectFloorId = string.Empty;
        /// <summary>
        /// 当前选择的房间ID【新风面板】
        /// </summary>
        public string currentSelectRoomId = string.Empty;
        /// <summary>
        /// 当前开关模式
        /// </summary>
        public string CurrentSwitchMode = "";
@@ -155,6 +159,7 @@
        /// <para>304:CurtainDownstop,窗帘下降停</para>
        /// </summary>
        public List<int> privateFuncThirdLevelList = new List<int>();

        #region 获取面板的私有信息.
        /// <summary>
        ///获取面板的私有信息
@@ -1563,7 +1568,7 @@
                        level = temp2;
                        break;
                }



                sbString2.Append(level.ToUpper());
                data = dataLength + dataComand1 + dataComand2 + dataSerialNum + addDataLength +
                   mode + time + sbString2;