Browse Source

1.添加获取moca试题库module

王鹏鹏 2 years ago
parent
commit
e3a815b477

+ 50 - 0
moca/src/main/java/com/yingyangfly/moca/entity/MyLine.java

@@ -0,0 +1,50 @@
+package com.yingyangfly.moca.entity;
+
+public class MyLine {
+
+    int startx;
+    int starty;
+    int endx;
+    int endy;
+    String anwer;
+
+    public int getStartx() {
+        return startx;
+    }
+
+    public void setStartx(int startx) {
+        this.startx = startx;
+    }
+
+    public int getStarty() {
+        return starty;
+    }
+
+    public void setStarty(int starty) {
+        this.starty = starty;
+    }
+
+    public int getEndx() {
+        return endx;
+    }
+
+    public void setEndx(int endx) {
+        this.endx = endx;
+    }
+
+    public int getEndy() {
+        return endy;
+    }
+
+    public void setEndy(int endy) {
+        this.endy = endy;
+    }
+
+    public String getAnwer() {
+        return anwer;
+    }
+
+    public void setAnwer(String anwer) {
+        this.anwer = anwer;
+    }
+}

+ 22 - 9
moca/src/main/java/com/yingyangfly/moca/widget/LinkLineView.java

@@ -1,6 +1,9 @@
 package com.yingyangfly.moca.widget;
 
 import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Paint;
 import android.util.AttributeSet;
 import android.widget.RelativeLayout;
 
@@ -9,24 +12,34 @@ import androidx.annotation.Nullable;
 
 public class LinkLineView extends RelativeLayout {
 
-    private Context context;
+    Paint linePaint = new Paint();
 
-    public LinkLineView(@NonNull Context context) {
-        super(context);
-        init(context);
+    public LinkLineView(Context context) {
+        this(context, null);
     }
 
     public LinkLineView(@NonNull Context context, @Nullable AttributeSet attrs) {
-        super(context, attrs);
-        init(context);
+        this(context, attrs, 0);
     }
 
     public LinkLineView(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
         super(context, attrs, defStyleAttr);
-        init(context);
+        initLinePaint();
     }
 
-    private void init(Context context) {
-        this.context = context;
+    private void initLinePaint() {
+        // TODO Auto-generated method stub
+        linePaint.setColor(Color.BLUE);
+        linePaint.setStrokeWidth(2);
+        linePaint.setAntiAlias(true);
+        linePaint.setStrokeCap(Paint.Cap.ROUND);
+    }
+
+    @Override
+    protected void dispatchDraw(Canvas canvas) {
+        super.dispatchDraw(canvas);
+
+
+
     }
 }

+ 17 - 1
moca/src/main/res/layout/fragment_alternating_connection.xml

@@ -45,7 +45,23 @@
             <com.yingyangfly.moca.widget.LinkLineView
                 android:id="@+id/signatureView"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent" />
+                android:layout_height="match_parent">
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:id="@+id/tvFirst"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerInParent="true"
+                    android:text="@string/first"
+                    android:textColor="@color/color_FF333333"
+                    android:textSize="@dimen/divider_30px"
+                    android:textStyle="bold" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content" />
+
+            </com.yingyangfly.moca.widget.LinkLineView>
 
         </com.google.android.material.card.MaterialCardView>
 

+ 10 - 0
moca/src/main/res/values/strings.xml

@@ -48,4 +48,14 @@
     <string name="now_for_category_tips_can_you_recall_words_memorized_before" tools:ignore="ResourceName">现在给您类别提示,您能回忆出来之前记过的词吗</string>
     <string name="overall_cognitive_ability" tools:ignore="ResourceName">总体认知能力</string>
     <string name="alternating_connection" tools:ignore="ResourceName">请您按照从数字到汉字并且逐渐递增的规律连出一条线从1连接甲,从甲连接2,后面请像继续连下去,一直连到戊</string>
+    <string name="first" tools:ignore="ResourceName">甲</string>
+    <string name="seconds" tools:ignore="ResourceName">乙</string>
+    <string name="third" tools:ignore="ResourceName">丙</string>
+    <string name="fourth" tools:ignore="ResourceName">丁</string>
+    <string name="fifth" tools:ignore="ResourceName">戊</string>
+    <string name="one" tools:ignore="ResourceName">1</string>
+    <string name="two" tools:ignore="ResourceName">2</string>
+    <string name="three" tools:ignore="ResourceName">3</string>
+    <string name="four" tools:ignore="ResourceName">4</string>
+    <string name="five" tools:ignore="ResourceName">5</string>
 </resources>