From 9acd3887f1f8db40d59f991b1726a61aa7c7637c Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 12 五月 2021 15:13:56 +0800
Subject: [PATCH] Merge branch 'CJL' into wxr4
---
HDL_ON/Entity/Function/Scene.cs | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/Entity/Function/Scene.cs b/HDL_ON/Entity/Function/Scene.cs
index 3970bc1..2f73b07 100644
--- a/HDL_ON/Entity/Function/Scene.cs
+++ b/HDL_ON/Entity/Function/Scene.cs
@@ -84,6 +84,11 @@
/// </summary>
public bool collect = false;
+ /// <summary>
+ /// 鍒涘缓璇ュ満鏅殑鐢ㄦ埛ID
+ /// </summary>
+ public string userId = "";
+
///// <summary>
///// 鍦烘櫙鑳屾櫙
///// </summary>
@@ -138,13 +143,14 @@
sTimeSpan = arry[0].ToString("X2") + arry[1].ToString("X2") + arry[2].ToString("X2") + arry[3].ToString("X2");
- if (sTimeSpan.Length > 8)
+ if (sTimeSpan.Length >= 8)
{
sTimeSpan = sTimeSpan.Substring(0, 8);
}
else
{
- sTimeSpan = "00000000";
+ sTimeSpan = Guid.NewGuid().ToString().Substring(0, 8);
+ //sTimeSpan = "00000000";
}
sceneId = sOidBeginsWith + sTimeSpan;
--
Gitblit v1.8.0