diff --git a/.idea/misc.xml b/.idea/misc.xml
index 7bfef59..b6ea2b1 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -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">
diff --git a/app/build.gradle b/app/build.gradle
index 7fbb3ef..e88d242 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -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"
diff --git a/app/src/main/java/com/navinfo/outdoor/adapter/CapacityMeasureAdapter.java b/app/src/main/java/com/navinfo/outdoor/adapter/CapacityMeasureAdapter.java
index 51ac0c7..d07cd57 100644
--- a/app/src/main/java/com/navinfo/outdoor/adapter/CapacityMeasureAdapter.java
+++ b/app/src/main/java/com/navinfo/outdoor/adapter/CapacityMeasureAdapter.java
@@ -47,7 +47,7 @@ public class CapacityMeasureAdapter extends RecyclerView.Adapter<CapacityMeasure
@NonNull
@Override
public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
- final View inflate = LayoutInflater.from(context).inflate(R.layout.measure_item, parent, false);
+ View inflate = LayoutInflater.from(context).inflate(R.layout.measure_item, parent, false);
return new ViewHolder(inflate);
}
@@ -94,6 +94,9 @@ public class CapacityMeasureAdapter extends RecyclerView.Adapter<CapacityMeasure
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
if (isChecked) {
checkedChangeRadioButton(parentLayout, buttonView);
+
+ // Toast.makeText(context, "option" + option, Toast.LENGTH_SHORT).show();
+
updateCheckedMap(questionId, buttonView, parentLayout);
}
diff --git a/app/src/main/java/com/navinfo/outdoor/adapter/IssueProblemAdapter.java b/app/src/main/java/com/navinfo/outdoor/adapter/IssueProblemAdapter.java
new file mode 100644
index 0000000..39cee88
--- /dev/null
+++ b/app/src/main/java/com/navinfo/outdoor/adapter/IssueProblemAdapter.java
@@ -0,0 +1,65 @@
+package com.navinfo.outdoor.adapter;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.navinfo.outdoor.R;
+import com.navinfo.outdoor.bean.TaskExplainInfo;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class IssueProblemAdapter extends RecyclerView.Adapter<IssueProblemAdapter.ViewHolder> {
+ private List<TaskExplainInfo.BodyBean.DataBean> issueList = new ArrayList<>();
+ private Context context;
+
+ public IssueProblemAdapter(Context context) {
+ this.context = context;
+ }
+
+ public void setExplainList(List<TaskExplainInfo.BodyBean.DataBean> explainList) {
+ this.issueList.addAll(explainList);
+ notifyDataSetChanged();
+ }
+
+ @NonNull
+ @Override
+ public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+ final View issueItem = LayoutInflater.from(context).inflate(R.layout.issue_problem_item, parent, false);
+
+ return new ViewHolder(issueItem);
+ }
+
+ @Override
+ public void onBindViewHolder(@NonNull ViewHolder holder, int position) {
+ holder.tvIssue.setText(issueList.get(position).getTitle());
+ }
+
+ @Override
+ public int getItemCount() {
+ return issueList.size();
+ }
+
+ class ViewHolder extends RecyclerView.ViewHolder {
+ TextView tvIssue;
+
+ public ViewHolder(@NonNull View itemView) {
+ super(itemView);
+ 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;
+ }
+}
diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/AboutFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/AboutFragment.java
index 3e74e04..a8bfd90 100644
--- a/app/src/main/java/com/navinfo/outdoor/fragment/AboutFragment.java
+++ b/app/src/main/java/com/navinfo/outdoor/fragment/AboutFragment.java
@@ -1,12 +1,20 @@
package com.navinfo.outdoor.fragment;
+import android.view.View;
+import android.widget.ImageView;
+
+import com.bumptech.glide.Glide;
+import com.bumptech.glide.request.RequestOptions;
import com.navinfo.outdoor.R;
import com.navinfo.outdoor.base.BaseFragment;
/**
* 关于页面的fragment
*/
-public class AboutFragment extends BaseFragment {
+public class AboutFragment extends BaseFragment implements View.OnClickListener {
+ private ImageView ivAboutFinish;
+ private ImageView imageAbout;
+
@Override
protected int getLayout() {
return R.layout.about_fragment;
@@ -20,6 +28,17 @@ public class AboutFragment extends BaseFragment {
@Override
protected void initView() {
super.initView();
+ ivAboutFinish = (ImageView) findViewById(R.id.iv_about_finish);
+ ivAboutFinish.setOnClickListener(this::onClick);
+ imageAbout = (ImageView) findViewById(R.id.image_about);
}
+ @Override
+ public void onClick(View v) {
+ switch (v.getId()) {
+ case R.id.iv_about_finish:
+ getActivity().finish();
+ break;
+ }
+ }
}
diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/ForgetPawFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/ForgetPawFragment.java
index cc3c5d5..c1ca3e6 100644
--- a/app/src/main/java/com/navinfo/outdoor/fragment/ForgetPawFragment.java
+++ b/app/src/main/java/com/navinfo/outdoor/fragment/ForgetPawFragment.java
@@ -30,8 +30,7 @@ public class ForgetPawFragment extends BaseFragment implements View.OnClickListe
@Override
protected void initView() {
super.initView();
- ivFinish = findViewById(R.id.iv_finish);
- title = findViewById(R.id.title);
+ ivFinish = findViewById(R.id.iv_forgePaw_finish);
etForgetPawPhone = findViewById(R.id.et_forgetPaw_phone);
etForgetPawNote = findViewById(R.id.et_forgetPaw_note);
etForgetPawPaw = findViewById(R.id.et_forgetPaw_paw);
@@ -41,7 +40,7 @@ public class ForgetPawFragment extends BaseFragment implements View.OnClickListe
ivFinish.setOnClickListener(this::onClick);
forgetPawGetNote.setOnClickListener(this::onClick);
- title.setText("忘记密码");
+
}
@@ -53,7 +52,7 @@ public class ForgetPawFragment extends BaseFragment implements View.OnClickListe
@Override
public void onClick(View v) {
switch (v.getId()){
- case R.id.iv_finish:
+ case R.id.iv_forgePaw_finish:
getActivity().finish();
break;
case R.id.forgetPaw_get_note:
diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/IssueFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/IssueFragment.java
index af310dc..8a58a32 100644
--- a/app/src/main/java/com/navinfo/outdoor/fragment/IssueFragment.java
+++ b/app/src/main/java/com/navinfo/outdoor/fragment/IssueFragment.java
@@ -1,12 +1,38 @@
package com.navinfo.outdoor.fragment;
+
+import android.util.Log;
+import android.view.View;
+import android.widget.ImageView;
+
+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.adapter.IssueProblemAdapter;
import com.navinfo.outdoor.base.BaseFragment;
+import com.navinfo.outdoor.bean.TaskExplainInfo;
+import com.navinfo.outdoor.http.Callback;
+import com.navinfo.outdoor.http.HttpInterface;
+import com.navinfo.outdoor.http.OkGoBuilder;
+
+import org.json.JSONObject;
+
+import java.util.ArrayList;
+
+import okhttp3.OkHttpClient;
/**
* 常见问题页面的fragment
*/
-public class IssueFragment extends BaseFragment {
+public class IssueFragment extends BaseFragment implements View.OnClickListener {
+ private ImageView ivIssueFinish;
+ private XRecyclerView mainIssueRecycler;
+ private IssueProblemAdapter issueProblemAdapter;
+ private ArrayList<TaskExplainInfo.BodyBean.DataBean> issueList;
+
@Override
protected int getLayout() {
return R.layout.issue_fragment;
@@ -15,11 +41,72 @@ public class IssueFragment extends BaseFragment {
@Override
protected void initData() {
super.initData();
+ issueList = new ArrayList<>();
+ initNetWork(true);
+ }
+
+ private void initNetWork(boolean b) {
+ OkGoBuilder.getInstance()
+ .Builder(getActivity())
+ .url(HttpInterface.listTaskExplain)
+ .method(OkGoBuilder.GET)
+ .cls(TaskExplainInfo.class)
+ .json(new JSONObject())
+ .callback(new Callback<TaskExplainInfo>() {
+ @Override
+ public void onSuccess(TaskExplainInfo response, int id) {
+ dismissLoadingDialog();
+ issueProblemAdapter.setExplainList(response.getBody().getData());
+ Log.d("TAG", "onSuccess: " + response.getMsg() + "");
+ }
+
+ @Override
+ public void onError(Throwable e, int id) {
+ dismissLoadingDialog();
+ // Toast.makeText(getActivity(), e.getMessage(), Toast.LENGTH_SHORT).show();
+ Log.d("TAG", "onError: " + e.getMessage());
+ }
+ }).build();
}
@Override
protected void initView() {
super.initView();
+ ivIssueFinish = (ImageView) findViewById(R.id.iv_issue_finish);
+ mainIssueRecycler = (XRecyclerView) findViewById(R.id.main_issue_recycler);
+ ivIssueFinish.setOnClickListener(this::onClick);
+ mainIssueRecycler.setLayoutManager(new LinearLayoutManager(getActivity()));
+ //设置下划线
+ mainIssueRecycler.addItemDecoration(new DividerItemDecoration(getActivity(), DividerItemDecoration.VERTICAL));
+ mainIssueRecycler.setRefreshProgressStyle(ProgressStyle.BallSpinFadeLoader);
+ mainIssueRecycler.setLoadingMoreProgressStyle(ProgressStyle.BallRotate);
+ //取消下拉刷新上拉加载
+ mainIssueRecycler.setPullRefreshEnabled(false);
+ mainIssueRecycler.setLoadingMoreEnabled(false);
+ issueProblemAdapter = new IssueProblemAdapter(getActivity());
+ mainIssueRecycler.setAdapter(issueProblemAdapter);
+ mainIssueRecycler.getDefaultFootView().setNoMoreHint("成功加载完毕");
+ mainIssueRecycler.setLoadingListener(new XRecyclerView.LoadingListener() {
+ @Override
+ public void onRefresh() {
+
+ }
+
+ @Override
+ public void onLoadMore() {
+
+ }
+ });
+
+
}
+ @Override
+ public void onClick(View v) {
+ switch (v.getId()) {
+ case R.id.iv_issue_finish:
+ getActivity().finish();
+ break;
+ }
+ }
}
diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/RegisterFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/RegisterFragment.java
index 4895d3f..11b9729 100644
--- a/app/src/main/java/com/navinfo/outdoor/fragment/RegisterFragment.java
+++ b/app/src/main/java/com/navinfo/outdoor/fragment/RegisterFragment.java
@@ -1,17 +1,19 @@
package com.navinfo.outdoor.fragment;
+import android.content.Intent;
import android.view.View;
import android.widget.EditText;
import android.widget.ImageView;
import android.widget.TextView;
import com.navinfo.outdoor.R;
+import com.navinfo.outdoor.activity.LoginActivity;
import com.navinfo.outdoor.base.BaseFragment;
/**
* 注册页面
*/
-public class RegisterFragment extends BaseFragment {
+public class RegisterFragment extends BaseFragment implements View.OnClickListener{
private EditText etRegisterPhone;
@@ -34,7 +36,7 @@ public class RegisterFragment extends BaseFragment {
@Override
protected void initView() {
super.initView();
- ivFinish =findViewById(R.id.iv_finish);
+ ivFinish =findViewById(R.id.iv_register_finish);
etRegisterPhone =findViewById(R.id.et_register_phone);
etRegisterNote = findViewById(R.id.et_register_note);
registerGetNote = findViewById(R.id.register_get_note);
@@ -44,12 +46,8 @@ public class RegisterFragment extends BaseFragment {
ivRegisterCheck = findViewById(R.id.iv_register_check);
haveGoLogin = findViewById(R.id.have_go_login);
tvRegister =findViewById(R.id.tv_register);
- ivFinish.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- getActivity().finish();
- }
- });
+ ivFinish.setOnClickListener(this::onClick);
+ haveGoLogin.setOnClickListener(this::onClick);
}
@@ -59,4 +57,16 @@ public class RegisterFragment extends BaseFragment {
super.initData();
}
+ @Override
+ public void onClick(View v) {
+ switch (v.getId()){
+ case R.id.iv_register_finish:
+ getActivity().finish();
+ break;
+ case R.id.have_go_login:
+ Intent registerLogin = new Intent(getActivity(), LoginActivity.class);
+ startActivity(registerLogin);
+ break;
+ }
+ }
}
\ No newline at end of file
diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/TaskExplainFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/TaskExplainFragment.java
index d52ed1e..154065d 100644
--- a/app/src/main/java/com/navinfo/outdoor/fragment/TaskExplainFragment.java
+++ b/app/src/main/java/com/navinfo/outdoor/fragment/TaskExplainFragment.java
@@ -48,6 +48,7 @@ public class TaskExplainFragment extends BaseFragment implements View.OnClickLis
taskExplainRecycle.setLayoutManager(new LinearLayoutManager(getActivity()));
//下划线
taskExplainRecycle.addItemDecoration(new DividerItemDecoration(getActivity(), DividerItemDecoration.VERTICAL));
+
taskExplainRecycle.setRefreshProgressStyle(ProgressStyle.BallSpinFadeLoader);
taskExplainRecycle.setLoadingMoreProgressStyle(ProgressStyle.BallRotate);
//取消上啦加载下拉刷新
diff --git a/app/src/main/res/drawable/icon_arrow_final.xml b/app/src/main/res/drawable/icon_arrow_final.xml
new file mode 100644
index 0000000..516febf
--- /dev/null
+++ b/app/src/main/res/drawable/icon_arrow_final.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector android:height="24dp" android:tint="#8E8E8E"
+ android:viewportHeight="24" android:viewportWidth="24"
+ android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+ <path android:fillColor="@android:color/white" android:pathData="M11.67,3.87L9.9,2.1 0,12l9.9,9.9 1.77,-1.77L3.54,12z"/>
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/main_shape_outlogin.xml b/app/src/main/res/drawable/main_shape_outlogin.xml
new file mode 100644
index 0000000..7794695
--- /dev/null
+++ b/app/src/main/res/drawable/main_shape_outlogin.xml
@@ -0,0 +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" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/select_check.xml b/app/src/main/res/drawable/select_check.xml
index b0c52fb..96fbf55 100644
--- a/app/src/main/res/drawable/select_check.xml
+++ b/app/src/main/res/drawable/select_check.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
-<item android:drawable="@mipmap/checkbox" android:state_selected="false"/>
-<item android:drawable="@mipmap/checkbox_checked" android:state_selected="true"/>
+<item android:drawable="@mipmap/checkbox" android:state_pressed="false"/>
+<item android:drawable="@mipmap/checkbox_checked" android:state_pressed="true"/>
</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/selector_change_color_btn_bg.xml b/app/src/main/res/drawable/selector_change_color_btn_bg.xml
index 8505197..20e2ab5 100644
--- a/app/src/main/res/drawable/selector_change_color_btn_bg.xml
+++ b/app/src/main/res/drawable/selector_change_color_btn_bg.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:drawable="@drawable/shape_red_radius_bg" android:state_selected="true" />
- <item android:drawable="@drawable/shape_transparent_pink_radius_bg" android:state_selected="false" />
+ <item android:drawable="@drawable/shape_red_radius_bg" android:state_pressed="true" />
+ <item android:drawable="@drawable/shape_transparent_pink_radius_bg" android:state_pressed="false"/>
</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_red_radius_bg.xml b/app/src/main/res/drawable/shape_red_radius_bg.xml
index 539f829..208e9bd 100644
--- a/app/src/main/res/drawable/shape_red_radius_bg.xml
+++ b/app/src/main/res/drawable/shape_red_radius_bg.xml
@@ -1,6 +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" />
</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/user_shape.xml b/app/src/main/res/drawable/user_shape.xml
new file mode 100644
index 0000000..8b0b2fc
--- /dev/null
+++ b/app/src/main/res/drawable/user_shape.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+ <solid android:color="@color/colorBlue" />
+ <corners android:radius="5dp" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/about_fragment.xml b/app/src/main/res/layout/about_fragment.xml
index 61a4490..6b7642c 100644
--- a/app/src/main/res/layout/about_fragment.xml
+++ b/app/src/main/res/layout/about_fragment.xml
@@ -1,6 +1,182 @@
<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
- xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent"
+<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">
+ <LinearLayout
+ android:id="@+id/ll_about"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:background="@color/white"
+ android:orientation="horizontal"
+ android:paddingTop="@dimen/top_pind_sp"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent">
+
+ <ImageView
+ android:id="@+id/iv_about_finish"
+ android:layout_width="wrap_content"
+ android:layout_height="45dp"
+ android:layout_alignParentLeft="true"
+ android:layout_marginLeft="15dp"
+ android:src="@drawable/icon_arrow_final" />
+
+ <TextView
+ android:id="@+id/tv_about_title"
+ style="@style/toolbar_style_titleBlack"
+ android:layout_width="match_parent"
+ android:layout_height="45dp"
+ android:layout_toRightOf="@id/iv_find_task"
+ android:gravity="center"
+ android:text="关于" />
+ </LinearLayout>
+
+ <View
+ android:id="@+id/view1"
+ android:layout_width="match_parent"
+ android:layout_height="20dp"
+ android:background="#ECECEC"
+ app:layout_constraintTop_toBottomOf="@id/ll_about" />
+
+ <LinearLayout
+ android:id="@+id/ll_image"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:background="@color/white"
+ android:orientation="vertical"
+ app:layout_constraintTop_toBottomOf="@+id/view1">
+
+ <ImageView
+ android:layout_width="100dp"
+ android:layout_height="100dp"
+ android:layout_gravity="center"
+ android:layout_marginTop="15dp"
+ android:src="@mipmap/ic_launcher"
+ />
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ android:layout_marginTop="15dp"
+ android:text="企鹅汇图"
+ android:textColor="@color/black"
+ android:textSize="20sp"
+ android:textStyle="bold" />
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ android:layout_marginTop="10dp"
+ android:text="Version 3.1.1"
+ android:textSize="18sp" />
+ </LinearLayout>
+
+ <View
+ android:id="@+id/view2"
+ android:layout_width="match_parent"
+ android:layout_height="20dp"
+ android:background="#ECECEC"
+ app:layout_constraintTop_toBottomOf="@id/ll_image" />
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
+ android:background="@color/white"
+ android:orientation="vertical"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/view2">
+
+ <RelativeLayout
+ android:id="@+id/rl_about"
+ android:layout_width="match_parent"
+ android:layout_height="60dp"
+ android:layout_marginLeft="15dp"
+ android:gravity="center"
+ android:background="?android:attr/selectableItemBackground">
+
+ <TextView
+ style="@style/main_about_text_style"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="关于企鹅汇图" />
+
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentRight="true"
+ android:layout_marginRight="15dp"
+ android:background="@drawable/ic_baseline_arrow_forward"
+ android:gravity="center"
+ android:textSize="16sp" />
+ </RelativeLayout>
+
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="1dp"
+ android:background="#F1F0F0" />
+
+ <RelativeLayout
+ android:id="@+id/rl_serve"
+ android:layout_width="match_parent"
+ android:layout_height="60dp"
+ android:layout_marginLeft="15dp"
+ android:background="?android:attr/selectableItemBackground"
+ android:gravity="center_vertical">
+
+ <TextView
+ style="@style/main_about_text_style"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="企鹅汇图服务协议条款" />
+
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentRight="true"
+ android:layout_marginRight="15dp"
+ android:background="@drawable/ic_baseline_arrow_forward"
+ android:gravity="center"
+ android:textSize="16sp" />
+ </RelativeLayout>
+
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="1dp"
+ android:background="#F1F0F0" />
+
+ <RelativeLayout
+ android:id="@+id/rl_privilege"
+ android:layout_width="match_parent"
+ android:layout_height="60dp"
+ android:layout_marginLeft="15dp"
+ android:background="?android:attr/selectableItemBackground"
+ android:gravity="center_vertical">
+
+ <TextView
+ style="@style/main_about_text_style"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="关于企鹅汇图" />
+
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentRight="true"
+ android:layout_marginRight="15dp"
+ android:background="@drawable/ic_baseline_arrow_forward"
+ android:gravity="center"
+ android:textSize="16sp" />
+ </RelativeLayout>
+
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="1dp"
+ android:background="#F1F0F0" />
+ </LinearLayout>
+
+
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index b080c9c..b205f74 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -32,12 +32,11 @@
<TextView
android:id="@+id/login_name"
+ style="@style/text_styles"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="25dp"
android:text="用户名"
- android:textColor="@color/colorWhite"
- android:textSize="14sp"
app:layout_constraintLeft_toLeftOf="@id/tv_login_deck"
app:layout_constraintTop_toBottomOf="@id/tv_login_deck" />
@@ -57,12 +56,11 @@
<TextView
android:id="@+id/login_paw"
+ style="@style/text_styles"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="25dp"
android:text="密码"
- android:textColor="@color/colorWhite"
- android:textSize="14sp"
app:layout_constraintLeft_toLeftOf="@id/et_login_name"
app:layout_constraintTop_toBottomOf="@id/et_login_name" />
@@ -79,51 +77,54 @@
app:layout_constraintLeft_toLeftOf="@id/login_paw"
app:layout_constraintTop_toBottomOf="@id/login_paw" />
- <CheckBox
- android:id="@+id/cb_disclaimer"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:buttonTint="@color/colorWhite"
- android:scaleX="0.7"
- android:scaleY="0.7"
- android:text="免责声明"
- android:textColor="@color/colorWhite"
- android:textSize="14sp"
+ <ImageView
+ android:id="@+id/iv_login_check"
+ android:layout_width="16dp"
+ android:layout_height="16dp"
+ android:layout_marginTop="5dp"
+ android:background="@drawable/select_check"
app:layout_constraintLeft_toLeftOf="@id/et_login_paw"
app:layout_constraintTop_toBottomOf="@id/et_login_paw" />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginLeft="2dp"
+ android:text="免责声明"
+ android:textColor="@color/colorWhite"
+ app:layout_constraintBottom_toBottomOf="@id/iv_login_check"
+ app:layout_constraintLeft_toRightOf="@id/iv_login_check"
+ app:layout_constraintTop_toTopOf="@id/iv_login_check" />
+
<TextView
android:id="@+id/tv_register"
+ style="@style/text_styles"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:layout_marginRight="10dp"
android:text="注册"
- android:textColor="@color/colorWhite"
- android:textSize="12sp"
app:layout_constraintRight_toLeftOf="@id/tv_forget_paw"
app:layout_constraintTop_toBottomOf="@id/et_login_paw" />
<TextView
android:id="@+id/tv_forget_paw"
+ style="@style/text_styles"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:text="忘记密码"
- android:textColor="@color/colorWhite"
- android:textSize="12sp"
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"
android:layout_width="300dp"
android:layout_height="50dp"
android:layout_marginTop="20dp"
- android:background="@drawable/selector_change_color_btn_bg"
android:gravity="center"
android:text="登录"
- android:textColor="@color/colorPrimaryDark"
- app:layout_constraintLeft_toLeftOf="@id/cb_disclaimer"
- app:layout_constraintTop_toBottomOf="@id/tv_forget_paw"/>
+ app:layout_constraintLeft_toLeftOf="@id/iv_login_check"
+ app:layout_constraintTop_toBottomOf="@id/tv_forget_paw" />
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/capacity_measure_option.xml b/app/src/main/res/layout/capacity_measure_option.xml
index 3312114..09ec495 100644
--- a/app/src/main/res/layout/capacity_measure_option.xml
+++ b/app/src/main/res/layout/capacity_measure_option.xml
@@ -18,11 +18,13 @@
<TextView
android:id="@+id/tv_option_content"
android:layout_width="wrap_content"
- android:layout_height="wrap_content" />
+ android:layout_height="wrap_content"/>
<ImageView
android:id="@+id/iv_option_img"
android:layout_width="200dp"
android:layout_height="100dp"
android:src="@mipmap/top_bg" />
+
+
</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_forget_paw.xml b/app/src/main/res/layout/fragment_forget_paw.xml
index ecbb710..6c57d41 100644
--- a/app/src/main/res/layout/fragment_forget_paw.xml
+++ b/app/src/main/res/layout/fragment_forget_paw.xml
@@ -1,24 +1,54 @@
<?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"
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"
android:background="@mipmap/bg"
tools:context=".fragment.ForgetPawFragment">
- <include layout="@layout/register_title" android:id="@+id/forgetPaw"/>
+
+ <LinearLayout
+ android:id="@+id/rl_forge_paw"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:background="@color/colorPrimaryBlue"
+ android:orientation="horizontal"
+ android:paddingTop="@dimen/top_pind_sp"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent">
+
+ <ImageView
+ android:id="@+id/iv_forgePaw_finish"
+ android:layout_width="wrap_content"
+ android:layout_height="45dp"
+ android:layout_alignParentLeft="true"
+ android:layout_marginLeft="15dp"
+ android:src="@drawable/ic_baseline_arrow" />
+
+ <TextView
+ android:id="@+id/tv_forgetPaw_title"
+ style="@style/toolbar_style"
+ android:layout_width="wrap_content"
+ android:layout_height="45dp"
+ android:layout_marginLeft="15dp"
+ android:layout_toRightOf="@id/iv_find_task"
+ android:gravity="center"
+ android:text="忘记密码" />
+ </LinearLayout>
+
<TextView
android:id="@+id/fragment_tv_forgetPaw"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="密码找回/修改"
- android:textSize="35sp"
- android:textColor="@color/colorWhite"
- app:layout_constraintTop_toBottomOf="@id/forgetPaw"
- app:layout_constraintLeft_toLeftOf="parent"
- android:layout_marginTop="35dp"
android:layout_marginLeft="20dp"
- />
+ android:layout_marginTop="35dp"
+ android:text="密码找回/修改"
+ android:textColor="@color/colorWhite"
+ android:textSize="35sp"
+ app:layout_constraintLeft_toLeftOf="parent"
+ app:layout_constraintTop_toBottomOf="@id/rl_forge_paw" />
+
<TextView
android:id="@+id/forgetPaw_phone"
android:layout_width="wrap_content"
@@ -27,30 +57,31 @@
android:text="手机号"
android:textColor="@color/colorWhite"
android:textSize="14sp"
- app:layout_constraintTop_toBottomOf="@id/fragment_tv_forgetPaw"
app:layout_constraintLeft_toLeftOf="@id/fragment_tv_forgetPaw"
- />
+ app:layout_constraintTop_toBottomOf="@id/fragment_tv_forgetPaw" />
<EditText
android:id="@+id/et_forgetPaw_phone"
android:layout_width="300dp"
android:layout_height="wrap_content"
- android:hint="11为手机号码"
- android:paddingBottom="10dp"
- android:paddingTop="10dp"
android:background="@null"
- android:textSize="15sp"
+ android:hint="11为手机号码"
+ android:paddingTop="10dp"
+ android:paddingBottom="10dp"
android:textColorHint="@color/colorTransparent"
android:textCursorDrawable="@drawable/text_color"
+ android:textSize="15sp"
android:theme="@style/MyEditText"
app:layout_constraintLeft_toLeftOf="@id/forgetPaw_phone"
app:layout_constraintTop_toBottomOf="@id/forgetPaw_phone" />
+
<View
android:layout_width="300dp"
android:layout_height="1dp"
android:background="@color/colorHui"
- app:layout_constraintTop_toBottomOf="@id/et_forgetPaw_phone"
- app:layout_constraintLeft_toLeftOf="@id/et_forgetPaw_phone"/>
+ app:layout_constraintLeft_toLeftOf="@id/et_forgetPaw_phone"
+ app:layout_constraintTop_toBottomOf="@id/et_forgetPaw_phone" />
+
<TextView
android:id="@+id/forgetPaw_note"
android:layout_width="wrap_content"
@@ -59,21 +90,20 @@
android:text="短信验证码"
android:textColor="@color/colorWhite"
android:textSize="14sp"
- app:layout_constraintTop_toBottomOf="@id/et_forgetPaw_phone"
app:layout_constraintLeft_toLeftOf="@id/et_forgetPaw_phone"
- />
+ app:layout_constraintTop_toBottomOf="@id/et_forgetPaw_phone" />
<EditText
android:id="@+id/et_forgetPaw_note"
android:layout_width="200dp"
android:layout_height="wrap_content"
- android:hint="6为短信验证"
- android:paddingBottom="10dp"
- android:paddingTop="10dp"
android:background="@null"
- android:textSize="15sp"
+ android:hint="6为短信验证"
+ android:paddingTop="10dp"
+ android:paddingBottom="10dp"
android:textColorHint="@color/colorTransparent"
android:textCursorDrawable="@drawable/text_color"
+ android:textSize="15sp"
android:theme="@style/MyEditText"
app:layout_constraintLeft_toLeftOf="@id/forgetPaw_note"
app:layout_constraintTop_toBottomOf="@id/forgetPaw_note" />
@@ -82,25 +112,27 @@
android:layout_width="300dp"
android:layout_height="1dp"
android:background="@color/colorHui"
- app:layout_constraintTop_toBottomOf="@id/et_forgetPaw_note"
- app:layout_constraintLeft_toLeftOf="@id/et_forgetPaw_note"/>
+ app:layout_constraintLeft_toLeftOf="@id/et_forgetPaw_note"
+ app:layout_constraintTop_toBottomOf="@id/et_forgetPaw_note" />
+
<TextView
android:id="@+id/forgetPaw_get_note"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:layout_marginRight="40dp"
android:text="获取短信验证码"
- android:textSize="14sp"
android:textColor="@color/colorWhite"
- app:layout_constraintTop_toTopOf="@id/et_forgetPaw_note"
+ android:textSize="14sp"
app:layout_constraintBottom_toBottomOf="@id/et_forgetPaw_note"
app:layout_constraintRight_toRightOf="parent"
- android:layout_marginRight="40dp"/>
-<TextView
- android:layout_width="300dp"
- android:layout_height="1dp"
- android:textColor="@color/colorWhite"
- app:layout_constraintTop_toBottomOf="@id/et_forgetPaw_note"
- app:layout_constraintLeft_toLeftOf="@id/et_forgetPaw_note"/>
+ app:layout_constraintTop_toTopOf="@id/et_forgetPaw_note" />
+
+ <TextView
+ android:layout_width="300dp"
+ android:layout_height="1dp"
+ android:textColor="@color/colorWhite"
+ app:layout_constraintLeft_toLeftOf="@id/et_forgetPaw_note"
+ app:layout_constraintTop_toBottomOf="@id/et_forgetPaw_note" />
<TextView
@@ -111,30 +143,31 @@
android:text="密码"
android:textColor="@color/colorWhite"
android:textSize="14sp"
- app:layout_constraintTop_toBottomOf="@id/et_forgetPaw_note"
app:layout_constraintLeft_toLeftOf="@id/et_forgetPaw_note"
- />
+ app:layout_constraintTop_toBottomOf="@id/et_forgetPaw_note" />
<EditText
android:id="@+id/et_forgetPaw_paw"
android:layout_width="300dp"
android:layout_height="wrap_content"
- android:hint="6-20位密码"
- android:paddingBottom="10dp"
- android:paddingTop="10dp"
android:background="@null"
- android:textSize="15sp"
+ android:hint="6-20位密码"
+ android:paddingTop="10dp"
+ android:paddingBottom="10dp"
android:textColorHint="@color/colorTransparent"
android:textCursorDrawable="@drawable/text_color"
+ android:textSize="15sp"
android:theme="@style/MyEditText"
app:layout_constraintLeft_toLeftOf="@id/forgetPaw_paw"
- app:layout_constraintTop_toBottomOf="@id/forgetPaw_paw"/>
+ app:layout_constraintTop_toBottomOf="@id/forgetPaw_paw" />
+
<View
android:layout_width="300dp"
android:layout_height="1dp"
android:background="@color/colorHui"
- app:layout_constraintTop_toBottomOf="@id/et_forgetPaw_paw"
- app:layout_constraintLeft_toLeftOf="@id/et_forgetPaw_paw"/>
+ app:layout_constraintLeft_toLeftOf="@id/et_forgetPaw_paw"
+ app:layout_constraintTop_toBottomOf="@id/et_forgetPaw_paw" />
+
<TextView
android:id="@+id/forgetPaw_confirm_paw"
android:layout_width="wrap_content"
@@ -143,43 +176,41 @@
android:text="确认密码"
android:textColor="@color/colorWhite"
android:textSize="14sp"
- app:layout_constraintTop_toBottomOf="@id/et_forgetPaw_paw"
app:layout_constraintLeft_toLeftOf="@id/et_forgetPaw_paw"
- />
+ app:layout_constraintTop_toBottomOf="@id/et_forgetPaw_paw" />
<EditText
android:id="@+id/et_forgetPaw_confirm_paw"
android:layout_width="300dp"
android:layout_height="wrap_content"
- android:hint="请再次输入一遍密码"
- android:paddingBottom="10dp"
- android:paddingTop="10dp"
android:background="@null"
- android:textSize="15sp"
+ android:hint="请再次输入一遍密码"
+ android:paddingTop="10dp"
+ android:paddingBottom="10dp"
android:textColorHint="@color/colorTransparent"
android:textCursorDrawable="@drawable/text_color"
+ android:textSize="15sp"
android:theme="@style/MyEditText"
app:layout_constraintLeft_toLeftOf="@id/forgetPaw_confirm_paw"
- app:layout_constraintTop_toBottomOf="@id/forgetPaw_confirm_paw"/>
+ app:layout_constraintTop_toBottomOf="@id/forgetPaw_confirm_paw" />
+
<View
android:layout_width="300dp"
android:layout_height="1dp"
android:background="@color/colorHui"
- app:layout_constraintTop_toBottomOf="@id/et_forgetPaw_confirm_paw"
- app:layout_constraintLeft_toLeftOf="@id/et_forgetPaw_confirm_paw"/>
+ app:layout_constraintLeft_toLeftOf="@id/et_forgetPaw_confirm_paw"
+ app:layout_constraintTop_toBottomOf="@id/et_forgetPaw_confirm_paw" />
+
<TextView
android:id="@+id/tv_forgetPaw"
+ style="@style/login_style"
android:layout_width="300dp"
android:layout_height="50dp"
android:layout_marginTop="20dp"
- android:background="@drawable/shape_login"
android:gravity="center"
android:text="提交"
- android:textSize="20dp"
- android:textColor="@color/colorPrimaryDark"
app:layout_constraintLeft_toLeftOf="parent"
- app:layout_constraintTop_toBottomOf="@id/et_forgetPaw_confirm_paw"
app:layout_constraintRight_toRightOf="parent"
- />
+ app:layout_constraintTop_toBottomOf="@id/et_forgetPaw_confirm_paw" />
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_register.xml b/app/src/main/res/layout/fragment_register.xml
index 5c1c834..05a00bc 100644
--- a/app/src/main/res/layout/fragment_register.xml
+++ b/app/src/main/res/layout/fragment_register.xml
@@ -7,8 +7,37 @@
android:background="@mipmap/bg"
tools:context=".fragment.RegisterFragment">
- <include layout="@layout/register_title"
- android:id="@+id/regs_title"/>
+ <LinearLayout
+ android:id="@+id/rl_register"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:background="@color/colorPrimaryBlue"
+ 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_register_finish"
+ android:layout_width="wrap_content"
+ android:layout_height="45dp"
+ android:layout_alignParentLeft="true"
+ android:layout_marginLeft="15dp"
+ android:src="@drawable/ic_baseline_arrow"
+ />
+
+ <TextView
+ android:id="@+id/tv_register_title"
+ android:layout_width="wrap_content"
+ android:layout_height="45dp"
+ android:layout_marginLeft="15dp"
+ android:layout_toRightOf="@id/iv_find_task"
+ android:gravity="center"
+ android:text="注册"
+ style="@style/toolbar_style"
+ />
+ </LinearLayout>
<TextView
android:id="@+id/register_title"
android:layout_width="match_parent"
@@ -19,7 +48,7 @@
android:textColor="@color/colorWhite"
android:textSize="30sp"
app:layout_constraintLeft_toLeftOf="parent"
- app:layout_constraintTop_toBottomOf="@id/regs_title" />
+ app:layout_constraintTop_toBottomOf="@id/rl_register" />
<TextView
android:id="@+id/register_desc"
@@ -38,8 +67,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="25dp"
android:text="手机号"
- android:textColor="@color/colorWhite"
- android:textSize="14sp"
+ style="@style/text_styles"
app:layout_constraintTop_toBottomOf="@id/register_desc"
app:layout_constraintLeft_toLeftOf="@id/register_desc"
/>
@@ -49,10 +77,7 @@
android:layout_width="300dp"
android:layout_height="wrap_content"
android:hint="11为手机号码"
- android:paddingBottom="10dp"
- android:layout_marginTop="10dp"
- android:background="@null"
- android:textSize="15sp"
+ style="@style/register_hint_style"
android:textColorHint="@color/colorTransparent"
android:textCursorDrawable="@drawable/text_color"
android:theme="@style/MyEditText"
@@ -70,8 +95,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:text="短信验证码"
- android:textColor="@color/colorWhite"
- android:textSize="14sp"
+ style="@style/text_styles"
app:layout_constraintTop_toBottomOf="@id/et_register_phone"
app:layout_constraintLeft_toLeftOf="@id/et_register_phone"
/>
@@ -81,10 +105,7 @@
android:layout_width="200dp"
android:layout_height="wrap_content"
android:hint="6为短信验证"
- android:paddingBottom="10dp"
- android:textSize="15sp"
- android:background="@null"
- android:layout_marginTop="10dp"
+ style="@style/register_hint_style"
android:textColorHint="@color/colorTransparent"
android:textCursorDrawable="@drawable/text_color"
android:theme="@style/MyEditText"
@@ -114,8 +135,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:text="推荐人"
- android:textColor="@color/colorWhite"
- android:textSize="14sp"
+ style="@style/text_styles"
app:layout_constraintTop_toBottomOf="@id/et_register_note"
app:layout_constraintLeft_toLeftOf="@id/et_register_note"
/>
@@ -125,10 +145,7 @@
android:layout_width="300dp"
android:layout_height="wrap_content"
android:hint="推荐人(编码/邮箱/手机号)"
- android:textSize="15sp"
- android:paddingBottom="10dp"
- android:paddingTop="10dp"
- android:background="@null"
+ style="@style/register_hint_style"
android:textColorHint="@color/colorTransparent"
android:textCursorDrawable="@drawable/text_color"
android:theme="@style/MyEditText"
@@ -146,8 +163,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:text="密码"
- android:textColor="@color/colorWhite"
- android:textSize="14sp"
+ style="@style/text_styles"
app:layout_constraintTop_toBottomOf="@id/et_register_referrer"
app:layout_constraintLeft_toLeftOf="@id/et_register_referrer"
/>
@@ -157,10 +173,7 @@
android:layout_width="300dp"
android:layout_height="wrap_content"
android:hint="6-20位密码"
- android:paddingBottom="10dp"
- android:paddingTop="10dp"
- android:background="@null"
- android:textSize="15sp"
+ style="@style/register_hint_style"
android:textColorHint="@color/colorTransparent"
android:textCursorDrawable="@drawable/text_color"
android:theme="@style/MyEditText"
@@ -178,8 +191,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:text="确认密码"
- android:textColor="@color/colorWhite"
- android:textSize="14sp"
+ style="@style/text_styles"
app:layout_constraintTop_toBottomOf="@id/et_register_paw"
app:layout_constraintLeft_toLeftOf="@id/et_register_paw"
/>
@@ -189,10 +201,7 @@
android:layout_width="300dp"
android:layout_height="wrap_content"
android:hint="请再次输入一遍密码"
- android:paddingBottom="10dp"
- android:paddingTop="10dp"
- android:background="@null"
- android:textSize="15sp"
+ style="@style/register_hint_style"
android:textColorHint="@color/colorTransparent"
android:textCursorDrawable="@drawable/text_color"
android:theme="@style/MyEditText"
@@ -235,11 +244,9 @@
android:layout_width="300dp"
android:layout_height="50dp"
android:layout_marginTop="20dp"
- android:background="@drawable/shape_login"
android:gravity="center"
+ style="@style/login_style"
android:text="注册"
- android:textSize="20dp"
- android:textColor="@color/colorPrimaryDark"
app:layout_constraintLeft_toLeftOf="@id/iv_register_check"
app:layout_constraintTop_toBottomOf="@id/iv_register_check"/>
diff --git a/app/src/main/res/layout/issue_fragment.xml b/app/src/main/res/layout/issue_fragment.xml
index 61a4490..5428764 100644
--- a/app/src/main/res/layout/issue_fragment.xml
+++ b/app/src/main/res/layout/issue_fragment.xml
@@ -1,6 +1,43 @@
<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
- xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent"
- android:layout_height="match_parent">
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ xmlns:app="http://schemas.android.com/apk/res-auto">
+ <LinearLayout
+ android:id="@+id/rl_issue"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:background="@color/colorPrimaryBlue"
+ 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_issue_finish"
+ android:layout_width="wrap_content"
+ android:layout_height="45dp"
+ android:layout_alignParentLeft="true"
+ android:layout_marginLeft="15dp"
+ android:src="@drawable/ic_baseline_arrow"
+ />
+
+ <TextView
+ android:id="@+id/tv_issue"
+ android:layout_width="match_parent"
+ android:layout_height="45dp"
+ android:gravity="center"
+ android:text="常见问题"
+ style="@style/toolbar_style"
+ />
+ </LinearLayout>
+ <com.jcodecraeer.xrecyclerview.XRecyclerView
+ android:id="@+id/main_issue_recycler"
+ 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_issue" />
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/issue_problem_item.xml b/app/src/main/res/layout/issue_problem_item.xml
new file mode 100644
index 0000000..1916861
--- /dev/null
+++ b/app/src/main/res/layout/issue_problem_item.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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"/>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/mine_fragment.xml b/app/src/main/res/layout/mine_fragment.xml
index aac5c71..c1c7ca9 100644
--- a/app/src/main/res/layout/mine_fragment.xml
+++ b/app/src/main/res/layout/mine_fragment.xml
@@ -1,8 +1,9 @@
<?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">
+
<RelativeLayout
android:id="@+id/rl_mine"
android:layout_width="match_parent"
@@ -11,12 +12,13 @@
android:paddingTop="@dimen/top_pind_sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent">
+
<TextView
android:id="@+id/tv_mine"
- android:layout_width="wrap_content"
style="@style/text_style_toolbar_title"
- android:textColor="#000"
- android:text="我的" />
+ android:layout_width="wrap_content"
+ android:text="我的"
+ android:textColor="#000" />
</RelativeLayout>
<androidx.constraintlayout.widget.ConstraintLayout
@@ -56,8 +58,8 @@
android:id="@+id/image_share"
android:layout_width="30dp"
android:layout_height="30dp"
- android:layout_marginRight="15dp"
android:layout_marginTop="10dp"
+ android:layout_marginRight="15dp"
android:background="@drawable/icon_event_prefecture"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@@ -76,24 +78,24 @@
<androidx.cardview.widget.CardView
android:layout_width="match_parent"
android:layout_height="100dp"
- android:layout_marginRight="40dp"
- android:layout_marginLeft="40dp"
+ android:layout_marginLeft="35dp"
+ android:layout_marginRight="35dp"
app:layout_constraintBottom_toTopOf="@+id/linearLayout"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent">
+
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
- android:layout_height="match_parent"
- >
+ android:layout_height="match_parent">
<TextView
android:id="@+id/tv_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:layout_marginLeft="20dp"
+ android:layout_marginTop="20dp"
android:text="总资产（元）"
android:textColor="#333"
- android:layout_marginTop="20dp"
- android:layout_marginLeft="20dp"
android:textSize="15sp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@@ -112,8 +114,9 @@
<Button
android:id="@+id/btn_withdraw"
+ style="@style/main_style"
android:layout_width="wrap_content"
- android:layout_height="wrap_content"
+ android:layout_height="40dp"
android:layout_marginRight="20dp"
android:text="去提现"
app:layout_constraintBottom_toBottomOf="parent"
@@ -126,180 +129,181 @@
android:id="@+id/linearLayout"
android:layout_width="match_parent"
android:layout_height="0dp"
- android:layout_marginTop="60dp"
- android:orientation="vertical"
- android:layout_marginRight="40dp"
android:layout_marginLeft="40dp"
+ android:layout_marginTop="60dp"
+ android:layout_marginRight="40dp"
android:layout_marginBottom="20dp"
+ android:orientation="vertical"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/constraintLayout">
+
<RelativeLayout
android:id="@+id/rl_grade"
- android:layout_marginTop="20dp"
android:layout_width="match_parent"
android:layout_height="0dp"
+ android:layout_marginTop="18dp"
android:layout_weight="1"
- android:background="?android:attr/selectableItemBackground"
- >
+ android:background="?android:attr/selectableItemBackground">
+
+ <TextView
+ style="@style/main_text_style"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="我的等级" />
+
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="我的等级"
- android:textSize="18sp"
- />
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="LV.1"
- android:gravity="center"
- android:textSize="18sp"
android:layout_alignParentRight="true"
android:drawableRight="@drawable/ic_baseline_arrow_forward"
- />
+ android:gravity="center"
+ android:text="LV.1"
+ android:textSize="18sp" />
</RelativeLayout>
+
<View
android:layout_width="match_parent"
android:layout_height="1dp"
- android:background="#F1F0F0"
- />
+ android:background="#F1F0F0" />
+
<RelativeLayout
android:id="@+id/rl_privilege"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:background="?android:attr/selectableItemBackground"
- android:gravity="center_vertical"
- >
+ android:gravity="center_vertical">
+
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="我的特权"
- android:textSize="18sp"
- />
+ style="@style/main_text_style" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:layout_alignParentRight="true"
android:background="@drawable/ic_baseline_arrow_forward"
android:gravity="center"
- android:textSize="18sp"
- android:layout_alignParentRight="true"
- />
+ android:textSize="18sp" />
</RelativeLayout>
+
<View
android:layout_width="match_parent"
android:layout_height="1dp"
- android:background="#F1F0F0"
- />
+ android:background="#F1F0F0" />
+
<RelativeLayout
android:id="@+id/rl_map"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:background="?android:attr/selectableItemBackground"
- android:gravity="center_vertical"
- >
+ android:gravity="center_vertical">
+
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="地图下载"
- android:textSize="18sp"
- />
+ style="@style/main_text_style" />
</RelativeLayout>
+
<View
android:layout_width="match_parent"
android:layout_height="1dp"
- android:background="#F1F0F0"
- />
+ android:background="#F1F0F0" />
+
<RelativeLayout
android:id="@+id/rl_issue"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:background="?android:attr/selectableItemBackground"
- android:gravity="center_vertical"
- >
+ android:gravity="center_vertical">
+
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="常见问题"
- android:textSize="18sp"
- />
+ style="@style/main_text_style"/>
</RelativeLayout>
+
<View
android:layout_width="match_parent"
android:layout_height="1dp"
- android:background="#F1F0F0"
- />
+ android:background="#F1F0F0" />
+
<RelativeLayout
android:id="@+id/rl_contact"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
- android:gravity="center_vertical"
android:background="?android:attr/selectableItemBackground"
- >
+ android:gravity="center_vertical">
+
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="联系我们"
- android:textSize="18sp"
- />
+ style="@style/main_text_style" />
</RelativeLayout>
+
<View
android:layout_width="match_parent"
android:layout_height="1dp"
- android:background="#F1F0F0"
- />
+ android:background="#F1F0F0" />
+
<RelativeLayout
android:id="@+id/rl_set"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
- android:gravity="center_vertical"
android:background="?android:attr/selectableItemBackground"
- >
+ android:gravity="center_vertical">
+
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="设置"
- android:textSize="18sp"
- />
+ style="@style/main_text_style" />
</RelativeLayout>
+
<View
android:layout_width="match_parent"
android:layout_height="1dp"
- android:background="#F1F0F0"
- />
+ android:background="#F1F0F0" />
+
<RelativeLayout
android:id="@+id/rl_about"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
- android:gravity="center_vertical"
android:background="?android:attr/selectableItemBackground"
- >
+ android:gravity="center_vertical">
+
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="关于"
- android:textSize="18sp"
- />
+ style="@style/main_text_style" />
</RelativeLayout>
+
<View
android:layout_width="match_parent"
android:layout_height="1dp"
- android:background="#F1F0F0"
- />
+ android:background="#F1F0F0" />
+
<Button
android:id="@+id/btn_quit"
+ style="@style/main_outLogin_style"
android:layout_width="match_parent"
- android:layout_margin="10dp"
- android:text="退出登录"
android:layout_height="0dp"
- android:layout_weight="1"/>
+ android:layout_margin="10dp"
+ android:layout_weight="1"
+ android:text="退出登录" />
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/user_data_fragment.xml b/app/src/main/res/layout/user_data_fragment.xml
index 63cd222..de53789 100644
--- a/app/src/main/res/layout/user_data_fragment.xml
+++ b/app/src/main/res/layout/user_data_fragment.xml
@@ -67,17 +67,16 @@
android:text="实名认证"
android:layout_marginLeft="20dp"
android:layout_centerVertical="true"
- android:textColor="#333"
- android:textSize="15sp" />
+ style="@style/user_text_style" />
<Button
android:id="@+id/btn_attestation"
- android:layout_width="80dp"
- android:layout_height="35dp"
+ android:layout_width="70dp"
+ android:layout_height="30dp"
android:layout_alignParentRight="true"
android:layout_marginRight="10dp"
android:text="去认证"
android:textColor="#fff"
- android:background="#2196F3"
+ style="@style/user_style"
android:layout_centerVertical="true"
/>
@@ -100,17 +99,17 @@
android:text="收款信息"
android:layout_marginLeft="20dp"
android:layout_centerVertical="true"
- android:textColor="#333"
- android:textSize="15sp"/>
+ style="@style/user_text_style"
+ />
<Button
android:id="@+id/btn_gathering"
- android:layout_width="80dp"
- android:layout_height="35dp"
+ android:layout_width="70dp"
+ android:layout_height="30dp"
android:layout_alignParentRight="true"
android:layout_marginRight="10dp"
android:text="去绑定"
android:textColor="#fff"
- android:background="#2196F3"
+ style="@style/user_style"
android:layout_centerVertical="true"
/>
</RelativeLayout>
@@ -133,15 +132,14 @@
android:text="所在地区*"
android:layout_centerVertical="true"
android:layout_marginLeft="20dp"
- android:textColor="#333"
- android:textSize="15sp"/>
+ style="@style/user_text_style"
+ />
<EditText
android:layout_toRightOf="@id/tv_region"
android:layout_width="wrap_content"
- android:background="#fff"
+ style="@style/user_hint_style"
android:layout_centerVertical="true"
android:hint="请选择所在区域"
- android:textSize="15sp"
android:layout_height="wrap_content"
/>
</RelativeLayout>
@@ -164,15 +162,14 @@
android:text="手机号码*"
android:layout_centerVertical="true"
android:layout_marginLeft="20dp"
- android:textColor="#333"
- android:textSize="15sp"/>
+ style="@style/user_text_style"
+ />
<EditText
android:layout_toRightOf="@id/tv_number"
android:layout_width="wrap_content"
- android:background="#fff"
+ style="@style/user_hint_style"
android:layout_centerVertical="true"
android:hint="请输入手机号码"
- android:textSize="15sp"
android:layout_height="wrap_content"
/>
</RelativeLayout>
@@ -195,15 +192,14 @@
android:text="QQ号码*"
android:layout_centerVertical="true"
android:layout_marginLeft="20dp"
- android:textColor="#333"
- android:textSize="15sp"/>
+ style="@style/user_text_style"
+ />
<EditText
android:layout_toRightOf="@id/tv_qq"
android:layout_width="wrap_content"
- android:background="#fff"
android:layout_centerVertical="true"
android:hint="请输入QQ号码"
- android:textSize="15sp"
+ style="@style/user_hint_style"
android:layout_height="wrap_content"
/>
</RelativeLayout>
@@ -226,15 +222,14 @@
android:text="电子邮箱*"
android:layout_centerVertical="true"
android:layout_marginLeft="20dp"
- android:textColor="#333"
- android:textSize="15sp" />
+ style="@style/user_text_style"
+ />
<EditText
android:layout_toRightOf="@id/tv_mailbox"
android:layout_width="wrap_content"
- android:background="#fff"
android:layout_centerVertical="true"
android:hint="请输入邮箱地址"
- android:textSize="15sp"
+ style="@style/user_hint_style"
android:layout_height="wrap_content"
/>
</RelativeLayout>
@@ -255,16 +250,16 @@
android:text="微信"
android:layout_marginLeft="20dp"
android:layout_centerVertical="true"
- android:textColor="#333"
- android:textSize="15sp"/>
+ style="@style/user_text_style"
+ />
<Button
- android:layout_width="80dp"
- android:layout_height="35dp"
+ android:layout_width="70dp"
+ android:layout_height="30dp"
android:layout_alignParentRight="true"
android:layout_marginRight="10dp"
android:text="去绑定"
android:textColor="#fff"
- android:background="#2196F3"
+ style="@style/user_style"
android:layout_centerVertical="true"
/>
</RelativeLayout>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 5137330..d397903 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -3,6 +3,7 @@
<color name="colorPrimary">#6200EE</color>
<color name="colorPrimaryDark">#3700B3</color>
<color name="colorPrimaryBlue">#03A9F4</color>
+ <color name="colorBlue">#2196F3</color>
<color name="colorAccent">#03DAC5</color>
<color name="colorBack">#000000</color>
<color name="colorGrey">#FAFAFA</color>
@@ -10,4 +11,5 @@
<color name="colorTransparent">#7fffffff</color>
<color name="colorGray">#666666</color>
<color name="colorHui">#95CAF6</color>
+ <color name="colorRed">#F44236</color>
</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index dbd1629..d9d4856 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -43,16 +43,75 @@
<item name="android:textColor">#EDBCBABA</item>
</style>
-<!-- 登录选择器-->
- <style name="sty1">
- <item name="android:background">#ffffff</item>
+
+<!-- 登录字体-->
+
+<style name="text_styles">
+ <item name="android:textSize">15sp</item>
+ <item name="android:textColor">#ffffff</item>
+</style>
+<!-- '我的'提现设置-->
+ <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>
</style>
- <style name="sty2" parent="@style/sty1">
- <item name="android:textColor">#471862</item>
- <item name="android:background">#03A9F4</item>
+<!--‘我的’退出登录设置-->
+ <style name="main_outLogin_style">
+ <item name="android:textColor">#ffffff</item>
+ <item name="android:background">@drawable/main_shape_outlogin</item>
+ </style>
+<!-- ‘我的’字体设置 -->
+ <style name="main_text_style">
+ <item name="android:textSize">18sp</item>
</style>
- 设置属性：
+ <style name="main_about_text_style">
+ <item name="android:textSize">18sp</item>
+ <item name="android:textStyle">bold</item>
+ <item name="android:textColor">@color/black</item>
+ </style>
+<!-- ‘我的-用户资料’方框设置-->
+<style name="user_style">
+ <item name="android:background">@drawable/user_shape</item>
+</style>
+<!-- ‘我的-用户资料’字体设置-->
+ <style name="user_text_style">
+ <item name="android:textSize">15sp</item>
+ <item name="android:textColor">#333</item>
+ </style>
+<!-- '我的-用户资料'输入字体设置-->
+ <style name="user_hint_style">
+ <item name="android:textSize">15sp</item>
+ <item name="android:background">#fff</item>
+ </style>
+<!-- 登录背景设置-->
+ <style name="login_style">
+ <item name="android:textSize">18sp</item>
+ <item name="android:background">@drawable/selector_change_color_btn_bg</item>
+ <item name="android:textColor">@color/colorPrimaryDark</item>
+ </style>
+<!--'注册'hint设置-->
+ <style name="register_hint_style">
+ <item name="android:paddingBottom">10dp</item>
+ <item name="android:layout_marginTop">10dp</item>
+ <item name="android:background">@null</item>
+ <item name="android:textSize">15sp</item>
+ <item name="android:textColorHint">@color/colorTransparent</item>
+ </style>
+<!-- 状态栏设置-->
+ <style name="toolbar_style">
+ <item name="android:textColor">#fff</item>
+ <item name="android:textSize">17sp</item>
+ <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>
</resources>
\ No newline at end of file