合并了代码

黄学彪

2019-12-30 3dcbd186c42c598c0c08d1cd37034cf2baa09e54

 ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/ChooseKeyModePage.cs

@@ -96,6 +96,7 @@
                BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack,
                TextColor = Shared.Common.ZigbeeColor.Current.XMWhite,
                TextSize = 16,
                IsBold = true,
            };
            bottomFrameLayout.AddChidren(btnFinifh);
            #endregion
@@ -612,6 +613,7 @@
                    Y = Application.GetRealHeight(58),
                    TextColor = Shared.Common.ZigbeeColor.Current.TextBlack,
                    TextAlignment = TextAlignment.CenterLeft,
                    TextSize = 14,
                };
                rowLayout.AddChidren(btnModeText);

@@ -767,6 +769,7 @@
                    Y = Application.GetRealHeight(58),
                    TextColor = Shared.Common.ZigbeeColor.Current.TextBlack,
                    TextAlignment = TextAlignment.CenterLeft,
                    TextSize = 14,
                };
                rowLayout.AddChidren(btnModeText);

@@ -810,7 +813,7 @@
                        break;
                }

                if (i == typeDetailModeList.Count - 1)
                if (i == typeDetailModeListTemp.Count - 1)
                {
                    line2.Visible = false;
                }
@@ -937,6 +940,7 @@
                    Y = Application.GetRealHeight(58),
                    TextColor = Shared.Common.ZigbeeColor.Current.TextBlack,
                    TextAlignment = TextAlignment.CenterLeft,
                    TextSize = 14,
                };
                rowLayout.AddChidren(btnModeText);

@@ -1070,11 +1074,6 @@
                btnChoose.MouseUpEventHandler += hander;
                i++;
            }
        }

        private void FinisfhEventHandler(object sender, MouseEventArgs e)
        {

        }

        public void DeviceInfoChange(CommonDevice common, string typeTag)