Browse Source

1.添加休闲健脑接口和UI

王鹏鹏 2 years ago
parent
commit
b5b21d314c

+ 1 - 0
.idea/misc.xml

@@ -83,6 +83,7 @@
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/layout/item_free_training_list.xml" value="0.8800000000000001" />
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/layout/item_free_training_type.xml" value="0.536" />
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/layout/item_game_list.xml" value="0.4" />
+        <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/layout/item_leisure_brain_list.xml" value="0.1" />
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/layout/item_task.xml" value="0.8800000000000001" />
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/layout/item_train_report.xml" value="0.536" />
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/layout/item_training_content.xml" value="0.176" />

+ 11 - 9
workbenches/src/main/res/layout/activity_service_package.xml

@@ -39,17 +39,19 @@
                 android:textStyle="bold" />
         </LinearLayout>
 
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="服务套餐"
-            android:textColor="@android:color/black"
-            android:textSize="@dimen/divider_36px"
-            android:textStyle="bold"
-            app:layout_constraintBottom_toBottomOf="parent"
+
+        <androidx.cardview.widget.CardView
+            android:layout_width="@dimen/divider_237px"
+            android:layout_height="@dimen/divider_68px"
+            app:cardBackgroundColor="@android:color/white"
+            app:cardCornerRadius="@dimen/divider_39px"
+            app:cardElevation="@dimen/divider_4px"
+            app:contentPadding="@dimen/divider_4px"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintRight_toRightOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintTop_toTopOf="parent">
+
+        </androidx.cardview.widget.CardView>
 
 
     </androidx.constraintlayout.widget.ConstraintLayout>

+ 0 - 1
workbenches/src/main/res/layout/item_free_training.xml

@@ -25,7 +25,6 @@
             <androidx.appcompat.widget.AppCompatImageView
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:background="@mipmap/icon_game"
                 app:isCircle="@{false}"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintLeft_toLeftOf="parent"

+ 0 - 1
workbenches/src/main/res/layout/item_leisure_brain_list.xml

@@ -25,7 +25,6 @@
             <androidx.appcompat.widget.AppCompatImageView
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:background="@mipmap/icon_game"
                 app:isCircle="@{false}"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintLeft_toLeftOf="parent"