修改UI界面问题,任务marker编辑点位问题,任务领取maker消失问题,内容管理APP显示问题
This commit is contained in:
@@ -13,7 +13,7 @@
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginLeft="35dp"
|
||||
android:layout_marginTop="70dp"
|
||||
android:text="Welcome"
|
||||
android:text="@string/tv_login_title"
|
||||
android:textColor="@color/colorWhite"
|
||||
android:textSize="30sp"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
@@ -25,7 +25,7 @@
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginLeft="35dp"
|
||||
android:text="欢迎来到地图寻宝"
|
||||
android:text="@string/tv_login_deck"
|
||||
android:textColor="@color/colorWhite"
|
||||
android:textSize="35sp"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
@@ -38,7 +38,7 @@
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="25dp"
|
||||
android:text="用户名"
|
||||
android:text="@string/tv_login_name"
|
||||
app:layout_constraintLeft_toLeftOf="@id/tv_login_deck"
|
||||
app:layout_constraintTop_toBottomOf="@id/tv_login_deck" />
|
||||
<EditText
|
||||
@@ -46,7 +46,7 @@
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="8dp"
|
||||
android:hint=" ID/手机号"
|
||||
android:hint="@string/et_login_name"
|
||||
android:maxLines="1"
|
||||
android:singleLine="true"
|
||||
android:textColor="@color/white"
|
||||
@@ -75,7 +75,7 @@
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="25dp"
|
||||
android:text="密码"
|
||||
android:text="@string/tv_login_paw"
|
||||
app:layout_constraintLeft_toLeftOf="@id/et_login_name"
|
||||
app:layout_constraintTop_toBottomOf="@id/et_login_name" />
|
||||
<EditText
|
||||
@@ -83,7 +83,7 @@
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="8dp"
|
||||
android:hint=" 请输入密码"
|
||||
android:hint="@string/et_login_paw"
|
||||
android:maxLines="1"
|
||||
android:textColor="@color/white"
|
||||
android:inputType="textPassword"
|
||||
@@ -95,7 +95,6 @@
|
||||
android:textCursorDrawable="@drawable/text_color"
|
||||
android:theme="@style/MyEditText"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
|
||||
app:layout_constraintLeft_toLeftOf="@id/login_paw"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@id/login_paw" />
|
||||
@@ -123,7 +122,7 @@
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginLeft="2dp"
|
||||
android:text="免责声明"
|
||||
android:text="@string/tv_statement"
|
||||
android:textColor="@color/colorWhite"
|
||||
app:layout_constraintBottom_toBottomOf="@id/iv_login_check"
|
||||
app:layout_constraintLeft_toRightOf="@id/iv_login_check"
|
||||
@@ -136,7 +135,7 @@
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="8dp"
|
||||
android:layout_marginRight="10dp"
|
||||
android:text="注册"
|
||||
android:text="@string/tv_register"
|
||||
app:layout_constraintRight_toLeftOf="@id/tv_forget_paw"
|
||||
app:layout_constraintTop_toBottomOf="@id/et_login_paw" />
|
||||
|
||||
@@ -146,7 +145,7 @@
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="8dp"
|
||||
android:text="忘记密码"
|
||||
android:text="@string/tv_forget_paw"
|
||||
app:layout_constraintRight_toRightOf="@id/et_login_paw"
|
||||
app:layout_constraintTop_toBottomOf="@id/et_login_paw" />
|
||||
|
||||
@@ -160,7 +159,7 @@
|
||||
android:layout_marginRight="40dp"
|
||||
android:layout_marginLeft="40dp"
|
||||
android:gravity="center"
|
||||
android:text="登录"
|
||||
android:text="@string/btn_login"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="@+id/et_login_paw"
|
||||
app:layout_constraintStart_toStartOf="@+id/et_login_paw"
|
||||
|
||||
@@ -61,4 +61,12 @@
|
||||
android:text="去测评>"
|
||||
app:layout_constraintRight_toRightOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@id/ll_results" />
|
||||
<View
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="1dp"
|
||||
android:layout_marginTop="5dp"
|
||||
android:background="@color/colormap"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent" />
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
@@ -36,5 +36,13 @@
|
||||
app:layout_constraintBottom_toBottomOf="@+id/tv_title"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintTop_toTopOf="@+id/tv_title" />
|
||||
|
||||
<View
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="1dp"
|
||||
android:layout_marginTop="5dp"
|
||||
android:background="@color/colormap"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/tv_dest" />
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
@@ -53,4 +53,14 @@
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
android:background="#C0BFBF"/>
|
||||
|
||||
<View
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="1dp"
|
||||
android:layout_marginTop="5dp"
|
||||
android:background="@color/colormap"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/tv_createTime" />
|
||||
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
@@ -28,6 +28,6 @@
|
||||
android:layout_width="wrap_content"
|
||||
style="@style/text_style_toolbar_title"
|
||||
android:layout_toRightOf="@id/iv_find_task"
|
||||
android:text="我的等级" />
|
||||
android:text="@string/tv_privilege_title" />
|
||||
</LinearLayout>
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
@@ -23,6 +23,8 @@
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_margin="10dp"
|
||||
android:singleLine="true"
|
||||
android:ellipsize="end"
|
||||
android:text="测试1"
|
||||
android:textSize="15sp" />
|
||||
<TextView
|
||||
|
||||
@@ -28,6 +28,8 @@
|
||||
<View
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="1dp"
|
||||
android:layout_marginStart="20dp"
|
||||
android:layout_marginEnd="20dp"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
android:background="#C0BFBF"/>
|
||||
|
||||
|
||||
@@ -38,7 +38,10 @@
|
||||
<View
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="1dp"
|
||||
android:background="#C0BFBF"
|
||||
app:layout_constraintBottom_toBottomOf="parent" />
|
||||
|
||||
android:layout_marginTop="5dp"
|
||||
android:background="@color/colormap"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/tv_createTime" />
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
Reference in New Issue
Block a user