Browse Source

1.添加获取moca试题库module

王鹏鹏 2 years ago
parent
commit
366e9469d9

+ 2 - 1
.idea/misc.xml

@@ -123,11 +123,12 @@
         <entry key="..\:/workspace/hcp-pad/moca/src/main/res/drawable/bg_choice_item.xml" value="0.1715" />
         <entry key="..\:/workspace/hcp-pad/moca/src/main/res/drawable/bg_resetting.xml" value="0.1715" />
         <entry key="..\:/workspace/hcp-pad/moca/src/main/res/drawable/bg_rubber.xml" value="0.1615" />
+        <entry key="..\:/workspace/hcp-pad/moca/src/main/res/drawable/bg_selected_text.xml" value="0.1715" />
         <entry key="..\:/workspace/hcp-pad/moca/src/main/res/drawable/bg_start_clock.xml" value="0.1715" />
         <entry key="..\:/workspace/hcp-pad/moca/src/main/res/drawable/bg_time_format.xml" value="0.1715" />
         <entry key="..\:/workspace/hcp-pad/moca/src/main/res/layout/activity_main.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/hcp-pad/moca/src/main/res/layout/activity_moca.xml" value="0.23697916666666666" />
-        <entry key="..\:/workspace/hcp-pad/moca/src/main/res/layout/fragment_alternating_connection.xml" value="0.23697916666666666" />
+        <entry key="..\:/workspace/hcp-pad/moca/src/main/res/layout/fragment_alternating_connection.xml" value="0.40588760035682425" />
         <entry key="..\:/workspace/hcp-pad/moca/src/main/res/layout/fragment_computation.xml" value="0.536" />
         <entry key="..\:/workspace/hcp-pad/moca/src/main/res/layout/fragment_designs_choice.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/hcp-pad/moca/src/main/res/layout/fragment_draw_design.xml" value="0.22239583333333332" />

+ 11 - 0
moca/src/main/res/drawable/bg_selected_text.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:shape="oval"
+    tools:ignore="ResourceName">
+    <stroke
+        android:width="@dimen/divider_1px"
+        android:color="@color/color_FF979797" />
+    <corners android:radius="@dimen/divider_8px" />
+    <solid android:color="@color/color_FF4A76FF" />
+</shape>

+ 24 - 6
moca/src/main/res/layout/fragment_alternating_connection.xml

@@ -49,17 +49,35 @@
 
                 <androidx.appcompat.widget.AppCompatTextView
                     android:id="@+id/tvFirst"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
+                    android:layout_width="@dimen/divider_60px"
+                    android:layout_height="@dimen/divider_60px"
+                    android:layout_alignParentTop="true"
+                    android:layout_alignParentEnd="true"
                     android:layout_centerInParent="true"
+                    android:layout_marginTop="@dimen/divider_37px"
+                    android:layout_marginEnd="@dimen/divider_218px"
+                    android:background="@drawable/bg_selected_text"
+                    android:gravity="center"
                     android:text="@string/first"
-                    android:textColor="@color/color_FF333333"
+                    android:textColor="@android:color/white"
                     android:textSize="@dimen/divider_30px"
                     android:textStyle="bold" />
 
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content" />
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:id="@+id/tvTwo"
+                    android:layout_width="@dimen/divider_60px"
+                    android:layout_height="@dimen/divider_60px"
+                    android:layout_below="@+id/tvFirst"
+                    android:layout_alignParentEnd="true"
+                    android:layout_centerInParent="true"
+                    android:layout_marginTop="@dimen/divider_9px"
+                    android:layout_marginEnd="@dimen/divider_148px"
+                    android:background="@drawable/bg_selected_text"
+                    android:gravity="center"
+                    android:text="@string/two"
+                    android:textColor="@android:color/white"
+                    android:textSize="@dimen/divider_30px"
+                    android:textStyle="bold" />
 
             </com.yingyangfly.moca.widget.LinkLineView>
 

+ 2 - 0
moca/src/main/res/values/dimens.xml

@@ -56,6 +56,7 @@
     <dimen name="divider_237px" tools:ignore="ResourceName">237px</dimen>
     <dimen name="divider_230px" tools:ignore="ResourceName">230px</dimen>
     <dimen name="divider_229px" tools:ignore="ResourceName">229px</dimen>
+    <dimen name="divider_218px" tools:ignore="ResourceName">218px</dimen>
     <dimen name="divider_215px" tools:ignore="ResourceName">215px</dimen>
     <dimen name="divider_214px" tools:ignore="ResourceName">214px</dimen>
     <dimen name="divider_213px" tools:ignore="ResourceName">213px</dimen>
@@ -79,6 +80,7 @@
     <dimen name="divider_154px" tools:ignore="ResourceName">154px</dimen>
     <dimen name="divider_152px" tools:ignore="ResourceName">152px</dimen>
     <dimen name="divider_149px" tools:ignore="ResourceName">149px</dimen>
+    <dimen name="divider_148px" tools:ignore="ResourceName">148px</dimen>
     <dimen name="divider_147px" tools:ignore="ResourceName">147px</dimen>
     <dimen name="divider_140px" tools:ignore="ResourceName">140px</dimen>
     <dimen name="divider_135px" tools:ignore="ResourceName">135px</dimen>