|
|
@@ -95,121 +95,115 @@
|
|
|
app:layout_constraintStart_toStartOf="parent"
|
|
|
app:layout_constraintTop_toTopOf="parent">
|
|
|
|
|
|
- <LinearLayout
|
|
|
- android:layout_width="match_parent"
|
|
|
+ <androidx.cardview.widget.CardView
|
|
|
+ android:id="@+id/videoLayout"
|
|
|
+ android:layout_width="0dp"
|
|
|
android:layout_height="match_parent"
|
|
|
- android:orientation="horizontal">
|
|
|
+ android:layout_marginStart="@dimen/divider_30px"
|
|
|
+ android:layout_marginTop="@dimen/divider_41px"
|
|
|
+ android:layout_marginEnd="@dimen/divider_15px"
|
|
|
+ android:layout_weight="1"
|
|
|
+ app:cardBackgroundColor="@android:color/white"
|
|
|
+ app:cardCornerRadius="@dimen/divider_26px"
|
|
|
+ app:layout_constraintBottom_toBottomOf="parent"
|
|
|
+ app:layout_constraintStart_toStartOf="parent"
|
|
|
+ app:layout_constraintTop_toTopOf="parent">
|
|
|
|
|
|
- <androidx.cardview.widget.CardView
|
|
|
- android:id="@+id/videoLayout"
|
|
|
- android:layout_width="0dp"
|
|
|
- android:layout_height="match_parent"
|
|
|
- android:layout_marginStart="@dimen/divider_30px"
|
|
|
- android:layout_marginTop="@dimen/divider_41px"
|
|
|
- android:layout_marginEnd="@dimen/divider_15px"
|
|
|
- android:layout_weight="1"
|
|
|
- app:cardBackgroundColor="@android:color/white"
|
|
|
- app:cardCornerRadius="@dimen/divider_26px"
|
|
|
- app:layout_constraintBottom_toBottomOf="parent"
|
|
|
- app:layout_constraintStart_toStartOf="parent"
|
|
|
- app:layout_constraintTop_toTopOf="parent">
|
|
|
+ <com.tencent.liteav.demo.superplayer.SuperPlayerView
|
|
|
+ android:id="@+id/play_tx_cloud_view"
|
|
|
+ android:layout_width="match_parent"
|
|
|
+ android:layout_height="match_parent" />
|
|
|
|
|
|
- <com.tencent.liteav.demo.superplayer.SuperPlayerView
|
|
|
- android:id="@+id/play_tx_cloud_view"
|
|
|
- android:layout_width="match_parent"
|
|
|
- android:layout_height="match_parent" />
|
|
|
+ </androidx.cardview.widget.CardView>
|
|
|
|
|
|
- </androidx.cardview.widget.CardView>
|
|
|
+ <com.google.android.material.card.MaterialCardView
|
|
|
+ android:layout_width="0dp"
|
|
|
+ android:layout_height="match_parent"
|
|
|
+ android:layout_marginStart="@dimen/divider_15px"
|
|
|
+ android:layout_marginTop="@dimen/divider_41px"
|
|
|
+ android:layout_marginEnd="@dimen/divider_31px"
|
|
|
+ android:layout_weight="1"
|
|
|
+ android:theme="@style/Theme.MaterialComponents.NoActionBar"
|
|
|
+ app:cardBackgroundColor="@android:color/white"
|
|
|
+ app:cardCornerRadius="@dimen/divider_26px"
|
|
|
+ app:layout_constraintBottom_toBottomOf="parent"
|
|
|
+ app:layout_constraintStart_toStartOf="parent"
|
|
|
+ app:layout_constraintTop_toTopOf="parent">
|
|
|
|
|
|
- <com.google.android.material.card.MaterialCardView
|
|
|
- android:layout_width="0dp"
|
|
|
- android:layout_height="match_parent"
|
|
|
- android:layout_marginStart="@dimen/divider_15px"
|
|
|
- android:layout_marginTop="@dimen/divider_41px"
|
|
|
- android:layout_marginEnd="@dimen/divider_31px"
|
|
|
- android:layout_weight="1"
|
|
|
- android:theme="@style/Theme.MaterialComponents.NoActionBar"
|
|
|
- app:cardBackgroundColor="@android:color/white"
|
|
|
- app:cardCornerRadius="@dimen/divider_26px"
|
|
|
- app:layout_constraintBottom_toBottomOf="parent"
|
|
|
- app:layout_constraintStart_toStartOf="parent"
|
|
|
- app:layout_constraintTop_toTopOf="parent">
|
|
|
+ <androidx.constraintlayout.widget.ConstraintLayout
|
|
|
+ android:layout_width="match_parent"
|
|
|
+ android:layout_height="match_parent">
|
|
|
|
|
|
- <androidx.constraintlayout.widget.ConstraintLayout
|
|
|
- android:layout_width="match_parent"
|
|
|
- android:layout_height="match_parent">
|
|
|
+ <androidx.appcompat.widget.AppCompatTextView
|
|
|
+ android:id="@+id/tvScientificPrinciple"
|
|
|
+ android:layout_width="@dimen/divider_180px"
|
|
|
+ android:layout_height="@dimen/divider_53px"
|
|
|
+ android:layout_marginTop="@dimen/divider_29px"
|
|
|
+ android:background="@drawable/bg_scientific_principle"
|
|
|
+ android:fontFamily="@font/lcb"
|
|
|
+ android:gravity="center"
|
|
|
+ android:includeFontPadding="false"
|
|
|
+ android:text="@string/game_introduction"
|
|
|
+ android:textColor="@color/color_FFA54A0B"
|
|
|
+ android:textSize="@dimen/divider_26px"
|
|
|
+ app:layout_constraintEnd_toEndOf="parent"
|
|
|
+ app:layout_constraintStart_toStartOf="parent"
|
|
|
+ app:layout_constraintTop_toTopOf="parent" />
|
|
|
|
|
|
- <androidx.appcompat.widget.AppCompatTextView
|
|
|
- android:id="@+id/tvScientificPrinciple"
|
|
|
- android:layout_width="@dimen/divider_180px"
|
|
|
- android:layout_height="@dimen/divider_53px"
|
|
|
- android:layout_marginTop="@dimen/divider_29px"
|
|
|
- android:background="@drawable/bg_scientific_principle"
|
|
|
- android:fontFamily="@font/lcb"
|
|
|
- android:gravity="center"
|
|
|
- android:includeFontPadding="false"
|
|
|
- android:text="@string/game_introduction"
|
|
|
- android:textColor="@color/color_FFA54A0B"
|
|
|
- android:textSize="@dimen/divider_26px"
|
|
|
- app:layout_constraintEnd_toEndOf="parent"
|
|
|
- app:layout_constraintStart_toStartOf="parent"
|
|
|
- app:layout_constraintTop_toTopOf="parent" />
|
|
|
-
|
|
|
- <androidx.appcompat.widget.AppCompatTextView
|
|
|
- android:id="@+id/tvScientificPrincipleInfo"
|
|
|
- android:layout_width="match_parent"
|
|
|
- android:layout_height="0dp"
|
|
|
- android:layout_marginStart="@dimen/divider_53px"
|
|
|
- android:layout_marginTop="@dimen/divider_18px"
|
|
|
- android:layout_marginEnd="@dimen/divider_30px"
|
|
|
- android:fontFamily="@font/lcb"
|
|
|
- android:includeFontPadding="false"
|
|
|
- android:scrollbars="vertical"
|
|
|
- android:text="@{data.desn}"
|
|
|
- android:textColor="@color/color_FFA54A0B"
|
|
|
- android:textSize="@dimen/divider_22px"
|
|
|
- app:layout_constraintBottom_toTopOf="@+id/tvTrainingSkill"
|
|
|
- app:layout_constraintEnd_toEndOf="parent"
|
|
|
- app:layout_constraintStart_toStartOf="parent"
|
|
|
- app:layout_constraintTop_toBottomOf="@+id/tvScientificPrinciple" />
|
|
|
+ <androidx.appcompat.widget.AppCompatTextView
|
|
|
+ android:id="@+id/tvScientificPrincipleInfo"
|
|
|
+ android:layout_width="match_parent"
|
|
|
+ android:layout_height="0dp"
|
|
|
+ android:layout_marginStart="@dimen/divider_53px"
|
|
|
+ android:layout_marginTop="@dimen/divider_18px"
|
|
|
+ android:layout_marginEnd="@dimen/divider_30px"
|
|
|
+ android:fontFamily="@font/lcb"
|
|
|
+ android:includeFontPadding="false"
|
|
|
+ android:scrollbars="vertical"
|
|
|
+ android:text="@{data.desn}"
|
|
|
+ android:textColor="@color/color_FFA54A0B"
|
|
|
+ android:textSize="@dimen/divider_22px"
|
|
|
+ app:layout_constraintBottom_toTopOf="@+id/tvTrainingSkill"
|
|
|
+ app:layout_constraintEnd_toEndOf="parent"
|
|
|
+ app:layout_constraintStart_toStartOf="parent"
|
|
|
+ app:layout_constraintTop_toBottomOf="@+id/tvScientificPrinciple" />
|
|
|
|
|
|
- <androidx.appcompat.widget.AppCompatTextView
|
|
|
- android:id="@+id/tvTrainingSkill"
|
|
|
- android:layout_width="@dimen/divider_180px"
|
|
|
- android:layout_height="@dimen/divider_53px"
|
|
|
- android:layout_marginTop="@dimen/divider_10px"
|
|
|
- android:layout_marginBottom="@dimen/divider_16px"
|
|
|
- android:background="@drawable/bg_scientific_principle"
|
|
|
- android:fontFamily="@font/lcb"
|
|
|
- android:gravity="center"
|
|
|
- android:includeFontPadding="false"
|
|
|
- android:text="@string/training_skill"
|
|
|
- android:textColor="@color/color_FFA54A0B"
|
|
|
- android:textSize="@dimen/divider_26px"
|
|
|
- app:layout_constraintBottom_toTopOf="@+id/tvGameType"
|
|
|
- app:layout_constraintEnd_toEndOf="parent"
|
|
|
- app:layout_constraintStart_toStartOf="parent"
|
|
|
- app:layout_constraintTop_toBottomOf="@+id/tvScientificPrincipleInfo" />
|
|
|
+ <androidx.appcompat.widget.AppCompatTextView
|
|
|
+ android:id="@+id/tvTrainingSkill"
|
|
|
+ android:layout_width="@dimen/divider_180px"
|
|
|
+ android:layout_height="@dimen/divider_53px"
|
|
|
+ android:layout_marginTop="@dimen/divider_10px"
|
|
|
+ android:layout_marginBottom="@dimen/divider_16px"
|
|
|
+ android:background="@drawable/bg_scientific_principle"
|
|
|
+ android:fontFamily="@font/lcb"
|
|
|
+ android:gravity="center"
|
|
|
+ android:includeFontPadding="false"
|
|
|
+ android:text="@string/training_skill"
|
|
|
+ android:textColor="@color/color_FFA54A0B"
|
|
|
+ android:textSize="@dimen/divider_26px"
|
|
|
+ app:layout_constraintBottom_toTopOf="@+id/tvGameType"
|
|
|
+ app:layout_constraintEnd_toEndOf="parent"
|
|
|
+ app:layout_constraintStart_toStartOf="parent"
|
|
|
+ app:layout_constraintTop_toBottomOf="@+id/tvScientificPrincipleInfo" />
|
|
|
|
|
|
- <androidx.appcompat.widget.AppCompatTextView
|
|
|
- android:id="@+id/tvGameType"
|
|
|
- android:layout_width="@dimen/divider_146px"
|
|
|
- android:layout_height="@dimen/divider_46px"
|
|
|
- android:layout_marginBottom="@dimen/divider_16px"
|
|
|
- android:background="@drawable/bg_game_type"
|
|
|
- android:fontFamily="@font/lcb"
|
|
|
- android:gravity="center"
|
|
|
- android:includeFontPadding="false"
|
|
|
- android:text="@{data.gameType}"
|
|
|
- android:textColor="@color/color_FFA54A0B"
|
|
|
- android:textSize="@dimen/divider_22px"
|
|
|
- app:layout_constraintBottom_toBottomOf="parent"
|
|
|
- app:layout_constraintEnd_toEndOf="parent"
|
|
|
- app:layout_constraintStart_toStartOf="parent" />
|
|
|
+ <androidx.appcompat.widget.AppCompatTextView
|
|
|
+ android:id="@+id/tvGameType"
|
|
|
+ android:layout_width="@dimen/divider_146px"
|
|
|
+ android:layout_height="@dimen/divider_46px"
|
|
|
+ android:layout_marginBottom="@dimen/divider_16px"
|
|
|
+ android:background="@drawable/bg_game_type"
|
|
|
+ android:fontFamily="@font/lcb"
|
|
|
+ android:gravity="center"
|
|
|
+ android:includeFontPadding="false"
|
|
|
+ android:text="@{data.gameType}"
|
|
|
+ android:textColor="@color/color_FFA54A0B"
|
|
|
+ android:textSize="@dimen/divider_22px"
|
|
|
+ app:layout_constraintBottom_toBottomOf="parent"
|
|
|
+ app:layout_constraintEnd_toEndOf="parent"
|
|
|
+ app:layout_constraintStart_toStartOf="parent" />
|
|
|
|
|
|
- </androidx.constraintlayout.widget.ConstraintLayout>
|
|
|
- </com.google.android.material.card.MaterialCardView>
|
|
|
- </LinearLayout>
|
|
|
+ </androidx.constraintlayout.widget.ConstraintLayout>
|
|
|
+ </com.google.android.material.card.MaterialCardView>
|
|
|
</LinearLayout>
|
|
|
|
|
|
<androidx.appcompat.widget.AppCompatTextView
|
王鹏鹏