diff --git a/.idea/misc.xml b/.idea/misc.xml index b6ea2b1..7bfef59 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,6 @@ - + diff --git a/app/build.gradle b/app/build.gradle index e88d242..b15eabe 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" @@ -63,8 +63,8 @@ dependencies { implementation 'io.reactivex.rxjava2:rxandroid:2.1.1' //EventBus implementation 'org.greenrobot:eventbus:3.1.1' - - + //三级选择 + implementation 'com.airsaid.library:pickerview:1.0.3' /* //加载html implementation 'com.github.sendtion:XRichText:1.9.4'*/ //加载图片的依赖包 diff --git a/app/src/main/java/com/navinfo/outdoor/activity/FragmentManagement.java b/app/src/main/java/com/navinfo/outdoor/activity/FragmentManagement.java index cfd1a51..cdcebcd 100644 --- a/app/src/main/java/com/navinfo/outdoor/activity/FragmentManagement.java +++ b/app/src/main/java/com/navinfo/outdoor/activity/FragmentManagement.java @@ -32,6 +32,7 @@ import com.navinfo.outdoor.fragment.UserAttestationFragment; import com.navinfo.outdoor.fragment.UserDataFragment; import com.navinfo.outdoor.fragment.WithdrawFragment; import com.gyf.immersionbar.ImmersionBar; +import com.navinfo.outdoor.fragment.WithdrawalRecordFragment; import androidx.annotation.Nullable; @@ -70,6 +71,7 @@ public class FragmentManagement extends BaseActivity { private AboutFragment aboutFragment;//我的-关于的fragment -23 private GatheringFragment gatheringFragment;//我的-用户资料-收款信息的fragment -24 private UserAttestationFragment userAttestationFragment;//我的-用户资料-实名认证的fragment -25 + private WithdrawalRecordFragment withdrawalRecordFragment;//我的-提现-提现记录的fragment -26 private IssueWebFragment issueWebFragment;//我的-常见问题-web的fragment -27 @@ -139,12 +141,13 @@ public class FragmentManagement extends BaseActivity { fragmentTransaction.hide(aboutFragment); if (gatheringFragment != null)//我的-用户资料-收款信息的fragment -24 fragmentTransaction.hide(gatheringFragment); - if (userAttestationFragment!=null){//我的-用户资料-实名认证的fragment-25 + if (userAttestationFragment!=null)//我的-用户资料-实名认证的fragment-25 fragmentTransaction.hide(userAttestationFragment); - } - if (issueWebFragment!=null){//我的-常见问题-web的fragment -27 + if (withdrawalRecordFragment!=null) + fragmentTransaction.hide(withdrawalRecordFragment); + if (issueWebFragment!=null)//我的-常见问题-web的fragment -27 fragmentTransaction.hide(issueWebFragment); - } + } @@ -339,7 +342,7 @@ public class FragmentManagement extends BaseActivity { fragmentTransaction.show(aboutFragment); } break; - case 24://我的-用户资料-收款信息的fragment + case 24://我的-用户资料-收款信息的fragment if (gatheringFragment == null) { gatheringFragment = new GatheringFragment(); fragmentTransaction.add(R.id.frame_layout, gatheringFragment); @@ -347,7 +350,7 @@ public class FragmentManagement extends BaseActivity { fragmentTransaction.show(gatheringFragment); } break; - case 25://我的-用户资料-实名认证的fragment + case 25://我的-用户资料-实名认证的fragment if (userAttestationFragment == null) { userAttestationFragment = new UserAttestationFragment(); fragmentTransaction.add(R.id.frame_layout, userAttestationFragment); @@ -355,6 +358,14 @@ public class FragmentManagement extends BaseActivity { fragmentTransaction.show(userAttestationFragment); } break; + case 26: + if (withdrawalRecordFragment ==null){ + withdrawalRecordFragment=new WithdrawalRecordFragment(); + fragmentTransaction.add(R.id.frame_layout,withdrawalRecordFragment); + }else { + fragmentTransaction.show(withdrawalRecordFragment); + } + break; case 27://我的-常见问题-web的fragment if (issueWebFragment == null) { issueWebFragment = new IssueWebFragment(); @@ -446,6 +457,9 @@ public class FragmentManagement extends BaseActivity { case 25: userAttestationFragment.onActivityResult(requestCode,resultCode,data); break; + case 26: + withdrawalRecordFragment.onActivityResult(requestCode,resultCode,data); + break; case 27: issueWebFragment.onActivityResult(requestCode,resultCode,data); break; 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 f4c2c7f..9b07f5c 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/AboutFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/AboutFragment.java @@ -2,6 +2,7 @@ package com.navinfo.outdoor.fragment; import android.view.View; import android.widget.ImageView; +import android.widget.RelativeLayout; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; @@ -13,6 +14,9 @@ import com.navinfo.outdoor.base.BaseFragment; */ public class AboutFragment extends BaseFragment implements View.OnClickListener { private ImageView ivAboutFinish; + private RelativeLayout rlAbout; + private RelativeLayout rlServe; + private RelativeLayout rlPrivilege; @Override protected int getLayout() { @@ -27,7 +31,13 @@ public class AboutFragment extends BaseFragment implements View.OnClickListener @Override protected void initView() { super.initView(); - ivAboutFinish = (ImageView) findViewById(R.id.iv_about_finish); + rlAbout = findViewById(R.id.rl_about); + rlAbout.setOnClickListener(this::onClick); + rlServe = findViewById(R.id.rl_serve); + rlServe.setOnClickListener(this::onClick); + rlPrivilege = findViewById(R.id.rl_privilege); + rlPrivilege.setOnClickListener(this::onClick); + ivAboutFinish =findViewById(R.id.iv_about_finish); ivAboutFinish.setOnClickListener(this::onClick); } @@ -37,6 +47,12 @@ public class AboutFragment extends BaseFragment implements View.OnClickListener case R.id.iv_about_finish: getActivity().finish(); break; + case R.id.rl_about: + break; + case R.id.rl_serve: + break; + case R.id.rl_privilege: + break; } } } diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/ContactFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/ContactFragment.java index c9f1d22..593db01 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/ContactFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/ContactFragment.java @@ -5,10 +5,7 @@ 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.activity.WebActivity; -import com.navinfo.outdoor.api.UserApplication; import com.navinfo.outdoor.base.BaseFragment; /** diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/FindFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/FindFragment.java index 02ec4af..a1eefde 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/FindFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/FindFragment.java @@ -37,7 +37,6 @@ public class FindFragment extends BaseFragment implements View.OnClickListener{ linear_task_explain.setOnClickListener(this::onClick); linearEnd = findViewById(R.id.linear_end); linearEnd.setOnClickListener(this::onClick); - } @Override diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/GradeFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/GradeFragment.java index 104077d..b0b2f4d 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/GradeFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/GradeFragment.java @@ -1,12 +1,18 @@ package com.navinfo.outdoor.fragment; +import android.view.View; +import android.widget.ImageView; + import com.navinfo.outdoor.R; import com.navinfo.outdoor.base.BaseFragment; /** * 我的等级页面的fragment */ -public class GradeFragment extends BaseFragment { +public class GradeFragment extends BaseFragment implements View.OnClickListener{ + + private ImageView ivGrade; + @Override protected int getLayout() { return R.layout.grade_fragment; @@ -20,6 +26,16 @@ public class GradeFragment extends BaseFragment { @Override protected void initView() { super.initView(); + ivGrade = findViewById(R.id.iv_grade); + ivGrade.setOnClickListener(this); } + @Override + public void onClick(View v) { + switch (v.getId()){ + case R.id.iv_grade: + getActivity().finish(); + break; + } + } } 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 c12aba3..f550f46 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/IssueFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/IssueFragment.java @@ -57,16 +57,15 @@ public class IssueFragment extends BaseFragment implements View.OnClickListener .json(new JSONObject()) .callback(new Callback() { @Override - public void onSuccess(TaskExplainInfo response, int id) { + public void onSuccess(TaskExplainInfo taskExplainInfo, int id) { dismissLoadingDialog(); - issueProblemAdapter.setExplainList(response.getBody().getData()); - Log.d("TAG", "onSuccess: " + response.getMsg() + ""); + issueProblemAdapter.setExplainList(taskExplainInfo.getBody().getData()); + Log.d("TAG", "onSuccess: " + taskExplainInfo.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(); @@ -75,8 +74,8 @@ public class IssueFragment extends BaseFragment implements View.OnClickListener @Override protected void initView() { super.initView(); - ivIssueFinish = (ImageView) findViewById(R.id.iv_issue_finish); - mainIssueRecycler = (XRecyclerView) findViewById(R.id.main_issue_recycler); + ivIssueFinish =findViewById(R.id.iv_issue_finish); + mainIssueRecycler =findViewById(R.id.main_issue_recycler); ivIssueFinish.setOnClickListener(this::onClick); mainIssueRecycler.setLayoutManager(new LinearLayoutManager(getActivity())); //设置下划线 @@ -91,14 +90,10 @@ public class IssueFragment extends BaseFragment implements View.OnClickListener mainIssueRecycler.getDefaultFootView().setNoMoreHint("成功加载完毕"); mainIssueRecycler.setLoadingListener(new XRecyclerView.LoadingListener() { @Override - public void onRefresh() { - - } + public void onRefresh() {} @Override - public void onLoadMore() { - - } + public void onLoadMore() {} }); issueProblemAdapter.setOnIssueClick(new IssueProblemAdapter.OnIssueClick() { @Override diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/MapDownloadFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/MapDownloadFragment.java index 7168a14..9dc2f2c 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/MapDownloadFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/MapDownloadFragment.java @@ -3,6 +3,7 @@ package com.navinfo.outdoor.fragment; import android.view.View; import android.widget.ImageView; +import com.jcodecraeer.xrecyclerview.XRecyclerView; import com.navinfo.outdoor.R; import com.navinfo.outdoor.base.BaseFragment; @@ -12,6 +13,7 @@ import com.navinfo.outdoor.base.BaseFragment; public class MapDownloadFragment extends BaseFragment implements View.OnClickListener{ private ImageView ivDownLoad; + private XRecyclerView recyclerView; @Override protected int getLayout() { @@ -23,6 +25,8 @@ public class MapDownloadFragment extends BaseFragment implements View.OnClickLis super.initView(); ivDownLoad = findViewById(R.id.iv_download); ivDownLoad.setOnClickListener(this); + recyclerView = findViewById(R.id.recycler_view); + } @Override diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/MineFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/MineFragment.java index 7c7da71..918bb1b 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/MineFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/MineFragment.java @@ -6,7 +6,11 @@ import android.widget.Button; import android.widget.ImageView; import android.widget.RelativeLayout; import android.widget.TextView; +import android.widget.Toast; +import com.bumptech.glide.Glide; +import com.bumptech.glide.load.resource.bitmap.CircleCrop; +import com.bumptech.glide.request.RequestOptions; import com.navinfo.outdoor.R; import com.navinfo.outdoor.activity.FragmentManagement; import com.navinfo.outdoor.base.BaseFragment; @@ -31,6 +35,7 @@ public class MineFragment extends BaseFragment implements View.OnClickListener{ protected void initView() { super.initView(); imageHeard = findViewById(R.id.image_heard); + Glide.with(getActivity()).load(R.drawable.icon_capacity_evaluation).apply(RequestOptions.bitmapTransform(new CircleCrop())).into(imageHeard); imageHeard.setOnClickListener(this::onClick); tvName = findViewById(R.id.tv_name); tvName.setOnClickListener(this::onClick); @@ -62,72 +67,65 @@ public class MineFragment extends BaseFragment implements View.OnClickListener{ @Override protected void initData() { super.initData(); + } @Override public void onClick(View v) { switch (v.getId()){ case R.id.image_heard: - case R.id.tv_name: - //跳转到个人信息 + case R.id.tv_name://跳转到个人信息 Intent intentUser = new Intent(getActivity(), FragmentManagement.class); intentUser.putExtra("tag",16); startActivity(intentUser); break; case R.id.image_share://分享 + Toast.makeText(getActivity(), "分享", Toast.LENGTH_SHORT).show(); break; case R.id.image_sign://签到 + Toast.makeText(getActivity(), "签到", Toast.LENGTH_SHORT).show(); break; - case R.id.btn_withdraw: - //提现页面 + case R.id.btn_withdraw://提现页面 Intent intentWithdraw = new Intent(getActivity(), FragmentManagement.class); intentWithdraw.putExtra("tag",15); startActivity(intentWithdraw); break; - case R.id.rl_grade: - //我的等级 - /* Intent intentGrade = new Intent(getActivity(), FragmentManagement.class); + case R.id.rl_grade://我的等级 + Intent intentGrade = new Intent(getActivity(), FragmentManagement.class); intentGrade.putExtra("tag",17); - startActivity(intentGrade);*/ + startActivity(intentGrade); break; - case R.id.rl_privilege: - //我的特权 - /*Intent intentPrivilege = new Intent(getActivity(), FragmentManagement.class); + case R.id.rl_privilege://我的特权 + Intent intentPrivilege = new Intent(getActivity(), FragmentManagement.class); intentPrivilege.putExtra("tag",18); - startActivity(intentPrivilege);*/ + startActivity(intentPrivilege); break; - case R.id.rl_map: - //地图下载 + case R.id.rl_map://地图下载 Intent intentMap = new Intent(getActivity(), FragmentManagement.class); intentMap.putExtra("tag",19); startActivity(intentMap); break; - case R.id.rl_issue: - //常见问题 + case R.id.rl_issue://常见问题 Intent intentIssue = new Intent(getActivity(), FragmentManagement.class); intentIssue.putExtra("tag",20); startActivity(intentIssue); break; - case R.id.rl_contact: - //联系我们 + case R.id.rl_contact://联系我们 Intent intentContact = new Intent(getActivity(), FragmentManagement.class); intentContact.putExtra("tag",21); startActivity(intentContact); break; - case R.id.rl_set: - //设置 + case R.id.rl_set://设置 Intent intentSet = new Intent(getActivity(), FragmentManagement.class); intentSet.putExtra("tag",22); startActivity(intentSet); break; - case R.id.rl_about: - //关于 + case R.id.rl_about://关于 Intent intentAbout = new Intent(getActivity(), FragmentManagement.class); intentAbout.putExtra("tag",23); startActivity(intentAbout); break; - case R.id.btn_quit: - //退出登录 + case R.id.btn_quit://退出登录 getActivity().finish(); break; } diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/PrivilegeFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/PrivilegeFragment.java index a78dc9e..8646949 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/PrivilegeFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/PrivilegeFragment.java @@ -1,12 +1,18 @@ package com.navinfo.outdoor.fragment; +import android.view.View; +import android.widget.ImageView; + import com.navinfo.outdoor.R; import com.navinfo.outdoor.base.BaseFragment; /** * 我的等级页面的fragment */ -public class PrivilegeFragment extends BaseFragment { +public class PrivilegeFragment extends BaseFragment implements View.OnClickListener{ + + private ImageView ivPrivilege; + @Override protected int getLayout() { return R.layout.privilege_fragment; @@ -20,6 +26,16 @@ public class PrivilegeFragment extends BaseFragment { @Override protected void initView() { super.initView(); + ivPrivilege = findViewById(R.id.iv_privilege); + ivPrivilege.setOnClickListener(this); } + @Override + public void onClick(View v) { + switch (v.getId()){ + case R.id.iv_privilege: + getActivity().finish(); + break; + } + } } diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/UserDataFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/UserDataFragment.java index 120a3a2..c6deab7 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/UserDataFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/UserDataFragment.java @@ -2,12 +2,17 @@ package com.navinfo.outdoor.fragment; import android.content.Intent; import android.text.TextUtils; +import android.util.Log; import android.view.View; import android.widget.Button; import android.widget.EditText; import android.widget.ImageView; +import android.widget.RelativeLayout; +import android.widget.TextView; import android.widget.Toast; +import com.airsaid.pickerviewlibrary.CityPickerView; +import com.airsaid.pickerviewlibrary.listener.OnSimpleCitySelectListener; import com.navinfo.outdoor.R; import com.navinfo.outdoor.activity.FragmentManagement; import com.navinfo.outdoor.base.BaseFragment; @@ -25,12 +30,13 @@ public class UserDataFragment extends BaseFragment implements View.OnClickListen private Button btnGathering; private Button btnAttestation; private ImageView ivUser; - private EditText etRegion; + private TextView region; 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; + private RelativeLayout rlRegion; @Override protected int getLayout() { @@ -51,15 +57,16 @@ 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); + region = findViewById(R.id.region); + rlRegion = findViewById(R.id.rl_region); + rlRegion.setOnClickListener(this::onClick); etPhone = (EditText) findViewById(R.id.et_phone); etPhone.setOnClickListener(this::onClick); - etQq = (EditText) findViewById(R.id.et_qq); + etQq = (EditText) findViewById(R.id.edit_qq); etQq.setOnClickListener(this::onClick); - etMailbox = (EditText) findViewById(R.id.et_mailbox); + etMailbox = (EditText) findViewById(R.id.edit_mailbox); etMailbox.setOnClickListener(this::onClick); - userSave = (Button) findViewById(R.id.user_save); + userSave = (Button) findViewById(R.id.btn_save); userSave.setOnClickListener(this::onClick); } @@ -80,6 +87,9 @@ public class UserDataFragment extends BaseFragment implements View.OnClickListen attestationIntent.putExtra("tag", 25); startActivity(attestationIntent); break; + case R.id.rl_region: + initRegion(); + break; case R.id.et_phone: String phoneEt = etPhone.getText().toString().trim(); if (TextUtils.isEmpty(phoneEt)) { @@ -90,17 +100,17 @@ public class UserDataFragment extends BaseFragment implements View.OnClickListen Toast.makeText(getActivity(), "手机格式有误", Toast.LENGTH_SHORT).show(); } break; - case R.id.et_qq: + case R.id.edit_qq: qq(); break; - case R.id.et_mailbox: + case R.id.edit_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: + case R.id.btn_save: final String userphone = etPhone.getText().toString().trim(); final String userqq = etQq.getText().toString().trim(); final String usermailbox = etMailbox.getText().toString().trim(); @@ -139,5 +149,42 @@ public class UserDataFragment extends BaseFragment implements View.OnClickListen return m.matches(); } + private void initRegion() { + CityPickerView mCityPickerView = new CityPickerView(getContext()); + // 设置点击外部是否消失 + mCityPickerView.setCancelable(true); + // 设置滚轮字体大小 + // mCityPickerView.setTextSize(18f); + // 设置标题 + //mCityPickerView.setTitle(""); + // 设置取消文字 + // mCityPickerView.setCancelText("取消"); + // 设置取消文字颜色 + // mCityPickerView.setCancelTextColor(Color.WHITE); + // 设置取消文字大小 + //mCityPickerView.setCancelTextSize(14f); + // 设置确定文字 + //mCityPickerView.setSubmitText("确定"); + // 设置确定文字颜色 + //mCityPickerView.setSubmitTextColor(Color.WHITE); + // 设置确定文字大小 + // mCityPickerView.setSubmitTextSize(14f); + // 设置头部背景 + // mCityPickerView.setHeadBackgroundColor(Color.BLUE); + mCityPickerView.setOnCitySelectListener(new OnSimpleCitySelectListener(){ + @Override + public void onCitySelect(String prov, String city, String area) { + // 省、市、区 分开获取 + Log.d("TAG", "省: " + prov + " 市: " + city + " 区: " + area); + region.setText(prov+"-"+city+"-"+area+""); + } + @Override + public void onCitySelect(String str) { + // 一起获取 + //Toast.makeText(getContext(), "选择了：" + str, Toast.LENGTH_SHORT).show(); + } + }); + mCityPickerView.show(); + } } diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/WithdrawFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/WithdrawFragment.java index b6cb914..1e31a57 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/WithdrawFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/WithdrawFragment.java @@ -1,9 +1,12 @@ package com.navinfo.outdoor.fragment; +import android.content.Intent; import android.view.View; import android.widget.ImageView; +import android.widget.TextView; import com.navinfo.outdoor.R; +import com.navinfo.outdoor.activity.FragmentManagement; import com.navinfo.outdoor.base.BaseFragment; /** @@ -12,6 +15,8 @@ import com.navinfo.outdoor.base.BaseFragment; public class WithdrawFragment extends BaseFragment implements View.OnClickListener{ private ImageView ivWithDraw; + private TextView tvText; + private TextView tvAll ,tvUnit,tvAlready,tvTotal; @Override protected int getLayout() { @@ -26,8 +31,15 @@ public class WithdrawFragment extends BaseFragment implements View.OnClickListen @Override protected void initView() { super.initView(); + tvUnit = findViewById(R.id.tv_unit);//可提现 + tvAlready = findViewById(R.id.tv_already);//以提现 + tvTotal = findViewById(R.id.tv_total);//总资产 + tvAll = findViewById(R.id.tv_all); + tvAll.setOnClickListener(this::onClick); ivWithDraw = findViewById(R.id.iv_withdraw); ivWithDraw.setOnClickListener(this); + tvText = findViewById(R.id.tv_text); + tvText.setOnClickListener(this::onClick); } @Override @@ -36,6 +48,11 @@ public class WithdrawFragment extends BaseFragment implements View.OnClickListen case R.id.iv_withdraw: getActivity().finish(); break; + case R.id.tv_text: + Intent intentText = new Intent(getActivity(), FragmentManagement.class); + intentText.putExtra("tag",26); + startActivity(intentText); + break; } } } diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/WithdrawalRecordFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/WithdrawalRecordFragment.java new file mode 100644 index 0000000..a237bbf --- /dev/null +++ b/app/src/main/java/com/navinfo/outdoor/fragment/WithdrawalRecordFragment.java @@ -0,0 +1,41 @@ +package com.navinfo.outdoor.fragment; + +import android.view.View; +import android.widget.ImageView; + +import com.navinfo.outdoor.R; +import com.navinfo.outdoor.base.BaseFragment; + +/** + * 提现记录： + */ +public class WithdrawalRecordFragment extends BaseFragment implements View.OnClickListener{ + + private ImageView ivWithdraw; + + @Override + protected int getLayout() { + return R.layout.withdrawal_record_fragment; + } + + @Override + protected void initView() { + super.initView(); + ivWithdraw = findViewById(R.id.iv_withdraw); + ivWithdraw.setOnClickListener(this); + } + + @Override + protected void initData() { + super.initData(); + } + + @Override + public void onClick(View v) { + switch (v.getId()){ + case R.id.iv_withdraw: + getActivity().finish(); + break; + } + } +} diff --git a/app/src/main/res/drawable/underline.xml b/app/src/main/res/drawable/underline.xml new file mode 100644 index 0000000..06334bc --- /dev/null +++ b/app/src/main/res/drawable/underline.xml @@ -0,0 +1,7 @@ + + + + + \ 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 ffe9346..e1b08d3 100644 --- a/app/src/main/res/layout/about_fragment.xml +++ b/app/src/main/res/layout/about_fragment.xml @@ -61,7 +61,7 @@ android:layout_height="wrap_content" android:layout_gravity="center" android:layout_marginTop="15dp" - android:text="企鹅汇图" + android:text="地图寻宝" android:textColor="@color/black" android:textSize="20sp" android:textStyle="bold" /> @@ -102,7 +102,7 @@ style="@style/main_about_text_style" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="关于企鹅汇图" /> + android:text="关于地图寻宝" /> + android:text="地图寻宝服务协议条款" /> + android:text="地图寻宝隐私保护指引" /> - \ No newline at end of file diff --git a/app/src/main/res/layout/grade_fragment.xml b/app/src/main/res/layout/grade_fragment.xml index 61a4490..7f1dc6a 100644 --- a/app/src/main/res/layout/grade_fragment.xml +++ b/app/src/main/res/layout/grade_fragment.xml @@ -1,6 +1,34 @@ - + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/map_download_fragment.xml b/app/src/main/res/layout/map_download_fragment.xml index 775101c..c1f62ec 100644 --- a/app/src/main/res/layout/map_download_fragment.xml +++ b/app/src/main/res/layout/map_download_fragment.xml @@ -66,4 +66,5 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/linearLayout2" /> + \ 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 f900a94..03f7bc7 100644 --- a/app/src/main/res/layout/mine_fragment.xml +++ b/app/src/main/res/layout/mine_fragment.xml @@ -31,10 +31,9 @@ @@ -172,19 +172,31 @@ android:layout_width="match_parent" android:layout_height="0dp" android:layout_weight="1" - android:background="?android:attr/selectableItemBackground" - android:gravity="center_vertical"> + android:background="?android:attr/selectableItemBackground"> + @@ -207,7 +219,15 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="地图下载" + android:layout_centerVertical="true" style="@style/main_text_style" /> + + + + - + - + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/user_attestation_fragment.xml b/app/src/main/res/layout/user_attestation_fragment.xml index 776905a..0ed2955 100644 --- a/app/src/main/res/layout/user_attestation_fragment.xml +++ b/app/src/main/res/layout/user_attestation_fragment.xml @@ -31,7 +31,6 @@ android:layout_toRightOf="@id/iv_find_task" android:gravity="center" android:text="实名认证" - android:textColor="#fff" android:textSize="17sp" android:textStyle="bold" /> diff --git a/app/src/main/res/layout/user_data_fragment.xml b/app/src/main/res/layout/user_data_fragment.xml index 84cae88..e4e06fd 100644 --- a/app/src/main/res/layout/user_data_fragment.xml +++ b/app/src/main/res/layout/user_data_fragment.xml @@ -9,8 +9,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:background="#1BA5F1" - android:orientation="horizontal" android:paddingTop="@dimen/top_pind_sp" + android:orientation="horizontal" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent"> @@ -21,12 +21,13 @@ android:layout_height="45dp" android:layout_alignParentLeft="true" android:layout_marginLeft="15dp" - android:src="@drawable/icon_arrow" /> + android:src="@drawable/icon_arrow" + /> @@ -36,10 +37,10 @@ style="@style/text_style" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_margin="20dp" android:text="账号信息" - app:layout_constraintBottom_toTopOf="@id/linearLayout" + android:layout_margin="20dp" app:layout_constraintStart_toStartOf="parent" + app:layout_constraintBottom_toTopOf="@id/linearLayout" app:layout_constraintTop_toBottomOf="@+id/rl_user" /> - + android:layout_centerVertical="true" + style="@style/user_text_style" />