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

修改我的页面的bug

Browse Source
This commit is contained in:
md 2021-08-17 18:11:29 +08:00
parent e69d8c3cec
commit a525ed7c99
26 changed files with 907 additions and 201 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@ -3,7 +3,7 @@ apply plugin: 'com.android.application'
android {
compileSdkVersion 29
buildToolsVersion '29.0.2'
// ndkVersion '23.0.7123448'
ndkVersion '23.0.7123448'
defaultConfig {
applicationId "com.navinfo.outdoor"

6
app/src/main/AndroidManifest.xml
View File

@ -46,8 +46,10 @@
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/Theme.WhiteScreen">
<activity android:name=".activity.StatementActivity"></activity>
<activity android:name=".activity.PicturesActivity"></activity>
<activity android:name=".activity.LinkActivity"></activity>
<activity android:name=".activity.RegardMapActivity" />
<activity android:name=".activity.StatementActivity" />
<activity android:name=".activity.PicturesActivity" />
<activity
android:name=".activity.PictureActivity"
android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|uiMode|screenSize|smallestScreenSize|navigation"

50
app/src/main/java/com/navinfo/outdoor/activity/LinkActivity.java Normal file
View File

@ -0,0 +1,50 @@
package com.navinfo.outdoor.activity;
import androidx.appcompat.app.AppCompatActivity;
import android.os.Build;
import android.os.Bundle;
import android.view.View;
import android.webkit.WebSettings;
import android.webkit.WebView;
import android.widget.ImageView;
import com.navinfo.outdoor.R;
import com.navinfo.outdoor.base.BaseActivity;
public class LinkActivity extends BaseActivity implements View.OnClickListener {
private android.widget.ImageView ivIcon;
private android.webkit.WebView linkWeb;
@Override
protected int getLayout() {
return R.layout.activity_link;
}
@Override
protected void initView() {
super.initView();
String url = getIntent().getStringExtra("url");
ivIcon = (ImageView) findViewById(R.id.iv_icon);
ivIcon.setOnClickListener(this::onClick);
linkWeb = (WebView) findViewById(R.id.link_web);
linkWeb.getSettings().setBlockNetworkImage(false);
WebSettings settings = linkWeb.getSettings();
settings.setJavaScriptEnabled(true);
if (Build.VERSION.SDK_INT > Build.VERSION_CODES.LOLLIPOP) {
linkWeb.getSettings().setMixedContentMode(WebSettings.MIXED_CONTENT_ALWAYS_ALLOW);
}
settings.setBuiltInZoomControls(false);
linkWeb.loadUrl(url);
}
@Override
public void onClick(View v) {
switch (v.getId()){
case R.id.iv_icon:
finish();
break;
}
}
}

56
app/src/main/java/com/navinfo/outdoor/activity/RegardMapActivity.java Normal file
View File

@ -0,0 +1,56 @@
package com.navinfo.outdoor.activity;
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.base.BaseActivity;
/*
* 地图寻宝-关于地图的web页面
* */
public class RegardMapActivity extends BaseActivity implements View.OnClickListener {
private ImageView ivFilterFinal;
private TextView tvPhone;
private TextView tvMapLink;
private TextView tvOfficialLink;
@Override
protected int getLayout() {
return R.layout.activity_regard_map;
}
@Override
protected void initView() {
super.initView();
ivFilterFinal = (ImageView) findViewById(R.id.iv_filter_final);
ivFilterFinal.setOnClickListener(this::onClick);
tvPhone = findViewById(R.id.tv_phone);
tvMapLink = (TextView) findViewById(R.id.tv_map_link);
tvMapLink.setOnClickListener(this::onClick);
tvOfficialLink = (TextView) findViewById(R.id.tv_official_link);
tvOfficialLink.setOnClickListener(this::onClick);
}
@Override
public void onClick(View v) {
switch (v.getId()) {
case R.id.iv_filter_final:
finish();
break;
case R.id.tv_map_link:
Intent linkIntent = new Intent(this, LinkActivity.class);
linkIntent.putExtra("url","http://www.navinfo.com");
startActivity(linkIntent);
break;
case R.id.tv_official_link:
Intent officialIntent = new Intent(this, LinkActivity.class);
officialIntent.putExtra("url","https://dtxbmaps.navinfo.com/user");
startActivity(officialIntent);
break;
}
}
}

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

@ -37,7 +37,7 @@ public class CapacityEvaluationAdapter extends RecyclerView.Adapter<CapacityEval
@NonNull
@Override
public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
final View capacity = LayoutInflater.from(context).inflate(R.layout.capacity_item, parent, false);
View capacity = LayoutInflater.from(context).inflate(R.layout.capacity_item, parent, false);
return new ViewHolder(capacity);
}

16
app/src/main/java/com/navinfo/outdoor/adapter/TaskExplainAdapter2.java
View File

@ -11,25 +11,33 @@ import androidx.recyclerview.widget.RecyclerView;
import com.navinfo.outdoor.R;
import com.navinfo.outdoor.bean.TaskExplainInfo;
import com.navinfo.outdoor.bean.TaskPrefectureBean;
import java.util.ArrayList;
import java.util.List;
public class TaskExplainAdapter2 extends RecyclerView.Adapter<TaskExplainAdapter2.ViewHolder2> {
private List<TaskExplainInfo.BodyBean.DataBean> explainList2 = new ArrayList<>();
private List<TaskPrefectureBean.BodyBean.ListBean> explainList2 = new ArrayList<>();
private Context context;
public TaskExplainAdapter2(Context context) {
this.context = context;
}
public void setExplainList2(List<TaskExplainInfo.BodyBean.DataBean> explainList2) {
if (explainList2!=null){
public void setExplainList2(List<TaskPrefectureBean.BodyBean.ListBean> explainList2) {
if (explainList2 != null) {
this.explainList2.addAll(explainList2);
notifyDataSetChanged();
}
}
public void taskExplainClearData() {
if (explainList2 != null) {
explainList2.clear();
}
notifyDataSetChanged();
}
@NonNull
@Override
public ViewHolder2 onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
@ -43,7 +51,7 @@ public class TaskExplainAdapter2 extends RecyclerView.Adapter<TaskExplainAdapter
holder.itemView.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
if (mOnItemClick2!=null){
if (mOnItemClick2 != null) {
mOnItemClick2.onClick2(explainList2.get(position).getId());
}
}

7
app/src/main/java/com/navinfo/outdoor/adapter/TaskPrefectureAdapter.java
View File

@ -33,7 +33,12 @@ public class TaskPrefectureAdapter extends RecyclerView.Adapter<TaskPrefectureAd
@Override
public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
View mView = LayoutInflater.from(context).inflate(R.layout.task_prefecture_item, parent, false);
return new ViewHolder(mView);
ViewHolder viewHolder = new ViewHolder(mView);
// int parentHeight= parent.getHeight();
// parent.getWidth();
// ViewGroup.LayoutParams layoutParams = viewHolder.itemView.getLayoutParams();
// layoutParams.height = (parentHeight/ 6);
return viewHolder;
}
@Override

34
app/src/main/java/com/navinfo/outdoor/api/Constant.java
View File

@ -173,5 +173,37 @@ public class Constant {
public static TencentMap.OnMarkerClickListener markerClickListener=null;
//--/
/**
* 联系我们的QQ群名称和QQ群号
* */
public static String REGION_JING_NAME = "京津冀晋蒙-地图寻宝群";
public static String REGION_JING_PHONE = "9721810";
public static String REGION_HEI_NAME = "黑吉辽-地图寻宝群";
public static String REGION_HEI_PHONE = "549321657";
public static String REGION_SHAN_NAME = "山东-地图寻宝群";
public static String REGION_SHAN_PHONE = "581827297";
public static String REGION_YU_NAME = "豫陕-地图寻宝群";
public static String REGION_YU_PHONE = "344192497";
public static String REGION_CHUAN_NAME = "川渝藏-地图寻宝";
public static String REGION_CHUAN_PHONE = "741373102";
public static String REGION_GAN_NAME = "甘青宁新蒙-地图寻宝群";
public static String REGION_GAN_PHONE = "343620420";
public static String REGION_SU_NAME = "苏皖-地图寻宝群";
public static String REGION_SU_PHONE = "1034993745";
public static String REGION_LU_NAME = "沪浙-地图寻宝群";
public static String REGION_LU_PHONE = "590815485";
public static String REGION_FU_NAME = "福建-地图寻宝群";
public static String REGION_FU_PHONE = "662056094";
public static String REGION_GUANG_NAME = "广西海南-地图寻宝群";
public static String REGION_GUANG_PHONE = "139376252";
public static String REGION_GANZ_NAME = "赣湘鄂-地图寻宝群";
public static String REGION_GANZ_PHONE = "229231160";
public static String REGION_YUE_NAME = "粤港澳-地图寻宝群";
public static String REGION_YUE_PHONE = "892781071";
public static String REGION_YUN_NAME = "云贵-地图寻宝群";
public static String REGION_YUN_PHONE = "284447253";
}

12
app/src/main/java/com/navinfo/outdoor/base/BaseActivity.java
View File

@ -2,6 +2,7 @@ package com.navinfo.outdoor.base;
import android.app.Activity;
import android.app.Application;
import android.content.Intent;
import android.content.pm.ActivityInfo;
import android.graphics.drawable.ColorDrawable;
import android.os.Bundle;
@ -19,10 +20,12 @@ import androidx.appcompat.app.AlertDialog;
import androidx.appcompat.app.AppCompatActivity;
import com.navinfo.outdoor.R;
import com.navinfo.outdoor.activity.WebActivity;
import com.navinfo.outdoor.api.UserApplication;
import com.gyf.immersionbar.ImmersionBar;
import com.navinfo.outdoor.util.NetWorkUtils;
import java.util.HashMap;
import java.util.Timer;
import java.util.TimerTask;
@ -101,7 +104,14 @@ public abstract class BaseActivity extends AppCompatActivity {
alertDialog.dismiss();
}
}
protected void intint2WebActivity(String url, HashMap<String, String> paramMap) {
Intent intent = new Intent(this, WebActivity.class);
if (paramMap !=null) {
intent.putExtra("map", paramMap);
}
intent.putExtra("url", url);
startActivity(intent);
}
protected void initListener() {
}

4
app/src/main/java/com/navinfo/outdoor/fragment/AboutFragment.java
View File

@ -9,6 +9,7 @@ import android.widget.RelativeLayout;
import com.bumptech.glide.Glide;
import com.bumptech.glide.request.RequestOptions;
import com.navinfo.outdoor.R;
import com.navinfo.outdoor.activity.RegardMapActivity;
import com.navinfo.outdoor.activity.WebActivity;
import com.navinfo.outdoor.base.BaseFragment;
import com.navinfo.outdoor.http.HttpInterface;
@ -57,7 +58,8 @@ public class AboutFragment extends BaseFragment implements View.OnClickListener
getActivity().finish();
break;
case R.id.rl_about:
intint2WebActivity(HttpInterface.ABOUT_MAP, null);
Intent regardIntent = new Intent(getActivity(), RegardMapActivity.class);
startActivity(regardIntent);
break;
case R.id.rl_serve:
intint2WebActivity(HttpInterface.MAP_AGREEMENT, null);

118
app/src/main/java/com/navinfo/outdoor/fragment/ContactFragment.java
View File

@ -1,42 +1,54 @@
package com.navinfo.outdoor.fragment;
import android.os.Build;
import android.os.Bundle;
import android.view.View;
import android.webkit.WebSettings;
import android.webkit.WebView;
import android.widget.ImageView;
import android.widget.TextView;
import com.navinfo.outdoor.R;
import com.navinfo.outdoor.api.Constant;
import com.navinfo.outdoor.base.BaseFragment;
/**
* 联系我们的Fragment
*/
public class ContactFragment extends BaseFragment implements View.OnClickListener{
public class ContactFragment extends BaseFragment implements View.OnClickListener {
private ImageView ivContact;
private String content = "<div>\n" +
"<h2>定义和用法</h2>\n" +
"\n" +
"<p>\n" +
"\t<img src=\"https://exp-picture.cdn.bcebos.com/560be432939c2cf72dff4caa452c5b1b1fde12e1.jpg?x-bce-process=image%2Fresize%2Cm_lfit%2Cw_500%2Climit_1%2Fformat%2Cf_jpg%2Fquality%2Cq_80\">\n" +
"</p>\n" +
"\n" +
"<p style=\"color: red; margin-left: 20px\">&lt;style&gt; 标签用于为 HTML 文档定义样式信息。</p>\n" +
"\n" +
"<p style=\"background-color: lightblue; margin-left: 20px\">在 style 中，您可以规定在浏览器中如何呈现 HTML 文档。</p>\n" +
"\n" +
"<p style=\"font-family: verdana; margin-left: 20px\">type 属性是必需的，定义 style 元素的内容。唯一可能的值是 \"text/css\"。</p>\n" +
"\n" +
"<p style=\"font-size: 20px; margin-left: 20px\">style 元素位于 head 部分中。</p>\n" +
"</div>";
private WebView nWebView;
private TextView tvJingName;
private TextView tvJingPhone;
private TextView tvHeiName;
private TextView tvHeiPhone;
private TextView tvShanName;
private TextView tvShanPhone;
private TextView tvYuName;
private TextView tvYuPhone;
private TextView tvChuanName;
private TextView tvChuanPhone;
private TextView tvGanName;
private TextView tvGanPhone;
private TextView tvSuName;
private TextView tvSuPhone;
private TextView tvLuName;
private TextView tvLuPhone;
private TextView tvFuName;
private TextView tvFuPhone;
private TextView tvGuangName;
private TextView tvGuangPhone;
private TextView tvGanzName;
private TextView tvGanzPhone;
private TextView tvYueName;
private TextView tvYuePhone;
private TextView tvYunName;
private TextView tvYunPhone;
public static ContactFragment newInstance(Bundle bundle) {
ContactFragment fragment = new ContactFragment();
fragment.setArguments(bundle);
return fragment;
}
@Override
protected int getLayout() {
return R.layout.contact_fragment;
@ -52,21 +64,65 @@ public class ContactFragment extends BaseFragment implements View.OnClickListene
super.initView();
ivContact = findViewById(R.id.iv_contact);
ivContact.setOnClickListener(this);
nWebView = findViewById(R.id.news_webView);
nWebView.getSettings().setBlockNetworkImage(false);
WebSettings settings = nWebView.getSettings();
settings.setJavaScriptEnabled(true);
if (Build.VERSION.SDK_INT > Build.VERSION_CODES.LOLLIPOP) {
nWebView.getSettings().setMixedContentMode(WebSettings.MIXED_CONTENT_ALWAYS_ALLOW);
}
settings.setBuiltInZoomControls(false);
content = content.replace("<img", "<img style='max-width: 100%'");
nWebView.loadDataWithBaseURL(null, content, "text/html", "utf-8", null);
tvJingName = (TextView) findViewById(R.id.tv_jingName);
tvJingName.setText(Constant.REGION_JING_NAME);
tvJingPhone = (TextView) findViewById(R.id.tv_jingPhone);
tvJingPhone.setText(Constant.REGION_JING_PHONE);
tvHeiName = (TextView) findViewById(R.id.tv_heiName);
tvHeiName.setText(Constant.REGION_HEI_NAME);
tvHeiPhone = (TextView) findViewById(R.id.tv_heiPhone);
tvHeiPhone.setText(Constant.REGION_HEI_PHONE);
tvShanName = (TextView) findViewById(R.id.tv_shanName);
tvShanName.setText(Constant.REGION_SHAN_NAME);
tvShanPhone = (TextView) findViewById(R.id.tv_shanPhone);
tvShanPhone.setText(Constant.REGION_SHAN_PHONE);
tvYuName = (TextView) findViewById(R.id.tv_yuName);
tvYuName.setText(Constant.REGION_YU_NAME);
tvYuPhone = (TextView) findViewById(R.id.tv_yuPhone);
tvYuPhone.setText(Constant.REGION_YU_PHONE);
tvChuanName = (TextView) findViewById(R.id.tv_chuanName);
tvChuanName.setText(Constant.REGION_CHUAN_NAME);
tvChuanPhone = (TextView) findViewById(R.id.tv_chuanPhone);
tvChuanPhone.setText(Constant.REGION_CHUAN_PHONE);
tvGanName = (TextView) findViewById(R.id.tv_ganName);
tvGanName.setText(Constant.REGION_GAN_NAME);
tvGanPhone = (TextView) findViewById(R.id.tv_ganPhone);
tvGanPhone.setText(Constant.REGION_GAN_PHONE);
tvSuName = (TextView) findViewById(R.id.tv_suName);
tvSuName.setText(Constant.REGION_SU_NAME);
tvSuPhone = (TextView) findViewById(R.id.tv_suPhone);
tvSuPhone.setText(Constant.REGION_SU_PHONE);
tvLuName = (TextView) findViewById(R.id.tv_luName);
tvLuName.setText(Constant.REGION_LU_NAME);
tvLuPhone = (TextView) findViewById(R.id.tv_luPhone);
tvLuPhone.setText(Constant.REGION_LU_PHONE);
tvFuName = (TextView) findViewById(R.id.tv_fuName);
tvFuName.setText(Constant.REGION_FU_NAME);
tvFuPhone = (TextView) findViewById(R.id.tv_fuPhone);
tvFuPhone.setText(Constant.REGION_FU_PHONE);
tvGuangName = (TextView) findViewById(R.id.tv_guangName);
tvGuangName.setText(Constant.REGION_GUANG_NAME);
tvGuangPhone = (TextView) findViewById(R.id.tv_guangPhone);
tvGuangPhone.setText(Constant.REGION_GUANG_PHONE);
tvGanzName = (TextView) findViewById(R.id.tv_ganzName);
tvGanzName.setText(Constant.REGION_GANZ_NAME);
tvGanzPhone = (TextView) findViewById(R.id.tv_ganzPhone);
tvGanzPhone.setText(Constant.REGION_GANZ_PHONE);
tvYueName = (TextView) findViewById(R.id.tv_yueName);
tvYueName.setText(Constant.REGION_YUE_NAME);
tvYuePhone = (TextView) findViewById(R.id.tv_yuePhone);
tvYuePhone.setText(Constant.REGION_YUE_PHONE);
tvYunName = (TextView) findViewById(R.id.tv_yunName);
tvYunName.setText(Constant.REGION_YUN_NAME);
tvYunPhone = (TextView) findViewById(R.id.tv_yunPhone);
tvYunPhone.setText(Constant.REGION_YUN_PHONE);
}
@Override
public void onClick(View v) {
switch (v.getId()){
switch (v.getId()) {
case R.id.iv_contact:
getActivity().finish();
break;

1
app/src/main/java/com/navinfo/outdoor/fragment/IssueWebFragment.java
View File

@ -55,6 +55,7 @@ public class IssueWebFragment extends BaseFragment implements View.OnClickListen
}
settings.setBuiltInZoomControls(false);
issueWebView.loadUrl("http://172.23.139.4:10001/#/serveclause");
// issueWebView.loadUrl("http://www.navinfo.com");
}

55
app/src/main/java/com/navinfo/outdoor/fragment/MineFragment.java
View File

@ -46,6 +46,7 @@ public class MineFragment extends BaseFragment implements View.OnClickListener {
fragment.setArguments(bundle);
return fragment;
}
@Override
public void onStart() {
super.onStart();
@ -54,6 +55,7 @@ public class MineFragment extends BaseFragment implements View.OnClickListener {
}
}
@Override
protected int getLayout() {
return R.layout.mine_fragment;
@ -93,10 +95,11 @@ public class MineFragment extends BaseFragment implements View.OnClickListener {
btnQuit.setOnClickListener(this::onClick);
initNetWork();
}
@Subscribe
public void onEvent(Message data) {
if (data.what == Constant.HOME_MINE) {
if ((boolean)data.obj){
if ((boolean) data.obj) {
initNetWork();
}
}
@ -114,14 +117,14 @@ public class MineFragment extends BaseFragment implements View.OnClickListener {
@Override
public void onSuccess(GetPriceBean response, int id) {
dismissLoadingDialog();
if (response.getCode() == 200){
if (response.getCode() == 200) {
GetPriceBean.BodyBean body = response.getBody();
if (body!=null){
Double userPrice =body.getUserPrice();
if (body != null) {
Double userPrice = body.getUserPrice();
tvMoney.setText(userPrice + "");
}
}else {
Toast.makeText(getActivity(), response.getMessage()+"", Toast.LENGTH_SHORT).show();
} else {
Toast.makeText(getActivity(), response.getMessage() + "", Toast.LENGTH_SHORT).show();
}
@ -151,10 +154,10 @@ public class MineFragment extends BaseFragment implements View.OnClickListener {
startActivity(intentUser);
break;
case R.id.image_share://分享
Toast.makeText(getActivity(), "分享", Toast.LENGTH_SHORT).show();
Toast.makeText(getActivity(), "该功能以后上新，敬请期待", Toast.LENGTH_SHORT).show();
break;
case R.id.image_sign://签到
Toast.makeText(getActivity(), "签到", Toast.LENGTH_SHORT).show();
Toast.makeText(getActivity(), "该功能以后上新，敬请期待", Toast.LENGTH_SHORT).show();
break;
case R.id.btn_withdraw://提现页面
@ -163,24 +166,28 @@ public class MineFragment extends BaseFragment implements View.OnClickListener {
startActivity(intentWithdraw);
break;
case R.id.rl_grade://我的等级
Intent intentGrade = new Intent(getActivity(), FragmentManagement.class);
intentGrade.putExtra("tag", 17);
startActivity(intentGrade);
Toast.makeText(getActivity(), "该功能以后上新，敬请期待", Toast.LENGTH_SHORT).show();
// Intent intentGrade = new Intent(getActivity(), FragmentManagement.class);
// intentGrade.putExtra("tag", 17);
// startActivity(intentGrade);
break;
case R.id.rl_privilege://我的特权
Intent intentPrivilege = new Intent(getActivity(), FragmentManagement.class);
intentPrivilege.putExtra("tag", 18);
startActivity(intentPrivilege);
Toast.makeText(getActivity(), "该功能以后上新，敬请期待", Toast.LENGTH_SHORT).show();
// Intent intentPrivilege = new Intent(getActivity(), FragmentManagement.class);
// intentPrivilege.putExtra("tag", 18);
// startActivity(intentPrivilege);
break;
case R.id.rl_map://地图下载
Intent intentMap = new Intent(getActivity(), FragmentManagement.class);
intentMap.putExtra("tag", 19);
startActivity(intentMap);
Toast.makeText(getActivity(), "该功能以后上新，敬请期待", Toast.LENGTH_SHORT).show();
// Intent intentMap = new Intent(getActivity(), FragmentManagement.class);
// intentMap.putExtra("tag", 19);
// startActivity(intentMap);
break;
case R.id.rl_issue://常见问题
Intent intentIssue = new Intent(getActivity(), FragmentManagement.class);
intentIssue.putExtra("tag", 20);
startActivity(intentIssue);
Toast.makeText(getActivity(), "该功能以后上新，敬请期待", Toast.LENGTH_SHORT).show();
// Intent intentIssue = new Intent(getActivity(), FragmentManagement.class);
// intentIssue.putExtra("tag", 20);
// startActivity(intentIssue);
break;
case R.id.rl_contact://联系我们
Intent intentContact = new Intent(getActivity(), FragmentManagement.class);
@ -188,9 +195,10 @@ public class MineFragment extends BaseFragment implements View.OnClickListener {
startActivity(intentContact);
break;
case R.id.rl_set://设置
Intent intentSet = new Intent(getActivity(), FragmentManagement.class);
intentSet.putExtra("tag", 22);
startActivity(intentSet);
Toast.makeText(getActivity(), "该功能以后上新，敬请期待", Toast.LENGTH_SHORT).show();
// Intent intentSet = new Intent(getActivity(), FragmentManagement.class);
// intentSet.putExtra("tag", 22);
// startActivity(intentSet);
break;
case R.id.rl_about://关于
Intent intentAbout = new Intent(getActivity(), FragmentManagement.class);
@ -202,6 +210,7 @@ public class MineFragment extends BaseFragment implements View.OnClickListener {
break;
}
}
@Override
public void onDestroy() {
if (EventBus.getDefault().isRegistered(this))//加上判断

9
app/src/main/java/com/navinfo/outdoor/fragment/TaskExplainFragment.java
View File

@ -38,8 +38,6 @@ public class TaskExplainFragment extends BaseFragment implements View.OnClickLis
private TaskExplainAdapter taskExplainAdapter;
private int taskPage = 1;
private Integer fId;
public static TaskExplainFragment newInstance(Bundle bundle) {
TaskExplainFragment fragment = new TaskExplainFragment();
@ -87,7 +85,7 @@ public class TaskExplainFragment extends BaseFragment implements View.OnClickLis
public void onClick(int pos) {
Intent itemIntent = new Intent(getActivity(), FragmentManagement.class);
itemIntent.putExtra("tag", 10);
itemIntent.putExtra("id",fId);
itemIntent.putExtra("id",pos+"");
startActivity(itemIntent);
}
@ -118,11 +116,6 @@ public class TaskExplainFragment extends BaseFragment implements View.OnClickLis
dismissLoadingDialog();
if (response.getCode() == 200){
taskExplainAdapter.setExplainList(response.getBody().getList());
TaskPrefectureBean.BodyBean body = response.getBody();
// List<TaskPrefectureBean.BodyBean.ListBean> list = body.getList();
// for (int i = 0; i < list.size(); i++) {
// fId = list.get(i).getId();
// }
taskPage++;
}else {
Toast.makeText(getActivity(), response.getMessage()+"", Toast.LENGTH_SHORT).show();

37
app/src/main/java/com/navinfo/outdoor/fragment/TaskExplainFragment2.java
View File

@ -18,6 +18,7 @@ import com.navinfo.outdoor.adapter.TaskExplainAdapter2;
import com.navinfo.outdoor.api.Constant;
import com.navinfo.outdoor.base.BaseFragment;
import com.navinfo.outdoor.bean.TaskExplainInfo;
import com.navinfo.outdoor.bean.TaskPrefectureBean;
import com.navinfo.outdoor.http.Callback;
import com.navinfo.outdoor.http.HttpInterface;
import com.navinfo.outdoor.http.OkGoBuilder;
@ -38,6 +39,7 @@ public class TaskExplainFragment2 extends BaseFragment implements View.OnClickLi
private XRecyclerView taskExplain2Recycler;
private ArrayList<TaskExplainInfo.BodyBean.DataBean> dataBeans2;
private TaskExplainAdapter2 taskExplainAdapter2;
private int taskExplainPage = 1;
public static TaskExplainFragment2 newInstance(Bundle bundle) {
TaskExplainFragment2 fragment = new TaskExplainFragment2();
@ -53,12 +55,13 @@ public class TaskExplainFragment2 extends BaseFragment implements View.OnClickLi
@Override
protected void initView() {
super.initView();
ivTaskExplain2 = findViewById(R.id.iv_task_explain2_finish);
taskExplain2Recycler = findViewById(R.id.task_explain2_recycler);
ivTaskExplain2.setOnClickListener(this::onClick);
taskExplain2Recycler.setLayoutManager(new LinearLayoutManager(getActivity()));
//下划线
taskExplain2Recycler.addItemDecoration(new DividerItemDecoration(getActivity(),DividerItemDecoration.VERTICAL));
// taskExplain2Recycler.addItemDecoration(new DividerItemDecoration(getActivity(),DividerItemDecoration.VERTICAL));
taskExplain2Recycler.setRefreshProgressStyle(ProgressStyle.BallSpinFadeLoader);
taskExplain2Recycler.setLoadingMoreProgressStyle(ProgressStyle.BallRotate);
//取消上拉加载，刷新功能。
@ -71,12 +74,14 @@ public class TaskExplainFragment2 extends BaseFragment implements View.OnClickLi
taskExplain2Recycler.setLoadingListener(new XRecyclerView.LoadingListener() {
@Override
public void onRefresh() {
taskExplainAdapter2.taskExplainClearData();
taskExplainPage=1;
initNetWork2();
}
@Override
public void onLoadMore() {
initNetWork2();
}
});
taskExplainAdapter2.setOnItemClick(new TaskExplainAdapter2.OnItemClick2() {
@ -98,26 +103,34 @@ public class TaskExplainFragment2 extends BaseFragment implements View.OnClickLi
private void initNetWork2() {
showLoadingDialog();
String id = getActivity().getIntent().getStringExtra("id");
HttpParams httpParams = new HttpParams();
httpParams.put("fid", "3");
httpParams.put("pageNum", "1");
httpParams.put("fid", id);
httpParams.put("pageNum", taskExplainPage);
httpParams.put("pageSize", "20");
OkGoBuilder.getInstance()
.Builder(getActivity())
.url(HttpInterface.LIST_TASK_EXPLAIN)
.cls(TaskExplainInfo.class)
.params(new HttpParams())
.url(HttpInterface.LIST_TASK)
.cls(TaskPrefectureBean.class)
.params(httpParams)
.token(Constant.ACCESS_TOKEN)
.getRequest(new Callback<TaskExplainInfo>() {
.getRequest(new Callback<TaskPrefectureBean>() {
@Override
public void onSuccess(TaskExplainInfo response, int id) {
public void onSuccess(TaskPrefectureBean response, int id) {
dismissLoadingDialog();
taskExplainAdapter2.setExplainList2(response.getBody().getData());
Log.d("TAG", "onSuccess: " + response.getMsg() + "sssssssssssss");
if (response.getCode() == 200){
taskExplainAdapter2.setExplainList2(response.getBody().getList());
taskExplainPage++;
}
taskExplain2Recycler.refreshComplete();
taskExplain2Recycler.loadMoreComplete();
Log.d("TAG", "onSuccess: " + response.getMessage() + "sssssssssssss");
}
@Override
public void onError(Throwable e, int id) {
taskExplain2Recycler.refreshComplete();
taskExplain2Recycler.loadMoreComplete();
dismissLoadingDialog();
Toast.makeText(getActivity(), e.getMessage(), Toast.LENGTH_SHORT).show();
Log.d("TAG", "onError: " + e.getMessage());

2
app/src/main/java/com/navinfo/outdoor/fragment/TaskPrefectureFragment.java
View File

@ -116,7 +116,7 @@ public class TaskPrefectureFragment extends BaseFragment implements View.OnClick
dismissLoadingDialog();
if (taskPrefectureBean.getCode() == 200){
taskPrefectureAdapter.setDataBeans(taskPrefectureBean.getBody().getList());
// taskPage++;
taskPage++;
}else {
Toast.makeText(getActivity(), taskPrefectureBean.getMessage()+"", Toast.LENGTH_SHORT).show();
}

39
app/src/main/res/layout/activity_link.xml Normal file
View File

@ -0,0 +1,39 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout 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"
android:orientation="vertical"
tools:context=".activity.LinkActivity">
<RelativeLayout
android:id="@+id/rl_web"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="#1BA5F1"
android:paddingTop="@dimen/top_pind_sp">
<ImageView
android:id="@+id/iv_icon"
android:layout_width="wrap_content"
android:layout_height="45dp"
android:padding="5dp"
android:src="@drawable/ic_baseline_arrow"
android:layout_alignParentLeft="true"
android:layout_marginLeft="15dp" />
<!-- <TextView-->
<!-- android:id="@+id/tv_title"-->
<!-- style="@style/text_style_toolbar_title"-->
<!-- android:layout_width="wrap_content"-->
<!-- -->
<!-- android:layout_toRightOf="@id/iv_icon"-->
<!-- android:textColor="#fff" />-->
</RelativeLayout>
<WebView
android:id="@+id/link_web"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</LinearLayout>

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

@ -48,6 +48,7 @@
android:layout_marginTop="8dp"
android:hint=" ID/手机号"
android:maxLines="1"
android:singleLine="true"
android:textColor="@color/white"
android:paddingBottom="20dp"
android:layout_marginRight="35dp"

94
app/src/main/res/layout/activity_regard_map.xml Normal file
View File

@ -0,0 +1,94 @@
<?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"
tools:context=".activity.RegardMapActivity">
<LinearLayout
android:id="@+id/rl_filter"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="#1BA5F1"
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_filter_final"
android:layout_width="wrap_content"
android:layout_height="45dp"
android:layout_alignParentLeft="true"
android:layout_marginLeft="15dp"
android:src="@drawable/icon_arrow" />
<TextView
android:id="@+id/tv_filter"
style="@style/text_style_toolbar_title"
android:layout_width="wrap_content"
android:layout_toRightOf="@id/iv_find_task"
android:text="地图寻宝简介" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_margin="20dp"
android:layout_marginBottom="245dp"
android:orientation="vertical"
app:layout_constraintTop_toBottomOf="@+id/rl_filter"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
>
<TextView
android:id="@+id/tv_phone"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/map_regard"
android:textSize="16sp"
app:layout_constraintTop_toBottomOf="@+id/rl_filter"
/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
android:text="公司官网请见"
android:textSize="16sp"
app:layout_constraintLeft_toLeftOf="@+id/tv_phone"
app:layout_constraintTop_toBottomOf="@+id/tv_phone" />
<TextView
android:id="@+id/tv_map_link"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
android:textColor="#0000FF"
android:textSize="16sp"
android:layout_marginLeft="5dp"
android:text="http://www.navinfo.com"
/>
</LinearLayout>
<TextView
android:id="@+id/tv_official_link"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="15sp"
android:textSize="16sp"
android:text="更多详情请见官网：https://dtxbmaps.navinfo.com/user"
app:layout_constraintLeft_toLeftOf="@+id/tv_phone"
app:layout_constraintTop_toBottomOf="@+id/tv_phone" />
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

345
app/src/main/res/layout/contact_fragment.xml
View File

@ -1,15 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
xmlns:app="http://schemas.android.com/apk/res-auto">
android:layout_height="match_parent">
<LinearLayout
android:id="@+id/rl_contact"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="#1BA5F1"
android:paddingTop="@dimen/top_pind_sp"
android:orientation="horizontal"
android:paddingTop="@dimen/top_pind_sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
@ -20,23 +21,341 @@
android:layout_height="45dp"
android:layout_alignParentLeft="true"
android:layout_marginLeft="15dp"
android:src="@drawable/icon_arrow"
/>
android:src="@drawable/icon_arrow" />
<TextView
android:id="@+id/tv_contact"
android:layout_width="wrap_content"
style="@style/text_style_toolbar_title"
android:layout_width="wrap_content"
android:layout_toRightOf="@id/iv_find_task"
android:text="联系我们" />
</LinearLayout>
<WebView
android:id="@+id/news_webView"
<LinearLayout
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_contact" />
android:layout_height="wrap_content"
android:layout_margin="20dp"
android:orientation="vertical"
app:layout_constraintTop_toBottomOf="@+id/rl_contact">
<TextView
android:id="@+id/tv_mapPhone"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="地图寻宝各区域联系方式："
android:textSize="16sp"
app:layout_constraintTop_toBottomOf="@+id/rl_contact" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="25dp"
android:gravity="center_horizontal"
android:layout_gravity="center_vertical"
android:background="@color/colorBlue"
android:orientation="horizontal">
<TextView
android:id="@+id/tv_qqName"
android:textSize="16sp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="QQ群名称" />
<TextView
android:id="@+id/tv_qqPhone"
android:layout_width="wrap_content"
android:textSize="16sp"
android:layout_height="wrap_content"
android:layout_marginLeft="120dp"
android:text="QQ群号" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="25dp"
android:gravity="center"
android:orientation="horizontal">
<TextView
android:id="@+id/tv_jingName"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="QQ群名称"
android:textSize="16sp" />
<TextView
android:id="@+id/tv_jingPhone"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="100dp"
android:text="QQ群号"
android:textSize="16sp" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="25dp"
android:gravity="center"
android:background="#AEAAAA"
android:orientation="horizontal">
<TextView
android:id="@+id/tv_heiName"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="QQ群名称"
android:textSize="16sp" />
<TextView
android:id="@+id/tv_heiPhone"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="120dp"
android:text="QQ群号"
android:textSize="16sp" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="25dp"
android:gravity="center"
android:orientation="horizontal">
<TextView
android:id="@+id/tv_shanName"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="QQ群名称"
android:textSize="16sp" />
<TextView
android:id="@+id/tv_shanPhone"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="120dp"
android:text="QQ群号"
android:textSize="16sp" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="25dp"
android:gravity="center"
android:background="#AEAAAA"
android:orientation="horizontal">
<TextView
android:id="@+id/tv_yuName"
android:textSize="16sp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="QQ群名称" />
<TextView
android:id="@+id/tv_yuPhone"
android:layout_width="wrap_content"
android:textSize="16sp"
android:layout_height="wrap_content"
android:layout_marginLeft="120dp"
android:text="QQ群号" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="25dp"
android:gravity="center"
android:orientation="horizontal">
<TextView
android:id="@+id/tv_chuanName"
android:textSize="16sp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="QQ群名称" />
<TextView
android:id="@+id/tv_chuanPhone"
android:layout_width="wrap_content"
android:textSize="16sp"
android:layout_height="wrap_content"
android:layout_marginLeft="120dp"
android:text="QQ群号" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="25dp"
android:gravity="center"
android:background="#AEAAAA"
android:orientation="horizontal">
<TextView
android:id="@+id/tv_ganName"
android:textSize="16sp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="QQ群名称" />
<TextView
android:id="@+id/tv_ganPhone"
android:layout_width="wrap_content"
android:textSize="16sp"
android:layout_height="wrap_content"
android:layout_marginLeft="120dp"
android:text="QQ群号" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="25dp"
android:gravity="center"
android:orientation="horizontal">
<TextView
android:id="@+id/tv_suName"
android:textSize="16sp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="QQ群名称" />
<TextView
android:id="@+id/tv_suPhone"
android:layout_width="wrap_content"
android:textSize="16sp"
android:layout_height="wrap_content"
android:layout_marginLeft="120dp"
android:text="QQ群号" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="25dp"
android:gravity="center"
android:background="#AEAAAA"
android:orientation="horizontal">
<TextView
android:id="@+id/tv_luName"
android:textSize="16sp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="QQ群名称" />
<TextView
android:id="@+id/tv_luPhone"
android:layout_width="wrap_content"
android:textSize="16sp"
android:layout_height="wrap_content"
android:layout_marginLeft="120dp"
android:text="QQ群号" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="25dp"
android:gravity="center"
android:orientation="horizontal">
<TextView
android:id="@+id/tv_fuName"
android:textSize="16sp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="QQ群名称" />
<TextView
android:id="@+id/tv_fuPhone"
android:layout_width="wrap_content"
android:textSize="16sp"
android:layout_height="wrap_content"
android:layout_marginLeft="120dp"
android:text="QQ群号" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="25dp"
android:gravity="center"
android:background="#AEAAAA"
android:orientation="horizontal">
<TextView
android:id="@+id/tv_guangName"
android:textSize="16sp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="QQ群名称" />
<TextView
android:id="@+id/tv_guangPhone"
android:layout_width="wrap_content"
android:textSize="16sp"
android:layout_height="wrap_content"
android:layout_marginLeft="120dp"
android:text="QQ群号" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="25dp"
android:gravity="center"
android:orientation="horizontal">
<TextView
android:id="@+id/tv_ganzName"
android:textSize="16sp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="QQ群名称" />
<TextView
android:id="@+id/tv_ganzPhone"
android:layout_width="wrap_content"
android:textSize="16sp"
android:layout_height="wrap_content"
android:layout_marginLeft="120dp"
android:text="QQ群号" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="25dp"
android:gravity="center"
android:background="#AEAAAA"
android:orientation="horizontal">
<TextView
android:id="@+id/tv_yueName"
android:textSize="16sp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="QQ群名称" />
<TextView
android:id="@+id/tv_yuePhone"
android:layout_width="wrap_content"
android:textSize="16sp"
android:layout_height="wrap_content"
android:layout_marginLeft="120dp"
android:text="QQ群号" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="25dp"
android:gravity="center"
android:orientation="horizontal">
<TextView
android:id="@+id/tv_yunName"
android:textSize="16sp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="QQ群名称" />
<TextView
android:id="@+id/tv_yunPhone"
android:layout_width="wrap_content"
android:textSize="16sp"
android:layout_height="wrap_content"
android:layout_marginLeft="120dp"
android:text="QQ群号" />
</LinearLayout>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="16sp"
android:text="地图寻宝微信公众号：微信搜索地图寻宝或者扫码关注"/>
<!-- <ImageView-->
<!-- android:layout_width=""-->
<!-- android:layout_height=""-->
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

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

@ -8,7 +8,7 @@
<TextView
android:id="@+id/tv_title"
android:layout_width="280dp"
android:layout_width="270dp"
android:layout_height="wrap_content"
android:text="众包录像 测试3"
android:textColor="#333"

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

@ -1,9 +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"
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="@drawable/bg"
tools:context=".fragment.RegisterFragment">
@ -12,8 +12,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/colorPrimaryBlue"
android:paddingTop="@dimen/top_pind_sp"
android:orientation="horizontal"
android:paddingTop="@dimen/top_pind_sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
@ -24,20 +24,19 @@
android:layout_height="45dp"
android:layout_alignParentLeft="true"
android:layout_marginLeft="15dp"
android:src="@drawable/ic_baseline_arrow"
/>
android:src="@drawable/ic_baseline_arrow" />
<TextView
android:id="@+id/tv_register_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="注册"
style="@style/toolbar_style"
/>
android:text="注册" />
</LinearLayout>
<TextView
android:id="@+id/register_title"
android:layout_width="match_parent"
@ -63,57 +62,57 @@
<TextView
android:id="@+id/register_phone"
style="@style/text_styles"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="25dp"
android:text="手机号"
style="@style/text_styles"
app:layout_constraintTop_toBottomOf="@id/register_desc"
app:layout_constraintLeft_toLeftOf="@id/register_desc"
/>
app:layout_constraintTop_toBottomOf="@id/register_desc" />
<EditText
android:id="@+id/et_register_phone"
style="@style/register_hint_style"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="35dp"
android:hint="11位手机号码"
android:inputType="number"
android:textColor="@color/white"
android:layout_marginLeft="35dp"
style="@style/register_hint_style"
android:maxLength="11"
android:textColor="@color/white"
android:textColorHint="@color/colorTransparent"
android:textCursorDrawable="@drawable/text_color"
android:theme="@style/MyEditText"
app:layout_constraintLeft_toLeftOf="@id/register_phone"
app:layout_constraintTop_toBottomOf="@id/register_phone" />
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginLeft="35dp"
android:layout_marginRight="50dp"
android:background="@color/colorHui"
app:layout_constraintTop_toBottomOf="@id/et_register_phone"
app:layout_constraintLeft_toLeftOf="@id/et_register_phone"/>
app:layout_constraintLeft_toLeftOf="@id/et_register_phone"
app:layout_constraintTop_toBottomOf="@id/et_register_phone" />
<TextView
android:id="@+id/register_note"
style="@style/text_styles"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:text="短信验证码"
style="@style/text_styles"
app:layout_constraintTop_toBottomOf="@id/et_register_phone"
app:layout_constraintLeft_toLeftOf="@id/et_register_phone"
/>
app:layout_constraintTop_toBottomOf="@id/et_register_phone" />
<EditText
android:id="@+id/et_register_note"
style="@style/register_hint_style"
android:layout_width="250dp"
android:layout_height="wrap_content"
android:hint="6位短信验证"
android:textColor="@color/white"
android:inputType="number"
style="@style/register_hint_style"
android:textColor="@color/white"
android:textColorHint="@color/colorTransparent"
android:textCursorDrawable="@drawable/text_color"
android:theme="@style/MyEditText"
@ -127,117 +126,121 @@
android:layout_marginLeft="35dp"
android:layout_marginRight="50dp"
android:background="@color/colorHui"
app:layout_constraintTop_toBottomOf="@id/et_register_note"
app:layout_constraintLeft_toLeftOf="@id/et_register_note"/>
app:layout_constraintLeft_toLeftOf="@id/et_register_note"
app:layout_constraintTop_toBottomOf="@id/et_register_note" />
<TextView
android:id="@+id/register_get_note"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="获取短信验证码"
android:textSize="14sp"
android:textColor="@color/colorWhite"
app:layout_constraintTop_toTopOf="@id/et_register_note"
android:textSize="14sp"
app:layout_constraintBottom_toBottomOf="@id/et_register_note"
app:layout_constraintRight_toRightOf="@id/view3"
/>
app:layout_constraintTop_toTopOf="@id/et_register_note" />
<TextView
android:id="@+id/register_referrer"
style="@style/text_styles"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:text="推荐人"
style="@style/text_styles"
app:layout_constraintTop_toBottomOf="@id/et_register_note"
app:layout_constraintLeft_toLeftOf="@id/et_register_note"
/>
app:layout_constraintTop_toBottomOf="@id/et_register_note" />
<EditText
android:id="@+id/et_register_referrer"
style="@style/register_hint_style"
android:layout_width="300dp"
android:layout_height="wrap_content"
android:hint="推荐人(编码/邮箱/手机号)"
android:maxLines="1"
android:textColor="@color/white"
style="@style/register_hint_style"
android:textColorHint="@color/colorTransparent"
android:textCursorDrawable="@drawable/text_color"
android:theme="@style/MyEditText"
app:layout_constraintLeft_toLeftOf="@id/register_referrer"
app:layout_constraintTop_toBottomOf="@id/register_referrer"/>
app:layout_constraintTop_toBottomOf="@id/register_referrer" />
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/colorHui"
android:layout_marginLeft="35dp"
android:layout_marginRight="50dp"
app:layout_constraintTop_toBottomOf="@id/et_register_referrer"
app:layout_constraintLeft_toLeftOf="@id/et_register_referrer"/>
android:background="@color/colorHui"
app:layout_constraintLeft_toLeftOf="@id/et_register_referrer"
app:layout_constraintTop_toBottomOf="@id/et_register_referrer" />
<TextView
android:id="@+id/register_paw"
style="@style/text_styles"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:text="密码"
style="@style/text_styles"
app:layout_constraintTop_toBottomOf="@id/et_register_referrer"
app:layout_constraintLeft_toLeftOf="@id/et_register_referrer"
/>
app:layout_constraintTop_toBottomOf="@id/et_register_referrer" />
<EditText
android:id="@+id/et_register_paw"
style="@style/register_hint_style"
android:layout_width="300dp"
android:layout_height="wrap_content"
android:hint="6-20位密码"
android:textColor="@color/white"
android:inputType="textPassword"
style="@style/register_hint_style"
android:maxLength="20"
android:textColor="@color/white"
android:textColorHint="@color/colorTransparent"
android:textCursorDrawable="@drawable/text_color"
android:theme="@style/MyEditText"
app:layout_constraintLeft_toLeftOf="@id/register_paw"
app:layout_constraintTop_toBottomOf="@id/register_paw"/>
app:layout_constraintTop_toBottomOf="@id/register_paw" />
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/colorHui"
android:layout_marginLeft="35dp"
android:layout_marginRight="50dp"
app:layout_constraintTop_toBottomOf="@id/et_register_paw"
app:layout_constraintLeft_toLeftOf="@id/et_register_paw"/>
android:background="@color/colorHui"
app:layout_constraintLeft_toLeftOf="@id/et_register_paw"
app:layout_constraintTop_toBottomOf="@id/et_register_paw" />
<TextView
android:id="@+id/register_confirm_paw"
style="@style/text_styles"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:text="确认密码"
style="@style/text_styles"
app:layout_constraintTop_toBottomOf="@id/et_register_paw"
app:layout_constraintLeft_toLeftOf="@id/et_register_paw"
/>
app:layout_constraintTop_toBottomOf="@id/et_register_paw" />
<EditText
android:id="@+id/et_register_confirm_paw"
style="@style/register_hint_style"
android:layout_width="300dp"
android:layout_height="wrap_content"
android:hint="请再次输入一遍密码"
android:inputType="textPassword"
android:maxLength="20"
android:textColor="@color/white"
android:inputType="textPassword"
style="@style/register_hint_style"
android:textColorHint="@color/colorTransparent"
android:textCursorDrawable="@drawable/text_color"
android:theme="@style/MyEditText"
app:layout_constraintLeft_toLeftOf="@id/register_confirm_paw"
app:layout_constraintTop_toBottomOf="@id/register_confirm_paw"/>
app:layout_constraintTop_toBottomOf="@id/register_confirm_paw" />
<View
android:id="@+id/view_paw"
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/colorHui"
android:layout_marginLeft="35dp"
android:layout_marginRight="50dp"
app:layout_constraintTop_toBottomOf="@id/et_register_confirm_paw"
app:layout_constraintLeft_toLeftOf="@id/et_register_confirm_paw"/>
android:background="@color/colorHui"
app:layout_constraintLeft_toLeftOf="@id/et_register_confirm_paw"
app:layout_constraintTop_toBottomOf="@id/et_register_confirm_paw" />
<CheckBox
android:id="@+id/iv_register_check"
@ -245,37 +248,40 @@
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:buttonTint="@color/white"
app:layout_constraintTop_toBottomOf="@id/et_register_confirm_paw"
app:layout_constraintLeft_toLeftOf="@id/et_register_confirm_paw" />
app:layout_constraintLeft_toLeftOf="@id/et_register_confirm_paw"
app:layout_constraintTop_toBottomOf="@id/et_register_confirm_paw" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="2dp"
android:text="免责声明"
android:textColor="@color/colorWhite"
app:layout_constraintTop_toTopOf="@id/iv_register_check"
app:layout_constraintLeft_toRightOf="@id/iv_register_check"
app:layout_constraintBottom_toBottomOf="@id/iv_register_check"
android:layout_marginLeft="2dp"/>
app:layout_constraintLeft_toRightOf="@id/iv_register_check"
app:layout_constraintTop_toTopOf="@id/iv_register_check" />
<TextView
android:id="@+id/have_go_login"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="已有账号,去登录"
android:textColor="@color/colorWhite"
app:layout_constraintTop_toTopOf="@id/iv_register_check"
app:layout_constraintBottom_toBottomOf="@id/iv_register_check"
app:layout_constraintRight_toRightOf="@id/view_paw"
app:layout_constraintBottom_toBottomOf="@id/iv_register_check"/>
app:layout_constraintTop_toTopOf="@id/iv_register_check" />
<Button
android:id="@+id/btn_register"
style="@style/login_style"
android:layout_width="match_parent"
android:layout_height="50dp"
android:layout_marginTop="20dp"
android:gravity="center"
style="@style/login_style"
android:text="注册"
android:layout_marginLeft="35dp"
android:layout_marginTop="20dp"
android:layout_marginRight="35dp"
android:gravity="center"
android:text="注册"
app:layout_constraintLeft_toLeftOf="@id/iv_register_check"
app:layout_constraintTop_toBottomOf="@id/iv_register_check"/>
app:layout_constraintTop_toBottomOf="@id/iv_register_check" />
</androidx.constraintlayout.widget.ConstraintLayout>

65
app/src/main/res/layout/fragment_stay_submit.xml
View File

@ -5,82 +5,77 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".fragment.StaySubmitFragment">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
>
android:layout_height="match_parent">
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl_stay_type"
android:layout_width="match_parent"
android:layout_height="70dp"
android:layout_height="80dp"
android:background="@drawable/road_shape"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<TextView
style="@style/text_style"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="18dp"
android:layout_marginBottom="5dp"
android:text="类型"
app:layout_constraintBottom_toTopOf="@+id/tv_stay_type"
app:layout_constraintStart_toStartOf="@+id/tv_stay_type" />
app:layout_constraintStart_toStartOf="@+id/tv_stay_type"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/tv_stay_type"
style="@style/main_about_text_style"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="20dp"
android:layout_marginLeft="10dp"
android:layout_marginBottom="20dp"
android:text="全部"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.65" />
app:layout_constraintStart_toStartOf="parent" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="20dp"
android:background="@drawable/ic_baseline_arrow_forward"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/colormap"
app:layout_constraintBottom_toBottomOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
<LinearLayout
<RelativeLayout
android:id="@+id/ll_results"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_height="80dp"
android:background="@drawable/road_shape"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/cl_stay_type">
<TextView
android:id="@+id/tv_stay_result"
android:id="@+id/tv_result"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="10dp"
android:layout_centerVertical="true"
android:layout_margin="20dp"
android:text="筛选结果"
android:textSize="25sp"
android:textStyle="bold" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/stay_xrv"
android:nestedScrollingEnabled="false"
android:layout_width="match_parent"
android:layout_height="match_parent"
/>
</LinearLayout>
android:textSize="20sp" />
</RelativeLayout>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/stay_xrv"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layout_constraintTop_toBottomOf="@+id/ll_results"
/>
<LinearLayout
android:id="@+id/ll_del"
android:layout_width="match_parent"
@ -88,7 +83,7 @@
android:orientation="horizontal"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/ll_results">
app:layout_constraintTop_toBottomOf="@+id/stay_xrv">
<CheckBox
android:id="@+id/cb_select"
@ -116,10 +111,10 @@
android:layout_height="wrap_content"
android:layout_margin="20dp"
android:text="提交"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/ll_del"
app:layout_constraintBottom_toBottomOf="parent"/>
app:layout_constraintTop_toBottomOf="@+id/ll_del" />
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.core.widget.NestedScrollView>

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

@ -47,5 +47,10 @@
android:layout_marginRight="10dp"
app:layout_constraintRight_toLeftOf="@+id/tv_auditStatus"
app:layout_constraintTop_toTopOf="@+id/tv_createTime" />
<View
android:layout_width="match_parent"
android:layout_height="1dp"
app:layout_constraintBottom_toBottomOf="parent"
android:background="#C0BFBF"/>
</androidx.constraintlayout.widget.ConstraintLayout>

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

@ -14,4 +14,9 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
android:layout_marginLeft="10dp"/>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="#C0BFBF"
app:layout_constraintBottom_toBottomOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>

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

@ -13,8 +13,6 @@
<string name="hello_blank_fragment">Hello blank fragment</string>
<string name="statement">一、地图寻宝活动说明\n\n
1.1.关于活动：地图寻宝活动（以下简称“活动”）是图新、其子公司和关联公司等（以下统称为“图新”）举办的一个以“实景互动，
@ -150,4 +148,11 @@
11.4如果出现您对本条款的违反行为，图新保留针对该违反行为采取法律所能提供的所有补救手段的权利。如果您在使用本软件或参与本活动期间发现有任何在您看来属于
不正当或在其它方面违反本条款的内容，您应及时向图新举报。\n\n
</string>
<string name="map_regard">北京四维图新科技股份有限公司（简称：四维图新，深交所股票代码：002405）是中国领先的数字地图内容、车联网及动态交通信息服务、地理位置相关的商业智能解决方案提供商。\n\n
地图寻宝是由北京四维图团队打造的兼职赚钱类应用。只要您有碎片时间，完成小任务即可有现金收入。\n\n
地图寻宝App：作为专业众包作业工具，可作业道路、POI、充电站、公交站、门牌号等多类型任务。\n\n
地图寻宝小程序：简版众包作业工具，无需安装，可采集POI、充电站点类型任务\n\n
地图寻宝小程序：微信小程序搜索-地图寻宝</string>
</resources>