From 218f1b72f9cabf8af845fa1d8a614d0ba10b98a5 Mon Sep 17 00:00:00 2001 From: md Date: Tue, 1 Jun 2021 18:20:41 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E6=88=91=E7=9A=84=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E9=83=A8=E5=88=86=E5=B8=83=E5=B1=80=E5=92=8C=E5=85=B6?= =?UTF-8?q?=E4=BB=96=E5=B8=83=E5=B1=80=E7=9A=84=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/misc.xml | 2 +- app/build.gradle | 2 +- .../adapter/CapacityMeasureAdapter.java | 5 +- .../outdoor/adapter/IssueProblemAdapter.java | 65 +++++++ .../outdoor/fragment/AboutFragment.java | 21 +- .../outdoor/fragment/ForgetPawFragment.java | 7 +- .../outdoor/fragment/IssueFragment.java | 89 ++++++++- .../outdoor/fragment/RegisterFragment.java | 26 ++- .../outdoor/fragment/TaskExplainFragment.java | 1 + .../main/res/drawable/icon_arrow_final.xml | 6 + .../main/res/drawable/main_shape_outlogin.xml | 5 + app/src/main/res/drawable/select_check.xml | 4 +- .../drawable/selector_change_color_btn_bg.xml | 4 +- .../main/res/drawable/shape_red_radius_bg.xml | 1 - app/src/main/res/drawable/user_shape.xml | 5 + app/src/main/res/layout/about_fragment.xml | 180 +++++++++++++++++- app/src/main/res/layout/activity_login.xml | 45 ++--- .../res/layout/capacity_measure_option.xml | 4 +- .../main/res/layout/fragment_forget_paw.xml | 145 ++++++++------ app/src/main/res/layout/fragment_register.xml | 79 ++++---- app/src/main/res/layout/issue_fragment.xml | 43 ++++- .../main/res/layout/issue_problem_item.xml | 14 ++ app/src/main/res/layout/mine_fragment.xml | 150 ++++++++------- .../main/res/layout/user_data_fragment.xml | 57 +++--- app/src/main/res/values/colors.xml | 2 + app/src/main/res/values/styles.xml | 73 ++++++- 26 files changed, 781 insertions(+), 254 deletions(-) create mode 100644 app/src/main/java/com/navinfo/outdoor/adapter/IssueProblemAdapter.java create mode 100644 app/src/main/res/drawable/icon_arrow_final.xml create mode 100644 app/src/main/res/drawable/main_shape_outlogin.xml create mode 100644 app/src/main/res/drawable/user_shape.xml create mode 100644 app/src/main/res/layout/issue_problem_item.xml 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 @@ - + 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 { + private List issueList = new ArrayList<>(); + private Context context; + + public IssueProblemAdapter(Context context) { + this.context = context; + } + + public void setExplainList(List 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 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() { + @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 @@ + + + + \ 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 @@ + + + + + \ 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 @@ - - + + \ 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 @@ - - + + \ 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 @@ - \ 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 @@ + + + + + \ 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 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ 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 @@ @@ -57,12 +56,11 @@ @@ -79,51 +77,54 @@ app:layout_constraintLeft_toLeftOf="@id/login_paw" app:layout_constraintTop_toBottomOf="@id/login_paw" /> - + + + app:layout_constraintLeft_toLeftOf="@id/iv_login_check" + app:layout_constraintTop_toBottomOf="@id/tv_forget_paw" /> \ 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 @@ + android:layout_height="wrap_content"/> + + \ 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 @@ - + + + + + + + + + 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" /> + + app:layout_constraintTop_toBottomOf="@id/fragment_tv_forgetPaw" /> + + app:layout_constraintLeft_toLeftOf="@id/et_forgetPaw_phone" + app:layout_constraintTop_toBottomOf="@id/et_forgetPaw_phone" /> + + app:layout_constraintTop_toBottomOf="@id/et_forgetPaw_phone" /> @@ -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" /> + - + app:layout_constraintTop_toTopOf="@id/et_forgetPaw_note" /> + + + app:layout_constraintTop_toBottomOf="@id/et_forgetPaw_note" /> + app:layout_constraintTop_toBottomOf="@id/forgetPaw_paw" /> + + app:layout_constraintLeft_toLeftOf="@id/et_forgetPaw_paw" + app:layout_constraintTop_toBottomOf="@id/et_forgetPaw_paw" /> + + app:layout_constraintTop_toBottomOf="@id/et_forgetPaw_paw" /> + app:layout_constraintTop_toBottomOf="@id/forgetPaw_confirm_paw" /> + + app:layout_constraintLeft_toLeftOf="@id/et_forgetPaw_confirm_paw" + app:layout_constraintTop_toBottomOf="@id/et_forgetPaw_confirm_paw" /> + + app:layout_constraintTop_toBottomOf="@id/et_forgetPaw_confirm_paw" /> \ 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"> - + + + + + + + app:layout_constraintTop_toBottomOf="@id/rl_register" /> @@ -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 @@ - + + + + + + + \ 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 @@ + + + + + \ 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 @@ + android:layout_height="match_parent"> + + + android:layout_width="wrap_content" + android:text="我的" + android:textColor="#000" /> @@ -76,24 +78,24 @@ + + android:layout_height="match_parent"> @@ -112,8 +114,9 @@