1.添加首页接口

.idea/misc.xml

@@ -13,7 +13,7 @@
         <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/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.1" />
+        <entry key="..\:/workspace/hcp-pad/baselib/src/main/res/layout/fragment_task.xml" value="0.264" />
         <entry key="..\:/workspace/hcp-pad/calendarview/src/main/res/drawable-v21/cv_bg_material.xml" value="0.219" />
         <entry key="..\:/workspace/hcp-pad/calendarview/src/main/res/layout/cv_layout_calendar_view.xml" value="0.1" />
         <entry key="..\:/workspace/hcp-pad/calendarview/src/main/res/layout/cv_week_bar.xml" value="0.1" />

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

@@ -7,6 +7,7 @@ import com.alibaba.android.arouter.facade.annotation.Route
 import com.bumptech.glide.Glide
 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
@@ -45,6 +46,25 @@ class HomeActivity : BaseMVVMActivity<ActivityHomeBinding, HomeViewModel>() {
         binding {
             rvGame.layoutManager = GridLayoutManager(this@HomeActivity, 2)
             rvGame.adapter = gameAdapter
+            gameAdapter.onGameImageClickListener = {
+                if (it.currentLevel == it.totalLevel) {
+                    TipDialogFragment.TipDialogBuilder()
+                        .title("当前游戏已通关，是否重新开始？", 0)
+                        .leftBtnText("确定")
+                        .rightBtnText("取消")
+                        .leftClick({
+                            jumpWebView(it)
+                            null
+                        }, true)
+                        .rightClick({
+                            null
+                        }, true)
+                        .outCancel(true)
+                        .show(supportFragmentManager)
+                } else {
+                    jumpWebView(it)
+                }
+            }
         }
         Glide.with(this@HomeActivity)
             .load("file:///android_asset/fish.GIF")
@@ -156,13 +176,18 @@ class HomeActivity : BaseMVVMActivity<ActivityHomeBinding, HomeViewModel>() {
                     if (it.currentTaskNum == it.totalTaskNum) {
                         if (TextUtils.equals("0", it.status)) {
                             //任务完成
-                            if (TextUtils.equals(User.getNowDay(), User.getTaskDialogStatus())
-                                    .not()
-                            ) {
+                            if (TextUtils.equals(User.getNowDay(), User.getTaskDialogStatus()).not()) {
                                 User.saveTaskDialogStatus(User.getNowDay())
                                 showTipDialog()
                             } else {
-                                showLayout(false)
+                                showLayout(true)
+                                getGameList()
+                            }
+                        } else {
+                            showLayout(false)
+                            if (TextUtils.equals(User.getNowDay(), User.getTaskDialogStatus()).not()) {
+                                playVoice?.speak(it.taskDesn)
+                                showTaskDialog(it.taskDesn)
                             }
                         }
                     } else {
@@ -173,8 +198,6 @@ class HomeActivity : BaseMVVMActivity<ActivityHomeBinding, HomeViewModel>() {
                         }
                     }
                 }
-
-
             } else {
                 showLayout(true)
                 getGameList()
@@ -238,4 +261,13 @@ class HomeActivity : BaseMVVMActivity<ActivityHomeBinding, HomeViewModel>() {
         }
         super.onDestroy()
     }
+
+    /**
+     * 跳转游戏列表
+     */
+    private fun jumpWebView(bean: Record) {
+        val str = bean.gameUrl + "?gameCode=" + bean.gameCode + "&gameLevel=" + bean.currentLevel +
+                "&playClass=" + bean.playClass + "&userToken=" + User.getToken()
+        JumpUtil.jumpActivityWithUrl(RouterUrlCommon.WEB_VIEW_INTERACTION_JS, str)
+    }
 }

home/src/main/res/layout/activity_home.xml

@@ -51,7 +51,7 @@
                         android:layout_marginEnd="@dimen/divider_31px"
                         android:background="@drawable/bg_home_title"
                         android:gravity="center"
-                        android:text='@{User.INSTANCE.name+"，欢迎你使用未来海豚"}'
+                        android:text='@{User.INSTANCE.name+"，欢迎你使用未来蓝豚"}'
                         android:textColor="@color/color_FF4A76FF"
                         android:textSize="@dimen/divider_24px"
                         app:layout_constraintBottom_toBottomOf="parent"

login/src/main/res/values/strings.xml

@@ -4,5 +4,5 @@
     <string name="prompt_password" tools:ignore="ResourceName">请输入密码</string>
     <string name="action_sign_in" tools:ignore="ResourceName">登录</string>
     <string name="account_login" tools:ignore="ResourceName">账号登录</string>
-    <string name="future_dolphin_awareness_platform" tools:ignore="ResourceName">未来海豚认知平台</string>
+    <string name="future_dolphin_awareness_platform" tools:ignore="ResourceName">未来蓝豚认知平台</string>
 </resources>