From 5b697b351a67eb1eb8c4a942c44053f429b2efbc Mon Sep 17 00:00:00 2001
From: haidong <chenloveguitar@qq.com>
Date: Fri, 29 Mar 2024 19:27:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A7jar=E5=8C=85=E5=88=B02.0.3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: haidong <chenloveguitar@qq.com>
---
 src/main/java/com/hkversion/Acs/AcsMain.java    | 4 ++--
 src/main/java/com/hkversion/Acs/UserManage.java | 9 +++++++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/hkversion/Acs/AcsMain.java b/src/main/java/com/hkversion/Acs/AcsMain.java
index 1fca9a7..9c04e8f 100644
--- a/src/main/java/com/hkversion/Acs/AcsMain.java
+++ b/src/main/java/com/hkversion/Acs/AcsMain.java
@@ -143,9 +143,9 @@ public class AcsMain {
 //		MutilCard.setGroupCfg(lUserID);
 //		MutilCard.setMultiCardCfg(lUserID);
 		//设置计划模板
-//		UserManage.setCardTemplate(lUserID,4,4);
+		UserManage.setCardTemplate(lUserID,9,9);
 		//获取计划模板
-		UserManage.getCardTemplate(lUserID,9);
+//		UserManage.getCardTemplate(lUserID,9);
 
 		//设备能力获取
 //		DeviceAbility.getDeviceAbility(lUserID,0x01);
diff --git a/src/main/java/com/hkversion/Acs/UserManage.java b/src/main/java/com/hkversion/Acs/UserManage.java
index d6470d4..acd4c0e 100644
--- a/src/main/java/com/hkversion/Acs/UserManage.java
+++ b/src/main/java/com/hkversion/Acs/UserManage.java
@@ -534,7 +534,8 @@ public class UserManage {
         cardTemplateInfo.setTemplateId(dwWeekPlanNumber);
         List<CardTemplateInfo.TimeSegmentInfo> timeSegmentInfos = cardTemplateInfo.getTimeSegmentInfos();
         for (int i = 0; i < 7; i++) {
-            System.out.println("星期:"+(i+1));
+            int weekday = (i+1);
+            System.out.println("星期:"+weekday);
             for (int j = 0; j < 8; j++) {
                 CardTemplateInfo.TimeSegmentInfo timeSegmentInfo = new CardTemplateInfo.TimeSegmentInfo();
                 byte enable = struWeekPlanCfg.struPlanCfg[i].struPlanCfgDay[j].byEnable;
@@ -551,7 +552,11 @@ public class UserManage {
                 timeSegmentInfo.setEndTimeHour(endTimeHour);
                 timeSegmentInfo.setEndTimeMinute(endTimeMinute);
                 timeSegmentInfo.setEndTimeSecond(endTimeSecond);
-                timeSegmentInfos.add(timeSegmentInfo);
+                timeSegmentInfo.setWeekday(weekday);
+                timeSegmentInfo.setTimeSegment(j);
+                if(enable == 1){
+                    timeSegmentInfos.add(timeSegmentInfo);
+                }
                 System.out.print("可用状态:"+ enable);
                 System.out.println("\t时间段"+j+":"+ beginTimeHour
                         + ":"