Merge remote-tracking branch 'origin/CJL-NEW'

wxr

2020-12-02 e3ad42ffa2fa67c8f6cb4519ca626fa275c8947d

 HDL_ON/UI/MainPage.cs

@@ -86,9 +86,6 @@
                BaseView = Application.MainPage;
                Application.MainPage.BackgroundColor = CSS_Color.MainBackgroundColor;

                //BusSocket.Start();
                //CommonPage.InitReceiveEvent();
               
                //LoginUser = Newtonsoft.Json.JsonConvert.DeserializeObject<UserInfo>(System.Text.Encoding.UTF8.GetString(FileUtils.ReadFile("UserInfo_File")));
                //判断需不需要登录，有没有登录，或者登录是否过期，
                if (UserInfo.Current == null || !UserInfo.Current.IsLogin)
@@ -97,18 +94,6 @@
                }
                else
                {
                    //UdpSocket._BusSocket.Start();
                    //if (Entity.DB_ResidenceData.residenceData.GatewayType == 1)
                    //{
                    //    BusSocket.Start();
                    //    CommonPage.InitReceiveEvent();
                    //    Control.ReadGatewayIPAddress();
                    //}
                    //else
                    //{
                    //    BusSocket.Start();
                    //    CommonPage.InitReceiveEvent();
                    //}
                    new System.Threading.Thread(() =>
                    {
                        var pm = new DAL.Server.HttpServerRequest();
@@ -128,9 +113,15 @@
                    new AppUnlockPage().LoadPage();
                    //读取音乐信息
                    UI.Music.A31MusicModel.ReadMusicStates();
                    //搜索网关

#if DEBUG
                    //new HDL_ON.DAL.Net.TcpListener().OpenServer(8586);
#endif           
                    //Entity.DB_ResidenceData.residenceData.residenceGatewayMAC = "4E47323347591243";
                    //Entity.DB_ResidenceData.residenceData.GatewayType = 0;
                    Entity.DB_ResidenceData.residenceData.residenceGatewayMAC = "123456789AAAAAAA";
                    Entity.DB_ResidenceData.residenceData.GatewayType = 1;
#endif
                    DriverLayer.Control.Ins.SearchLoaclGateway();
                }
            }
            catch (Exception ex)
@@ -193,6 +184,26 @@
            BasePageView.PageIndex = 0;
        }

        public static void GetRoomList()
        {
            var pm = new DAL.Server.HttpServerRequest();
            var packNew = pm.GetRoomList();//刷新房间列表
            var floorPack = pm.GetRoomList("FLOOR");
            var rooms = Newtonsoft.Json.JsonConvert.DeserializeObject<Entity.RoomApiPack>(packNew.Data.ToString());
            var floors = Newtonsoft.Json.JsonConvert.DeserializeObject<Entity.RoomApiPack>(packNew.Data.ToString());
            MainPage.Log(packNew.Data.ToString());
            MainPage.Log(floorPack.Data.ToString());
        }

        public static void GetDeviceList()
        {
            var pm = new DAL.Server.HttpServerRequest();
            var packNew = pm.GetDeviceList();
            var functions = Newtonsoft.Json.JsonConvert.DeserializeObject<Entity.DevcieApiPack>(packNew.Data.ToString());
            MainPage.Log(packNew.Data.ToString());
        }


        /// <summary>
        /// 自定义日志输出
        /// </summary>
@@ -203,6 +214,31 @@
#endif
        }

        /// <summary>
        /// 生成13位时间戳
        /// </summary>
        /// <param name="value">时间</param>
        /// <returns></returns>
        public static long GetTimestamp13bit(DateTime value)
        {
            return new DateTimeOffset(value).ToUnixTimeSeconds();
        }

        /// <summary>
        /// 获取时间
        /// </summary>
        /// <param name="timestamp"></param>
        /// <returns></returns>
        public static DateTime GetDateTime (long timestamp)
        {
            long begtime = timestamp * 10000000;
            DateTime dt_1970 = new DateTime(1970, 1, 1, 0, 0, 0);
            long tricks_1970 = dt_1970.Ticks;//1970年1月1日刻度
            long time_tricks = tricks_1970 + begtime;//日志日期刻度
            DateTime dt = new DateTime(time_tricks);//转化为DateTime
            return dt;
        }

    }

}