合并全部代码完成

黄学彪

2019-11-28 3a26f6025130dcaae4aa82ea19b16ad902450eb8

 ZigbeeApp/Shared/Common/CommonPage.cs

@@ -7,7 +7,7 @@
using Shared.Phone.UserCenter.Abount;
namespace Shared.Common
{
    public class CommonPage : FrameLayout
    public class CommonPage : UIDrawerLayout
    {
        static CommonPage commonPage;
        public static CommonPage Instance
@@ -43,6 +43,11 @@
            Application.MainPage.AddChidren(Loading);
            //}
            Phone.UserView.HomePage.Instance.InitPage();

            var roomList = new Shared.Phone.Device.Room.RoomManagement();
           
            Instance.AddLeftView(roomList);
            roomList.Show();
        }

        public static string SoftTitle = "ZigBee";
@@ -57,7 +62,7 @@
        /// <summary>
        /// 版本号
        /// </summary>
        public static string CodeIDString = "1.0.19112201";
        public static string CodeIDString = "1.0.19112601";
        /// <summary>
        /// 注册来源(0:HDL On 1:Zigbee)
        /// </summary>