请合并代码，完成晾衣架最终功能。

xm

2020-12-14 d6fb0646531172f23648441c224cdcccd721b894

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/AiererTimeControl.cs

@@ -68,47 +68,48 @@
        btnTextView.Y += chidrenYaxis;
      }

      //右箭头
      this.AddRightArrow();
      //右箭头  {烘干、风干和消毒的设置默认时间暂时取去掉，且倒计时也去掉，因为第三方设备不支持」
      //默认最大3小时，所以下次要处理时为3，分钟不能操作大情况
      //this.AddRightArrow();

      //如果当前不是展示模板,则需要处理
      if (Common.Config.Instance.Home.IsShowTemplate == false)
      {
        this.ButtonClickEvent += (sender, e) =>
        {
          //区域选择
          SelectTimeEvent = (min, curType) =>
          {
            switch (curType)
            {
              case 1:
              case 2:
                double result = min / 60.0;
                var hour = Math.Round(result, 2);
                var text = hour + Language.StringByID(R.MyInternationalizationString.AirerHour);
      //if (Common.Config.Instance.Home.IsShowTemplate == false)
      //{
      //  this.ButtonClickEvent += (sender, e) =>
      //  {
      //区域选择
      //SelectTimeEvent = (min, curType) =>
      //{
      //  switch (curType)
      //  {
      //    case 1:
      //    case 2:
      //      double result = min / 60.0;
      //      var hour = Math.Round(result, 2);
      //      var text = hour + Language.StringByID(R.MyInternationalizationString.AirerHour);

                if (min == 0)
                {
                  text = Language.StringByID(R.MyInternationalizationString.AirerDefault) + 3 + Language.StringByID(R.MyInternationalizationString.AirerHour);
                }
                btnTextView.Text = text;
      //      if (min == 0)
      //      {
      //        text = Language.StringByID(R.MyInternationalizationString.AirerDefault) + 3 + Language.StringByID(R.MyInternationalizationString.AirerHour);
      //      }
      //      btnTextView.Text = text;

                break;
              case 3:
                int result2 = min;
                var text2 = result2 + Language.StringByID(R.MyInternationalizationString.AirerMin);
      //      break;
      //    case 3:
      //      int result2 = min;
      //      var text2 = result2 + Language.StringByID(R.MyInternationalizationString.AirerMin);

                if (min == 0)
                {
                  text2 = Language.StringByID(R.MyInternationalizationString.AirerDefault) + 30 + Language.StringByID(R.MyInternationalizationString.AirerMin);
                }
                btnTextView.Text = text2;
                break;
            }
          };
          this.ShowSelectTime(airer, bodyFrameLayout, btnTextView, i_caption, type);
        };
      }
      //      if (min == 0)
      //      {
      //        text2 = Language.StringByID(R.MyInternationalizationString.AirerDefault) + 30 + Language.StringByID(R.MyInternationalizationString.AirerMin);
      //      }
      //      btnTextView.Text = text2;
      //      break;
      //  }
      //};
      //this.ShowSelectTime(airer, bodyFrameLayout, btnTextView, i_caption, type);
      // };
      //}
    }

    #endregion
@@ -205,8 +206,8 @@
             this.DetailCardActionTimeEvent?.Invoke(airer.DisinfectRemainTime, type);
             break;
         }
         //成功后更新外面文本
         this.SelectTimeEvent?.Invoke(totalMin, type);
       //成功后更新外面文本
       this.SelectTimeEvent?.Invoke(totalMin, type);
         this.SelectTimeEvent = null;

         this.shadowRadiusFrameLayout.RemoveFromParent();
@@ -229,7 +230,7 @@
      base.RemoveFromParent();
    }

    #endregion 
    #endregion
  }
}