全部合并了代码，安卓和 IOS 都测试通过了

黄学彪

2019-11-13 8b9ce384b26c414db32f98e94e088f5334869c2d

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

@@ -240,6 +240,90 @@

        #endregion

        #region ◆ 获取扫风模式图片名称_____________________
        /// <summary>
        /// 通过扫风模式获取选中图片
        /// </summary>
        /// <returns>The fan mode selected image path by fan mode identifier.</returns>
        /// <param name="swingMode">Fan mode.</param>
        public static string GetFanSwingModeSelectedImagePathByFanSwingModeId(int swingMode)
        {
            if (swingMode == 0)
            {
                return "AC/Swing_1Selected.png";
            }
            else if (swingMode == 1)
            {
                return "AC/Swing_2Selected.png";
            }
            else if (swingMode == 2)
            {
                return "AC/Swing_3Selected.png";
            }
            else if (swingMode == 3)
            {
                return "AC/Swing_4Selected.png";
            }
            else if (swingMode == 4)
            {
                return "AC/Swing_5Selected.png";
            }
            return "AC/Swing_AutoSelected.png";
        }

        /// <summary>
        /// 通过扫风模式获取图片
        /// </summary>
        /// <returns>The fan mode selected image path by fan mode identifier.</returns>
        /// <param name="swingMode">Fan mode.</param>
        public static string GetFanSwingModeUnSelectedImagePathByFanSwingModeId(int swingMode)
        {
            if (swingMode == 0)
            {
                return "AC/Swing_1.png";
            }
            else if (swingMode == 1)
            {
                return "AC/Swing_2.png";
            }
            else if (swingMode == 2)
            {
                return "AC/Swing_3.png";
            }
            else if (swingMode == 3)
            {
                return "AC/Swing_4.png";
            }
            else if (swingMode == 4)
            {
                return "AC/Swing_5.png";
            }
            return "AC/Swing_Auto.png";
        }

        /// <summary>
        /// 通过扫风模式获取选中图片
        /// </summary>
        /// <returns>The fan mode selected image path by fan mode identifier.</returns>
        /// <param name="swingMode">Fan mode.</param>
        public static string GetFanSwingModeSelectedImagePathByFanSwingMode(ZigBee.Device.AC.FanSwingMode swingMode)
        {
            return GetFanSwingModeSelectedImagePathByFanSwingModeId((int)swingMode);
        }

        /// <summary>
        /// 通过扫风模式获取图片
        /// </summary>
        /// <returns>The fan mode selected image path by fan mode identifier.</returns>
        /// <param name="swingMode">Fan mode.</param>
        public static string GetFanSwingModeUnSelectedImagePathByFanSwingMode(ZigBee.Device.AC.FanSwingMode swingMode)
        {
            return GetFanSwingModeUnSelectedImagePathByFanSwingModeId((int)swingMode);
        }

        #endregion


        #region ◆ 获取风速图片名称_____________________

        /// <summary>
@@ -293,41 +377,17 @@
        /// <param name="fanMode">Fan mode.</param>
        public static string GetFanModeSelectedImagePathByFanMode(ZigBee.Device.AC.FanMode fanMode)
        {
            if (fanMode == ZigBee.Device.AC.FanMode.Low)
            {
                return GetFanModeSelectedImagePathByFanModeId(1);
            }
            else if (fanMode == ZigBee.Device.AC.FanMode.Medium)
            {
                return GetFanModeSelectedImagePathByFanModeId(2);
            }
            else if (fanMode == ZigBee.Device.AC.FanMode.High)
            {
                return GetFanModeSelectedImagePathByFanModeId(3);
            }
            return GetFanModeSelectedImagePathByFanModeId(1);
            return GetFanModeSelectedImagePathByFanModeId((int)fanMode);
        }

        /// <summary>
        /// 通过风速模式获取风速图片
        /// </summary>
        /// <returns>The fan mode selected image path by fan mode identifier.</returns>
        /// <param name="fanMode">Fan mode.</param>
        /// <param name="swingMode">Fan mode.</param>
        public static string GetFanModeUnSelectedImagePathByFanMode(ZigBee.Device.AC.FanMode fanMode)
        {
            if (fanMode == ZigBee.Device.AC.FanMode.Low)
            {
                return GetFanModeUnSelectedImagePathByFanModeId(1);
            }
            else if (fanMode == ZigBee.Device.AC.FanMode.Medium)
            {
                return GetFanModeUnSelectedImagePathByFanModeId(2);
            }
            else if (fanMode == ZigBee.Device.AC.FanMode.High)
            {
                return GetFanModeUnSelectedImagePathByFanModeId(3);
            }
            return GetFanModeUnSelectedImagePathByFanModeId(1);
            return GetFanModeUnSelectedImagePathByFanModeId((int)fanMode);
        }

        #endregion
@@ -409,8 +469,8 @@
            Application.RunOnMainThread(() =>
            {
                string msg = Language.StringByID(R.MyInternationalizationString.TheACIsClose);
                var tip = new Phone.UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Tip, msg);
                tip.Show();
                //var tip = new Phone.UserCenter.TipViewControl(msg, 1000, 1);
                //tip.ShowView();
            });
        }