hurixing vor 1 Jahr
Ursprung
Commit
fbb1527de5

+ 2 - 0
game/src/main/java/com/yingyangfly/game/play/PlayGameActivity.kt

@@ -641,6 +641,8 @@ class PlayGameActivity : BaseMVVMActivity<ActivityPlayGameBinding, PlayGameViewM
                 if (TextUtils.equals("2", isPass)) {
                     LiveEventBusUtil.send(RxBusCodes.QUITGAME, "")
                     finish()
+                } else if (TextUtils.equals("A", playClass) && !TextUtils.equals("0", isPass)){
+                    showCompletionTrainingDialog(gameDataBean)
                 } else if (TextUtils.equals("3", isPass)) {
                     if (TextUtils.equals("A", playClass) ){
                         showCompletionTrainingDialog(gameDataBean)

+ 1 - 1
game/src/main/res/layout/activity_play_game.xml

@@ -83,7 +83,7 @@
             <com.google.android.material.card.MaterialCardView
                 android:id="@+id/gameLayout"
                 android:layout_width="@dimen/divider_767px"
-                android:layout_height="@dimen/divider_668px"
+                android:layout_height="@dimen/divider_535px"
                 android:layout_marginStart="@dimen/divider_31px"
                 android:layout_marginTop="@dimen/divider_124px"
                 android:layout_marginBottom="@dimen/divider_42px"

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

@@ -63,6 +63,7 @@
     <dimen name="divider_464px" tools:ignore="ResourceName">464px</dimen>
     <dimen name="divider_460px" tools:ignore="ResourceName">460px</dimen>
     <dimen name="divider_458px" tools:ignore="ResourceName">458px</dimen>
+    <dimen name="divider_456px" tools:ignore="ResourceName">456px</dimen>
     <dimen name="divider_453px" tools:ignore="ResourceName">453px</dimen>
     <dimen name="divider_451px" tools:ignore="ResourceName">451px</dimen>
     <dimen name="divider_445px" tools:ignore="ResourceName">445px</dimen>

BIN
home/src/main/res/mipmap-xxhdpi/icon_data_img.png


BIN
home/src/main/res/mipmap-xxhdpi/icon_enjoy.png


BIN
home/src/main/res/mipmap-xxhdpi/icon_evaluation.png


BIN
home/src/main/res/mipmap-xxhdpi/icon_fun_time.png


BIN
home/src/main/res/mipmap-xxhdpi/icon_help.png


BIN
home/src/main/res/mipmap-xxhdpi/icon_news_information.png


BIN
home/src/main/res/mipmap-xxhdpi/icon_notify.png


BIN
home/src/main/res/mipmap-xxhdpi/icon_service_package.png


+ 1 - 1
home/src/main/res/values/strings.xml

@@ -83,5 +83,5 @@
     <string name="is_correct" tools:ignore="ResourceName">是否正确</string>
     <string name="hz_audio" tools:ignore="ResourceName">40HZ音频</string>
     <string name="return_to_upper_level" tools:ignore="ResourceName">返回上一级</string>
-    <string name="exclusive_training" tools:ignore="ResourceName">专属训练</string>
+    <string name="exclusive_training" tools:ignore="ResourceName">理疗任务</string>
 </resources>

+ 1 - 1
login/src/main/res/values/strings.xml

@@ -6,7 +6,7 @@
     <string name="action_sign_in" tools:ignore="ResourceName">登录</string>
     <string name="account_login" tools:ignore="ResourceName">账号登录</string>
     <string name="account_phone" tools:ignore="ResourceName">手机号登录</string>
-    <string name="future_dolphin_awareness_platform" tools:ignore="ResourceName">未来蓝豚认知平台</string>
+    <string name="future_dolphin_awareness_platform" tools:ignore="ResourceName">未来蓝豚强脑系统</string>
     <string name="get_verification_code" tools:ignore="ResourceName">获取验证码</string>
     <string name="app_model" tools:ignore="ResourceName">型号:YR-DTX-EP-01</string>
     <string name="app_version" tools:ignore="ResourceName">版本:V1.0.0</string>

+ 1 - 1
workbenches/src/main/res/values/strings.xml

@@ -56,7 +56,7 @@
     <string name="game_duration_info" tools:ignore="ResourceName">游戏时长(秒)</string>
     <string name="game_level" tools:ignore="ResourceName">游戏级别</string>
     <string name="status" tools:ignore="ResourceName">状态</string>
-    <string name="exclusive_training" tools:ignore="ResourceName">专属训练</string>
+    <string name="exclusive_training" tools:ignore="ResourceName">理疗任务</string>
     <string name="trends_changes_primary_brain_abilities" tools:ignore="ResourceName">一级脑能力变化趋势</string>
     <string name="pay_countdown" tools:ignore="ResourceName">支付倒计时:15分钟</string>
     <string name="physical_therapy_details" tools:ignore="ResourceName">理疗详情</string>