Merge branch 'WJC' into temp-wxr

wxr

2021-03-31 3532db3610381f37eca1a6ac783d882517847c91

 HDL_ON/UI/UI2/FuntionControlView/Video/VideoMethod.cs

@@ -19,7 +19,7 @@
            Loading loading = new Loading();
            frameLayout.AddChidren(loading);
            loading.Start();
            List<ESVideoInfo> listESVideoInfo = new List<ESVideoInfo>();
            List<VideoMethod.FlVideo> listESVideoInfo = new List<VideoMethod.FlVideo>();
            List<CallView> listCall = new List<CallView>();
            new System.Threading.Thread(() =>
            {
@@ -203,12 +203,23 @@


        }

        /// <summary>
        /// 随机密码6位
        /// </summary>
        /// <returns></returns>
        public static string getCode()
        {
            Random rand = new Random();
            string code = "";
            for (int ctr = 0; ctr < 6; ctr++)
            {
                code += rand.Next(10).ToString();
            }
            return code;
        }
        /// <summary>
        /// 获取当前时间戳
        /// </summary>
        /// <returns></returns>
        public static string GetCurrentTimeStamp()
        {
            //TimeSpan ts = DateTime.Now - new DateTime(1970, 1, 1, 0, 0, 0, 0);
            //return Convert.ToInt64(ts.TotalSeconds).ToString();

            System.DateTime startTime = TimeZone.CurrentTimeZone.ToLocalTime(new System.DateTime(1970, 1, 1)); // 当地时区
          
            return ((long)(DateTime.Now - startTime).TotalSeconds).ToString(); // 相差秒数
            
        }
        /// <summary>
        /// 获取当前时间戳
        /// </summary>
        /// <returns></returns>
        public static string GetTomorrowTimeStamp()
        {
            //当前时间的后一天
            //TimeSpan ts = DateTime.Now.AddDays(1) - new DateTime(1970, 1, 1, 0, 0, 0, 0);
            //return Convert.ToInt64(ts.TotalSeconds).ToString();
            System.DateTime startTime = TimeZone.CurrentTimeZone.ToLocalTime(new System.DateTime(1970, 1, 1)); // 当地时区
            return ((long)(DateTime.Now.AddDays(1) - startTime).TotalSeconds).ToString(); // 相差秒数
        }
        [Serializable] 
        public class VideoClouds
        { 
        {
            /// <summary>
            /// 丰林绑定id（flBindId）
            /// 丰林绑定id（flBindId）(userKey)
            /// </summary>
            public string id = string.Empty;
            /// <summary>
@@ -296,6 +307,19 @@
           public List<Call> callList = new List<Call>();

        }
        
        [Serializable]
        public class FlVideo
        {
            /// <summary>
            /// 设备名称
            /// </summary>
            public string aliasName = string.Empty;
            /// <summary>
            /// 设备类型：(1室内机,2室外机，3围墙机，4管理机,5二次确认机)

            /// </summary>
            public string devType = string.Empty;
            public string uuid = string.Empty;
        }

    }
}