xiaoyan159/NavinfoOutDoor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改9.15号提出的问题

Browse Source
This commit is contained in:
wangdongsheng
2021-09-15 18:38:26 +08:00
parent ed105e8ab7
commit a1e735e352
16 changed files with 115 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/res/layout/activity_login.xml
View File

@@ -121,7 +121,7 @@
android:id="@+id/tv_statement"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="2dp"
android:layout_marginStart="2dp"
android:text="@string/tv_statement"
android:textColor="@color/colorWhite"
app:layout_constraintBottom_toBottomOf="@id/iv_login_check"

2
app/src/main/res/layout/activity_statement.xml
View File

@@ -33,7 +33,7 @@
android:layout_width="wrap_content"
style="@style/text_style_toolbar_title"
android:layout_toRightOf="@id/iv_find_task"
android:text="免责声明" />
android:text="@string/tv_statement" />
</LinearLayout>
<TextView
android:layout_margin="20dp"

4
app/src/main/res/layout/fragment_filter.xml
View File

@@ -235,13 +235,13 @@
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_toEndOf="@id/check_ok"
android:text="批量领取"
android:text="选择任务"
/>
<Button
android:id="@+id/btn_draw"
style="@style/user_style"
android:layout_width="80dp"
android:padding="@dimen/default_widget_padding"
android:layout_height="40dp"
android:layout_centerVertical="true"
android:layout_alignParentEnd="true"

21
app/src/main/res/layout/mine_fragment.xml
View File

@@ -154,28 +154,31 @@
style="@style/main_text_style"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:text="我的等级" />
<TextView
android:id="@+id/main_grade"
android:layout_width="20dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_marginRight="40dp"
android:gravity="center"
android:text="LV."
android:layout_centerVertical="true"
android:layout_toLeftOf="@id/image_grade_view"
android:text="LV.0"
android:textSize="16sp" />
<TextView
android:id="@+id/tv_main_grade"
android:layout_width="40dp"
<ImageView
android:id="@+id/image_grade_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_marginRight="0dp"
android:drawableRight="@drawable/ic_baseline_navigate"
android:layout_centerVertical="true"
android:background="@drawable/ic_baseline_navigate"
android:gravity="center"
android:text="0"
android:textSize="16sp"/>
android:textSize="18sp" />
</RelativeLayout>

2
app/src/main/res/layout/withdraw_fragment.xml
View File

@@ -218,7 +218,7 @@
android:layout_marginRight="20dp"
android:layout_marginLeft="20dp"
android:layout_marginTop="20dp"
android:text="注：达到10元方可兑换，只能兑换整数部分，10个工作日内发放,如遇到特殊情况"
android:text="注：达到10元方可兑换，只能兑换整数部分，10个工作日内发放,如遇到特殊情况可能延后"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/button" />

2
app/src/main/res/values/strings.xml
View File

@@ -155,7 +155,7 @@
<string name="et_login_name">ID/手机号</string>
<string name="tv_login_paw">密码</string>
<string name="et_login_paw">请输入密码</string>
<string name="tv_statement">免责声明</string>
<string name="tv_statement" tools:ignore="MissingTranslation">用户协议</string>
<string name="tv_register">注册</string>
<string name="tv_forget_paw">忘记密码</string>
<string name="btn_login">登录</string>