Merge branch 'newUI'

lizhanwei

2020-05-14 8735b56eefde751618c819f5b331a56a62274a5c

 app/src/main/res/layout/profile_layout.xml

@@ -2,194 +2,142 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:background="@color/profile_bg"
    android:gravity="center"
    android:gravity="center_vertical"
    android:orientation="horizontal"
    android:padding="5dp">
   >
<LinearLayout android:layout_width="457dp"
    android:layout_height="105dp"
    android:orientation="horizontal"
    android:background="@drawable/stu_score_bg"
    >

    <ImageView

<LinearLayout
    android:layout_width="0dp"
    android:layout_height="105dp"
    android:paddingTop="@dimen/ui_margin_10dp"
    android:gravity="center"
    android:layout_weight="1"
    android:orientation="vertical">
    <safeluck.drive.evaluation.customview.CircleImageView
        android:id="@+id/iv_head"
        android:layout_width="0dp"
        android:layout_height="90dp"
        android:layout_weight="1"
        android:scaleType="center"

        android:src="@drawable/head_select" />

    <LinearLayout
        android:layout_width="0dp"
        android:layout_height="90dp"
        android:layout_marginLeft="10dp"
        android:layout_weight="3"
        android:orientation="vertical">

        <LinearLayout
            android:layout_width="match_parent"
            android:layout_height="0dp"
            android:layout_weight="1"
            android:orientation="horizontal">

            <TextView
                android:id="@+id/tv_name"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_toRightOf="@+id/iv_head"
                android:layout_weight="1"
                android:text="@string/name"
                android:textColor="@android:color/white" />
        android:layout_width="73dp"
        android:layout_height="73dp"
        android:src="@drawable/head_select1" />


            <TextView
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_toRightOf="@+id/tv_sex"
                android:layout_weight="1"
                android:text="电子教练:高级"
                android:textColor="@android:color/white"
                android:visibility="gone" />
        </LinearLayout>

        <LinearLayout
            android:layout_width="match_parent"
            android:layout_height="0dp"
            android:layout_marginTop="5dp"
            android:layout_marginBottom="5dp"
            android:layout_weight="1">

            <TextView
                android:id="@+id/tv_sex"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_marginRight="10dp"
                android:layout_toRightOf="@+id/tv_name"
                android:layout_weight="1"
                android:text="@string/sex"
                android:textColor="@android:color/white" />

            <TextView
                android:id="@+id/tv_use_time"
                android:layout_width="0dp"
                android:layout_height="wrap_content"
                android:layout_weight="1"
                android:text="用时:"
                android:textColor="@android:color/white"

                android:visibility="gone" />

        </LinearLayout>

        <LinearLayout
            android:layout_width="match_parent"
            android:layout_height="0dp"
            android:layout_marginTop="5dp"
            android:layout_marginBottom="5dp"
            android:layout_weight="1">

            <TextView
                android:id="@+id/tv_ID"
                android:layout_width="0dp"
                android:layout_height="match_parent"
                android:layout_below="@+id/tv_name"
                android:layout_weight="2"
                android:text="@string/user_id"
                android:textColor="@android:color/white" />

        </LinearLayout>

        <LinearLayout
            android:layout_width="match_parent"
            android:layout_height="0dp"
            android:layout_weight="1">

            <TextView
                android:id="@+id/tv_start_time"
                android:layout_width="0dp"
                android:layout_height="wrap_content"
                android:layout_weight="1"
                android:text="@string/begin_time"
                android:textColor="@android:color/white" />


            <TextView
                android:id="@+id/view_map"
                android:layout_width="0dp"
                android:layout_height="wrap_content"
                android:layout_weight="1"
                android:text="查看地图"
                android:textColor="@android:color/white" />


        </LinearLayout>

    </LinearLayout>

    <RelativeLayout
        android:visibility="gone"
        android:layout_width="0dp"
        android:layout_height="90dp"
        android:layout_marginLeft="10dp"
        android:layout_weight="1"
        android:gravity="center">

        <LinearLayout
            android:id="@+id/ll_gps"
            android:layout_width="wrap_content"
            android:layout_height="40dp"
            android:gravity="center"
            android:orientation="horizontal">

            <ImageView
                android:id="@+id/iv_gps"
                android:layout_width="20dp"
                android:layout_height="20dp"
                android:src="@drawable/gps" />

            <TextView
                android:id="@+id/tv_sat_num"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:gravity="center"
                android:text="10"
                android:textColor="@android:color/white" />


        </LinearLayout>

        <ImageView
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:layout_below="@+id/ll_gps"
            android:id="@+id/iv_rtk_connect"
            android:src="@drawable/antennaxml" />

    </RelativeLayout>

    <LinearLayout
        android:layout_width="0dp"
        android:layout_height="100dp"

    <TextView
        android:id="@+id/tv_name"
        android:layout_width="73dp"
        android:layout_height="0dp"
        android:layout_weight="1"
        android:gravity="center"
        android:orientation="vertical">
        android:text="@string/name"
        style="@style/ui_exam_font"
        android:textColor="@android:color/white" />



</LinearLayout>
<LinearLayout
    android:layout_width="0dp"
    android:layout_height="105dp"
    android:gravity="center"
    android:layout_weight="1"
    android:paddingTop="@dimen/ui_margin_10dp"
    android:orientation="vertical">
    <safeluck.drive.evaluation.customview.CircleImageView
        android:id="@+id/iv_coach_head"
        android:layout_width="73dp"
        android:layout_height="73dp"
        android:src="@drawable/head_select2" />


    <TextView
        android:id="@+id/tv_coach_name"
        android:layout_width="73dp"
        android:layout_height="0dp"
        android:layout_weight="1"
        android:gravity="center"
        android:text="@string/name1"
        style="@style/ui_exam_font"
        android:textColor="@android:color/white" />



</LinearLayout>
</LinearLayout>
    <LinearLayout android:layout_width="166dp"
        android:layout_height="105dp"
        android:orientation="vertical"
        android:id="@+id/view_map"
        android:layout_marginLeft="@dimen/ui_margin_10dp"
        android:background="@drawable/view_map_bg"
        >
<ImageView
    android:layout_width="128dp"
    android:layout_height="78dp"
    android:layout_gravity="center_horizontal"
    android:scaleType="centerCrop"
    android:src="@mipmap/view_map"/>
        <TextView
            android:id="@+id/tv_total_score"
            android:layout_width="90dp"
            android:layout_height="40dp"
            android:layout_marginTop="5dp"
            android:background="@android:color/holo_green_dark"
            android:padding="5dp"
            android:text="@string/total_score"

            android:layout_width="96dp"
            android:layout_height="20dp"
            android:gravity="center"
            android:textSize="20sp"
            android:layout_gravity="center"
            android:layout_marginTop="@dimen/ui_margin_5dp"
            android:text="查看地图"
            android:textSize="13sp"
            android:background="@drawable/view_map_font_bg"
            android:textColor="@android:color/white" />

        <TextView
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:text="当前得分"
    </LinearLayout>
    <LinearLayout
        android:layout_width="143dp"
        android:layout_height="105dp"
        android:layout_marginLeft="10dp"
        android:orientation="vertical"
    >
<LinearLayout
    android:layout_width="143dp"
    android:layout_height="60dp"
    android:orientation="vertical"
    android:gravity="center"

    android:background="@drawable/stu_score_bg">
    <TextView
        android:id="@+id/tv_total_score"
        android:layout_width="90dp"
        android:layout_height="40dp"
        android:text="@string/total_score"
        android:gravity="center"
        android:textSize="28sp"
        android:textColor="@android:color/white" />

    <TextView
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:text="当前训练得分"
        android:gravity="center"
        android:textColor="#ffa1a1a3"
        android:textSize="13sp"
        android:id="@+id/tv_score_tip"
        android:shadowDx="0"
        android:shadowDy="1"
        android:shadowRadius="3.0"
        android:shadowColor="#330f1329"
       />
</LinearLayout>
        <Button
            android:layout_width="match_parent"
            android:layout_height="match_parent"
            android:textColor="#ffffff"
            android:background="@drawable/start_exam_bg"
            android:textSize="@dimen/network_train_textsize24px"
            android:gravity="center"
            android:textColor="@android:color/white" />
            android:id="@+id/btn_start"
            android:layout_marginTop="2dp"
            android:text="开始考试"/>
    </LinearLayout>
</LinearLayout>