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>> call, Response>> response) { if (response.code()==200){ BaseModel> baseModel = response.body(); - if (baseModel.getCode()==1){ - observer.onNext(baseModel.getData()); + if (baseModel.getCode()==1 ){ + observer.onNext(baseModel.getData()!=null ? baseModel.getData() : new ArrayList()); }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(context) { } override fun onNext(t: List) { - 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 @@