From 1b56157e8edc3f502810820d99b607e3629c7171 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 19 七月 2023 09:42:00 +0800
Subject: [PATCH] Merge branch 'Dev-Branch' into wjc

---
 HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/GroupControl.cs |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/GroupControl.cs b/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/GroupControl.cs
index 30fbc37..81ce887 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/GroupControl.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/GroupControl.cs
@@ -26,7 +26,7 @@
         /// </summary>
         public string NewGroupControlSid()
         {
-            string sceneId = "";
+            string Id = "";
             try
             {
                 string sOidBeginsWith = "000101";//鍘傚晢 + 閫氳鏂瑰紡
@@ -53,23 +53,23 @@
                     //sTimeSpan = "00000000";
                 }
 
-                sceneId = sOidBeginsWith + sTimeSpan;
+                Id = sOidBeginsWith + sTimeSpan;
 
-                sceneId += "AA";
-                sceneId += "AA01";
+                Id += "AA";
+                Id += "AA01";
                 int maxId = 1;
 
                 Random random = new Random(Guid.NewGuid().GetHashCode());
                 maxId = random.Next(10);
 
-                sceneId += (maxId + 1).ToString("X4");
-                sceneId += "0000";
+                Id += (maxId + 1).ToString("X4");
+                Id += "0000";
             }
             catch
             {
-                return sceneId;
+                return Id;
             }
-            return sceneId;
+            return Id;
         }
         /// <summary>
         /// 缇ゆ帶鍚嶇О

--
Gitblit v1.8.0