Merge remote-tracking branch 'origin/dev-tzy' into DEV_GXC

gxc

2020-01-02 00ab3ddb140ba8bb88b5cf572b004a85e1da85e9

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

@@ -187,7 +187,7 @@
                {
                    Width = Application.GetRealWidth(58),
                    Height = Application.GetRealHeight(58),
                    UnSelectedImagePath = "Item/Next.png",
                    UnSelectedImagePath = "Item/RightNext.png",
                    SelectedImagePath = "Item/Down.png",
                };
                btnNextFrameLayout.AddChidren(btnNext);
@@ -282,8 +282,8 @@
                EventHandler<MouseEventArgs> hander = (sender, e) =>
                {
                    this.midFrameLayout.AddChidren(this.shadowRadiusFrameLayout);
                    this.bottomRadiusFrameLayout.RemoveAll();
                    this.BottomRadiusFrameLayout(this);

                    var mUIPickerView = new UIPickerView()
                    {
                        X = Application.GetRealWidth(0),
@@ -317,11 +317,25 @@
                        }
                        for (int m = 1; m < 13; m++)
                        {
                            mList2.Add(m.ToString());
                            if(Language .CurrentLanguage == "Chinese")
                            {
                                mList2.Add(m.ToString()+"月");
                            }
                            else
                            {
                                mList2.Add(m.ToString());
                            } 
                        }
                        for (int d = 1; d < days + 1; d++)
                        {
                            mList3.Add(d.ToString());
                            if (Language.CurrentLanguage == "Chinese")
                            {
                                mList3.Add(d.ToString() + "日");
                            }
                            else
                            {
                                mList3.Add(d.ToString());
                            } 
                        }

                        if (setTimeType != "DoorLockTime")
@@ -350,7 +364,7 @@
                                Height = Application.GetRealHeight(58),
                                Width = Application.GetRealWidth(101),
                                Text = Language.StringByID(R.MyInternationalizationString.Complete),
                                TextColor = Shared.Common.ZigbeeColor.Current.XMGray3,
                                TextColor = Shared.Common.ZigbeeColor.Current.XMOrange,
                                TextSize = 14,
                            };
                            this.bottomRadiusFrameLayout.AddChidren(btnOk);
@@ -407,7 +421,14 @@

                                for (int d = 1; d < days + 1; d++)
                                {
                                    mList3.Add(d.ToString());
                                    if (Language.CurrentLanguage == "Chinese")
                                    {
                                        mList3.Add(d.ToString() + "日");
                                    }
                                    else
                                    {
                                        mList3.Add(d.ToString());
                                    }
                                }

                                if (setTimeType != "DoorLockTime")
@@ -522,7 +543,7 @@
                                Height = Application.GetRealHeight(58),
                                Width = Application.GetRealWidth(101),
                                Text = Language.StringByID(R.MyInternationalizationString.Complete),
                                TextColor = Shared.Common.ZigbeeColor.Current.XMGray3,
                                TextColor = Shared.Common.ZigbeeColor.Current.XMOrange,
                                TextSize = 14,
                            };
                            this.bottomRadiusFrameLayout.AddChidren(btnOk);