From 8faac0f526aeefb336fd2866a6cc6dabea73a875 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E5=B0=8F=E6=B1=9F?= <461355754@qq.com>
Date: Fri, 12 Dec 2025 18:13:26 +0800
Subject: [PATCH] =?UTF-8?q?1:=E4=BF=AE=E6=94=B9=E6=AF=8F=E6=97=A5=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E7=9A=84=E5=AE=B9=E9=94=99=202=EF=BC=9A=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E7=AD=BE=E5=88=B0=E5=BC=B9=E6=A1=86=E5=B8=83=E5=B1=80?=
 =?UTF-8?q?=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/xscm/moduleutil/http/RetrofitClient.java |  4 ++--
 .../java/com/xscm/modulemain/dialog/SignInDialog.kt   | 11 ++++++++---
 MainModule/src/main/res/layout/day_sgin.xml           |  1 -
 MainModule/src/main/res/layout/day_sgin2.xml          |  1 -
 MainModule/src/main/res/layout/dialog_sign.xml        |  5 +++--
 5 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java b/BaseModule/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java
index ea205073..06b259a6 100644
--- a/BaseModule/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java
+++ b/BaseModule/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java
@@ -4940,8 +4940,8 @@ public class RetrofitClient {
             public void onResponse(Call<BaseModel<List<SignInData>>> call, Response<BaseModel<List<SignInData>>> response) {
                 if (response.code()==200){
                     BaseModel<List<SignInData>> baseModel = response.body();
-                    if (baseModel.getCode()==1){
-                        observer.onNext(baseModel.getData());
+                    if (baseModel.getCode()==1 ){
+                        observer.onNext(baseModel.getData()!=null ? baseModel.getData() : new ArrayList<SignInData>());
                     }else if (baseModel.getCode()==0){
                         com.hjq.toast.ToastUtils.show(baseModel.getMsg());
                     }else if (baseModel.getCode()==301){
diff --git a/MainModule/src/main/java/com/xscm/modulemain/dialog/SignInDialog.kt b/MainModule/src/main/java/com/xscm/modulemain/dialog/SignInDialog.kt
index d678af19..f2c20acd 100644
--- a/MainModule/src/main/java/com/xscm/modulemain/dialog/SignInDialog.kt
+++ b/MainModule/src/main/java/com/xscm/modulemain/dialog/SignInDialog.kt
@@ -77,9 +77,14 @@ class SignInDialog(context: Context) : BaseDialog<DialogSignBinding>(context) {
             }
 
             override fun onNext(t: List<SignInData>) {
-                signInDataLists = t
-                for (i in signInDataLists!!) {
-                    setUpView(i)
+                if (t.isNotEmpty()) {
+                    signInDataLists = t
+                    for (i in signInDataLists!!) {
+                        setUpView(i)
+                    }
+                }else{
+                    onCloseCallback?.invoke()
+                    dismiss()
                 }
             }
 
diff --git a/MainModule/src/main/res/layout/day_sgin.xml b/MainModule/src/main/res/layout/day_sgin.xml
index 46447aab..f2103f87 100644
--- a/MainModule/src/main/res/layout/day_sgin.xml
+++ b/MainModule/src/main/res/layout/day_sgin.xml
@@ -14,7 +14,6 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/dp_4"
-        android:layout_marginTop="@dimen/dp_4"
         android:fontFamily="@font/youshebiaotihei"
         android:gravity="center"
         android:textColor="#FFC273"
diff --git a/MainModule/src/main/res/layout/day_sgin2.xml b/MainModule/src/main/res/layout/day_sgin2.xml
index 971cb9ab..7fbb4280 100644
--- a/MainModule/src/main/res/layout/day_sgin2.xml
+++ b/MainModule/src/main/res/layout/day_sgin2.xml
@@ -12,7 +12,6 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/dp_4"
-        android:layout_marginTop="@dimen/dp_4"
         android:fontFamily="@font/youshebiaotihei"
         android:gravity="center"
         android:textColor="#FFC273"
diff --git a/MainModule/src/main/res/layout/dialog_sign.xml b/MainModule/src/main/res/layout/dialog_sign.xml
index 8869b7c0..a71d9386 100644
--- a/MainModule/src/main/res/layout/dialog_sign.xml
+++ b/MainModule/src/main/res/layout/dialog_sign.xml
@@ -36,6 +36,7 @@
             android:layout_marginHorizontal="@dimen/dp_22"
             android:gravity="center"
             android:orientation="horizontal"
+            android:layout_marginTop="-25dp"
             app:layout_constraintEnd_toEndOf="@id/im_v"
             app:layout_constraintStart_toStartOf="@id/im_v"
             app:layout_constraintTop_toTopOf="@id/im_v"
@@ -76,10 +77,10 @@
 
         <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="@dimen/dp_88"
+            android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
             android:layout_marginHorizontal="@dimen/dp_22"
-            android:layout_marginTop="12.5dp"
+            android:layout_marginTop="5dp"
             android:orientation="horizontal"
             app:layout_constraintTop_toBottomOf="@+id/ll1">