Browse Source

1.添加游戏介绍页面

王鹏鹏 2 years ago
parent
commit
212063b72b

+ 4 - 0
.idea/misc.xml

@@ -477,10 +477,14 @@
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/layout/item_training_content_details.xml" value="0.4" />
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/layout/layout_empty.xml" value="0.1" />
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/layout/spinner_list_item.xml" value="0.1" />
+        <entry key="..\:/workspace/hcp-pads/baselib/src/main/res/drawable/home_webview_progressbar_selector.xml" value="0.151" />
         <entry key="..\:/workspace/hcp-pads/baselib/src/main/res/layout/activity_base.xml" value="0.23697916666666666" />
+        <entry key="..\:/workspace/hcp-pads/baselib/src/main/res/layout/activity_base_web_view.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/hcp-pads/baselib/src/main/res/layout/dialog_loading.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/hcp-pads/baselib/src/main/res/layout/rv_empty.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/hcp-pads/game/src/main/res/drawable/bg_game_loading.xml" value="0.151" />
+        <entry key="..\:/workspace/hcp-pads/game/src/main/res/drawable/bg_game_progressbar_selector.xml" value="0.151" />
+        <entry key="..\:/workspace/hcp-pads/game/src/main/res/layout/activity_game_introduction.xml" value="0.22239583333333332" />
         <entry key="..\:/workspace/hcp-pads/game/src/main/res/layout/activity_game_loading.xml" value="0.22239583333333332" />
         <entry key="..\:/workspace/hcp-pads/game/src/main/res/layout/activity_main.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/hcp-pads/healthconsultation/src/main/res/layout/activity_consultation_request.xml" value="0.23697916666666666" />

+ 4 - 0
baselib/src/main/java/com/yingyangfly/baselib/router/RouterUrlCommon.kt

@@ -195,4 +195,8 @@ object RouterUrlCommon {
      */
     const val gameLoading = "/game/loading"
 
+    /**
+     * 游戏介绍
+     */
+    const val gameIntroduction = "/game/introduction"
 }

+ 6 - 0
game/src/main/AndroidManifest.xml

@@ -10,6 +10,12 @@
             android:screenOrientation="landscape"
             android:windowSoftInputMode="adjustResize|adjustPan" />
 
+        <activity
+            android:name="com.yingyangfly.game.introduction.GameIntroductionActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize"
+            android:screenOrientation="landscape"
+            android:windowSoftInputMode="adjustResize|adjustPan" />
+
     </application>
 
 </manifest>

+ 25 - 0
game/src/main/java/com/yingyangfly/game/introduction/GameIntroductionActivity.kt

@@ -0,0 +1,25 @@
+package com.yingyangfly.game.introduction
+
+import com.alibaba.android.arouter.facade.annotation.Route
+import com.yingyangfly.baselib.base.BaseActivity
+import com.yingyangfly.baselib.router.RouterUrlCommon
+import com.yingyangfly.game.databinding.ActivityGameIntroductionBinding
+
+/**
+ * 游戏介绍
+ */
+@Route(path = RouterUrlCommon.gameIntroduction)
+class GameIntroductionActivity : BaseActivity<ActivityGameIntroductionBinding>() {
+
+    override fun initViews() {
+
+    }
+
+    override fun initListener() {
+
+    }
+
+    override fun initData() {
+
+    }
+}

+ 20 - 2
game/src/main/java/com/yingyangfly/game/loading/GameLoadingActivity.kt

@@ -1,8 +1,12 @@
 package com.yingyangfly.game.loading
 
 import com.alibaba.android.arouter.facade.annotation.Route
+import com.bumptech.glide.Glide
+import com.yingyangfly.baselib.R
 import com.yingyangfly.baselib.base.BaseActivity
 import com.yingyangfly.baselib.router.RouterUrlCommon
+import com.yingyangfly.baselib.utils.JumpUtil
+import com.yingyangfly.baselib.utils.RxTimer
 import com.yingyangfly.game.databinding.ActivityGameLoadingBinding
 
 /**
@@ -11,8 +15,19 @@ import com.yingyangfly.game.databinding.ActivityGameLoadingBinding
 @Route(path = RouterUrlCommon.gameLoading)
 class GameLoadingActivity : BaseActivity<ActivityGameLoadingBinding>() {
 
-    override fun initViews() {
+    private lateinit var rxTimer: RxTimer
+    private var time: Long = 4
 
+    override fun initViews() {
+        rxTimer = RxTimer()
+        val m: Long = 1000
+        rxTimer.interval(m) {
+            binding.progressBar.progress = it.toInt() + 1
+            if (time == it) {
+                JumpUtil.jumpActivity(RouterUrlCommon.gameIntroduction, mContext)
+                finish()
+            }
+        }
     }
 
     override fun initListener() {
@@ -20,6 +35,9 @@ class GameLoadingActivity : BaseActivity<ActivityGameLoadingBinding>() {
     }
 
     override fun initData() {
-
+        Glide.with(mContext)
+            .asGif()
+            .load(R.drawable.fish)
+            .into(binding.loadingImage)
     }
 }

+ 6 - 0
game/src/main/manifest/AndroidManifest.xml

@@ -8,6 +8,12 @@
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:screenOrientation="landscape"
             android:windowSoftInputMode="adjustResize|adjustPan" />
+
+        <activity
+            android:name="com.yingyangfly.game.introduction.GameIntroductionActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize"
+            android:screenOrientation="landscape"
+            android:windowSoftInputMode="adjustResize|adjustPan" />
     </application>
 
 </manifest>

+ 28 - 0
game/src/main/res/drawable/bg_game_progressbar_selector.xml

@@ -0,0 +1,28 @@
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:ignore="MissingDefaultResource">
+
+    <item android:id="@android:id/background">
+        <shape>
+            <corners android:radius="@dimen/divider_19px" />
+            <gradient
+                android:angle="270"
+                android:centerColor="@android:color/white"
+                android:endColor="@android:color/white"
+                android:startColor="@android:color/white" />
+        </shape>
+    </item>
+    <item android:id="@android:id/progress">
+        <clip>
+            <shape>
+                <corners android:radius="@dimen/divider_19px" />
+                <gradient
+                    android:centerColor="@color/color_D63658F7"
+                    android:endColor="@color/color_D63658F7"
+                    android:startColor="@color/color_D63658F7" />
+
+            </shape>
+        </clip>
+    </item>
+
+</layer-list>

+ 14 - 0
game/src/main/res/layout/activity_game_introduction.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:ignore="ResourceName">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+
+
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>

+ 16 - 1
game/src/main/res/layout/activity_game_loading.xml

@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:ignore="ResourceName">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
@@ -16,6 +18,19 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
+        <ProgressBar
+            android:id="@+id/progressBar"
+            style="?android:attr/progressBarStyleHorizontal"
+            android:layout_width="@dimen/divider_527px"
+            android:layout_height="@dimen/divider_20px"
+            android:layout_marginTop="@dimen/divider_41px"
+            android:indeterminate="false"
+            android:max="4"
+            android:progressDrawable="@drawable/bg_game_progressbar_selector"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/loadingImage" />
+
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>

+ 1 - 0
game/src/main/res/values/colors.xml

@@ -2,4 +2,5 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
     <color name="color_FFD2DDFF" tools:ignore="ResourceName">#FFD2DDFF</color>
     <color name="color_FF9FBBFF" tools:ignore="ResourceName">#FF9FBBFF</color>
+    <color name="color_D63658F7" tools:ignore="ResourceName">#D63658F7</color>
 </resources>

+ 1 - 0
game/src/main/res/values/dimens.xml

@@ -12,6 +12,7 @@
     <dimen name="divider_597px" tools:ignore="ResourceName">597px</dimen>
     <dimen name="divider_561px" tools:ignore="ResourceName">561px</dimen>
     <dimen name="divider_533px" tools:ignore="ResourceName">533px</dimen>
+    <dimen name="divider_527px" tools:ignore="ResourceName">527px</dimen>
     <dimen name="divider_525px" tools:ignore="ResourceName">525px</dimen>
     <dimen name="divider_503px" tools:ignore="ResourceName">503px</dimen>
     <dimen name="divider_502px" tools:ignore="ResourceName">502px</dimen>

+ 1 - 1
workbenches/src/main/java/com/yingyang/workbenches/freetraining/FreeTrainActivity.kt

@@ -75,7 +75,7 @@ class FreeTrainActivity : BaseMVVMActivity<ActivityFreeTrainBinding, FreeTrainVi
                 val str =
                     bean.gameUrl + "?gameCode=" + bean.gameCode + "&isFull=false&isSound=true&playClass=" + bean.playClass +
                             "&userToken=" + User.getToken()
-                JumpUtil.jumpActivityWithUrl(RouterUrlCommon.WEB_VIEW_INTERACTION_JS, str, mContext)
+                JumpUtil.jumpActivityWithUrl(RouterUrlCommon.gameLoading, str, mContext)
             }
         }
     }