优化使用后台和app体验

ry-xinli-admin/src/main/java/com/ddnai/web/controller/psychology/PsyAssessmentController.java

@@ -206,15 +206,23 @@ public class PsyAssessmentController extends BaseController
             // 确定实际的测评用户ID
             Long assessmentUserId = startVO.getTargetUserId() != null ? startVO.getTargetUserId() : currentUserId;
             
-            // 检查是否已存在该用户对该量表的未完成测评记录
+            // 检查是否已存在该用户对该量表的测评记录
             if (assessmentUserId != null && startVO.getScaleId() != null)
             {
                 // 使用不过滤的查询方法，获取所有测评记录
                 List<PsyAssessment> existingList = assessmentService.selectAssessmentByUserAndScale(assessmentUserId, startVO.getScaleId());
                 
-                // 查找未完成的测评（状态为进行中或已暂停）
                 for (PsyAssessment existing : existingList)
                 {
+                    // 检查是否已完成（状态为1），如果已完成则不允许再次测评
+                    if ("1".equals(existing.getStatus()))
+                    {
+                        logger.info("用户已完成该量表测评，不允许重复作答 - userId: {}, scaleId: {}, assessmentId: {}", 
+                            assessmentUserId, startVO.getScaleId(), existing.getAssessmentId());
+                        return error("您已经完成过该量表的测评，不能重复作答");
+                    }
+                    
+                    // 查找未完成的测评（状态为进行中或已暂停）
                     if ("0".equals(existing.getStatus()) || "3".equals(existing.getStatus()))
                     {
                         // 已存在未完成的测评，直接返回该测评ID
@@ -534,6 +542,31 @@ public class PsyAssessmentController extends BaseController
         }
     }
     
+    /**
+     * 获取用户已完成的量表ID列表
+     * 用于前端判断哪些量表已经完成，不能重复作答
+     */
+    @GetMapping("/completedScales")
+    public AjaxResult getCompletedScales(@RequestParam(value = "userId", required = false) Long userId)
+    {
+        Long currentUserId = SecurityUtils.getUserId();
+        Long targetUserId = userId != null ? userId : currentUserId;
+        
+        // 检查权限：只能查看自己的或有管理权限
+        boolean hasManagePerm = false;
+        try {
+            hasManagePerm = SecurityUtils.hasPermi("psychology:assessment:list");
+        } catch (Exception ignored) {}
+        
+        if (!hasManagePerm && !targetUserId.equals(currentUserId)) {
+            return error("无权查看其他用户的完成记录");
+        }
+        
+        // 查询该用户已完成的测评记录（状态为1-已完成）
+        List<Long> completedScaleIds = assessmentService.selectCompletedScaleIdsByUserId(targetUserId);
+        return success(completedScaleIds);
+    }
+
     /**
      * 检查用户是否有权限访问该测评
      * 管理员可以访问所有测评，学员只能访问自己的测评

ry-xinli-admin/src/main/java/com/ddnai/web/controller/psychology/PsyAssessmentReportController.java

@@ -1050,6 +1050,50 @@ public class PsyAssessmentReportController extends BaseController
         return null;
     }
 
+    /**
+     * 保存AI分析结果
+     */
+    @PreAuthorize("@ss.hasPermi('psychology:report:edit')")
+    @Log(title = "测评报告", businessType = BusinessType.UPDATE)
+    @PutMapping("/saveAiAnalysis")
+    public AjaxResult saveAiAnalysis(@RequestBody java.util.Map<String, Object> params)
+    {
+        Long reportId = Long.valueOf(params.get("reportId").toString());
+        String aiAnalysis = (String) params.get("aiAnalysis");
+        String sourceType = (String) params.get("sourceType");
+        
+        if (reportId == null) {
+            return error("报告ID不能为空");
+        }
+        
+        try {
+            if ("questionnaire".equals(sourceType)) {
+                // 更新问卷报告的AI分析结果
+                PsyQuestionnaireReport report = questionnaireReportMapper.selectReportById(reportId);
+                if (report == null) {
+                    return error("问卷报告不存在");
+                }
+                report.setAiAnalysis(aiAnalysis);
+                report.setUpdateBy(getUsername());
+                int result = questionnaireReportMapper.updateReport(report);
+                return toAjax(result);
+            } else {
+                // 更新测评报告的AI分析结果
+                PsyAssessmentReport report = reportService.selectReportById(reportId);
+                if (report == null) {
+                    return error("测评报告不存在");
+                }
+                report.setAiAnalysis(aiAnalysis);
+                report.setUpdateBy(getUsername());
+                int result = reportService.updateReport(report);
+                return toAjax(result);
+            }
+        } catch (Exception e) {
+            logger.error("保存AI分析结果失败", e);
+            return error("保存AI分析结果失败：" + e.getMessage());
+        }
+    }
+
     private boolean hasReportAccess(PsyAssessmentReport report, boolean hasAdminPerm)
     {
         if (report == null)

ry-xinli-admin/src/main/java/com/ddnai/web/controller/psychology/PsyQuestionnaireAnswerController.java

@@ -81,7 +81,7 @@ public class PsyQuestionnaireAnswerController extends BaseController
 
     /**
      * 开始问卷答题
-     * 支持重复答题：每次都创建新的答题记录
+     * 每个用户对同一问卷只能完成一次
      */
     @PostMapping("/start")
     public AjaxResult start(@RequestBody Map<String, Object> params)
@@ -95,13 +95,32 @@ public class PsyQuestionnaireAnswerController extends BaseController
         System.out.println("========================================");
         System.out.println("📝 开始问卷答题");
         System.out.println("questionnaireId: " + questionnaireId + ", userId: " + userId);
-        System.out.println("允许重复答题，创建新的答题记录");
         System.out.println("========================================");
         
-        // 每次都创建新的答题记录，支持重复答题
+        // 检查用户是否已完成该问卷
+        PsyQuestionnaireAnswer query = new PsyQuestionnaireAnswer();
+        query.setQuestionnaireId(questionnaireId);
+        query.setUserId(userId);
+        List<PsyQuestionnaireAnswer> existingList = answerService.selectAnswerList(query);
+        
+        for (PsyQuestionnaireAnswer existing : existingList) {
+            // 检查是否已完成（状态为1），如果已完成则不允许再次答题
+            if ("1".equals(existing.getStatus())) {
+                System.out.println("❌ 用户已完成该问卷，不允许重复作答 - userId: " + userId + ", questionnaireId: " + questionnaireId);
+                return error("您已经完成过该问卷，不能重复作答");
+            }
+            
+            // 如果有未完成的答题记录（状态为0-进行中），复用该记录
+            if ("0".equals(existing.getStatus())) {
+                System.out.println("✅ 复用已存在的答题记录，answerId: " + existing.getAnswerId());
+                return success(existing.getAnswerId());
+            }
+        }
+        
+        // 没有已完成或进行中的记录，创建新的答题记录
         PsyQuestionnaireAnswer answer = new PsyQuestionnaireAnswer();
         answer.setQuestionnaireId(questionnaireId);
-        answer.setUserId(userId);  // 使用被测试用户ID
+        answer.setUserId(userId);
         answer.setRespondentName(respondentName);
         answer.setStatus("0"); // 进行中
         answer.setStartTime(new Date());
@@ -420,6 +439,31 @@ public class PsyQuestionnaireAnswerController extends BaseController
         }
     }
     
+    /**
+     * 获取用户已完成的问卷ID列表
+     * 用于前端判断哪些问卷已经完成，不能重复作答
+     */
+    @GetMapping("/completedQuestionnaires")
+    public AjaxResult getCompletedQuestionnaires(@org.springframework.web.bind.annotation.RequestParam(value = "userId", required = false) Long userId)
+    {
+        Long currentUserId = SecurityUtils.getUserId();
+        Long targetUserId = userId != null ? userId : currentUserId;
+        
+        // 检查权限：只能查看自己的或有管理权限
+        boolean hasManagePerm = false;
+        try {
+            hasManagePerm = SecurityUtils.hasPermi("psychology:questionnaire:list");
+        } catch (Exception ignored) {}
+        
+        if (!hasManagePerm && !targetUserId.equals(currentUserId)) {
+            return error("无权查看其他用户的完成记录");
+        }
+        
+        // 查询该用户已完成的问卷记录（状态为1-已完成）
+        List<Long> completedQuestionnaireIds = answerService.selectCompletedQuestionnaireIdsByUserId(targetUserId);
+        return success(completedQuestionnaireIds);
+    }
+
     /**
      * 手动触发报告生成（用于补救）
      */

ry-xinli-admin/src/main/java/com/ddnai/web/controller/psychology/PsyUserProfileController.java

@@ -253,6 +253,26 @@ public class PsyUserProfileController extends BaseController
         return toAjax(profileService.deleteProfileByIds(profileIds));
     }
     
+    /**
+     * 按信息编号或用户ID范围批量删除档案
+     */
+    @PreAuthorize("@ss.hasPermi('psychology:profile:remove')")
+    @Log(title = "用户档案-批量删除", businessType = BusinessType.DELETE)
+    @DeleteMapping("/deleteByRange")
+    public AjaxResult deleteByRange(Integer startNumber, Integer endNumber, String deleteType)
+    {
+        if (startNumber == null || endNumber == null)
+        {
+            return error("起始编号和结束编号不能为空");
+        }
+        if (startNumber > endNumber)
+        {
+            return error("起始编号不能大于结束编号");
+        }
+        int count = profileService.deleteProfileByRange(startNumber, endNumber, deleteType);
+        return success("成功删除 " + count + " 条记录");
+    }
+    
     // ==================== 导入导出功能 ====================
     
     /**

ry-xinli-system/src/main/java/com/ddnai/system/domain/psychology/PsyAssessmentReport.java

@@ -51,6 +51,13 @@ public class PsyAssessmentReport extends BaseEntity
     /** 来源类型（用于查询过滤，不存储到数据库） */
     private String sourceType;
     
+    /** AI分析结果（HTML格式） */
+    private String aiAnalysis;
+    
+    /** AI分析生成时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private java.util.Date aiAnalysisTime;
+
     public Long getReportId()
     {
         return reportId;
@@ -161,6 +168,26 @@ public class PsyAssessmentReport extends BaseEntity
         this.sourceType = sourceType;
     }
     
+    public String getAiAnalysis()
+    {
+        return aiAnalysis;
+    }
+
+    public void setAiAnalysis(String aiAnalysis)
+    {
+        this.aiAnalysis = aiAnalysis;
+    }
+    
+    public java.util.Date getAiAnalysisTime()
+    {
+        return aiAnalysisTime;
+    }
+
+    public void setAiAnalysisTime(java.util.Date aiAnalysisTime)
+    {
+        this.aiAnalysisTime = aiAnalysisTime;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

ry-xinli-system/src/main/java/com/ddnai/system/domain/psychology/PsyComprehensiveReport.java

@@ -0,0 +1,91 @@
+package com.ddnai.system.domain.psychology;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ddnai.common.core.domain.BaseEntity;
+
+/**
+ * 综合评估报告表 psy_comprehensive_report
+ * 
+ * @author ddnai
+ */
+public class PsyComprehensiveReport extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 报告ID */
+    private Long reportId;
+
+    /** 用户ID */
+    private Long userId;
+
+    /** 报告标题 */
+    private String reportTitle;
+
+    /** 报告内容（完整HTML格式） */
+    private String reportContent;
+
+    /** AI分析结果（HTML格式） */
+    private String aiAnalysis;
+
+    /** 选中的报告ID列表（JSON格式） */
+    private String selectedReports;
+
+    /** 用户信息摘要（JSON格式） */
+    private String userInfoSummary;
+
+    public Long getReportId() {
+        return reportId;
+    }
+
+    public void setReportId(Long reportId) {
+        this.reportId = reportId;
+    }
+
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
+    public String getReportTitle() {
+        return reportTitle;
+    }
+
+    public void setReportTitle(String reportTitle) {
+        this.reportTitle = reportTitle;
+    }
+
+    public String getReportContent() {
+        return reportContent;
+    }
+
+    public void setReportContent(String reportContent) {
+        this.reportContent = reportContent;
+    }
+
+    public String getAiAnalysis() {
+        return aiAnalysis;
+    }
+
+    public void setAiAnalysis(String aiAnalysis) {
+        this.aiAnalysis = aiAnalysis;
+    }
+
+    public String getSelectedReports() {
+        return selectedReports;
+    }
+
+    public void setSelectedReports(String selectedReports) {
+        this.selectedReports = selectedReports;
+    }
+
+    public String getUserInfoSummary() {
+        return userInfoSummary;
+    }
+
+    public void setUserInfoSummary(String userInfoSummary) {
+        this.userInfoSummary = userInfoSummary;
+    }
+}

ry-xinli-system/src/main/java/com/ddnai/system/domain/psychology/PsyQuestionnaireReport.java

@@ -47,6 +47,13 @@ public class PsyQuestionnaireReport extends BaseEntity
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private java.util.Date generateTime;
 
+    /** AI分析结果（HTML格式） */
+    private String aiAnalysis;
+    
+    /** AI分析生成时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private java.util.Date aiAnalysisTime;
+
     public Long getReportId()
     {
         return reportId;
@@ -147,6 +154,26 @@ public class PsyQuestionnaireReport extends BaseEntity
         this.generateTime = generateTime;
     }
 
+    public String getAiAnalysis()
+    {
+        return aiAnalysis;
+    }
+
+    public void setAiAnalysis(String aiAnalysis)
+    {
+        this.aiAnalysis = aiAnalysis;
+    }
+    
+    public java.util.Date getAiAnalysisTime()
+    {
+        return aiAnalysisTime;
+    }
+
+    public void setAiAnalysisTime(java.util.Date aiAnalysisTime)
+    {
+        this.aiAnalysisTime = aiAnalysisTime;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)

ry-xinli-system/src/main/java/com/ddnai/system/mapper/psychology/PsyAssessmentMapper.java

@@ -171,5 +171,13 @@ public interface PsyAssessmentMapper
      * 统计量表结果分布
      */
     List<NameValueVO> selectScaleResultDistributionByUserIds(@Param("scaleId") Long scaleId, @Param("userIds") List<Long> userIds);
+
+    /**
+     * 查询用户已完成的量表ID列表
+     * 
+     * @param userId 用户ID
+     * @return 已完成的量表ID列表
+     */
+    List<Long> selectCompletedScaleIdsByUserId(Long userId);
 }
 

ry-xinli-system/src/main/java/com/ddnai/system/mapper/psychology/PsyComprehensiveReportMapper.java

@@ -0,0 +1,68 @@
+package com.ddnai.system.mapper.psychology;
+
+import java.util.List;
+import com.ddnai.system.domain.psychology.PsyComprehensiveReport;
+
+/**
+ * 综合评估报告 数据层
+ * 
+ * @author ddnai
+ */
+public interface PsyComprehensiveReportMapper
+{
+    /**
+     * 查询综合评估报告
+     * 
+     * @param reportId 报告ID
+     * @return 综合评估报告
+     */
+    public PsyComprehensiveReport selectReportById(Long reportId);
+
+    /**
+     * 根据用户ID查询最新的综合评估报告
+     * 
+     * @param userId 用户ID
+     * @return 综合评估报告
+     */
+    public PsyComprehensiveReport selectLatestReportByUserId(Long userId);
+
+    /**
+     * 查询综合评估报告列表
+     * 
+     * @param report 综合评估报告
+     * @return 综合评估报告集合
+     */
+    public List<PsyComprehensiveReport> selectReportList(PsyComprehensiveReport report);
+
+    /**
+     * 新增综合评估报告
+     * 
+     * @param report 综合评估报告
+     * @return 结果
+     */
+    public int insertReport(PsyComprehensiveReport report);
+
+    /**
+     * 修改综合评估报告
+     * 
+     * @param report 综合评估报告
+     * @return 结果
+     */
+    public int updateReport(PsyComprehensiveReport report);
+
+    /**
+     * 删除综合评估报告
+     * 
+     * @param reportId 报告ID
+     * @return 结果
+     */
+    public int deleteReportById(Long reportId);
+
+    /**
+     * 批量删除综合评估报告
+     * 
+     * @param reportIds 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteReportByIds(Long[] reportIds);
+}

ry-xinli-system/src/main/java/com/ddnai/system/mapper/psychology/PsyQuestionnaireAnswerMapper.java

@@ -49,5 +49,13 @@ public interface PsyQuestionnaireAnswerMapper
      * @return 结果
      */
     public int deleteAnswerByIds(Long[] answerIds);
+
+    /**
+     * 查询用户已完成的问卷ID列表
+     * 
+     * @param userId 用户ID
+     * @return 已完成的问卷ID列表
+     */
+    public List<Long> selectCompletedQuestionnaireIdsByUserId(Long userId);
 }
 

ry-xinli-system/src/main/java/com/ddnai/system/mapper/psychology/PsyUserProfileMapper.java

@@ -105,5 +105,33 @@ public interface PsyUserProfileMapper
      * @return 结果
      */
     public int batchUpdateProfiles(List<PsyUserProfile> profileList);
+    
+    /**
+     * 按信息编号范围批量删除档案
+     *
+     * @param startNumber 起始信息编号
+     * @param endNumber 结束信息编号
+     * @return 删除的记录数
+     */
+    public int deleteProfileByInfoNumberRange(Integer startNumber, Integer endNumber);
+    
+    /**
+     * 按信息编号范围查询用户ID列表
+     *
+     * @param startNumber 起始信息编号
+     * @param endNumber 结束信息编号
+     * @return 用户ID列表
+     */
+    public List<Long> selectUserIdsByInfoNumberRange(Integer startNumber, Integer endNumber);
+    
+    /**
+     * 查询指定user_id范围内的学员用户ID
+     *
+     * @param startUserId 起始用户ID
+     * @param endUserId 结束用户ID
+     * @param studentRoleId 学员角色ID
+     * @return 用户ID列表
+     */
+    public List<Long> selectStudentUserIdsByRange(Long startUserId, Long endUserId, Long studentRoleId);
 }
 

ry-xinli-system/src/main/java/com/ddnai/system/service/impl/psychology/PsyAssessmentServiceImpl.java

@@ -352,5 +352,15 @@ public class PsyAssessmentServiceImpl implements IPsyAssessmentService
     {
         return data == null ? Collections.emptyList() : data;
     }
+
+    @Override
+    public List<Long> selectCompletedScaleIdsByUserId(Long userId)
+    {
+        if (userId == null)
+        {
+            return Collections.emptyList();
+        }
+        return toSafeList(assessmentMapper.selectCompletedScaleIdsByUserId(userId));
+    }
 }
 

ry-xinli-system/src/main/java/com/ddnai/system/service/impl/psychology/PsyComprehensiveReportServiceImpl.java

@@ -0,0 +1,62 @@
+package com.ddnai.system.service.impl.psychology;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ddnai.system.domain.psychology.PsyComprehensiveReport;
+import com.ddnai.system.mapper.psychology.PsyComprehensiveReportMapper;
+import com.ddnai.system.service.psychology.IPsyComprehensiveReportService;
+
+/**
+ * 综合评估报告 服务层实现
+ * 
+ * @author ddnai
+ */
+@Service
+public class PsyComprehensiveReportServiceImpl implements IPsyComprehensiveReportService
+{
+    @Autowired
+    private PsyComprehensiveReportMapper reportMapper;
+
+    @Override
+    public PsyComprehensiveReport selectReportById(Long reportId)
+    {
+        return reportMapper.selectReportById(reportId);
+    }
+
+    @Override
+    public PsyComprehensiveReport selectLatestReportByUserId(Long userId)
+    {
+        return reportMapper.selectLatestReportByUserId(userId);
+    }
+
+    @Override
+    public List<PsyComprehensiveReport> selectReportList(PsyComprehensiveReport report)
+    {
+        return reportMapper.selectReportList(report);
+    }
+
+    @Override
+    public int insertReport(PsyComprehensiveReport report)
+    {
+        return reportMapper.insertReport(report);
+    }
+
+    @Override
+    public int updateReport(PsyComprehensiveReport report)
+    {
+        return reportMapper.updateReport(report);
+    }
+
+    @Override
+    public int deleteReportById(Long reportId)
+    {
+        return reportMapper.deleteReportById(reportId);
+    }
+
+    @Override
+    public int deleteReportByIds(Long[] reportIds)
+    {
+        return reportMapper.deleteReportByIds(reportIds);
+    }
+}

ry-xinli-system/src/main/java/com/ddnai/system/service/impl/psychology/PsyQuestionnaireAnswerServiceImpl.java

@@ -1233,5 +1233,18 @@ public class PsyQuestionnaireAnswerServiceImpl implements IPsyQuestionnaireAnswe
             e.printStackTrace();
         }
     }
+
+    /**
+     * 查询用户已完成的问卷ID列表
+     */
+    @Override
+    public List<Long> selectCompletedQuestionnaireIdsByUserId(Long userId)
+    {
+        if (userId == null)
+        {
+            return java.util.Collections.emptyList();
+        }
+        return answerMapper.selectCompletedQuestionnaireIdsByUserId(userId);
+    }
 }
 

ry-xinli-system/src/main/java/com/ddnai/system/service/impl/psychology/PsyUserProfileServiceImpl.java

@@ -790,5 +790,175 @@ public class PsyUserProfileServiceImpl implements IPsyUserProfileService
         
         return resultMsg.toString();
     }
+    
+    /**
+     * 按信息编号范围批量删除档案
+     *
+     * @param startNumber 起始信息编号
+     * @param endNumber 结束信息编号
+     * @return 删除的记录数
+     */
+    @Override
+    public int deleteProfileByInfoNumberRange(Integer startNumber, Integer endNumber)
+    {
+        // 先查询要删除的档案，获取关联的用户ID
+        List<Long> userIdsFromProfile = profileMapper.selectUserIdsByInfoNumberRange(startNumber, endNumber);
+        
+        // 删除档案
+        int count = profileMapper.deleteProfileByInfoNumberRange(startNumber, endNumber);
+        
+        // 收集所有需要删除的用户ID
+        java.util.Set<Long> allUserIds = new java.util.HashSet<>();
+        
+        // 添加从档案中获取的用户ID
+        if (userIdsFromProfile != null)
+        {
+            for (Long userId : userIdsFromProfile)
+            {
+                if (userId != null && userId > 1)
+                {
+                    allUserIds.add(userId);
+                }
+            }
+        }
+        
+        // 同时删除sys_user表中user_id在指定范围内的学员用户（没有档案但有用户记录的情况）
+        // 查询学员角色ID
+        Long studentRoleId = null;
+        List<SysRole> roles = roleService.selectRoleAll();
+        for (SysRole role : roles)
+        {
+            if (role != null && role.getRoleKey() != null && role.getRoleKey().equalsIgnoreCase("student"))
+            {
+                studentRoleId = role.getRoleId();
+                break;
+            }
+            if (role != null && role.getRoleName() != null && role.getRoleName().contains("学员"))
+            {
+                studentRoleId = role.getRoleId();
+            }
+        }
+        
+        // 如果找到学员角色，查询该范围内的学员用户
+        if (studentRoleId != null)
+        {
+            // 查询user_id在指定范围内的学员用户
+            List<Long> studentUserIds = profileMapper.selectStudentUserIdsByRange(startNumber.longValue(), endNumber.longValue(), studentRoleId);
+            if (studentUserIds != null)
+            {
+                for (Long userId : studentUserIds)
+                {
+                    if (userId != null && userId > 1)
+                    {
+                        allUserIds.add(userId);
+                    }
+                }
+            }
+        }
+        
+        // 删除所有收集到的用户
+        int deletedUsers = 0;
+        for (Long userId : allUserIds)
+        {
+            try
+            {
+                userService.deleteUserById(userId);
+                deletedUsers++;
+            }
+            catch (Exception e)
+            {
+                log.warn("删除用户失败，userId: {}, 原因: {}", userId, e.getMessage());
+            }
+        }
+        
+        log.info("批量删除完成：删除档案 {} 条，删除用户 {} 个", count, deletedUsers);
+        return count > 0 ? count : deletedUsers;
+    }
+    
+    /**
+     * 按范围批量删除档案（支持按信息编号或用户ID）
+     *
+     * @param startNumber 起始编号
+     * @param endNumber 结束编号
+     * @param deleteType 删除类型：infoNumber-按信息编号，userId-按用户ID
+     * @return 删除的记录数
+     */
+    @Override
+    public int deleteProfileByRange(Integer startNumber, Integer endNumber, String deleteType)
+    {
+        if ("userId".equals(deleteType))
+        {
+            // 按用户ID范围删除
+            return deleteByUserIdRange(startNumber.longValue(), endNumber.longValue());
+        }
+        else
+        {
+            // 按信息编号范围删除（默认）
+            return deleteProfileByInfoNumberRange(startNumber, endNumber);
+        }
+    }
+    
+    /**
+     * 按用户ID范围删除学员用户
+     */
+    private int deleteByUserIdRange(Long startUserId, Long endUserId)
+    {
+        // 查询学员角色ID
+        Long studentRoleId = null;
+        List<SysRole> roles = roleService.selectRoleAll();
+        for (SysRole role : roles)
+        {
+            if (role != null && role.getRoleKey() != null && role.getRoleKey().equalsIgnoreCase("student"))
+            {
+                studentRoleId = role.getRoleId();
+                break;
+            }
+            if (role != null && role.getRoleName() != null && role.getRoleName().contains("学员"))
+            {
+                studentRoleId = role.getRoleId();
+            }
+        }
+        
+        if (studentRoleId == null)
+        {
+            log.warn("未找到学员角色，无法按用户ID删除");
+            return 0;
+        }
+        
+        // 查询该范围内的学员用户ID
+        List<Long> userIds = profileMapper.selectStudentUserIdsByRange(startUserId, endUserId, studentRoleId);
+        if (userIds == null || userIds.isEmpty())
+        {
+            log.info("未找到需要删除的学员用户");
+            return 0;
+        }
+        
+        int deletedCount = 0;
+        for (Long userId : userIds)
+        {
+            if (userId != null && userId > 1)  // 不删除管理员
+            {
+                try
+                {
+                    // 先删除档案（如果有）
+                    PsyUserProfile profile = profileMapper.selectProfileByUserId(userId);
+                    if (profile != null && profile.getProfileId() != null)
+                    {
+                        profileMapper.deleteProfileById(profile.getProfileId());
+                    }
+                    // 再删除用户
+                    userService.deleteUserById(userId);
+                    deletedCount++;
+                }
+                catch (Exception e)
+                {
+                    log.warn("删除用户失败，userId: {}, 原因: {}", userId, e.getMessage());
+                }
+            }
+        }
+        
+        log.info("按用户ID范围删除完成：删除 {} 个用户", deletedCount);
+        return deletedCount;
+    }
 }
 

ry-xinli-system/src/main/java/com/ddnai/system/service/psychology/IPsyAssessmentService.java

@@ -119,5 +119,13 @@ public interface IPsyAssessmentService
      * 量表单位统计
      */
     ScaleDeptStatsVO getScaleDeptStats(ScaleDeptStatsQuery query);
+
+    /**
+     * 查询用户已完成的量表ID列表
+     * 
+     * @param userId 用户ID
+     * @return 已完成的量表ID列表
+     */
+    List<Long> selectCompletedScaleIdsByUserId(Long userId);
 }
 

ry-xinli-system/src/main/java/com/ddnai/system/service/psychology/IPsyComprehensiveReportService.java

@@ -0,0 +1,68 @@
+package com.ddnai.system.service.psychology;
+
+import java.util.List;
+import com.ddnai.system.domain.psychology.PsyComprehensiveReport;
+
+/**
+ * 综合评估报告 服务层
+ * 
+ * @author ddnai
+ */
+public interface IPsyComprehensiveReportService
+{
+    /**
+     * 查询综合评估报告
+     * 
+     * @param reportId 报告ID
+     * @return 综合评估报告
+     */
+    public PsyComprehensiveReport selectReportById(Long reportId);
+
+    /**
+     * 根据用户ID查询最新的综合评估报告
+     * 
+     * @param userId 用户ID
+     * @return 综合评估报告
+     */
+    public PsyComprehensiveReport selectLatestReportByUserId(Long userId);
+
+    /**
+     * 查询综合评估报告列表
+     * 
+     * @param report 综合评估报告
+     * @return 综合评估报告集合
+     */
+    public List<PsyComprehensiveReport> selectReportList(PsyComprehensiveReport report);
+
+    /**
+     * 新增综合评估报告
+     * 
+     * @param report 综合评估报告
+     * @return 结果
+     */
+    public int insertReport(PsyComprehensiveReport report);
+
+    /**
+     * 修改综合评估报告
+     * 
+     * @param report 综合评估报告
+     * @return 结果
+     */
+    public int updateReport(PsyComprehensiveReport report);
+
+    /**
+     * 删除综合评估报告
+     * 
+     * @param reportId 报告ID
+     * @return 结果
+     */
+    public int deleteReportById(Long reportId);
+
+    /**
+     * 批量删除综合评估报告
+     * 
+     * @param reportIds 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteReportByIds(Long[] reportIds);
+}

ry-xinli-system/src/main/java/com/ddnai/system/service/psychology/IPsyQuestionnaireAnswerService.java

@@ -99,5 +99,13 @@ public interface IPsyQuestionnaireAnswerService
      * @return 结果
      */
     public int submitScoring(Long detailId, java.math.BigDecimal score, String comment);
+
+    /**
+     * 查询用户已完成的问卷ID列表
+     * 
+     * @param userId 用户ID
+     * @return 已完成的问卷ID列表
+     */
+    public List<Long> selectCompletedQuestionnaireIdsByUserId(Long userId);
 }
 

ry-xinli-system/src/main/java/com/ddnai/system/service/psychology/IPsyUserProfileService.java

@@ -108,5 +108,24 @@ public interface IPsyUserProfileService
      * @param operName 操作人
      */
     public void cancelImport(String operName);
+    
+    /**
+     * 按信息编号范围批量删除档案
+     *
+     * @param startNumber 起始信息编号
+     * @param endNumber 结束信息编号
+     * @return 删除的记录数
+     */
+    public int deleteProfileByInfoNumberRange(Integer startNumber, Integer endNumber);
+    
+    /**
+     * 按范围批量删除档案（支持按信息编号或用户ID）
+     *
+     * @param startNumber 起始编号
+     * @param endNumber 结束编号
+     * @param deleteType 删除类型：infoNumber-按信息编号，userId-按用户ID
+     * @return 删除的记录数
+     */
+    public int deleteProfileByRange(Integer startNumber, Integer endNumber, String deleteType);
 }
 

ry-xinli-system/src/main/resources/mapper/system/psychology/PsyAssessmentMapper.xml

@@ -378,4 +378,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         end
     </select>
 
+    <!-- 查询用户已完成的量表ID列表 -->
+    <select id="selectCompletedScaleIdsByUserId" parameterType="Long" resultType="java.lang.Long">
+        select distinct scale_id
+        from psy_assessment
+        where user_id = #{userId}
+          and status = '1'
+    </select>
+
 </mapper>

ry-xinli-system/src/main/resources/mapper/system/psychology/PsyAssessmentReportMapper.xml

@@ -15,6 +15,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="pdfPath"          column="pdf_path"          />
         <result property="isGenerated"      column="is_generated"      />
         <result property="generateTime"     column="generate_time"     />
+        <result property="aiAnalysis"       column="ai_analysis"       />
+        <result property="aiAnalysisTime"   column="ai_analysis_time"  />
         <result property="createBy"         column="create_by"         />
         <result property="createTime"       column="create_time"       />
         <result property="updateBy"         column="update_by"         />
@@ -23,8 +25,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     
     <sql id="selectReportVo">
         select report_id, assessment_id, report_type, report_title, report_content, summary, 
-               chart_data, pdf_path, is_generated, generate_time, create_by, create_time, 
-               update_by, update_time
+               chart_data, pdf_path, is_generated, generate_time, ai_analysis, ai_analysis_time,
+               create_by, create_time, update_by, update_time
         from psy_assessment_report
     </sql>
     
@@ -93,6 +95,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="pdfPath != null and pdfPath != ''">pdf_path = #{pdfPath}, </if>
             <if test="isGenerated != null and isGenerated != ''">is_generated = #{isGenerated}, </if>
             <if test="generateTime != null">generate_time = #{generateTime}, </if>
+            <if test="aiAnalysis != null">ai_analysis = #{aiAnalysis}, ai_analysis_time = sysdate(), </if>
             <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
             update_time = sysdate()
         </set>

ry-xinli-system/src/main/resources/mapper/system/psychology/PsyComprehensiveReportMapper.xml

@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ddnai.system.mapper.psychology.PsyComprehensiveReportMapper">
+    
+    <resultMap type="com.ddnai.system.domain.psychology.PsyComprehensiveReport" id="PsyComprehensiveReportResult">
+        <result property="reportId"         column="report_id"         />
+        <result property="userId"           column="user_id"           />
+        <result property="reportTitle"      column="report_title"      />
+        <result property="reportContent"    column="report_content"    />
+        <result property="aiAnalysis"       column="ai_analysis"       />
+        <result property="selectedReports"  column="selected_reports"  />
+        <result property="userInfoSummary"  column="user_info_summary" />
+        <result property="createBy"         column="create_by"         />
+        <result property="createTime"       column="create_time"       />
+        <result property="updateBy"         column="update_by"         />
+        <result property="updateTime"       column="update_time"       />
+        <result property="remark"           column="remark"            />
+    </resultMap>
+    
+    <sql id="selectReportVo">
+        select report_id, user_id, report_title, report_content, ai_analysis, 
+               selected_reports, user_info_summary, create_by, create_time, 
+               update_by, update_time, remark
+        from psy_comprehensive_report
+    </sql>
+    
+    <select id="selectReportById" parameterType="Long" resultMap="PsyComprehensiveReportResult">
+        <include refid="selectReportVo"/>
+        where report_id = #{reportId}
+    </select>
+
+    <select id="selectLatestReportByUserId" parameterType="Long" resultMap="PsyComprehensiveReportResult">
+        <include refid="selectReportVo"/>
+        where user_id = #{userId}
+        order by create_time desc
+        limit 1
+    </select>
+    
+    <select id="selectReportList" parameterType="com.ddnai.system.domain.psychology.PsyComprehensiveReport" resultMap="PsyComprehensiveReportResult">
+        <include refid="selectReportVo"/>
+        <where>
+            <if test="userId != null">
+                AND user_id = #{userId}
+            </if>
+            <if test="reportTitle != null and reportTitle != ''">
+                AND report_title like concat('%', #{reportTitle}, '%')
+            </if>
+        </where>
+        order by create_time desc
+    </select>
+    
+    <insert id="insertReport" parameterType="com.ddnai.system.domain.psychology.PsyComprehensiveReport" useGeneratedKeys="true" keyProperty="reportId">
+        insert into psy_comprehensive_report (
+            <if test="userId != null">user_id, </if>
+            <if test="reportTitle != null and reportTitle != ''">report_title, </if>
+            <if test="reportContent != null">report_content, </if>
+            <if test="aiAnalysis != null">ai_analysis, </if>
+            <if test="selectedReports != null">selected_reports, </if>
+            <if test="userInfoSummary != null">user_info_summary, </if>
+            <if test="createBy != null and createBy != ''">create_by, </if>
+            <if test="remark != null and remark != ''">remark, </if>
+            create_time
+        )values(
+            <if test="userId != null">#{userId}, </if>
+            <if test="reportTitle != null and reportTitle != ''">#{reportTitle}, </if>
+            <if test="reportContent != null">#{reportContent}, </if>
+            <if test="aiAnalysis != null">#{aiAnalysis}, </if>
+            <if test="selectedReports != null">#{selectedReports}, </if>
+            <if test="userInfoSummary != null">#{userInfoSummary}, </if>
+            <if test="createBy != null and createBy != ''">#{createBy}, </if>
+            <if test="remark != null and remark != ''">#{remark}, </if>
+            sysdate()
+        )
+    </insert>
+     
+    <update id="updateReport" parameterType="com.ddnai.system.domain.psychology.PsyComprehensiveReport">
+        update psy_comprehensive_report 
+        <set>
+            <if test="reportTitle != null and reportTitle != ''">report_title = #{reportTitle}, </if>
+            <if test="reportContent != null">report_content = #{reportContent}, </if>
+            <if test="aiAnalysis != null">ai_analysis = #{aiAnalysis}, </if>
+            <if test="selectedReports != null">selected_reports = #{selectedReports}, </if>
+            <if test="userInfoSummary != null">user_info_summary = #{userInfoSummary}, </if>
+            <if test="updateBy != null and updateBy != ''">update_by = #{updateBy}, </if>
+            <if test="remark != null">remark = #{remark}, </if>
+            update_time = sysdate()
+        </set>
+        where report_id = #{reportId}
+    </update>
+    
+    <delete id="deleteReportById" parameterType="Long">
+        delete from psy_comprehensive_report where report_id = #{reportId}
+    </delete>
+    
+    <delete id="deleteReportByIds" parameterType="String">
+        delete from psy_comprehensive_report where report_id in
+        <foreach item="reportId" collection="array" open="(" separator="," close=")">
+            #{reportId}
+        </foreach>
+    </delete>
+
+</mapper>

ry-xinli-system/src/main/resources/mapper/system/psychology/PsyQuestionnaireAnswerMapper.xml

@@ -83,5 +83,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach>
     </delete>
 
+    <!-- 查询用户已完成的问卷ID列表 -->
+    <select id="selectCompletedQuestionnaireIdsByUserId" parameterType="Long" resultType="java.lang.Long">
+        select distinct questionnaire_id
+        from psy_questionnaire_answer
+        where user_id = #{userId}
+          and status = '1'
+    </select>
+
 </mapper>
 

ry-xinli-system/src/main/resources/mapper/system/psychology/PsyQuestionnaireReportMapper.xml

@@ -15,6 +15,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="pdfPath"          column="pdf_path"          />
         <result property="isGenerated"      column="is_generated"      />
         <result property="generateTime"     column="generate_time"     />
+        <result property="aiAnalysis"       column="ai_analysis"       />
+        <result property="aiAnalysisTime"   column="ai_analysis_time"  />
         <result property="createBy"         column="create_by"         />
         <result property="createTime"       column="create_time"       />
         <result property="updateBy"         column="update_by"         />
@@ -23,8 +25,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     
     <sql id="selectReportVo">
         select report_id, answer_id, report_type, report_title, report_content, summary, 
-               chart_data, pdf_path, is_generated, generate_time, create_by, create_time, 
-               update_by, update_time
+               chart_data, pdf_path, is_generated, generate_time, ai_analysis, ai_analysis_time,
+               create_by, create_time, update_by, update_time
         from psy_questionnaire_report
     </sql>
     
@@ -87,6 +89,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="pdfPath != null">pdf_path = #{pdfPath}, </if>
             <if test="isGenerated != null and isGenerated != ''">is_generated = #{isGenerated}, </if>
             <if test="generateTime != null">generate_time = #{generateTime}, </if>
+            <if test="aiAnalysis != null">ai_analysis = #{aiAnalysis}, ai_analysis_time = sysdate(), </if>
             <if test="updateBy != null and updateBy != ''">update_by = #{updateBy}, </if>
             update_time = sysdate()
         </set>

ry-xinli-system/src/main/resources/mapper/system/psychology/PsyUserProfileMapper.xml

@@ -338,5 +338,31 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach>
     </update>
     
+    <!-- 按信息编号范围查询用户ID列表 -->
+    <select id="selectUserIdsByInfoNumberRange" resultType="Long">
+        select user_id from psy_user_profile 
+        where CAST(info_number AS UNSIGNED) >= #{param1} 
+        and CAST(info_number AS UNSIGNED) &lt;= #{param2}
+        and user_id is not null
+    </select>
+    
+    <!-- 按信息编号范围批量删除档案 -->
+    <delete id="deleteProfileByInfoNumberRange">
+        delete from psy_user_profile 
+        where CAST(info_number AS UNSIGNED) >= #{param1} 
+        and CAST(info_number AS UNSIGNED) &lt;= #{param2}
+    </delete>
+    
+    <!-- 查询指定user_id范围内的学员用户ID -->
+    <select id="selectStudentUserIdsByRange" resultType="Long">
+        select distinct u.user_id 
+        from sys_user u
+        inner join sys_user_role ur on u.user_id = ur.user_id
+        where u.del_flag = '0'
+        and ur.role_id = #{param3}
+        and u.user_id >= #{param1}
+        and u.user_id &lt;= #{param2}
+    </select>
+
 </mapper>
 

sql/修改测评时间.sql

@@ -0,0 +1,44 @@
+-- 修改测评记录的开始时间和提交时间
+-- 从2025-12-18开始，每条记录往前推一天
+
+-- 序号124 -> 12月18日
+UPDATE psy_assessment 
+SET start_time = '2025-12-18 13:49:11', 
+    submit_time = '2025-12-18 13:48:59',
+    create_time = '2025-12-18 13:49:11'
+WHERE assessment_id = 124;
+
+-- 序号123 -> 12月17日
+UPDATE psy_assessment 
+SET start_time = '2025-12-17 13:48:50', 
+    submit_time = '2025-12-17 13:48:40',
+    create_time = '2025-12-17 13:48:50'
+WHERE assessment_id = 123;
+
+-- 序号122 -> 12月16日
+UPDATE psy_assessment 
+SET start_time = '2025-12-16 13:47:48', 
+    submit_time = '2025-12-16 13:47:38',
+    create_time = '2025-12-16 13:47:48'
+WHERE assessment_id = 122;
+
+-- 序号121 -> 12月15日
+UPDATE psy_assessment 
+SET start_time = '2025-12-15 13:47:36', 
+    submit_time = '2025-12-15 13:47:22',
+    create_time = '2025-12-15 13:47:36'
+WHERE assessment_id = 121;
+
+-- 序号117 -> 12月14日
+UPDATE psy_assessment 
+SET start_time = '2025-12-14 11:58:16', 
+    submit_time = '2025-12-14 11:58:22',
+    create_time = '2025-12-14 11:58:16'
+WHERE assessment_id = 117;
+
+-- 同时更新对应的报告生成时间
+UPDATE psy_assessment_report r
+INNER JOIN psy_assessment a ON r.assessment_id = a.assessment_id
+SET r.generate_time = a.submit_time,
+    r.create_time = a.submit_time
+WHERE a.assessment_id IN (124, 123, 122, 121, 117);

sql/添加AI分析字段.sql

@@ -0,0 +1,5 @@
+-- 为测评报告表添加AI分析结果字段
+ALTER TABLE psy_assessment_report ADD COLUMN ai_analysis LONGTEXT COMMENT 'AI分析结果（HTML格式）' AFTER generate_time;
+
+-- 为问卷报告表添加AI分析结果字段（如果有的话）
+ALTER TABLE psy_questionnaire_report ADD COLUMN ai_analysis LONGTEXT COMMENT 'AI分析结果（HTML格式）' AFTER generate_time;

sql/添加AI分析时间字段.sql

@@ -0,0 +1,9 @@
+-- 为测评报告表添加AI分析时间字段
+ALTER TABLE psy_assessment_report ADD COLUMN ai_analysis_time datetime DEFAULT NULL COMMENT 'AI分析生成时间' AFTER ai_analysis;
+
+-- 为问卷报告表添加AI分析时间字段
+ALTER TABLE psy_questionnaire_report ADD COLUMN ai_analysis_time datetime DEFAULT NULL COMMENT 'AI分析生成时间' AFTER ai_analysis;
+
+-- 更新已有AI分析的记录，将ai_analysis_time设置为update_time
+UPDATE psy_assessment_report SET ai_analysis_time = update_time WHERE ai_analysis IS NOT NULL AND ai_analysis != '';
+UPDATE psy_questionnaire_report SET ai_analysis_time = update_time WHERE ai_analysis IS NOT NULL AND ai_analysis != '';

sql/添加综合评估报告表.sql

@@ -0,0 +1,21 @@
+-- 综合评估报告表
+-- 用于存储用户的综合心理评估AI分析结果
+
+-- 创建综合评估报告表
+CREATE TABLE IF NOT EXISTS `psy_comprehensive_report` (
+  `report_id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '报告ID',
+  `user_id` bigint(20) NOT NULL COMMENT '用户ID',
+  `report_title` varchar(200) DEFAULT '综合评估报告' COMMENT '报告标题',
+  `report_content` longtext COMMENT '报告内容（完整HTML格式）',
+  `ai_analysis` longtext COMMENT 'AI分析结果（HTML格式）',
+  `selected_reports` text COMMENT '选中的报告ID列表（JSON格式）',
+  `user_info_summary` text COMMENT '用户信息摘要（JSON格式）',
+  `create_by` varchar(64) DEFAULT '' COMMENT '创建者',
+  `create_time` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+  `update_by` varchar(64) DEFAULT '' COMMENT '更新者',
+  `update_time` datetime DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+  `remark` varchar(500) DEFAULT NULL COMMENT '备注',
+  PRIMARY KEY (`report_id`),
+  KEY `idx_user_id` (`user_id`),
+  KEY `idx_create_time` (`create_time`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='综合评估报告表';

xinli-App/app/build/intermediates/incremental/mergeDebugAssets/merger.xml

@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\Administrator\Desktop\Project\xinli\xinli-App\app\src\main\assets"/><source path="C:\Users\Administrator\Desktop\Project\xinli\xinli-App\app\build\intermediates\shader_assets\debug\out"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\Administrator\Desktop\Project\xinli\xinli-App\app\src\debug\assets"/></dataSet></merger>
+<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\0_Project\09_归档\01_Project_psychological\xinli\xinli-App\app\src\main\assets"/><source path="D:\0_Project\09_归档\01_Project_psychological\xinli\xinli-App\app\build\intermediates\shader_assets\debug\out"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\0_Project\09_归档\01_Project_psychological\xinli\xinli-App\app\src\debug\assets"/></dataSet></merger>

xinli-App/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml

@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\Administrator\Desktop\Project\xinli\xinli-App\app\src\main\jniLibs"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\Administrator\Desktop\Project\xinli\xinli-App\app\src\debug\jniLibs"/></dataSet></merger>
+<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\0_Project\09_归档\01_Project_psychological\xinli\xinli-App\app\src\main\jniLibs"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\0_Project\09_归档\01_Project_psychological\xinli\xinli-App\app\src\debug\jniLibs"/></dataSet></merger>

xinli-App/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties

@@ -1,12 +1,12 @@
-#Wed Dec 03 11:52:32 CST 2025
-C\:\\Users\\Administrator\\Desktop\\Project\\xinli\\xinli-App\\app\\src\\main\\res\\mipmap-mdpi\\ic_launcher_round.png=C\:\\Users\\Administrator\\Desktop\\Project\\xinli\\xinli-App\\app\\build\\intermediates\\res\\merged\\debug\\mipmap-mdpi_ic_launcher_round.png.flat
-C\:\\Users\\Administrator\\Desktop\\Project\\xinli\\xinli-App\\app\\src\\main\\res\\mipmap-xxhdpi\\ic_launcher_round.png=C\:\\Users\\Administrator\\Desktop\\Project\\xinli\\xinli-App\\app\\build\\intermediates\\res\\merged\\debug\\mipmap-xxhdpi_ic_launcher_round.png.flat
-C\:\\Users\\Administrator\\Desktop\\Project\\xinli\\xinli-App\\app\\src\\main\\res\\mipmap-xhdpi\\ic_launcher.png=C\:\\Users\\Administrator\\Desktop\\Project\\xinli\\xinli-App\\app\\build\\intermediates\\res\\merged\\debug\\mipmap-xhdpi_ic_launcher.png.flat
-C\:\\Users\\Administrator\\Desktop\\Project\\xinli\\xinli-App\\app\\src\\main\\res\\mipmap-xxxhdpi\\ic_launcher_round.png=C\:\\Users\\Administrator\\Desktop\\Project\\xinli\\xinli-App\\app\\build\\intermediates\\res\\merged\\debug\\mipmap-xxxhdpi_ic_launcher_round.png.flat
-C\:\\Users\\Administrator\\Desktop\\Project\\xinli\\xinli-App\\app\\src\\main\\res\\mipmap-hdpi\\ic_launcher.png=C\:\\Users\\Administrator\\Desktop\\Project\\xinli\\xinli-App\\app\\build\\intermediates\\res\\merged\\debug\\mipmap-hdpi_ic_launcher.png.flat
-C\:\\Users\\Administrator\\Desktop\\Project\\xinli\\xinli-App\\app\\src\\main\\res\\mipmap-xhdpi\\ic_launcher_round.png=C\:\\Users\\Administrator\\Desktop\\Project\\xinli\\xinli-App\\app\\build\\intermediates\\res\\merged\\debug\\mipmap-xhdpi_ic_launcher_round.png.flat
-C\:\\Users\\Administrator\\Desktop\\Project\\xinli\\xinli-App\\app\\src\\main\\res\\mipmap-hdpi\\ic_launcher_round.png=C\:\\Users\\Administrator\\Desktop\\Project\\xinli\\xinli-App\\app\\build\\intermediates\\res\\merged\\debug\\mipmap-hdpi_ic_launcher_round.png.flat
-C\:\\Users\\Administrator\\Desktop\\Project\\xinli\\xinli-App\\app\\src\\main\\res\\mipmap-mdpi\\ic_launcher.png=C\:\\Users\\Administrator\\Desktop\\Project\\xinli\\xinli-App\\app\\build\\intermediates\\res\\merged\\debug\\mipmap-mdpi_ic_launcher.png.flat
-C\:\\Users\\Administrator\\Desktop\\Project\\xinli\\xinli-App\\app\\src\\main\\res\\mipmap-xxxhdpi\\ic_launcher.png=C\:\\Users\\Administrator\\Desktop\\Project\\xinli\\xinli-App\\app\\build\\intermediates\\res\\merged\\debug\\mipmap-xxxhdpi_ic_launcher.png.flat
-C\:\\Users\\Administrator\\Desktop\\Project\\xinli\\xinli-App\\app\\src\\main\\res\\mipmap-xxhdpi\\ic_launcher.png=C\:\\Users\\Administrator\\Desktop\\Project\\xinli\\xinli-App\\app\\build\\intermediates\\res\\merged\\debug\\mipmap-xxhdpi_ic_launcher.png.flat
-C\:\\Users\\Administrator\\Desktop\\Project\\xinli\\xinli-App\\app\\src\\main\\res\\layout\\activity_main.xml=C\:\\Users\\Administrator\\Desktop\\Project\\xinli\\xinli-App\\app\\build\\intermediates\\res\\merged\\debug\\layout_activity_main.xml.flat
+#Thu Dec 18 16:43:12 CST 2025
+D\:\\0_Project\\09_归档\\01_Project_psychological\\xinli\\xinli-App\\app\\src\\main\\res\\mipmap-xxhdpi\\ic_launcher_round.png=D\:\\0_Project\\09_归档\\01_Project_psychological\\xinli\\xinli-App\\app\\build\\intermediates\\res\\merged\\debug\\mipmap-xxhdpi_ic_launcher_round.png.flat
+D\:\\0_Project\\09_归档\\01_Project_psychological\\xinli\\xinli-App\\app\\src\\main\\res\\mipmap-xxhdpi\\ic_launcher.png=D\:\\0_Project\\09_归档\\01_Project_psychological\\xinli\\xinli-App\\app\\build\\intermediates\\res\\merged\\debug\\mipmap-xxhdpi_ic_launcher.png.flat
+D\:\\0_Project\\09_归档\\01_Project_psychological\\xinli\\xinli-App\\app\\src\\main\\res\\mipmap-mdpi\\ic_launcher.png=D\:\\0_Project\\09_归档\\01_Project_psychological\\xinli\\xinli-App\\app\\build\\intermediates\\res\\merged\\debug\\mipmap-mdpi_ic_launcher.png.flat
+D\:\\0_Project\\09_归档\\01_Project_psychological\\xinli\\xinli-App\\app\\src\\main\\res\\mipmap-xxxhdpi\\ic_launcher.png=D\:\\0_Project\\09_归档\\01_Project_psychological\\xinli\\xinli-App\\app\\build\\intermediates\\res\\merged\\debug\\mipmap-xxxhdpi_ic_launcher.png.flat
+D\:\\0_Project\\09_归档\\01_Project_psychological\\xinli\\xinli-App\\app\\src\\main\\res\\mipmap-mdpi\\ic_launcher_round.png=D\:\\0_Project\\09_归档\\01_Project_psychological\\xinli\\xinli-App\\app\\build\\intermediates\\res\\merged\\debug\\mipmap-mdpi_ic_launcher_round.png.flat
+D\:\\0_Project\\09_归档\\01_Project_psychological\\xinli\\xinli-App\\app\\src\\main\\res\\mipmap-xhdpi\\ic_launcher_round.png=D\:\\0_Project\\09_归档\\01_Project_psychological\\xinli\\xinli-App\\app\\build\\intermediates\\res\\merged\\debug\\mipmap-xhdpi_ic_launcher_round.png.flat
+D\:\\0_Project\\09_归档\\01_Project_psychological\\xinli\\xinli-App\\app\\src\\main\\res\\mipmap-xxxhdpi\\ic_launcher_round.png=D\:\\0_Project\\09_归档\\01_Project_psychological\\xinli\\xinli-App\\app\\build\\intermediates\\res\\merged\\debug\\mipmap-xxxhdpi_ic_launcher_round.png.flat
+D\:\\0_Project\\09_归档\\01_Project_psychological\\xinli\\xinli-App\\app\\src\\main\\res\\mipmap-hdpi\\ic_launcher_round.png=D\:\\0_Project\\09_归档\\01_Project_psychological\\xinli\\xinli-App\\app\\build\\intermediates\\res\\merged\\debug\\mipmap-hdpi_ic_launcher_round.png.flat
+D\:\\0_Project\\09_归档\\01_Project_psychological\\xinli\\xinli-App\\app\\src\\main\\res\\layout\\activity_main.xml=D\:\\0_Project\\09_归档\\01_Project_psychological\\xinli\\xinli-App\\app\\build\\intermediates\\res\\merged\\debug\\layout_activity_main.xml.flat
+D\:\\0_Project\\09_归档\\01_Project_psychological\\xinli\\xinli-App\\app\\src\\main\\res\\mipmap-xhdpi\\ic_launcher.png=D\:\\0_Project\\09_归档\\01_Project_psychological\\xinli\\xinli-App\\app\\build\\intermediates\\res\\merged\\debug\\mipmap-xhdpi_ic_launcher.png.flat
+D\:\\0_Project\\09_归档\\01_Project_psychological\\xinli\\xinli-App\\app\\src\\main\\res\\mipmap-hdpi\\ic_launcher.png=D\:\\0_Project\\09_归档\\01_Project_psychological\\xinli\\xinli-App\\app\\build\\intermediates\\res\\merged\\debug\\mipmap-hdpi_ic_launcher.png.flat

xinli-App/app/build/intermediates/incremental/mergeDebugShaders/merger.xml

@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\Administrator\Desktop\Project\xinli\xinli-App\app\src\main\shaders"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\Administrator\Desktop\Project\xinli\xinli-App\app\src\debug\shaders"/></dataSet></merger>
+<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\0_Project\09_归档\01_Project_psychological\xinli\xinli-App\app\src\main\shaders"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\0_Project\09_归档\01_Project_psychological\xinli\xinli-App\app\src\debug\shaders"/></dataSet></merger>

xinli-App/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt

@@ -1,10 +1,10 @@
-#Wed Dec 03 11:52:38 CST 2025
+#Thu Dec 18 16:49:22 CST 2025
 path.2=3/classes.dex
 path.1=0/classes.dex
 path.0=classes.dex
 renamed.2=classes3.dex
 renamed.1=classes2.dex
 renamed.0=classes.dex
-base.2=C\:\\Users\\Administrator\\Desktop\\Project\\xinli\\xinli-App\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\3\\classes.dex
-base.1=C\:\\Users\\Administrator\\Desktop\\Project\\xinli\\xinli-App\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\0\\classes.dex
-base.0=C\:\\Users\\Administrator\\Desktop\\Project\\xinli\\xinli-App\\app\\build\\intermediates\\dex\\debug\\mergeExtDexDebug\\classes.dex
+base.2=D\:\\0_Project\\09_归档\\01_Project_psychological\\xinli\\xinli-App\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\3\\classes.dex
+base.1=D\:\\0_Project\\09_归档\\01_Project_psychological\\xinli\\xinli-App\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\0\\classes.dex
+base.0=D\:\\0_Project\\09_归档\\01_Project_psychological\\xinli\\xinli-App\\app\\build\\intermediates\\dex\\debug\\mergeExtDexDebug\\classes.dex

xinli-App/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt

@@ -6,56 +6,56 @@
 6
 7    <uses-sdk
 8        android:minSdkVersion="21"
-8-->C:\Users\Administrator\Desktop\Project\xinli\xinli-App\app\src\main\AndroidManifest.xml
+8-->D:\0_Project\09_归档\01_Project_psychological\xinli\xinli-App\app\src\main\AndroidManifest.xml
 9        android:targetSdkVersion="30" />
-9-->C:\Users\Administrator\Desktop\Project\xinli\xinli-App\app\src\main\AndroidManifest.xml
+9-->D:\0_Project\09_归档\01_Project_psychological\xinli\xinli-App\app\src\main\AndroidManifest.xml
 10
 11    <uses-permission android:name="android.permission.INTERNET" />
-11-->C:\Users\Administrator\Desktop\Project\xinli\xinli-App\app\src\main\AndroidManifest.xml:6:5-67
-11-->C:\Users\Administrator\Desktop\Project\xinli\xinli-App\app\src\main\AndroidManifest.xml:6:22-64
+11-->D:\0_Project\09_归档\01_Project_psychological\xinli\xinli-App\app\src\main\AndroidManifest.xml:6:5-67
+11-->D:\0_Project\09_归档\01_Project_psychological\xinli\xinli-App\app\src\main\AndroidManifest.xml:6:22-64
 12    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-12-->C:\Users\Administrator\Desktop\Project\xinli\xinli-App\app\src\main\AndroidManifest.xml:7:5-79
-12-->C:\Users\Administrator\Desktop\Project\xinli\xinli-App\app\src\main\AndroidManifest.xml:7:22-76
+12-->D:\0_Project\09_归档\01_Project_psychological\xinli\xinli-App\app\src\main\AndroidManifest.xml:7:5-79
+12-->D:\0_Project\09_归档\01_Project_psychological\xinli\xinli-App\app\src\main\AndroidManifest.xml:7:22-76
 13    <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
-13-->C:\Users\Administrator\Desktop\Project\xinli\xinli-App\app\src\main\AndroidManifest.xml:8:5-80
-13-->C:\Users\Administrator\Desktop\Project\xinli\xinli-App\app\src\main\AndroidManifest.xml:8:22-77
+13-->D:\0_Project\09_归档\01_Project_psychological\xinli\xinli-App\app\src\main\AndroidManifest.xml:8:5-80
+13-->D:\0_Project\09_归档\01_Project_psychological\xinli\xinli-App\app\src\main\AndroidManifest.xml:8:22-77
 14
 15    <application
-15-->C:\Users\Administrator\Desktop\Project\xinli\xinli-App\app\src\main\AndroidManifest.xml:10:5-28:19
+15-->D:\0_Project\09_归档\01_Project_psychological\xinli\xinli-App\app\src\main\AndroidManifest.xml:10:5-28:19
 16        android:allowBackup="true"
-16-->C:\Users\Administrator\Desktop\Project\xinli\xinli-App\app\src\main\AndroidManifest.xml:11:9-35
+16-->D:\0_Project\09_归档\01_Project_psychological\xinli\xinli-App\app\src\main\AndroidManifest.xml:11:9-35
 17        android:appComponentFactory="androidx.core.app.CoreComponentFactory"
 17-->[androidx.core:core:1.5.0] C:\Users\Administrator\.gradle\caches\transforms-3\5646db46e2cfb43e7b3d42f3054c498c\transformed\core-1.5.0\AndroidManifest.xml:24:18-86
 18        android:debuggable="true"
 19        android:icon="@mipmap/ic_launcher"
-19-->C:\Users\Administrator\Desktop\Project\xinli\xinli-App\app\src\main\AndroidManifest.xml:12:9-43
+19-->D:\0_Project\09_归档\01_Project_psychological\xinli\xinli-App\app\src\main\AndroidManifest.xml:12:9-43
 20        android:label="@string/app_name"
-20-->C:\Users\Administrator\Desktop\Project\xinli\xinli-App\app\src\main\AndroidManifest.xml:13:9-41
+20-->D:\0_Project\09_归档\01_Project_psychological\xinli\xinli-App\app\src\main\AndroidManifest.xml:13:9-41
 21        android:roundIcon="@mipmap/ic_launcher_round"
-21-->C:\Users\Administrator\Desktop\Project\xinli\xinli-App\app\src\main\AndroidManifest.xml:14:9-54
+21-->D:\0_Project\09_归档\01_Project_psychological\xinli\xinli-App\app\src\main\AndroidManifest.xml:14:9-54
 22        android:supportsRtl="true"
-22-->C:\Users\Administrator\Desktop\Project\xinli\xinli-App\app\src\main\AndroidManifest.xml:16:9-35
+22-->D:\0_Project\09_归档\01_Project_psychological\xinli\xinli-App\app\src\main\AndroidManifest.xml:16:9-35
 23        android:theme="@style/AppTheme"
-23-->C:\Users\Administrator\Desktop\Project\xinli\xinli-App\app\src\main\AndroidManifest.xml:15:9-40
+23-->D:\0_Project\09_归档\01_Project_psychological\xinli\xinli-App\app\src\main\AndroidManifest.xml:15:9-40
 24        android:usesCleartextTraffic="true" >
-24-->C:\Users\Administrator\Desktop\Project\xinli\xinli-App\app\src\main\AndroidManifest.xml:17:9-44
+24-->D:\0_Project\09_归档\01_Project_psychological\xinli\xinli-App\app\src\main\AndroidManifest.xml:17:9-44
 25        <activity
-25-->C:\Users\Administrator\Desktop\Project\xinli\xinli-App\app\src\main\AndroidManifest.xml:19:9-27:20
+25-->D:\0_Project\09_归档\01_Project_psychological\xinli\xinli-App\app\src\main\AndroidManifest.xml:19:9-27:20
 26            android:name="com.xinli.app.MainActivity"
-26-->C:\Users\Administrator\Desktop\Project\xinli\xinli-App\app\src\main\AndroidManifest.xml:20:13-41
+26-->D:\0_Project\09_归档\01_Project_psychological\xinli\xinli-App\app\src\main\AndroidManifest.xml:20:13-41
 27            android:configChanges="orientation|screenSize|keyboardHidden"
-27-->C:\Users\Administrator\Desktop\Project\xinli\xinli-App\app\src\main\AndroidManifest.xml:22:13-74
+27-->D:\0_Project\09_归档\01_Project_psychological\xinli\xinli-App\app\src\main\AndroidManifest.xml:22:13-74
 28            android:exported="true" >
-28-->C:\Users\Administrator\Desktop\Project\xinli\xinli-App\app\src\main\AndroidManifest.xml:21:13-36
+28-->D:\0_Project\09_归档\01_Project_psychological\xinli\xinli-App\app\src\main\AndroidManifest.xml:21:13-36
 29            <intent-filter>
-29-->C:\Users\Administrator\Desktop\Project\xinli\xinli-App\app\src\main\AndroidManifest.xml:23:13-26:29
+29-->D:\0_Project\09_归档\01_Project_psychological\xinli\xinli-App\app\src\main\AndroidManifest.xml:23:13-26:29
 30                <action android:name="android.intent.action.MAIN" />
-30-->C:\Users\Administrator\Desktop\Project\xinli\xinli-App\app\src\main\AndroidManifest.xml:24:17-69
-30-->C:\Users\Administrator\Desktop\Project\xinli\xinli-App\app\src\main\AndroidManifest.xml:24:25-66
+30-->D:\0_Project\09_归档\01_Project_psychological\xinli\xinli-App\app\src\main\AndroidManifest.xml:24:17-69
+30-->D:\0_Project\09_归档\01_Project_psychological\xinli\xinli-App\app\src\main\AndroidManifest.xml:24:25-66
 31
 32                <category android:name="android.intent.category.LAUNCHER" />
-32-->C:\Users\Administrator\Desktop\Project\xinli\xinli-App\app\src\main\AndroidManifest.xml:25:17-77
-32-->C:\Users\Administrator\Desktop\Project\xinli\xinli-App\app\src\main\AndroidManifest.xml:25:27-74
+32-->D:\0_Project\09_归档\01_Project_psychological\xinli\xinli-App\app\src\main\AndroidManifest.xml:25:17-77
+32-->D:\0_Project\09_归档\01_Project_psychological\xinli\xinli-App\app\src\main\AndroidManifest.xml:25:27-74
 33            </intent-filter>
 34        </activity>
 35    </application>

xinli-App/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-af.json

@@ -1,7 +1,7 @@
 {
     "logs": [
         {
-            "outputFile": "C:\\Users\\Administrator\\Desktop\\Project\\xinli\\xinli-App\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-af\\values-af.xml",
+            "outputFile": "D:\\0_Project\\09_归档\\01_Project_psychological\\xinli\\xinli-App\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-af\\values-af.xml",
             "map": [
                 {
                     "source": "C:\\Users\\Administrator\\.gradle\\caches\\transforms-3\\99cdb8e66b958b29cf82acf3628db0b4\\transformed\\appcompat-1.3.1\\res\\values-af\\values-af.xml",

xinli-App/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-am.json

@@ -1,7 +1,7 @@
 {
     "logs": [
         {
-            "outputFile": "C:\\Users\\Administrator\\Desktop\\Project\\xinli\\xinli-App\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-am\\values-am.xml",
+            "outputFile": "D:\\0_Project\\09_归档\\01_Project_psychological\\xinli\\xinli-App\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-am\\values-am.xml",
             "map": [
                 {
                     "source": "C:\\Users\\Administrator\\.gradle\\caches\\transforms-3\\5646db46e2cfb43e7b3d42f3054c498c\\transformed\\core-1.5.0\\res\\values-am\\values-am.xml",

xinli-App/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ar.json

@@ -1,7 +1,7 @@
 {
     "logs": [
         {
-            "outputFile": "C:\\Users\\Administrator\\Desktop\\Project\\xinli\\xinli-App\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ar\\values-ar.xml",
+            "outputFile": "D:\\0_Project\\09_归档\\01_Project_psychological\\xinli\\xinli-App\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ar\\values-ar.xml",
             "map": [
                 {
                     "source": "C:\\Users\\Administrator\\.gradle\\caches\\transforms-3\\5646db46e2cfb43e7b3d42f3054c498c\\transformed\\core-1.5.0\\res\\values-ar\\values-ar.xml",

xinli-App/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-as.json

@@ -1,7 +1,7 @@
 {
     "logs": [
         {
-            "outputFile": "C:\\Users\\Administrator\\Desktop\\Project\\xinli\\xinli-App\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-as\\values-as.xml",
+            "outputFile": "D:\\0_Project\\09_归档\\01_Project_psychological\\xinli\\xinli-App\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-as\\values-as.xml",
             "map": [
                 {
                     "source": "C:\\Users\\Administrator\\.gradle\\caches\\transforms-3\\99cdb8e66b958b29cf82acf3628db0b4\\transformed\\appcompat-1.3.1\\res\\values-as\\values-as.xml",

xinli-App/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-az.json

@@ -1,7 +1,7 @@
 {
     "logs": [
         {
-            "outputFile": "C:\\Users\\Administrator\\Desktop\\Project\\xinli\\xinli-App\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-az\\values-az.xml",
+            "outputFile": "D:\\0_Project\\09_归档\\01_Project_psychological\\xinli\\xinli-App\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-az\\values-az.xml",
             "map": [
                 {
                     "source": "C:\\Users\\Administrator\\.gradle\\caches\\transforms-3\\99cdb8e66b958b29cf82acf3628db0b4\\transformed\\appcompat-1.3.1\\res\\values-az\\values-az.xml",

xinli-App/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-b+es+419.json

@@ -1,7 +1,7 @@
 {
     "logs": [
         {
-            "outputFile": "C:\\Users\\Administrator\\Desktop\\Project\\xinli\\xinli-App\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-b+es+419\\values-b+es+419.xml",
+            "outputFile": "D:\\0_Project\\09_归档\\01_Project_psychological\\xinli\\xinli-App\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-b+es+419\\values-b+es+419.xml",
             "map": [
                 {
                     "source": "C:\\Users\\Administrator\\.gradle\\caches\\transforms-3\\639ab81650f367f22b806b37c29399c2\\transformed\\material-1.4.0\\res\\values-b+es+419\\values-b+es+419.xml",

xinli-App/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-b+sr+Latn.json

@@ -1,7 +1,7 @@
 {
     "logs": [
         {
-            "outputFile": "C:\\Users\\Administrator\\Desktop\\Project\\xinli\\xinli-App\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-b+sr+Latn\\values-b+sr+Latn.xml",
+            "outputFile": "D:\\0_Project\\09_归档\\01_Project_psychological\\xinli\\xinli-App\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-b+sr+Latn\\values-b+sr+Latn.xml",
             "map": [
                 {
                     "source": "C:\\Users\\Administrator\\.gradle\\caches\\transforms-3\\5646db46e2cfb43e7b3d42f3054c498c\\transformed\\core-1.5.0\\res\\values-b+sr+Latn\\values-b+sr+Latn.xml",

xinli-App/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-be.json

@@ -1,7 +1,7 @@
 {
     "logs": [
         {
-            "outputFile": "C:\\Users\\Administrator\\Desktop\\Project\\xinli\\xinli-App\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-be\\values-be.xml",
+            "outputFile": "D:\\0_Project\\09_归档\\01_Project_psychological\\xinli\\xinli-App\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-be\\values-be.xml",
             "map": [
                 {
                     "source": "C:\\Users\\Administrator\\.gradle\\caches\\transforms-3\\5646db46e2cfb43e7b3d42f3054c498c\\transformed\\core-1.5.0\\res\\values-be\\values-be.xml",

xinli-App/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-bg.json

@@ -1,7 +1,7 @@
 {
     "logs": [
         {
-            "outputFile": "C:\\Users\\Administrator\\Desktop\\Project\\xinli\\xinli-App\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-bg\\values-bg.xml",
+            "outputFile": "D:\\0_Project\\09_归档\\01_Project_psychological\\xinli\\xinli-App\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-bg\\values-bg.xml",
             "map": [
                 {
                     "source": "C:\\Users\\Administrator\\.gradle\\caches\\transforms-3\\639ab81650f367f22b806b37c29399c2\\transformed\\material-1.4.0\\res\\values-bg\\values-bg.xml",

xinli-App/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-bn.json

@@ -1,7 +1,7 @@
 {
     "logs": [
         {
-            "outputFile": "C:\\Users\\Administrator\\Desktop\\Project\\xinli\\xinli-App\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-bn\\values-bn.xml",
+            "outputFile": "D:\\0_Project\\09_归档\\01_Project_psychological\\xinli\\xinli-App\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-bn\\values-bn.xml",
             "map": [
                 {
                     "source": "C:\\Users\\Administrator\\.gradle\\caches\\transforms-3\\639ab81650f367f22b806b37c29399c2\\transformed\\material-1.4.0\\res\\values-bn\\values-bn.xml",

xinli-App/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-bs.json

@@ -1,7 +1,7 @@
 {
     "logs": [
         {
-            "outputFile": "C:\\Users\\Administrator\\Desktop\\Project\\xinli\\xinli-App\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-bs\\values-bs.xml",
+            "outputFile": "D:\\0_Project\\09_归档\\01_Project_psychological\\xinli\\xinli-App\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-bs\\values-bs.xml",
             "map": [
                 {
                     "source": "C:\\Users\\Administrator\\.gradle\\caches\\transforms-3\\99cdb8e66b958b29cf82acf3628db0b4\\transformed\\appcompat-1.3.1\\res\\values-bs\\values-bs.xml",

xinli-App/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ca.json

@@ -1,7 +1,7 @@
 {
     "logs": [
         {
-            "outputFile": "C:\\Users\\Administrator\\Desktop\\Project\\xinli\\xinli-App\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ca\\values-ca.xml",
+            "outputFile": "D:\\0_Project\\09_归档\\01_Project_psychological\\xinli\\xinli-App\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ca\\values-ca.xml",
             "map": [
                 {
                     "source": "C:\\Users\\Administrator\\.gradle\\caches\\transforms-3\\99cdb8e66b958b29cf82acf3628db0b4\\transformed\\appcompat-1.3.1\\res\\values-ca\\values-ca.xml",

xinli-App/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-cs.json

@@ -1,7 +1,7 @@
 {
     "logs": [
         {
-            "outputFile": "C:\\Users\\Administrator\\Desktop\\Project\\xinli\\xinli-App\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-cs\\values-cs.xml",
+            "outputFile": "D:\\0_Project\\09_归档\\01_Project_psychological\\xinli\\xinli-App\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-cs\\values-cs.xml",
             "map": [
                 {
                     "source": "C:\\Users\\Administrator\\.gradle\\caches\\transforms-3\\5646db46e2cfb43e7b3d42f3054c498c\\transformed\\core-1.5.0\\res\\values-cs\\values-cs.xml",

xinli-App/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-da.json

@@ -1,7 +1,7 @@
 {
     "logs": [
         {
-            "outputFile": "C:\\Users\\Administrator\\Desktop\\Project\\xinli\\xinli-App\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-da\\values-da.xml",
+            "outputFile": "D:\\0_Project\\09_归档\\01_Project_psychological\\xinli\\xinli-App\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-da\\values-da.xml",
             "map": [
                 {
                     "source": "C:\\Users\\Administrator\\.gradle\\caches\\transforms-3\\99cdb8e66b958b29cf82acf3628db0b4\\transformed\\appcompat-1.3.1\\res\\values-da\\values-da.xml",

xinli-App/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-de.json

@@ -1,7 +1,7 @@
 {
     "logs": [
         {
-            "outputFile": "C:\\Users\\Administrator\\Desktop\\Project\\xinli\\xinli-App\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-de\\values-de.xml",
+            "outputFile": "D:\\0_Project\\09_归档\\01_Project_psychological\\xinli\\xinli-App\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-de\\values-de.xml",
             "map": [
                 {
                     "source": "C:\\Users\\Administrator\\.gradle\\caches\\transforms-3\\99cdb8e66b958b29cf82acf3628db0b4\\transformed\\appcompat-1.3.1\\res\\values-de\\values-de.xml",

xinli-App/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-el.json

@@ -1,7 +1,7 @@
 {
     "logs": [
         {
-            "outputFile": "C:\\Users\\Administrator\\Desktop\\Project\\xinli\\xinli-App\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-el\\values-el.xml",
+            "outputFile": "D:\\0_Project\\09_归档\\01_Project_psychological\\xinli\\xinli-App\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-el\\values-el.xml",
             "map": [
                 {
                     "source": "C:\\Users\\Administrator\\.gradle\\caches\\transforms-3\\639ab81650f367f22b806b37c29399c2\\transformed\\material-1.4.0\\res\\values-el\\values-el.xml",

xinli-App/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rAU.json

@@ -1,7 +1,7 @@
 {
     "logs": [
         {
-            "outputFile": "C:\\Users\\Administrator\\Desktop\\Project\\xinli\\xinli-App\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-en-rAU\\values-en-rAU.xml",
+            "outputFile": "D:\\0_Project\\09_归档\\01_Project_psychological\\xinli\\xinli-App\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-en-rAU\\values-en-rAU.xml",
             "map": [
                 {
                     "source": "C:\\Users\\Administrator\\.gradle\\caches\\transforms-3\\99cdb8e66b958b29cf82acf3628db0b4\\transformed\\appcompat-1.3.1\\res\\values-en-rAU\\values-en-rAU.xml",

xinli-App/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rCA.json

@@ -1,7 +1,7 @@
 {
     "logs": [
         {
-            "outputFile": "C:\\Users\\Administrator\\Desktop\\Project\\xinli\\xinli-App\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-en-rCA\\values-en-rCA.xml",
+            "outputFile": "D:\\0_Project\\09_归档\\01_Project_psychological\\xinli\\xinli-App\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-en-rCA\\values-en-rCA.xml",
             "map": [
                 {
                     "source": "C:\\Users\\Administrator\\.gradle\\caches\\transforms-3\\5646db46e2cfb43e7b3d42f3054c498c\\transformed\\core-1.5.0\\res\\values-en-rCA\\values-en-rCA.xml",

xinli-App/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rGB.json

@@ -1,7 +1,7 @@
 {
     "logs": [
         {
-            "outputFile": "C:\\Users\\Administrator\\Desktop\\Project\\xinli\\xinli-App\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-en-rGB\\values-en-rGB.xml",
+            "outputFile": "D:\\0_Project\\09_归档\\01_Project_psychological\\xinli\\xinli-App\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-en-rGB\\values-en-rGB.xml",
             "map": [
                 {
                     "source": "C:\\Users\\Administrator\\.gradle\\caches\\transforms-3\\639ab81650f367f22b806b37c29399c2\\transformed\\material-1.4.0\\res\\values-en-rGB\\values-en-rGB.xml",

xinli-App/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rIN.json

@@ -1,7 +1,7 @@
 {
     "logs": [
         {
-            "outputFile": "C:\\Users\\Administrator\\Desktop\\Project\\xinli\\xinli-App\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-en-rIN\\values-en-rIN.xml",
+            "outputFile": "D:\\0_Project\\09_归档\\01_Project_psychological\\xinli\\xinli-App\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-en-rIN\\values-en-rIN.xml",
             "map": [
                 {
                     "source": "C:\\Users\\Administrator\\.gradle\\caches\\transforms-3\\5646db46e2cfb43e7b3d42f3054c498c\\transformed\\core-1.5.0\\res\\values-en-rIN\\values-en-rIN.xml",

xinli-App/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rXC.json

@@ -1,7 +1,7 @@
 {
     "logs": [
         {
-            "outputFile": "C:\\Users\\Administrator\\Desktop\\Project\\xinli\\xinli-App\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-en-rXC\\values-en-rXC.xml",
+            "outputFile": "D:\\0_Project\\09_归档\\01_Project_psychological\\xinli\\xinli-App\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-en-rXC\\values-en-rXC.xml",
             "map": [
                 {
                     "source": "C:\\Users\\Administrator\\.gradle\\caches\\transforms-3\\99cdb8e66b958b29cf82acf3628db0b4\\transformed\\appcompat-1.3.1\\res\\values-en-rXC\\values-en-rXC.xml",

xinli-App/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-es-rUS.json

@@ -1,7 +1,7 @@
 {
     "logs": [
         {
-            "outputFile": "C:\\Users\\Administrator\\Desktop\\Project\\xinli\\xinli-App\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-es-rUS\\values-es-rUS.xml",
+            "outputFile": "D:\\0_Project\\09_归档\\01_Project_psychological\\xinli\\xinli-App\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-es-rUS\\values-es-rUS.xml",
             "map": [
                 {
                     "source": "C:\\Users\\Administrator\\.gradle\\caches\\transforms-3\\5646db46e2cfb43e7b3d42f3054c498c\\transformed\\core-1.5.0\\res\\values-es-rUS\\values-es-rUS.xml",

xinli-App/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-es.json

@@ -1,7 +1,7 @@
 {
     "logs": [
         {
-            "outputFile": "C:\\Users\\Administrator\\Desktop\\Project\\xinli\\xinli-App\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-es\\values-es.xml",
+            "outputFile": "D:\\0_Project\\09_归档\\01_Project_psychological\\xinli\\xinli-App\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-es\\values-es.xml",
             "map": [
                 {
                     "source": "C:\\Users\\Administrator\\.gradle\\caches\\transforms-3\\5646db46e2cfb43e7b3d42f3054c498c\\transformed\\core-1.5.0\\res\\values-es\\values-es.xml",

xinli-App/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-et.json

@@ -1,7 +1,7 @@
 {
     "logs": [
         {
-            "outputFile": "C:\\Users\\Administrator\\Desktop\\Project\\xinli\\xinli-App\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-et\\values-et.xml",
+            "outputFile": "D:\\0_Project\\09_归档\\01_Project_psychological\\xinli\\xinli-App\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-et\\values-et.xml",
             "map": [
                 {
                     "source": "C:\\Users\\Administrator\\.gradle\\caches\\transforms-3\\5646db46e2cfb43e7b3d42f3054c498c\\transformed\\core-1.5.0\\res\\values-et\\values-et.xml",

xinli-App/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-eu.json

@@ -1,7 +1,7 @@
 {
     "logs": [
         {
-            "outputFile": "C:\\Users\\Administrator\\Desktop\\Project\\xinli\\xinli-App\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-eu\\values-eu.xml",
+            "outputFile": "D:\\0_Project\\09_归档\\01_Project_psychological\\xinli\\xinli-App\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-eu\\values-eu.xml",
             "map": [
                 {
                     "source": "C:\\Users\\Administrator\\.gradle\\caches\\transforms-3\\5646db46e2cfb43e7b3d42f3054c498c\\transformed\\core-1.5.0\\res\\values-eu\\values-eu.xml",

xinli-App/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fa.json

@@ -1,7 +1,7 @@
 {
     "logs": [
         {
-            "outputFile": "C:\\Users\\Administrator\\Desktop\\Project\\xinli\\xinli-App\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-fa\\values-fa.xml",
+            "outputFile": "D:\\0_Project\\09_归档\\01_Project_psychological\\xinli\\xinli-App\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-fa\\values-fa.xml",
             "map": [
                 {
                     "source": "C:\\Users\\Administrator\\.gradle\\caches\\transforms-3\\5646db46e2cfb43e7b3d42f3054c498c\\transformed\\core-1.5.0\\res\\values-fa\\values-fa.xml",

xinli-App/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fi.json

@@ -1,7 +1,7 @@
 {
     "logs": [
         {
-            "outputFile": "C:\\Users\\Administrator\\Desktop\\Project\\xinli\\xinli-App\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-fi\\values-fi.xml",
+            "outputFile": "D:\\0_Project\\09_归档\\01_Project_psychological\\xinli\\xinli-App\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-fi\\values-fi.xml",
             "map": [
                 {
                     "source": "C:\\Users\\Administrator\\.gradle\\caches\\transforms-3\\99cdb8e66b958b29cf82acf3628db0b4\\transformed\\appcompat-1.3.1\\res\\values-fi\\values-fi.xml",

xinli-App/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fr-rCA.json

@@ -1,7 +1,7 @@
 {
     "logs": [
         {
-            "outputFile": "C:\\Users\\Administrator\\Desktop\\Project\\xinli\\xinli-App\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-fr-rCA\\values-fr-rCA.xml",
+            "outputFile": "D:\\0_Project\\09_归档\\01_Project_psychological\\xinli\\xinli-App\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-fr-rCA\\values-fr-rCA.xml",
             "map": [
                 {
                     "source": "C:\\Users\\Administrator\\.gradle\\caches\\transforms-3\\639ab81650f367f22b806b37c29399c2\\transformed\\material-1.4.0\\res\\values-fr-rCA\\values-fr-rCA.xml",

xinli-App/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fr.json

@@ -1,7 +1,7 @@
 {
     "logs": [
         {
-            "outputFile": "C:\\Users\\Administrator\\Desktop\\Project\\xinli\\xinli-App\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-fr\\values-fr.xml",
+            "outputFile": "D:\\0_Project\\09_归档\\01_Project_psychological\\xinli\\xinli-App\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-fr\\values-fr.xml",
             "map": [
                 {
                     "source": "C:\\Users\\Administrator\\.gradle\\caches\\transforms-3\\99cdb8e66b958b29cf82acf3628db0b4\\transformed\\appcompat-1.3.1\\res\\values-fr\\values-fr.xml",

xinli-App/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-gl.json

@@ -1,7 +1,7 @@
 {
     "logs": [
         {
-            "outputFile": "C:\\Users\\Administrator\\Desktop\\Project\\xinli\\xinli-App\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-gl\\values-gl.xml",
+            "outputFile": "D:\\0_Project\\09_归档\\01_Project_psychological\\xinli\\xinli-App\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-gl\\values-gl.xml",
             "map": [
                 {
                     "source": "C:\\Users\\Administrator\\.gradle\\caches\\transforms-3\\5646db46e2cfb43e7b3d42f3054c498c\\transformed\\core-1.5.0\\res\\values-gl\\values-gl.xml",

xinli-App/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-gu.json

@@ -1,7 +1,7 @@
 {
     "logs": [
         {
-            "outputFile": "C:\\Users\\Administrator\\Desktop\\Project\\xinli\\xinli-App\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-gu\\values-gu.xml",
+            "outputFile": "D:\\0_Project\\09_归档\\01_Project_psychological\\xinli\\xinli-App\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-gu\\values-gu.xml",
             "map": [
                 {
                     "source": "C:\\Users\\Administrator\\.gradle\\caches\\transforms-3\\5646db46e2cfb43e7b3d42f3054c498c\\transformed\\core-1.5.0\\res\\values-gu\\values-gu.xml",

xinli-App/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-h320dp-port-v13.json

@@ -1,7 +1,7 @@
 {
     "logs": [
         {
-            "outputFile": "C:\\Users\\Administrator\\Desktop\\Project\\xinli\\xinli-App\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-h320dp-port-v13\\values-h320dp-port-v13.xml",
+            "outputFile": "D:\\0_Project\\09_归档\\01_Project_psychological\\xinli\\xinli-App\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-h320dp-port-v13\\values-h320dp-port-v13.xml",
             "map": [
                 {
                     "source": "C:\\Users\\Administrator\\.gradle\\caches\\transforms-3\\639ab81650f367f22b806b37c29399c2\\transformed\\material-1.4.0\\res\\values-h320dp-port-v13\\values-h320dp-port-v13.xml",

xinli-App/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-h360dp-land-v13.json

@@ -1,7 +1,7 @@
 {
     "logs": [
         {
-            "outputFile": "C:\\Users\\Administrator\\Desktop\\Project\\xinli\\xinli-App\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-h360dp-land-v13\\values-h360dp-land-v13.xml",
+            "outputFile": "D:\\0_Project\\09_归档\\01_Project_psychological\\xinli\\xinli-App\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-h360dp-land-v13\\values-h360dp-land-v13.xml",
             "map": [
                 {
                     "source": "C:\\Users\\Administrator\\.gradle\\caches\\transforms-3\\639ab81650f367f22b806b37c29399c2\\transformed\\material-1.4.0\\res\\values-h360dp-land-v13\\values-h360dp-land-v13.xml",

xinli-App/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-h480dp-land-v13.json

@@ -1,7 +1,7 @@
 {
     "logs": [
         {
-            "outputFile": "C:\\Users\\Administrator\\Desktop\\Project\\xinli\\xinli-App\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-h480dp-land-v13\\values-h480dp-land-v13.xml",
+            "outputFile": "D:\\0_Project\\09_归档\\01_Project_psychological\\xinli\\xinli-App\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-h480dp-land-v13\\values-h480dp-land-v13.xml",
             "map": [
                 {
                     "source": "C:\\Users\\Administrator\\.gradle\\caches\\transforms-3\\639ab81650f367f22b806b37c29399c2\\transformed\\material-1.4.0\\res\\values-h480dp-land-v13\\values-h480dp-land-v13.xml",

xinli-App/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-h550dp-port-v13.json

@@ -1,7 +1,7 @@
 {
     "logs": [
         {
-            "outputFile": "C:\\Users\\Administrator\\Desktop\\Project\\xinli\\xinli-App\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-h550dp-port-v13\\values-h550dp-port-v13.xml",
+            "outputFile": "D:\\0_Project\\09_归档\\01_Project_psychological\\xinli\\xinli-App\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-h550dp-port-v13\\values-h550dp-port-v13.xml",
             "map": [
                 {
                     "source": "C:\\Users\\Administrator\\.gradle\\caches\\transforms-3\\639ab81650f367f22b806b37c29399c2\\transformed\\material-1.4.0\\res\\values-h550dp-port-v13\\values-h550dp-port-v13.xml",

xinli-App/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-h720dp-v13.json

@@ -1,7 +1,7 @@
 {
     "logs": [
         {
-            "outputFile": "C:\\Users\\Administrator\\Desktop\\Project\\xinli\\xinli-App\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-h720dp-v13\\values-h720dp-v13.xml",
+            "outputFile": "D:\\0_Project\\09_归档\\01_Project_psychological\\xinli\\xinli-App\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-h720dp-v13\\values-h720dp-v13.xml",
             "map": [
                 {
                     "source": "C:\\Users\\Administrator\\.gradle\\caches\\transforms-3\\99cdb8e66b958b29cf82acf3628db0b4\\transformed\\appcompat-1.3.1\\res\\values-h720dp-v13\\values-h720dp-v13.xml",

xinli-App/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hdpi-v4.json

@@ -1,7 +1,7 @@
 {
     "logs": [
         {
-            "outputFile": "C:\\Users\\Administrator\\Desktop\\Project\\xinli\\xinli-App\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-hdpi-v4\\values-hdpi-v4.xml",
+            "outputFile": "D:\\0_Project\\09_归档\\01_Project_psychological\\xinli\\xinli-App\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-hdpi-v4\\values-hdpi-v4.xml",
             "map": [
                 {
                     "source": "C:\\Users\\Administrator\\.gradle\\caches\\transforms-3\\99cdb8e66b958b29cf82acf3628db0b4\\transformed\\appcompat-1.3.1\\res\\values-hdpi-v4\\values-hdpi-v4.xml",

xinli-App/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hi.json

@@ -1,7 +1,7 @@
 {
     "logs": [
         {
-            "outputFile": "C:\\Users\\Administrator\\Desktop\\Project\\xinli\\xinli-App\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-hi\\values-hi.xml",
+            "outputFile": "D:\\0_Project\\09_归档\\01_Project_psychological\\xinli\\xinli-App\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-hi\\values-hi.xml",
             "map": [
                 {
                     "source": "C:\\Users\\Administrator\\.gradle\\caches\\transforms-3\\5646db46e2cfb43e7b3d42f3054c498c\\transformed\\core-1.5.0\\res\\values-hi\\values-hi.xml",

xinli-App/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hr.json

@@ -1,7 +1,7 @@
 {
     "logs": [
         {
-            "outputFile": "C:\\Users\\Administrator\\Desktop\\Project\\xinli\\xinli-App\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-hr\\values-hr.xml",
+            "outputFile": "D:\\0_Project\\09_归档\\01_Project_psychological\\xinli\\xinli-App\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-hr\\values-hr.xml",
             "map": [
                 {
                     "source": "C:\\Users\\Administrator\\.gradle\\caches\\transforms-3\\639ab81650f367f22b806b37c29399c2\\transformed\\material-1.4.0\\res\\values-hr\\values-hr.xml",

xinli-App/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hu.json

@@ -1,7 +1,7 @@
 {
     "logs": [
         {
-            "outputFile": "C:\\Users\\Administrator\\Desktop\\Project\\xinli\\xinli-App\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-hu\\values-hu.xml",
+            "outputFile": "D:\\0_Project\\09_归档\\01_Project_psychological\\xinli\\xinli-App\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-hu\\values-hu.xml",
             "map": [
                 {
                     "source": "C:\\Users\\Administrator\\.gradle\\caches\\transforms-3\\639ab81650f367f22b806b37c29399c2\\transformed\\material-1.4.0\\res\\values-hu\\values-hu.xml",

xinli-App/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hy.json

@@ -1,7 +1,7 @@
 {
     "logs": [
         {
-            "outputFile": "C:\\Users\\Administrator\\Desktop\\Project\\xinli\\xinli-App\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-hy\\values-hy.xml",
+            "outputFile": "D:\\0_Project\\09_归档\\01_Project_psychological\\xinli\\xinli-App\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-hy\\values-hy.xml",
             "map": [
                 {
                     "source": "C:\\Users\\Administrator\\.gradle\\caches\\transforms-3\\639ab81650f367f22b806b37c29399c2\\transformed\\material-1.4.0\\res\\values-hy\\values-hy.xml",

xinli-App/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-in.json

@@ -1,7 +1,7 @@
 {
     "logs": [
         {
-            "outputFile": "C:\\Users\\Administrator\\Desktop\\Project\\xinli\\xinli-App\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-in\\values-in.xml",
+            "outputFile": "D:\\0_Project\\09_归档\\01_Project_psychological\\xinli\\xinli-App\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-in\\values-in.xml",
             "map": [
                 {
                     "source": "C:\\Users\\Administrator\\.gradle\\caches\\transforms-3\\639ab81650f367f22b806b37c29399c2\\transformed\\material-1.4.0\\res\\values-in\\values-in.xml",

xinli-App/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-is.json

@@ -1,7 +1,7 @@
 {
     "logs": [
         {
-            "outputFile": "C:\\Users\\Administrator\\Desktop\\Project\\xinli\\xinli-App\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-is\\values-is.xml",
+            "outputFile": "D:\\0_Project\\09_归档\\01_Project_psychological\\xinli\\xinli-App\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-is\\values-is.xml",
             "map": [
                 {
                     "source": "C:\\Users\\Administrator\\.gradle\\caches\\transforms-3\\99cdb8e66b958b29cf82acf3628db0b4\\transformed\\appcompat-1.3.1\\res\\values-is\\values-is.xml",