From 6825009aba80945b2e88197f4e15b5d39fdc082b 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 15:27:32 +0800 Subject: [PATCH] =?UTF-8?q?1:=E6=B7=BB=E5=8A=A0=E7=AD=BE=E5=88=B0=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=EF=BC=8C=E5=9C=A8=E9=A6=96=E9=A1=B5=E5=B1=95=E7=A4=BA?= =?UTF-8?q?=EF=BC=8C=E8=B7=9F=E5=9C=A8=E9=9D=92=E5=B0=91=E5=B9=B4=E6=A8=A1?= =?UTF-8?q?=E5=BC=8F=E4=B8=8B=EF=BC=8C=202=EF=BC=9A=E5=9C=A8=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E9=A1=B5=E9=9D=A2=E5=B1=95=E7=A4=BA=E7=AD=BE=E5=88=B0?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xscm/moduleutil/http/ApiServer.java | 10 +++ .../xscm/moduleutil/http/RetrofitClient.java | 77 +++++++++++++++++++ .../com/xscm/moduleutil/widget/Constants.java | 3 + .../activity/room/contacts/VoiceContacts.java | 5 ++ .../activity/room/fragment/VoiceFragment.java | 23 +++++- .../room/presenter/VoicePresenter.java | 19 +++++ .../user/activity/DailyTasksActivity.java | 16 +++- 7 files changed, 150 insertions(+), 3 deletions(-) diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/http/ApiServer.java b/BaseModule/src/main/java/com/xscm/moduleutil/http/ApiServer.java index 34bbfab6..e9bb7533 100644 --- a/BaseModule/src/main/java/com/xscm/moduleutil/http/ApiServer.java +++ b/BaseModule/src/main/java/com/xscm/moduleutil/http/ApiServer.java @@ -919,4 +919,14 @@ public interface ApiServer { @FormUrlEncoded @POST(Constants.POST_SIGN_REFUSE) Call> signRefuse(@Field("room_id") String room_id); + + + @GET(Constants.GET_SIGN_IN_LIST) + Call>> signIn(); + + @GET(Constants.POST_DAILY_TASKS_SIGN) + Call> postDailyTasksSign(); + + @GET(Constants.POST_DAILY_TASKS_SIGN_STATUS) + Call> postDailyTasksSignStatus(); } 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 1f085d78..ea205073 100644 --- a/BaseModule/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java +++ b/BaseModule/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java @@ -4933,6 +4933,83 @@ public class RetrofitClient { } } + public void signIn(BaseObserver> observer) { + sApiServer.signIn().enqueue(new Callback>>(){ + + @Override + public void onResponse(Call>> call, Response>> response) { + if (response.code()==200){ + BaseModel> baseModel = response.body(); + if (baseModel.getCode()==1){ + observer.onNext(baseModel.getData()); + }else if (baseModel.getCode()==0){ + com.hjq.toast.ToastUtils.show(baseModel.getMsg()); + }else if (baseModel.getCode()==301){ + try { + CommonAppContext.getInstance().clearLoginInfo(); + ToastUtils.showShort(baseModel.getMsg()); + } catch (ClassNotFoundException e) { + throw new RuntimeException(e); + } + } + }else { + LogUtils.e("signIn",response.errorBody()); + } + } + + @Override + public void onFailure(Call>> call, Throwable t) { + LogUtils.e("signIn", t.fillInStackTrace()); + } + }); + + } + public void dailyTasksSign(BaseObserver observer) { + sApiServer.postDailyTasksSign().enqueue(new Callback>(){ + + @Override + public void onResponse(Call> call, Response> response) { + onNextRetu(response, observer); + } + + @Override + public void onFailure(Call> call, Throwable t) { + LogUtils.e("signIn", t.fillInStackTrace()); + } + }); + + } + public void tasksSignStatus(BaseObserver observer) { + sApiServer.postDailyTasksSignStatus().enqueue(new Callback>(){ + + @Override + public void onResponse(Call> call, Response> response) { + if (response.code()==200){ + BaseModel baseModel = response.body(); + if (baseModel.getCode()==1){ + observer.onNext(baseModel.getData()); + }else if (baseModel.getCode()==0){ + com.hjq.toast.ToastUtils.show(baseModel.getMsg()); + }else if (baseModel.getCode()==301){ + try { + CommonAppContext.getInstance().clearLoginInfo(); + ToastUtils.showShort(baseModel.getMsg()); + } catch (ClassNotFoundException e) { + throw new RuntimeException(e); + } + } + }else { + LogUtils.e("postDailyTasksSignStatus",response.errorBody()); + } + } + + @Override + public void onFailure(Call> call, Throwable t) { + LogUtils.e("postDailyTasksSignStatus", t.fillInStackTrace()); + } + }); + + } } diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/widget/Constants.java b/BaseModule/src/main/java/com/xscm/moduleutil/widget/Constants.java index fbc36ffd..63d77d95 100644 --- a/BaseModule/src/main/java/com/xscm/moduleutil/widget/Constants.java +++ b/BaseModule/src/main/java/com/xscm/moduleutil/widget/Constants.java @@ -437,6 +437,9 @@ public class Constants { public static final String POST_FREE_RE_SIGN = "/api/Sign/free_re_sign";//免费续约 public static final String POST_RE_SIGN = "/api/Sign/re_sign";//续签（花金币） public static final String POST_SIGN_REFUSE = "/api/RoomPit/refuse_sign_room_host_invite";//签约房间主持邀请上签约麦用户拒绝 + public static final String GET_SIGN_IN_LIST = "/api/Tasks/dailyTasksSignList";//签到列表页面 + public static final String POST_DAILY_TASKS_SIGN = "/api/Tasks/dailyTasksSign";//每日签到 + public static final String POST_DAILY_TASKS_SIGN_STATUS = "/api/Tasks/dailyTasksSignStatus";//每日签到状态 diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/room/contacts/VoiceContacts.java b/MainModule/src/main/java/com/xscm/modulemain/activity/room/contacts/VoiceContacts.java index aa63a302..4f5c19b7 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/activity/room/contacts/VoiceContacts.java +++ b/MainModule/src/main/java/com/xscm/modulemain/activity/room/contacts/VoiceContacts.java @@ -5,6 +5,7 @@ import android.app.Activity; import com.xscm.moduleutil.activity.IPresenter; import com.xscm.moduleutil.activity.IView; import com.xscm.moduleutil.bean.ActivitiesPermission; +import com.xscm.moduleutil.bean.TasksSignStatus; public final class VoiceContacts { @@ -15,6 +16,8 @@ public final class VoiceContacts { void hideRecommend(boolean hideRecommend,boolean hideGame); void activitiesPermissionSuccess(ActivitiesPermission activitiesPermission); + void tasksSignStatus(TasksSignStatus tasksSignStatus); + } public interface IIndexPre extends IPresenter { @@ -25,6 +28,8 @@ public final class VoiceContacts { void activitiesPermission();//活动弹框权限 + void tasksSignStatus(); + } } diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/VoiceFragment.java b/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/VoiceFragment.java index 8946c0df..f4459607 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/VoiceFragment.java +++ b/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/VoiceFragment.java @@ -17,10 +17,12 @@ import com.xscm.modulemain.activity.room.activity.SearchActivity; import com.xscm.modulemain.activity.room.contacts.VoiceContacts; import com.xscm.modulemain.databinding.FragmentVoiceBinding; import com.xscm.modulemain.activity.room.presenter.VoicePresenter; +import com.xscm.modulemain.dialog.SignInDialog; import com.xscm.moduleutil.adapter.MyFragmentPagerAdapter; import com.xscm.moduleutil.base.BaseMvpFragment; import com.xscm.moduleutil.bean.ActivitiesPermission; import com.xscm.moduleutil.bean.FirstChargeGiftBean; +import com.xscm.moduleutil.bean.TasksSignStatus; import com.xscm.moduleutil.dialog.FirstChargeDialog; import com.xscm.moduleutil.dialog.RechargeDialogFragment; import com.xscm.modulemain.dialog.YouthModelDialog; @@ -33,6 +35,8 @@ import java.util.concurrent.TimeUnit; import io.reactivex.Observable; import io.reactivex.android.schedulers.AndroidSchedulers; +import kotlin.Unit; +import kotlin.jvm.functions.Function0; public class VoiceFragment extends BaseMvpFragment implements VoiceContacts.View { @@ -98,7 +102,7 @@ public class VoiceFragment extends BaseMvpFragment() { + @Override + public Unit invoke() { + MvpPre.activitiesPermission(); + return null; + } + }); + signInDialog.show(); + } + } + private void setDialog(){ if(ActivityUtils.getTopActivity() instanceof MainActivity){ ((MainActivity)ActivityUtils.getTopActivity()).dialogUp(); diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/room/presenter/VoicePresenter.java b/MainModule/src/main/java/com/xscm/modulemain/activity/room/presenter/VoicePresenter.java index a12f2387..a2f74581 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/activity/room/presenter/VoicePresenter.java +++ b/MainModule/src/main/java/com/xscm/modulemain/activity/room/presenter/VoicePresenter.java @@ -4,6 +4,7 @@ import android.content.Context; import com.xscm.modulemain.activity.room.contacts.VoiceContacts; import com.xscm.moduleutil.bean.ActivitiesPermission; +import com.xscm.moduleutil.bean.TasksSignStatus; import com.xscm.moduleutil.http.BaseObserver; import com.xscm.moduleutil.presenter.BasePresenter; @@ -134,4 +135,22 @@ public class VoicePresenter extends BasePresenter implements } }); } + + @Override + public void tasksSignStatus() { + api.tasksSignStatus(new BaseObserver() { + + @Override + public void onSubscribe(Disposable d) { + addDisposable(d); + } + + @Override + public void onNext(TasksSignStatus tasksSignStatus) { + if (MvpRef==null) + MvpRef=new WeakReference<>(mView); + MvpRef.get().tasksSignStatus(tasksSignStatus); + } + }); + } } \ No newline at end of file diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/DailyTasksActivity.java b/MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/DailyTasksActivity.java index dbb0107f..910f8445 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/DailyTasksActivity.java +++ b/MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/DailyTasksActivity.java @@ -24,10 +24,10 @@ import com.xscm.modulemain.activity.user.conacts.DailyTasksConacts; import com.xscm.modulemain.activity.user.presenter.DailyTasksPresenter; import com.xscm.modulemain.BaseMvpActivity; import com.xscm.modulemain.activity.WebViewActivity; +import com.xscm.modulemain.dialog.SignInDialog; import com.xscm.modulemain.manager.RoomManager; import com.xscm.moduleutil.base.CommonAppContext; import com.xscm.moduleutil.bean.RoomMessageEvent; -import com.xscm.moduleutil.bean.TaskDataBean; import com.xscm.moduleutil.utils.CustomMsgCode; import com.xscm.moduleutil.base.WebUrlConstants; import com.xscm.moduleutil.bean.GiftBoxBean; @@ -45,6 +45,8 @@ import java.util.concurrent.TimeUnit; import io.reactivex.Observable; import io.reactivex.android.schedulers.AndroidSchedulers; +import kotlin.Unit; +import kotlin.jvm.functions.Function0; /** * @author qx @@ -110,7 +112,8 @@ public class DailyTasksActivity extends BaseMvpActivity() { + @Override + public Unit invoke() { + MvpPre.tasksLihen(); + return null; + } + }); + sginDialog.show(); break; default: switch (item.getJump_type()) {