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

gxc

2020-01-02 00ab3ddb140ba8bb88b5cf572b004a85e1da85e9

 ZigbeeApp/Shared/Phone/Device/Logic/SelectedLogic.cs

@@ -42,6 +42,7 @@
                //Text = "时间条件",
                TextID = MyInternationalizationString.Timecondition,
                TextSize = 17,
                IsBold = true,
            };
            topFrameLayout.AddChidren (titleName);