备份

xm

2020-07-10 acb2b278663952ce555b06a2e821f359225f15e0

 ZigbeeApp/Shared/Phone/CommonForm/EditorCommonForm.cs

old mode 100644
new mode 100755
File was renamed from Home0630/Shared/Phone/CommonForm/EditorCommonForm.cs
@@ -21,15 +21,15 @@
        /// <summary>

        /// TopMenuFrameLayout
        /// </summary>
        public FrameLayout topMenuFrameLayout = null;
        public NormalFrameLayout topMenuFrameLayout = null;
        /// <summary>
        /// TopFrameLayout
        /// </summary>
        public FrameLayout topFrameLayout = null;
        public NormalFrameLayout topFrameLayout = null;
        /// <summary>
        /// bodyFrameLayout
        /// </summary>
        public FrameLayout bodyFrameLayout = null;
        public NormalFrameLayout bodyFrameLayout = null;
        /// <summary>

        /// 左滑使能

        /// </summary>
@@ -102,14 +102,14 @@
            }

            //TopMenuFrameLayout做成
            topMenuFrameLayout = new FrameLayout();
            topMenuFrameLayout = new NormalFrameLayout();
            topMenuFrameLayout.Height = ControlCommonResourse.TopMenuFrameHeight;
            topMenuFrameLayout.BackgroundColor = UserCenterColor.Current.TopFrameLayout;
            topMenuFrameLayout.Name = "topMenuFrameLayout";
            this.AddChidren(topMenuFrameLayout);


            //TopFrameLayout做成
            topFrameLayout = new FrameLayout();
            topFrameLayout = new NormalFrameLayout();
            topFrameLayout.Height = ControlCommonResourse.TopFrameHeight;
            topFrameLayout.BackgroundColor = UserCenterColor.Current.TopFrameLayout;
            topFrameLayout.Y = topMenuFrameLayout.Bottom;
@@ -169,7 +169,7 @@
            {
                bodyFrameLayout.RemoveAll();
            }

            bodyFrameLayout = new FrameLayout();
            bodyFrameLayout = new NormalFrameLayout();
            bodyFrameLayout.Height = ControlCommonResourse.BodyFrameHeight;
            bodyFrameLayout.Y = topFrameLayout.Bottom;
            bodyFrameLayout.BackgroundColor = UserCenterColor.Current.BodyFrameLayout;
@@ -441,49 +441,6 @@
            return back;
        }

        #region ■ 显示选择设备睡眠时间_______________

        /// <summary>

        /// 当前选择的功能类型索引

        /// </summary>

        private int nowSelectNo = 0;
        /// <summary>

        /// 显示选择设备睡眠时间的界面

        /// </summary>

        private void ShowSelectDeviceFunctionListForm()

        {

            //显示列表

            var listText = new List<string>();

            listText.Add("15s");

            listText.Add("1min");

            listText.Add("5min");

            //标题:选择功能类型

            var title = Language.StringByID(R.MyInternationalizationString.uSelectFunctionType);



            var form = new BottomItemSelectForm();

            form.CancelCallEvent = true;//允许取消

            form.AddForm(title, listText, nowSelectNo);

            form.FinishSelectEvent += (selectNo) =>

            {
                //    if (selectNo == nowSelectNo)
                //    {
                //        //选择的是相同的
                //        return;
                //    }
                //    //-1:选择取消
                //    this.Text = selectNo == -1 ? string.Empty : listText[selectNo];
                //    nowSelectNo = selectNo;

                //    //记录起当前选择的功能类型
                //    this.RefreshDfunctionType();

                //    //设备改变功能类型的话,主页需要重新刷新
                //    UserView.UserPage.Instance.RefreshForm = true;

                //    //调用回调函数
                //    this.FinishSelectEvent?.Invoke(nowSelectNo);
            };

        }

        #endregion

        #endregion
    }
}