合并代码

黄学彪

2020-01-09 fa6bcb2e9907772480f99205f36ec2a1ce735a22

 ZigbeeApp/Shared/Phone/UserCenter/DoorLock/TimeSettignPage.cs

@@ -287,6 +287,7 @@
                    var mUIPickerView = new UIPickerView()
                    {
                        X = Application.GetRealWidth(0),
                        Height = Application.GetRealHeight(440),
                    };
                    this.bottomRadiusFrameLayout.AddChidren(mUIPickerView);

@@ -302,7 +303,7 @@
                            this.btnBottomTitle.TextID = R.MyInternationalizationString.CurrentDate;
                        }

                        mUIPickerView.Y = Application.GetRealWidth(110);
                        mUIPickerView.Y = Application.GetRealWidth(245);
                        var mList1 = new List<string>();
                        var mList2 = new List<string>();
                        var mList3 = new List<string>();
@@ -311,20 +312,20 @@
                        int year = dtNow.Year + 1;
                        int days = DateTime.DaysInMonth(dtNow.Year, dtNow.Month);

                        for (int y = dtNow.Year - 10; y < dtNow.Year + 1; y++)
                        for (int y = dtNow.Year - 9; y < dtNow.Year + 1; y++)
                        {
                            mList1.Add(y.ToString());
                        }
                        for (int m = 1; m < 13; m++)
                        {
                            if(Language .CurrentLanguage == "Chinese")
                            if (Language.CurrentLanguage == "Chinese")
                            {
                                mList2.Add(m.ToString()+"月");
                                mList2.Add(m.ToString() + "月");
                            }
                            else
                            {
                                mList2.Add(m.ToString());
                            } 
                            }
                        }
                        for (int d = 1; d < days + 1; d++)
                        {
@@ -335,7 +336,7 @@
                            else
                            {
                                mList3.Add(d.ToString());
                            } 
                            }
                        }

                        if (setTimeType != "DoorLockTime")
@@ -393,7 +394,7 @@
                        else
                        {
                            mUIPickerView.setNPicker(mList1, mList2, mList3);
                            mUIPickerView.setCurrentItems(dtNow.Year, dtNow.Month - 1, dtNow.Day - 1);
                            mUIPickerView.setCurrentItems(9, dtNow.Month - 1, dtNow.Day - 1);
                            curYear = dtNow.Year;
                            curMonth = dtNow.Month;
                            curDay = dtNow.Day;
@@ -439,7 +440,7 @@
                                else
                                {
                                    mUIPickerView.setNPicker(mList1, mList2, mList3);
                                    mUIPickerView.setCurrentItems(curYear, curMonth - 1, curDay - 1);
                                    mUIPickerView.setCurrentItems(9, curMonth - 1, curDay - 1);
                                }
                            }
                        };
@@ -472,7 +473,7 @@
                            this.btnBottomTitle.TextID = R.MyInternationalizationString.CurrentTime;
                        }

                        mUIPickerView.Y = Application.GetRealWidth(95);
                        mUIPickerView.Y = Application.GetRealWidth(245);
                        var mList1 = new List<string>();
                        var mList2 = new List<string>();
                        for (int h = 0; h < 24; h++)
@@ -576,6 +577,14 @@
                textDisplayDateFrameLayout.MouseDownEventHandler += hander;
                btnNextFrameLayout.MouseDownEventHandler += hander;
                btnNext.MouseDownEventHandler += hander;
                if (curIndex == 0)
                {
                    textDisplayDate.MouseDownEventHandler += hander;
                }
                else
                {
                    textDisplayTime.MouseDownEventHandler += hander;
                }
            }

            btnCancel.MouseUpEventHandler += (sender1, e1) =>