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

!6 完善‘我的’页面的细节和常见问题页面

Browse Source 
Merge pull request !6 from Amdi/master
This commit is contained in:
肖岩 2021-06-02 18:48:01 +08:00 committed by Gitee
commit 17130a7aa2
33 changed files with 425 additions and 274 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.idea/misc.xml generated
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="JDK" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
<component name="ProjectType">

2
app/build.gradle
View File

@ -3,7 +3,7 @@ apply plugin: 'com.android.application'
android {
compileSdkVersion 30
buildToolsVersion "30.0.3"
//ndkVersion '23.0.7123448'
ndkVersion '23.0.7123448'
defaultConfig {
applicationId "com.example.myapplication"

17
app/src/main/java/com/navinfo/outdoor/activity/FragmentManagement.java
View File

@ -15,6 +15,7 @@ import com.navinfo.outdoor.fragment.ForgetPawFragment;
import com.navinfo.outdoor.fragment.GatheringFragment;
import com.navinfo.outdoor.fragment.GradeFragment;
import com.navinfo.outdoor.fragment.IssueFragment;
import com.navinfo.outdoor.fragment.IssueWebFragment;
import com.navinfo.outdoor.fragment.MapDownloadFragment;
import com.navinfo.outdoor.fragment.MineFragment;
import com.navinfo.outdoor.fragment.PrivilegeFragment;
@ -69,6 +70,7 @@ public class FragmentManagement extends BaseActivity {
private AboutFragment aboutFragment;//我的-关于的fragment -23
private GatheringFragment gatheringFragment;//我的-用户资料-收款信息的fragment -24
private UserAttestationFragment userAttestationFragment;//我的-用户资料-实名认证的fragment -25
private IssueWebFragment issueWebFragment;//我的-常见问题-web的fragment -27
@Override
@ -140,7 +142,9 @@ public class FragmentManagement extends BaseActivity {
if (userAttestationFragment!=null){//我的-用户资料-实名认证的fragment-25
fragmentTransaction.hide(userAttestationFragment);
}
if (issueWebFragment!=null){//我的-常见问题-web的fragment -27
fragmentTransaction.hide(issueWebFragment);
}
}
@ -351,6 +355,14 @@ public class FragmentManagement extends BaseActivity {
fragmentTransaction.show(userAttestationFragment);
}
break;
case 27://我的-常见问题-web的fragment
if (issueWebFragment == null) {
issueWebFragment = new IssueWebFragment();
fragmentTransaction.add(R.id.frame_layout, issueWebFragment);
} else {
fragmentTransaction.show(issueWebFragment);
}
break;
}
fragmentTransaction.commit();
}
@ -434,6 +446,9 @@ public class FragmentManagement extends BaseActivity {
case 25:
userAttestationFragment.onActivityResult(requestCode,resultCode,data);
break;
case 27:
issueWebFragment.onActivityResult(requestCode,resultCode,data);
break;
}
}

10
app/src/main/java/com/navinfo/outdoor/activity/LoginActivity.java
View File

@ -2,6 +2,7 @@ package com.navinfo.outdoor.activity;
import android.content.Intent;
import android.view.View;
import android.widget.Button;
import android.widget.EditText;
import android.widget.TextView;
@ -16,7 +17,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
private android.widget.EditText etLoginName;
private android.widget.EditText etLoginPaw;
private TextView tvForgetPaw;
private TextView tvLogin;
private Button btnLogin;
@Override
protected int getLayout() {
@ -36,8 +37,8 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
etLoginName = (EditText) findViewById(R.id.et_login_name);
etLoginPaw = (EditText) findViewById(R.id.et_login_paw);
tvForgetPaw = (TextView) findViewById(R.id.tv_forget_paw);
tvLogin = (TextView) findViewById(R.id.tv_login);
tvLogin.setOnClickListener(this::onClick);
btnLogin = (Button) findViewById(R.id.btn_login);
btnLogin.setOnClickListener(this::onClick);
tvRegister.setOnClickListener(this);
tvForgetPaw.setOnClickListener(this);
}
@ -55,8 +56,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
forgetPaw.putExtra("tag", 6);
startActivity(forgetPaw);
break;
case R.id.tv_login:
case R.id.btn_login:
Intent intent = new Intent(this, HomeActivity.class);
startActivity(intent);
break;

2
app/src/main/java/com/navinfo/outdoor/adapter/CapacityMeasureAdapter.java
View File

@ -137,7 +137,7 @@ public class CapacityMeasureAdapter extends RecyclerView.Adapter<CapacityMeasure
//indext内容
private String getOptionIndex(int index) {
char A = (char) (65 + index);
return "选项" + A + ":";
return A + "：";
}

22
app/src/main/java/com/navinfo/outdoor/adapter/IssueProblemAdapter.java
View File

@ -39,6 +39,14 @@ public class IssueProblemAdapter extends RecyclerView.Adapter<IssueProblemAdapte
@Override
public void onBindViewHolder(@NonNull ViewHolder holder, int position) {
holder.tvIssue.setText(issueList.get(position).getTitle());
holder.itemView.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
if (onIssueClick != null) {
onIssueClick.onClick(position);
}
}
});
}
@Override
@ -54,12 +62,14 @@ public class IssueProblemAdapter extends RecyclerView.Adapter<IssueProblemAdapte
tvIssue = itemView.findViewById(R.id.tv_issue_title);
}
}
private interface OnClick{
void click(int position);
}
private OnClick click;
public void setClick(OnClick click) {
this.click = click;
public interface OnIssueClick {
void onClick(int pos);
}
private OnIssueClick onIssueClick;
public void setOnIssueClick(OnIssueClick onIssueClick) {
this.onIssueClick = onIssueClick;
}
}

12
app/src/main/java/com/navinfo/outdoor/fragment/IssueFragment.java
View File

@ -1,16 +1,19 @@
package com.navinfo.outdoor.fragment;
import android.content.Intent;
import android.util.Log;
import android.view.View;
import android.widget.ImageView;
import androidx.fragment.app.FragmentManager;
import androidx.recyclerview.widget.DividerItemDecoration;
import androidx.recyclerview.widget.LinearLayoutManager;
import com.jcodecraeer.xrecyclerview.ProgressStyle;
import com.jcodecraeer.xrecyclerview.XRecyclerView;
import com.navinfo.outdoor.R;
import com.navinfo.outdoor.activity.FragmentManagement;
import com.navinfo.outdoor.adapter.IssueProblemAdapter;
import com.navinfo.outdoor.base.BaseFragment;
import com.navinfo.outdoor.bean.TaskExplainInfo;
@ -97,7 +100,14 @@ public class IssueFragment extends BaseFragment implements View.OnClickListener
}
});
issueProblemAdapter.setOnIssueClick(new IssueProblemAdapter.OnIssueClick() {
@Override
public void onClick(int pos) {
Intent iissueWeb = new Intent(getActivity(), FragmentManagement.class);
iissueWeb.putExtra("tag",27);
startActivity(iissueWeb);
}
});
}

66
app/src/main/java/com/navinfo/outdoor/fragment/IssueWebFragment.java Normal file
View File

@ -0,0 +1,66 @@
package com.navinfo.outdoor.fragment;
import android.os.Build;
import android.view.View;
import android.webkit.WebSettings;
import android.webkit.WebView;
import android.widget.ImageView;
import com.navinfo.outdoor.R;
import com.navinfo.outdoor.base.BaseFragment;
/**
* 我的-常见问题-web
*/
public class IssueWebFragment extends BaseFragment implements View.OnClickListener {
private ImageView ivIssueWebFinish;
private String content = "<div>\n" +
"<h2>定义和用法</h2>\n" +
"\n" +
"<p>\n" +
"\t<img src=\"https://exp-picture.cdn.bcebos.com/560be432939c2cf72dff4caa452c5b1b1fde12e1.jpg?x-bce-process=image%2Fresize%2Cm_lfit%2Cw_500%2Climit_1%2Fformat%2Cf_jpg%2Fquality%2Cq_80\">\n" +
"</p>\n" +
"\n" +
"<p style=\"color: red; margin-left: 20px\">&lt;style&gt; 标签用于为 HTML 文档定义样式信息。</p>\n" +
"\n" +
"<p style=\"background-color: lightblue; margin-left: 20px\">在 style 中，您可以规定在浏览器中如何呈现 HTML 文档。</p>\n" +
"\n" +
"<p style=\"font-family: verdana; margin-left: 20px\">type 属性是必需的，定义 style 元素的内容。唯一可能的值是 \"text/css\"。</p>\n" +
"\n" +
"<p style=\"font-size: 20px; margin-left: 20px\">style 元素位于 head 部分中。</p>\n" +
"</div>";
private WebView issueWebView;
@Override
protected int getLayout() {
return R.layout.fragment_issue_web;
}
@Override
protected void initView() {
super.initView();
ivIssueWebFinish = (ImageView) findViewById(R.id.iv_issueWeb_finish);
issueWebView = (WebView) findViewById(R.id.issue_webView);
ivIssueWebFinish.setOnClickListener(this::onClick);
issueWebView.getSettings().setBlockNetworkImage(false);
WebSettings settings = issueWebView.getSettings();
settings.setJavaScriptEnabled(true);
if (Build.VERSION.SDK_INT > Build.VERSION_CODES.LOLLIPOP) {
issueWebView.getSettings().setMixedContentMode(WebSettings.MIXED_CONTENT_ALWAYS_ALLOW);
}
settings.setBuiltInZoomControls(false);
content = content.replace("<img", "<img style='max-width: 100%'");
issueWebView.loadDataWithBaseURL(null, content, "text/html", "utf-8", null);
}
@Override
public void onClick(View v) {
switch (v.getId()) {
case R.id.iv_issueWeb_finish:
getActivity().finish();
break;
}
}
}

85
app/src/main/java/com/navinfo/outdoor/fragment/UserDataFragment.java
View File

@ -1,19 +1,21 @@
package com.navinfo.outdoor.fragment;
import android.content.Intent;
import android.graphics.Bitmap;
import android.os.Bundle;
import android.text.TextUtils;
import android.view.View;
import android.widget.Button;
import android.widget.EditText;
import android.widget.ImageView;
import androidx.annotation.Nullable;
import android.widget.Toast;
import com.navinfo.outdoor.R;
import com.navinfo.outdoor.activity.FragmentManagement;
import com.navinfo.outdoor.base.BaseFragment;
import com.navinfo.outdoor.util.RegexUtil;
import static android.app.Activity.RESULT_OK;
import java.util.Scanner;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
/**
* 用户资料的fragment
@ -23,6 +25,12 @@ public class UserDataFragment extends BaseFragment implements View.OnClickListen
private Button btnGathering;
private Button btnAttestation;
private ImageView ivUser;
private EditText etRegion;
private EditText etPhone;
private EditText etQq;
private EditText etMailbox;
public static Pattern compile = Pattern.compile("/^[_a-z0-9-]+(\\.[_a-z0-9-]+)*@[a-z0-9-]+(\\.[a-z0-9-]+)*(\\.[a-z]{2,})$/");
private Button userSave;
@Override
protected int getLayout() {
@ -43,8 +51,19 @@ public class UserDataFragment extends BaseFragment implements View.OnClickListen
btnAttestation.setOnClickListener(this::onClick);
btnGathering = findViewById(R.id.btn_gathering);
btnGathering.setOnClickListener(this::onClick);
etRegion = (EditText) findViewById(R.id.et_region);
etRegion.setOnClickListener(this::onClick);
etPhone = (EditText) findViewById(R.id.et_phone);
etPhone.setOnClickListener(this::onClick);
etQq = (EditText) findViewById(R.id.et_qq);
etQq.setOnClickListener(this::onClick);
etMailbox = (EditText) findViewById(R.id.et_mailbox);
etMailbox.setOnClickListener(this::onClick);
userSave = (Button) findViewById(R.id.user_save);
userSave.setOnClickListener(this::onClick);
}
@Override
public void onClick(View v) {
switch (v.getId()) {
@ -61,8 +80,64 @@ public class UserDataFragment extends BaseFragment implements View.OnClickListen
attestationIntent.putExtra("tag", 25);
startActivity(attestationIntent);
break;
case R.id.et_phone:
String phoneEt = etPhone.getText().toString().trim();
if (TextUtils.isEmpty(phoneEt)) {
Toast.makeText(getActivity(), "请输入手机号", Toast.LENGTH_SHORT).show();
return;
}
if (!RegexUtil.isPhone(phoneEt)) {
Toast.makeText(getActivity(), "手机格式有误", Toast.LENGTH_SHORT).show();
}
break;
case R.id.et_qq:
qq();
break;
case R.id.et_mailbox:
if (isEmail(etMailbox.getText().toString().trim()) && etMailbox.getText().toString().trim().length() <= 31) {
Toast.makeText(getActivity(), "邮箱验证成功", Toast.LENGTH_SHORT).show();
} else {
Toast.makeText(getActivity(), "邮箱格式错误", Toast.LENGTH_SHORT).show();
}
break;
case R.id.user_save:
final String userphone = etPhone.getText().toString().trim();
final String userqq = etQq.getText().toString().trim();
final String usermailbox = etMailbox.getText().toString().trim();
if (!RegexUtil.isPhone(userphone)) {
Toast.makeText(getActivity(), "手机号输入错误", Toast.LENGTH_SHORT).show();
return;
}
if (userqq.length() > 11) {
Toast.makeText(getActivity(), "QQ号输入错误", Toast.LENGTH_SHORT).show();
return;
}
if (usermailbox.length() > 31) {
Toast.makeText(getActivity(), "邮箱输入错误", Toast.LENGTH_SHORT).show();
}
break;
}
}
private static String qq() {
String qq = "23412312";
String regex = "[1-9][0-9]{4,11}";
boolean flag = qq.matches(regex);
if (flag) {
System.out.println("输入正确！！");
} else {
System.out.println("输入正确！！");
}
return qq();
}
public static boolean isEmail(String email) {
if (null == email || "".equals(email)) return false;
Matcher m = compile.matcher(email);
return m.matches();
}
}

27
app/src/main/java/com/navinfo/outdoor/util/RegexUtil.java Normal file
View File

@ -0,0 +1,27 @@
package com.navinfo.outdoor.util;
import android.text.TextUtils;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
/**
* 手机号验证
*/
public class RegexUtil {
public static boolean isPhone(String name) {
if (TextUtils.isEmpty(name))return false;
Pattern p = Pattern.compile("^1[3,4,5,6,7,8,9]\\d{9}$");
Matcher m = p.matcher(name);
return m.matches();
}
public static boolean checkPassword(String password) {
if (TextUtils.isEmpty(password))return false;
//字母+数字。最少6位的正则表达式
Pattern p = Pattern.compile("(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{6,}");
Matcher m = p.matcher(password);
boolean isPassword = m.matches();
return isPassword;
}
}

6
app/src/main/res/drawable/gethering_shape.xml Normal file
View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="2dp"/>
<size android:width="200dp" android:height="100dp"/>
<stroke android:color="#FF9800" android:width="1dp"/>
</shape>

5
app/src/main/res/drawable/image_shape.xml Normal file
View File

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<corners android:radius="10dp"/>
</shape>

6
app/src/main/res/drawable/login_ripple.xml Normal file
View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="#7fffffff">
<item
android:drawable="@drawable/shape_login" />
</ripple>

2
app/src/main/res/drawable/main_shape_outlogin.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/colorRed" />
<corners android:radius="40dp" />
<corners android:radius="50dp" />
</shape>

7
app/src/main/res/drawable/mine_outlogin_ripple.xml Normal file
View File

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="#7fffffff"
>
<item android:drawable="@drawable/main_shape_outlogin"/>
</ripple>

4
app/src/main/res/drawable/shape_login.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/colorWhite"/>
<corners android:radius="50dp"/>
<solid android:color="@color/colorTransparent" />
<corners android:radius="50dp" />
</shape>

2
app/src/main/res/drawable/shape_red_radius_bg.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/colorPrimaryBlue" />
<corners android:radius="40dp" />
<corners android:radius="50dp" />
</shape>

6
app/src/main/res/drawable/user_data_shape.xml Normal file
View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/colorPrimaryBlue"/>
<corners android:radius="50dp"/>
</shape>

6
app/src/main/res/drawable/user_rz.xml Normal file
View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="#7fffffff"
>
<item android:drawable="@drawable/user_shape"/>
</ripple>

5
app/src/main/res/drawable/user_style.xml Normal file
View File

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="#7fffffff">
<item android:drawable="@drawable/user_data_shape"/>
</ripple>

12
app/src/main/res/layout/about_fragment.xml
View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
xmlns:app="http://schemas.android.com/apk/res-auto">
android:layout_height="match_parent">
<LinearLayout
android:id="@+id/ll_about"
@ -53,8 +53,8 @@
android:layout_height="100dp"
android:layout_gravity="center"
android:layout_marginTop="15dp"
android:src="@mipmap/ic_launcher"
/>
android:background="@drawable/image_shape"
android:src="@mipmap/ic_launcher" />
<TextView
android:layout_width="wrap_content"
@ -95,8 +95,8 @@
android:layout_width="match_parent"
android:layout_height="60dp"
android:layout_marginLeft="15dp"
android:gravity="center"
android:background="?android:attr/selectableItemBackground">
android:background="?android:attr/selectableItemBackground"
android:gravity="center">
<TextView
style="@style/main_about_text_style"

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

@ -45,7 +45,7 @@
android:layout_width="300dp"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:hint="编码/手机号/邮箱"
android:hint="ID/手机号"
android:paddingBottom="20dp"
android:textColorHint="@color/colorTransparent"
android:textCursorDrawable="@drawable/text_color"
@ -117,14 +117,14 @@
app:layout_constraintRight_toRightOf="@id/et_login_paw"
app:layout_constraintTop_toBottomOf="@id/et_login_paw" />
<TextView
android:id="@+id/tv_login"
style="@style/login_style"
<Button
android:id="@+id/btn_login"
android:layout_width="300dp"
android:layout_height="50dp"
android:layout_marginTop="20dp"
android:gravity="center"
android:text="登录"
style="@style/login_style"
app:layout_constraintLeft_toLeftOf="@id/iv_login_check"
app:layout_constraintTop_toBottomOf="@id/tv_forget_paw" />
</androidx.constraintlayout.widget.ConstraintLayout>

45
app/src/main/res/layout/fragment_issue_web.xml Normal file
View File

@ -0,0 +1,45 @@
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
xmlns:app="http://schemas.android.com/apk/res-auto"
tools:context="com.navinfo.outdoor.fragment.IssueWebFragment">
<LinearLayout
android:id="@+id/rl_issueWeb"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="#1BA5F1"
android:paddingTop="@dimen/top_pind_sp"
android:orientation="horizontal"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<ImageView
android:id="@+id/iv_issueWeb_finish"
android:layout_width="wrap_content"
android:layout_height="45dp"
android:layout_alignParentLeft="true"
android:layout_marginLeft="15dp"
android:src="@drawable/icon_arrow"
/>
<TextView
android:id="@+id/tv_issueWeb"
android:layout_width="wrap_content"
style="@style/text_style_toolbar_title"
android:layout_toRightOf="@id/iv_issueWeb_finish"
android:text="常见问题" />
</LinearLayout>
<WebView
android:id="@+id/issue_webView"
android:layout_width="match_parent"
android:layout_height="0dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/rl_issueWeb" />
</androidx.constraintlayout.widget.ConstraintLayout>

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

@ -112,6 +112,7 @@
app:layout_constraintLeft_toLeftOf="@id/register_note"
app:layout_constraintTop_toBottomOf="@id/register_note" />
<View
android:id="@+id/view3"
android:layout_width="300dp"
android:layout_height="1dp"
android:background="@color/colorHui"
@ -126,8 +127,7 @@
android:textColor="@color/colorWhite"
app:layout_constraintTop_toTopOf="@id/et_register_note"
app:layout_constraintBottom_toBottomOf="@id/et_register_note"
app:layout_constraintRight_toRightOf="parent"
android:layout_marginRight="30dp"
app:layout_constraintRight_toRightOf="@id/et_register_phone"
/>
<TextView
android:id="@+id/register_referrer"

8
app/src/main/res/layout/gathering_fragment.xml
View File

@ -44,6 +44,7 @@
android:orientation="vertical"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
android:background="@drawable/gethering_shape"
app:layout_constraintTop_toBottomOf="@+id/rl_gathering">
<TextView
@ -92,7 +93,7 @@
android:textSize="18sp"
android:gravity="center"
android:textColor="#333"
android:text="持卡人" />
android:text="持 卡 人:" />
<EditText
android:layout_width="wrap_content"
@ -118,7 +119,7 @@
android:textSize="18sp"
android:gravity="center"
android:textColor="#333"
android:text="银行卡号" />
android:text="银行卡号:" />
<EditText
android:layout_width="wrap_content"
@ -146,7 +147,7 @@
android:textColor="#333"
android:layout_alignParentLeft="true"
android:layout_centerVertical="true"
android:text="所属银行" />
android:text="所属银行:" />
<TextView
android:id="@+id/tv_bank"
@ -174,6 +175,7 @@
/>
<Button
android:id="@+id/btn_bank"
style="@style/user_data_style"
android:layout_marginTop="40dp"
android:layout_width="match_parent"
android:layout_height="match_parent"

22
app/src/main/res/layout/issue_problem_item.xml
View File

@ -1,14 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/tv_issue_title"
android:layout_marginLeft="15dp"
android:textSize="15sp"/>
android:layout_marginTop="15dp"
android:orientation="vertical">
<TextView
android:id="@+id/tv_issue_title"
android:layout_width="match_parent"
android:layout_height="50dp"
android:layout_marginLeft="15dp"
android:background="?android:attr/selectableItemBackground"
android:textSize="16sp" />
</LinearLayout>

149
app/src/main/res/layout/measure_item.xml
View File

@ -22,153 +22,4 @@
app:layout_constraintTop_toBottomOf="@id/tv_measure_text1">
</LinearLayout>
<!-- <LinearLayout-->
<!-- android:id="@+id/ll_choose2"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:orientation="vertical"-->
<!-- android:visibility="gone"-->
<!-- app:layout_constraintTop_toBottomOf="@id/tv_measure_text1">-->
<!-- <LinearLayout-->
<!-- android:id="@+id/ll_measureA"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:orientation="vertical">-->
<!-- <CheckBox-->
<!-- android:id="@+id/cb_measureA"-->
<!-- style="@style/Widget.AppCompat.CompoundButton.RadioButton"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:text="选项A：" />-->
<!-- <ImageView-->
<!-- android:id="@+id/iv_measureA"-->
<!-- android:layout_width="100dp"-->
<!-- android:layout_height="100dp"-->
<!-- android:src="@drawable/select_check" />-->
<!-- </LinearLayout>-->
<!-- <LinearLayout-->
<!-- android:id="@+id/ll_measureB"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:orientation="vertical">-->
<!-- <CheckBox-->
<!-- android:id="@+id/cb_measureB"-->
<!-- style="@style/Widget.AppCompat.CompoundButton.RadioButton"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:text="选项A：" />-->
<!-- <ImageView-->
<!-- android:id="@+id/iv_measureB"-->
<!-- android:layout_width="100dp"-->
<!-- android:layout_height="100dp"-->
<!-- android:src="@drawable/select_check" />-->
<!-- </LinearLayout>-->
<!-- <LinearLayout-->
<!-- android:id="@+id/ll_measureC"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:orientation="vertical">-->
<!-- <CheckBox-->
<!-- android:id="@+id/cb_measureC"-->
<!-- style="@style/Widget.AppCompat.CompoundButton.RadioButton"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:text="选项A：" />-->
<!-- <ImageView-->
<!-- android:id="@+id/iv_measureC"-->
<!-- android:layout_width="100dp"-->
<!-- android:layout_height="100dp"-->
<!-- android:src="@drawable/select_check" />-->
<!-- </LinearLayout>-->
<!-- <LinearLayout-->
<!-- android:id="@+id/ll_measureD"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:orientation="vertical">-->
<!-- <CheckBox-->
<!-- android:id="@+id/cb_measureD"-->
<!-- style="@style/Widget.AppCompat.CompoundButton.RadioButton"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:text="选项A：" />-->
<!-- <ImageView-->
<!-- android:id="@+id/iv_measureD"-->
<!-- android:layout_width="100dp"-->
<!-- android:layout_height="100dp"-->
<!-- android:src="@drawable/select_check" />-->
<!-- </LinearLayout>-->
<!-- <LinearLayout-->
<!-- android:id="@+id/ll_measureE"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:orientation="vertical"-->
<!-- android:visibility="gone">-->
<!-- <CheckBox-->
<!-- style="@style/Widget.AppCompat.CompoundButton.RadioButton"-->
<!-- android:id="@+id/cb_measureE"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:text="选项A：" />-->
<!-- <ImageView-->
<!-- android:id="@+id/iv_measureE"-->
<!-- android:layout_width="100dp"-->
<!-- android:layout_height="100dp"-->
<!-- android:src="@drawable/select_check" />-->
<!-- </LinearLayout>-->
<!-- <LinearLayout-->
<!-- android:id="@+id/ll_measureF"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:orientation="vertical"-->
<!-- android:visibility="gone">-->
<!-- <RadioButton-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:text="选项A：" />-->
<!-- <ImageView-->
<!-- android:id="@+id/iv_measureF"-->
<!-- android:layout_width="100dp"-->
<!-- android:layout_height="100dp"-->
<!-- android:src="@drawable/select_check" />-->
<!-- </LinearLayout>-->
<!-- <LinearLayout-->
<!-- android:id="@+id/ll_measureG"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:orientation="vertical"-->
<!-- android:visibility="gone">-->
<!-- <RadioButton-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:text="选项A：" />-->
<!-- <ImageView-->
<!-- android:id="@+id/iv_measureG"-->
<!-- android:layout_width="100dp"-->
<!-- android:layout_height="100dp"-->
<!-- android:src="@drawable/select_check" />-->
<!-- </LinearLayout>-->
<!-- </LinearLayout>-->
</androidx.constraintlayout.widget.ConstraintLayout>

1
app/src/main/res/layout/set_fragment.xml
View File

@ -207,6 +207,7 @@
android:layout_marginTop="40dp"
android:layout_marginRight="20dp"
android:text="退出登录"
style="@style/user_data_style"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/relativeLayout" />

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

@ -31,6 +31,7 @@
android:layout_toRightOf="@id/iv_find_task"
android:gravity="center"
android:text="实名认证"
android:textColor="#fff"
android:textSize="17sp"
android:textStyle="bold" />
@ -55,7 +56,7 @@
android:layout_width="100dp"
android:layout_height="wrap_content"
android:gravity="center"
android:text="姓名："
android:text="姓 名："
android:textColor="#333"
android:textSize="18sp" />
@ -133,6 +134,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="40dp"
style="@style/user_data_style"
android:text="认证" />
</LinearLayout>

133
app/src/main/res/layout/user_data_fragment.xml
View File

@ -1,15 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
xmlns:app="http://schemas.android.com/apk/res-auto">
android:layout_height="match_parent">
<LinearLayout
android:id="@+id/rl_user"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="#1BA5F1"
android:paddingTop="@dimen/top_pind_sp"
android:orientation="horizontal"
android:paddingTop="@dimen/top_pind_sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
@ -20,13 +21,12 @@
android:layout_height="45dp"
android:layout_alignParentLeft="true"
android:layout_marginLeft="15dp"
android:src="@drawable/icon_arrow"
/>
android:src="@drawable/icon_arrow" />
<TextView
android:id="@+id/tv_user"
android:layout_width="wrap_content"
style="@style/text_style_toolbar_title"
android:layout_width="wrap_content"
android:layout_toRightOf="@id/iv_find_task"
android:text="用户资料" />
</LinearLayout>
@ -36,10 +36,10 @@
style="@style/text_style"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="账号信息"
android:layout_margin="20dp"
app:layout_constraintStart_toStartOf="parent"
android:text="账号信息"
app:layout_constraintBottom_toTopOf="@id/linearLayout"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/rl_user" />
<LinearLayout
@ -47,10 +47,10 @@
android:layout_width="match_parent"
android:layout_height="480dp"
android:layout_marginLeft="20dp"
android:layout_marginTop="20dp"
android:layout_marginRight="20dp"
android:background="#fff"
android:orientation="vertical"
android:layout_marginTop="20dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tv_title">
@ -62,23 +62,22 @@
android:gravity="center_vertical">
<TextView
style="@style/user_text_style"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="实名认证"
android:layout_marginLeft="20dp"
android:layout_centerVertical="true"
style="@style/user_text_style" />
android:layout_marginLeft="20dp"
android:text="实名认证" />
<Button
android:id="@+id/btn_attestation"
style="@style/user_style"
android:layout_width="70dp"
android:layout_height="30dp"
android:layout_alignParentRight="true"
android:layout_marginRight="10dp"
android:text="去认证"
android:textColor="#fff"
style="@style/user_style"
android:layout_centerVertical="true"
/>
android:textColor="#fff" />
</RelativeLayout>
@ -94,24 +93,23 @@
android:gravity="center_vertical">
<TextView
style="@style/user_text_style"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="收款信息"
android:layout_marginLeft="20dp"
android:layout_centerVertical="true"
style="@style/user_text_style"
/>
android:layout_marginLeft="20dp"
android:text="收款信息" />
<Button
android:id="@+id/btn_gathering"
style="@style/user_style"
android:layout_width="70dp"
android:layout_height="30dp"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginRight="10dp"
android:text="去绑定"
android:textColor="#fff"
style="@style/user_style"
android:layout_centerVertical="true"
/>
android:textColor="#fff" />
</RelativeLayout>
<View
@ -127,21 +125,21 @@
<TextView
android:id="@+id/tv_region"
style="@style/user_text_style"
android:layout_width="80dp"
android:layout_height="wrap_content"
android:text="所在地区*"
android:layout_centerVertical="true"
android:layout_marginLeft="20dp"
style="@style/user_text_style"
/>
android:text="所在地区*" />
<EditText
android:layout_toRightOf="@id/tv_region"
android:layout_width="wrap_content"
android:id="@+id/et_region"
style="@style/user_hint_style"
android:layout_centerVertical="true"
android:hint="请选择所在区域"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
/>
android:layout_centerVertical="true"
android:layout_toRightOf="@id/tv_region"
android:hint="请选择所在区域" />
</RelativeLayout>
<View
@ -157,21 +155,21 @@
<TextView
android:id="@+id/tv_number"
style="@style/user_text_style"
android:layout_width="80dp"
android:layout_height="wrap_content"
android:text="手机号码*"
android:layout_centerVertical="true"
android:layout_marginLeft="20dp"
style="@style/user_text_style"
/>
android:text="手机号码*" />
<EditText
android:layout_toRightOf="@id/tv_number"
android:layout_width="wrap_content"
android:id="@+id/et_phone"
style="@style/user_hint_style"
android:layout_centerVertical="true"
android:hint="请输入手机号码"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
/>
android:layout_centerVertical="true"
android:layout_toRightOf="@id/tv_number"
android:hint="请输入手机号码" />
</RelativeLayout>
<View
@ -187,21 +185,21 @@
<TextView
android:id="@+id/tv_qq"
style="@style/user_text_style"
android:layout_width="80dp"
android:layout_height="wrap_content"
android:text="QQ号码*"
android:layout_centerVertical="true"
android:layout_marginLeft="20dp"
style="@style/user_text_style"
/>
android:text="QQ号码*" />
<EditText
android:layout_toRightOf="@id/tv_qq"
android:layout_width="wrap_content"
android:layout_centerVertical="true"
android:hint="请输入QQ号码"
android:id="@+id/et_qq"
style="@style/user_hint_style"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
/>
android:layout_centerVertical="true"
android:layout_toRightOf="@id/tv_qq"
android:hint="请输入QQ号码" />
</RelativeLayout>
<View
@ -217,21 +215,21 @@
<TextView
android:id="@+id/tv_mailbox"
style="@style/user_text_style"
android:layout_width="80dp"
android:layout_height="wrap_content"
android:text="电子邮箱*"
android:layout_centerVertical="true"
android:layout_marginLeft="20dp"
style="@style/user_text_style"
/>
android:text="电子邮箱*" />
<EditText
android:layout_toRightOf="@id/tv_mailbox"
android:layout_width="wrap_content"
android:layout_centerVertical="true"
android:hint="请输入邮箱地址"
android:id="@+id/et_mailbox"
style="@style/user_hint_style"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
/>
android:layout_centerVertical="true"
android:layout_toRightOf="@id/tv_mailbox"
android:hint="请输入邮箱地址" />
</RelativeLayout>
<View
@ -245,34 +243,35 @@
android:layout_weight="1">
<TextView
style="@style/user_text_style"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="微信"
android:layout_marginLeft="20dp"
android:layout_centerVertical="true"
style="@style/user_text_style"
/>
android:layout_marginLeft="20dp"
android:text="微信" />
<Button
style="@style/user_style"
android:layout_width="70dp"
android:layout_height="30dp"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginRight="10dp"
android:text="去绑定"
android:textColor="#fff"
style="@style/user_style"
android:layout_centerVertical="true"
/>
android:textColor="#fff" />
</RelativeLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="#F1F0F0" />
<Button
android:layout_marginTop="50dp"
android:id="@+id/user_save"
style="@style/user_data_style"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="保存"
/>
android:layout_marginTop="50dp"
android:text="保存" />
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

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

@ -47,7 +47,7 @@
android:layout_width="match_parent"
android:layout_height="200dp"
android:layout_margin="20dp"
android:background="#fff"
android:background="@mipmap/white_bg"
app:layout_constraintEnd_toEndOf="@+id/linear_hint"
app:layout_constraintStart_toStartOf="@+id/linear_hint"
app:layout_constraintTop_toBottomOf="@+id/rl_withdraw">
@ -188,9 +188,10 @@
<Button
android:id="@+id/button"
android:layout_width="match_parent"
android:layout_height="70dp"
android:layout_height="50dp"
android:layout_margin="20dp"
android:text="立即提现"
style="@style/user_data_style"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/checkBox" />

BIN
app/src/main/res/mipmap-xhdpi/white_bg.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.2 KiB

14
app/src/main/res/values/styles.xml
View File

@ -54,12 +54,12 @@
<style name="main_style">
<item name="android:textColor">#ffffff</item>
<item name="android:textSize">15sp</item>
<item name="android:background">@drawable/shape_red_radius_bg</item>
<item name="android:background">@drawable/user_style</item>
</style>
<!--‘我的’退出登录设置-->
<style name="main_outLogin_style">
<item name="android:textColor">#ffffff</item>
<item name="android:background">@drawable/main_shape_outlogin</item>
<item name="android:background">@drawable/mine_outlogin_ripple</item>
</style>
<!-- ‘我的’字体设置 -->
<style name="main_text_style">
@ -74,7 +74,7 @@
<!-- ‘我的-用户资料’方框设置-->
<style name="user_style">
<item name="android:background">@drawable/user_shape</item>
<item name="android:background">@drawable/user_rz</item>
</style>
<!-- ‘我的-用户资料’字体设置-->
<style name="user_text_style">
@ -89,7 +89,7 @@
<!-- 登录背景设置-->
<style name="login_style">
<item name="android:textSize">18sp</item>
<item name="android:background">@drawable/selector_change_color_btn_bg</item>
<item name="android:background">@drawable/login_ripple</item>
<item name="android:textColor">@color/colorPrimaryDark</item>
</style>
<!--'注册'hint设置-->
@ -107,11 +107,15 @@
<item name="android:layout_marginRight">20dp</item>
<item name="android:textStyle">bold</item>
</style>
<!-- 状态栏设置-->
<!-- '我的-关于'状态栏设置-->
<style name="toolbar_style_titleBlack">
<item name="android:textColor">#171918</item>
<item name="android:textSize">17sp</item>
<item name="android:layout_marginRight">20dp</item>
<item name="android:textStyle">bold</item>
</style>
<style name="user_data_style">
<item name="android:background">@drawable/user_style</item>
<item name="android:textColor">@color/white</item>
</style>
</resources>