Merge branch 'dev-tzy' into DEV_GXC

gxc

2019-11-14 a7adf98ff4ac801342853b1f9231cc1ab5acebf3

 ZigbeeApp/Shared/Phone/Device/AC/ACControl.cs

@@ -213,7 +213,7 @@
                                        currentModeBtn.Text = ACControlBase.GetModeNameByModeId(ac.currentSystemMode);

                                        mArcScaleSeekBar.Progress = ACControlBase.GetCurrentModeTemperature(ac);
                                        

                                        fanModeBtn.IsSelected = false;
                                        FanSwingModeBtn.IsSelected = false;
                                    }
@@ -252,7 +252,7 @@
                                    fanModeBtn.UnSelectedImagePath = ACControlBase.GetFanModeUnSelectedImagePathByFanModeId(ac.currentFanMode);
                                    break;
                                case 4096:
                                    //风扇当前的扫风模式 
                                    //风扇当前的扫风模式
                                    ac.currentFanSwingMode = attriButeList[0].AttriButeData;
                                    ac.LastDateTime = DateTime.Now;
                                    FanSwingModeBtn.IsSelected = true;
@@ -611,7 +611,7 @@
                IsSelected = ACControlBase.IsOpen(ac)
            };
            itemView.AddChidren(FanSwingModeBtn);
            

            //模式
            modeBtn = new Button()
            {
@@ -1431,7 +1431,7 @@

        #endregion

       


        #region ◆ 控制反馈_________________________