From 3dcbd186c42c598c0c08d1cd37034cf2baa09e54 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 30 十二月 2019 15:47:51 +0800
Subject: [PATCH] 合并了代码
---
ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/ChooseKeyModePage.cs | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/ChooseKeyModePage.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/ChooseKeyModePage.cs
index d5408d6..953f73e 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/ChooseKeyModePage.cs
+++ b/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)
--
Gitblit v1.8.0