1.优化首页弹窗UI

.idea/misc.xml

@@ -21,7 +21,7 @@
         <entry key="..\:/workspace/hcp-pad/baselib/src/main/res/layout/activity_base_web_view.xml" value="0.1" />
         <entry key="..\:/workspace/hcp-pad/baselib/src/main/res/layout/dialog_loading.xml" value="0.136" />
         <entry key="..\:/workspace/hcp-pad/baselib/src/main/res/layout/dialog_tip.xml" value="0.264" />
-        <entry key="..\:/workspace/hcp-pad/baselib/src/main/res/layout/dialog_tips.xml" value="0.1" />
+        <entry key="..\:/workspace/hcp-pad/baselib/src/main/res/layout/dialog_tips.xml" value="0.6" />
         <entry key="..\:/workspace/hcp-pad/baselib/src/main/res/layout/fragment_base.xml" value="0.1" />
         <entry key="..\:/workspace/hcp-pad/baselib/src/main/res/layout/fragment_dialog_base.xml" value="0.152" />
         <entry key="..\:/workspace/hcp-pad/baselib/src/main/res/layout/fragment_task.xml" value="0.152" />

baselib/src/main/res/layout/dialog_tips.xml

@@ -38,6 +38,7 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/divider_65px"
             android:layout_marginTop="@dimen/divider_29px"
+            android:gravity="center_horizontal"
             android:layout_marginEnd="@dimen/divider_32px"
             android:textColor="@color/color_FF333333"
             android:textSize="@dimen/divider_28px"

home/src/main/java/com/yingyangfly/home/activity/HomeActivity.kt

@@ -6,7 +6,6 @@ import androidx.recyclerview.widget.GridLayoutManager
 import com.alibaba.android.arouter.facade.annotation.Route
 import com.yingyang.home.databinding.ActivityHomeBinding
 import com.yingyangfly.baselib.dialog.TaskFragment
-import com.yingyangfly.baselib.dialog.TipDialogFragment
 import com.yingyangfly.baselib.dialog.TipsDialog
 import com.yingyangfly.baselib.ext.setOnSingleClickListener
 import com.yingyangfly.baselib.ext.show
@@ -59,18 +58,18 @@ class HomeActivity : BaseMVVMActivity<ActivityHomeBinding, HomeViewModel>() {
             rvGame.adapter = gameAdapter
             gameAdapter.onGameImageClickListener = {
                 if (it.currentLevel == it.totalNum) {
-                    TipDialogFragment.TipDialogBuilder()
-                        .title("当前游戏已通关，是否重新开始？", 0)
-                        .leftBtnText("确定")
-                        .rightBtnText("取消")
+                    TipsDialog.TipDialogBuilder()
+                        .title("恭喜您")
+                        .content("当前游戏已通关，是否重新开始？")
+                        .leftBtnText("取消")
+                        .rightBtnText("确定")
                         .leftClick({
-                            jumpWebView(it, true)
                             null
                         }, true)
                         .rightClick({
+                            jumpWebView(it, true)
                             null
                         }, true)
-                        .outCancel(true)
                         .show(supportFragmentManager)
                 } else {
                     jumpWebView(it, false)
@@ -307,8 +306,9 @@ class HomeActivity : BaseMVVMActivity<ActivityHomeBinding, HomeViewModel>() {
      * 训练完成弹窗页面
      */
     private fun showTipDialog() {
-        TipsDialog.TipDialogBuilder().title("恭喜您")
-            .content("恭喜您 您完成了今天的专属训练！今天的训练报告已生成，快去查看吧！")
+        TipsDialog.TipDialogBuilder()
+            .title("恭喜您")
+            .content("您完成了今天的专属训练！今天的训练报告已生成，快去查看吧！")
             .leftBtnText("稍后再看")
             .rightBtnText("立即查看")
             .leftClick({

workbenches/src/main/java/com/yingyang/workbenches/WorkbenchesActivity.kt

@@ -9,7 +9,6 @@ import com.yingyang.workbenches.adapter.TaskAdapter
 import com.yingyang.workbenches.databinding.ActivityWorkbenchesBinding
 import com.yingyang.workbenches.entity.Record
 import com.yingyangfly.baselib.dialog.TaskFragment
-import com.yingyangfly.baselib.dialog.TipDialogFragment
 import com.yingyangfly.baselib.dialog.TipsDialog
 import com.yingyangfly.baselib.ext.setOnSingleClickListener
 import com.yingyangfly.baselib.ext.show
@@ -48,7 +47,7 @@ class WorkbenchesActivity : BaseMVVMActivity<ActivityWorkbenchesBinding, Workben
         }
         gameAdapter.onGameImageClickListener = { bean ->
             if (bean.currentLevel == bean.totalLevel) {
-                TipDialogFragment.TipDialogBuilder()
+                TipsDialog.TipDialogBuilder()
                     .title("当前游戏已通关，是否重新开始？", 0)
                     .leftBtnText("确定")
                     .rightBtnText("取消")
@@ -59,7 +58,6 @@ class WorkbenchesActivity : BaseMVVMActivity<ActivityWorkbenchesBinding, Workben
                     .rightClick({
                         null
                     }, true)
-                    .outCancel(true)
                     .show(supportFragmentManager)
             } else {
                 jumpWebView(bean)
@@ -137,7 +135,7 @@ class WorkbenchesActivity : BaseMVVMActivity<ActivityWorkbenchesBinding, Workben
      */
     private fun showTipDialog() {
         TipsDialog.TipDialogBuilder().title("恭喜您")
-            .content("恭喜您 您完成了今天的专属训练！今天的训练报告已生成，快去查看吧！")
+            .content("您完成了今天的专属训练！今天的训练报告已生成，快去查看吧！")
             .leftBtnText("稍后再看")
             .rightBtnText("立即查看")
             .leftClick({

workbenches/src/main/java/com/yingyang/workbenches/net/WorkbenchesApiService.kt

@@ -42,7 +42,11 @@ interface WorkbenchesApiService {
      * @param gameType
      */
     @POST("app/game/freePlay")
-    suspend fun getTrainingList(@Query("gameType") gameType: String, @Query("page") page: Int, @Query("limit") limit: String): BaseResp<FreeTrainBean>
+    suspend fun getTrainingList(
+        @Query("gameType") gameType: String,
+        @Query("page") page: Int,
+        @Query("limit") limit: String
+    ): BaseResp<FreeTrainBean>
 
     /**
      * 获取自由训练类型列表
@@ -80,4 +84,10 @@ interface WorkbenchesApiService {
      */
     @POST("app/pay/queryMyOrder")
     suspend fun getQueryMyOrder(): BaseResp<List<OrderBean>>
+
+    /**
+     * 获取游戏详情
+     */
+    @POST("game/params/user/detail")
+    suspend fun getGameDetail(@Query("id") id: String): BaseResp<Record>
 }