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

修改’我的‘得页面修改

Browse Source
This commit is contained in:
md
2021-09-07 19:02:14 +08:00
parent 13bf70c69a
commit 4911f5df93
12 changed files with 166 additions and 145 deletions
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 { android {
compileSdkVersion 29 compileSdkVersion 29
buildToolsVersion '29.0.2' buildToolsVersion '29.0.2'
// ndkVersion '23.0.7123448' ndkVersion '23.0.7123448'
defaultConfig { defaultConfig {
applicationId "com.navinfo.outdoor" applicationId "com.navinfo.outdoor"

9
app/src/main/java/com/navinfo/outdoor/activity/MainActivity.java
View File

@@ -12,6 +12,7 @@ import android.os.Environment;
import android.os.Handler; import android.os.Handler;
import android.os.Message; import android.os.Message;
import android.view.View; import android.view.View;
import android.widget.TextView;
import android.widget.Toast; import android.widget.Toast;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
@@ -77,12 +78,20 @@ public class MainActivity extends BaseActivity {
private ProgressDialog pBar; private ProgressDialog pBar;
private int progress; private int progress;
private String user_id; private String user_id;
private TextView tvView;
@Override @Override
protected int getLayout() { protected int getLayout() {
return R.layout.activity_main; return R.layout.activity_main;
} }
@Override
protected void initMVP() {
super.initMVP();
tvView = findViewById(R.id.tv_view);
tvView.setText(Constant.NAVIN_FO);
}
@Override @Override
protected void initData() { protected void initData() {
super.initData(); super.initData();

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

@@ -181,7 +181,7 @@ public class Constant {
public static TencentMap.OnMarkerClickListener markerClickListener=null; public static TencentMap.OnMarkerClickListener markerClickListener=null;
public static final String NAVIN_FO="9.06";
/** /**
* 联系我们的QQ群名称和QQ群号 * 联系我们的QQ群名称和QQ群号

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

@@ -22,11 +22,9 @@ import com.navinfo.outdoor.activity.UserActivity;
import com.navinfo.outdoor.api.Constant; import com.navinfo.outdoor.api.Constant;
import com.navinfo.outdoor.base.BaseFragment; import com.navinfo.outdoor.base.BaseFragment;
import com.navinfo.outdoor.bean.GetPriceBean; import com.navinfo.outdoor.bean.GetPriceBean;
import com.navinfo.outdoor.bean.MeasureBean;
import com.navinfo.outdoor.http.Callback; import com.navinfo.outdoor.http.Callback;
import com.navinfo.outdoor.http.HttpInterface; import com.navinfo.outdoor.http.HttpInterface;
import com.navinfo.outdoor.http.OkGoBuilder; import com.navinfo.outdoor.http.OkGoBuilder;
import com.tencent.tencentmap.mapsdk.maps.model.LatLng;
import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe; import org.greenrobot.eventbus.Subscribe;
@@ -40,6 +38,7 @@ import java.util.Objects;
public class MineFragment extends BaseFragment implements View.OnClickListener { public class MineFragment extends BaseFragment implements View.OnClickListener {
private TextView tvMoney; private TextView tvMoney;
private TextView mainGrade;
public static MineFragment newInstance(Bundle bundle) { public static MineFragment newInstance(Bundle bundle) {
MineFragment fragment = new MineFragment(); MineFragment fragment = new MineFragment();
@@ -93,7 +92,9 @@ public class MineFragment extends BaseFragment implements View.OnClickListener {
rlAbout.setOnClickListener(this); rlAbout.setOnClickListener(this);
Button btnQuit = findViewById(R.id.btn_quit); Button btnQuit = findViewById(R.id.btn_quit);
btnQuit.setOnClickListener(this); btnQuit.setOnClickListener(this);
mainGrade = (TextView) findViewById(R.id.main_grade);
initNetWork(); initNetWork();
} }
@Subscribe @Subscribe
@@ -121,7 +122,7 @@ public class MineFragment extends BaseFragment implements View.OnClickListener {
GetPriceBean.BodyBean body = response.getBody(); GetPriceBean.BodyBean body = response.getBody();
if (body != null) { if (body != null) {
Double userPrice = body.getUserPrice(); Double userPrice = body.getUserPrice();
tvMoney.setText(userPrice+""); tvMoney.setText(userPrice + "");
} }
} else { } else {
Toast.makeText(getActivity(), response.getMessage() + "", Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), response.getMessage() + "", Toast.LENGTH_SHORT).show();

8
app/src/main/java/com/navinfo/outdoor/fragment/RegisterFragment.java
View File

@@ -41,6 +41,7 @@ public class RegisterFragment extends BaseFragment implements View.OnClickListen
private TextView registerGetNote; private TextView registerGetNote;
private String sessionId; private String sessionId;
private CountDownTimer timer; private CountDownTimer timer;
private CheckBox ivRegisterCheck;
public static RegisterFragment newInstance(Bundle bundle) { public static RegisterFragment newInstance(Bundle bundle) {
RegisterFragment fragment = new RegisterFragment(); RegisterFragment fragment = new RegisterFragment();
@@ -65,7 +66,7 @@ public class RegisterFragment extends BaseFragment implements View.OnClickListen
EditText etRegisterReferrer = findViewById(R.id.et_register_referrer); EditText etRegisterReferrer = findViewById(R.id.et_register_referrer);
etRegisterPaw = findViewById(R.id.et_register_paw); etRegisterPaw = findViewById(R.id.et_register_paw);
etRegisterConfirmPaw = findViewById(R.id.et_register_confirm_paw); etRegisterConfirmPaw = findViewById(R.id.et_register_confirm_paw);
CheckBox ivRegisterCheck = findViewById(R.id.iv_register_check); ivRegisterCheck = findViewById(R.id.iv_register_check);
TextView haveGoLogin = findViewById(R.id.have_go_login); TextView haveGoLogin = findViewById(R.id.have_go_login);
haveGoLogin.setOnClickListener(this); haveGoLogin.setOnClickListener(this);
Button btnRegister = findViewById(R.id.btn_register); Button btnRegister = findViewById(R.id.btn_register);
@@ -89,6 +90,7 @@ public class RegisterFragment extends BaseFragment implements View.OnClickListen
startActivity(registerLogin); startActivity(registerLogin);
break; break;
case R.id.btn_register: case R.id.btn_register:
initRegister(); initRegister();
break; break;
case R.id.register_get_note: case R.id.register_get_note:
@@ -180,6 +182,10 @@ public class RegisterFragment extends BaseFragment implements View.OnClickListen
} else { } else {
httpParams.put("sessionId", sessionId); httpParams.put("sessionId", sessionId);
} }
if (!ivRegisterCheck.isChecked()){
Toast.makeText(getActivity(), "请先同意免责声明", Toast.LENGTH_SHORT).show();
return;
}
long time = System.currentTimeMillis(); long time = System.currentTimeMillis();
httpParams.put("datetime", time); httpParams.put("datetime", time);
showLoadingDialog(); showLoadingDialog();

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

@@ -288,7 +288,7 @@ public class StaySubmitFragment extends BaseFragment implements View.OnClickList
} }
public void refreshData() { public void refreshData() {
cbSelect.setChecked(false);
if (roadEntities == null) { if (roadEntities == null) {
roadEntities = new ArrayList<>(); roadEntities = new ArrayList<>();
} else { } else {

144
app/src/main/java/com/navinfo/outdoor/fragment/TreasureFragment.java
View File

@@ -192,7 +192,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
if (dataTime!=null){ if (dataTime!=null){
Date parse1 = formatter.parse(dataTime); Date parse1 = formatter.parse(dataTime);
if (parse.getTime() + parse1.getTime() >= 1) { if (parse.getTime() + parse1.getTime() >= 1) {
initMessageNotice(); // initMessageNotice();
Log.d("TAG", "refreshFilterData: " + parse + "和" + parse1); Log.d("TAG", "refreshFilterData: " + parse + "和" + parse1);
} else { } else {
return; return;
@@ -622,8 +622,8 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
poiMarker.setZIndex(MARKER_DOT); poiMarker.setZIndex(MARKER_DOT);
poiMarker.setTag(listBean); poiMarker.setTag(listBean);
removables.add(poiMarker); removables.add(poiMarker);
String poiGeo = initGeo(latLng); /*String poiGeo = initGeo(latLng);
geoMarker(poiGeo, poiMarker); geoMarker(poiGeo, poiMarker);*/
poiMarker.setClickable(true); poiMarker.setClickable(true);
break; break;
case 2://充电站 case 2://充电站
@@ -636,8 +636,8 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
stationMarker.setZIndex(MARKER_DOT); stationMarker.setZIndex(MARKER_DOT);
stationMarker.setTag(listBean); stationMarker.setTag(listBean);
removables.add(stationMarker); removables.add(stationMarker);
String stationGeo = initGeo(latLng); /* String stationGeo = initGeo(latLng);
geoMarker(stationGeo, stationMarker); geoMarker(stationGeo, stationMarker);*/
stationMarker.setClickable(true); stationMarker.setClickable(true);
break; break;
@@ -651,8 +651,8 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
poiVideoMarker.setTag(listBean); poiVideoMarker.setTag(listBean);
poiVideoMarker.setZIndex(MARKER_DOT); poiVideoMarker.setZIndex(MARKER_DOT);
removables.add(poiVideoMarker); removables.add(poiVideoMarker);
String poiVideoGeo = initGeo(latLng); /* String poiVideoGeo = initGeo(latLng);
geoMarker(poiVideoGeo, poiVideoMarker); geoMarker(poiVideoGeo, poiVideoMarker);*/
poiVideoMarker.setClickable(true); poiVideoMarker.setClickable(true);
break; break;
case 4://道路录像 case 4://道路录像
@@ -665,8 +665,8 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
roadMarker.setZIndex(MARKER_DOT); roadMarker.setZIndex(MARKER_DOT);
roadMarker.setTag(listBean); roadMarker.setTag(listBean);
removables.add(roadMarker); removables.add(roadMarker);
String roadGeo = initGeo(latLng); /* String roadGeo = initGeo(latLng);
geoMarker(roadGeo, roadMarker); geoMarker(roadGeo, roadMarker);*/
roadMarker.setClickable(true); roadMarker.setClickable(true);
break; break;
case 5://其他 case 5://其他
@@ -679,8 +679,8 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
otherMarker.setZIndex(MARKER_DOT); otherMarker.setZIndex(MARKER_DOT);
otherMarker.setTag(listBean); otherMarker.setTag(listBean);
removables.add(otherMarker); removables.add(otherMarker);
String otherGeo = initGeo(latLng); /* String otherGeo = initGeo(latLng);
geoMarker(otherGeo, otherMarker); geoMarker(otherGeo, otherMarker);*/
otherMarker.setClickable(true); otherMarker.setClickable(true);
break; break;
case 6://面状任务 case 6://面状任务
@@ -693,8 +693,8 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
planarMarker.setZIndex(MARKER_DOT); planarMarker.setZIndex(MARKER_DOT);
planarMarker.setTag(listBean); planarMarker.setTag(listBean);
removables.add(planarMarker); removables.add(planarMarker);
String planarGeo = initGeo(latLng); // String planarGeo = initGeo(latLng);
geoMarker(planarGeo, planarMarker); // geoMarker(planarGeo, planarMarker);
planarMarker.setClickable(true); planarMarker.setClickable(true);
break; break;
} }
@@ -953,8 +953,8 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
poiMarker.setTitle(poiEntity.getName() + ""); poiMarker.setTitle(poiEntity.getName() + "");
poiMarker.setTag(poiEntity); poiMarker.setTag(poiEntity);
removablesLocality.add(poiMarker); removablesLocality.add(poiMarker);
String poiGeo = initGeo(latLng); // String poiGeo = initGeo(latLng);
geoMarker(poiGeo, poiMarker); // geoMarker(poiGeo, poiMarker);
break; break;
case 2://充电站 case 2://充电站
BitmapDescriptor chargeDescriptor = null; BitmapDescriptor chargeDescriptor = null;
@@ -973,8 +973,8 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
stationMarker.setTitle(poiEntity.getName() + ""); stationMarker.setTitle(poiEntity.getName() + "");
stationMarker.setTag(poiEntity); stationMarker.setTag(poiEntity);
removablesLocality.add(stationMarker); removablesLocality.add(stationMarker);
String stationGeo = initGeo(latLng); // String stationGeo = initGeo(latLng);
geoMarker(stationGeo, stationMarker); // geoMarker(stationGeo, stationMarker);
break; break;
case 3://poi录像 case 3://poi录像
BitmapDescriptor poiVideoDescriptor = null; BitmapDescriptor poiVideoDescriptor = null;
@@ -993,8 +993,8 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
poiVideoMarker.setTitle(poiEntity.getName() + ""); poiVideoMarker.setTitle(poiEntity.getName() + "");
poiVideoMarker.setTag(poiEntity); poiVideoMarker.setTag(poiEntity);
removablesLocality.add(poiVideoMarker); removablesLocality.add(poiVideoMarker);
String poiVideoGeo = initGeo(latLng); // String poiVideoGeo = initGeo(latLng);
geoMarker(poiVideoGeo, poiVideoMarker); // geoMarker(poiVideoGeo, poiVideoMarker);
break; break;
case 4://道路录像 case 4://道路录像
BitmapDescriptor roadDescriptor = null; BitmapDescriptor roadDescriptor = null;
@@ -1013,8 +1013,8 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
roadMarker.setTitle(poiEntity.getName() + ""); roadMarker.setTitle(poiEntity.getName() + "");
roadMarker.setTag(poiEntity); roadMarker.setTag(poiEntity);
removablesLocality.add(roadMarker); removablesLocality.add(roadMarker);
String roadGeo = initGeo(latLng); // String roadGeo = initGeo(latLng);
geoMarker(roadGeo, roadMarker); // geoMarker(roadGeo, roadMarker);
break; break;
case 5://其他 case 5://其他
BitmapDescriptor otherDescriptor = null; BitmapDescriptor otherDescriptor = null;
@@ -1033,8 +1033,8 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
otherMarker.setTitle(poiEntity.getName() + ""); otherMarker.setTitle(poiEntity.getName() + "");
otherMarker.setTag(poiEntity); otherMarker.setTag(poiEntity);
removablesLocality.add(otherMarker); removablesLocality.add(otherMarker);
String otherGeo = initGeo(latLng); // String otherGeo = initGeo(latLng);
geoMarker(otherGeo, otherMarker); // geoMarker(otherGeo, otherMarker);
break; break;
case 6://面状任务 case 6://面状任务
BitmapDescriptor Descriptor = null; BitmapDescriptor Descriptor = null;
@@ -1053,8 +1053,8 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
planarMarker.setTitle(poiEntity.getName() + ""); planarMarker.setTitle(poiEntity.getName() + "");
planarMarker.setTag(poiEntity); planarMarker.setTag(poiEntity);
removablesLocality.add(planarMarker); removablesLocality.add(planarMarker);
String planarGeo = initGeo(latLng); // String planarGeo = initGeo(latLng);
geoMarker(planarGeo, planarMarker); // geoMarker(planarGeo, planarMarker);
break; break;
} }
} }
@@ -1646,52 +1646,54 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
TencentMap.OnMarkerClickListener markerClickListener = new TencentMap.OnMarkerClickListener() { TencentMap.OnMarkerClickListener markerClickListener = new TencentMap.OnMarkerClickListener() {
@Override @Override
public boolean onMarkerClick(Marker marker) { public boolean onMarkerClick(Marker marker) {
LatLng latLng = marker.getPosition(); initEntity(marker, true);
ArrayList<LatLng> lngArrayList = new ArrayList<>();//存储的是内部的屏幕点坐标
Projection projection = tencentMap.getProjection(); // LatLng latLng = marker.getPosition();
android.graphics.Point point = projection.toScreenLocation(latLng);//转换为屏幕坐标 // ArrayList<LatLng> lngArrayList = new ArrayList<>();//存储的是内部的屏幕点坐标
int minX = point.x - 200; // Projection projection = tencentMap.getProjection();
int minY = point.y - 200; // android.graphics.Point point = projection.toScreenLocation(latLng);//转换为屏幕坐标
int maxX = point.x + 200; // int minX = point.x - 200;
int maxY = point.y + 200; // int minY = point.y - 200;
point.set(minX, minY); // int maxX = point.x + 200;
lngArrayList.add(new LatLng(projection.fromScreenLocation(point))); // int maxY = point.y + 200;
point.set(maxX, minY); // point.set(minX, minY);
lngArrayList.add(new LatLng(projection.fromScreenLocation(point))); // lngArrayList.add(new LatLng(projection.fromScreenLocation(point)));
point.set(maxX, maxY); // point.set(maxX, minY);
lngArrayList.add(new LatLng(projection.fromScreenLocation(point))); // lngArrayList.add(new LatLng(projection.fromScreenLocation(point)));
point.set(minX, maxY); // point.set(maxX, maxY);
lngArrayList.add(new LatLng(projection.fromScreenLocation(point))); // lngArrayList.add(new LatLng(projection.fromScreenLocation(point)));
point.set(minX, minY); // point.set(minX, maxY);
lngArrayList.add(new LatLng(projection.fromScreenLocation(point))); // lngArrayList.add(new LatLng(projection.fromScreenLocation(point)));
poiEntityArrayList = new ArrayList<>(); // point.set(minX, minY);
com.vividsolutions.jts.geom.Polygon polygon = GeometryTools.createPolygon(lngArrayList); // lngArrayList.add(new LatLng(projection.fromScreenLocation(point)));
//多点 // poiEntityArrayList = new ArrayList<>();
MultiPoint multiPoint = GeometryTools.createMultiPoint(latList); // com.vividsolutions.jts.geom.Polygon polygon = GeometryTools.createPolygon(lngArrayList);
//拿到覆蓋點 // //多点
Geometry intersection = polygon.intersection(multiPoint); // MultiPoint multiPoint = GeometryTools.createMultiPoint(latList);
if (intersection == null) { // //拿到覆蓋點
initEntity(marker, true); // Geometry intersection = polygon.intersection(multiPoint);
} else { // if (intersection == null) {
initEntity(marker, true); // initEntity(marker, true);
/*if (intersection.getGeometryType().equals("MultiPoint")) { // } else {
List<LatLng> latList = GeometryTools.getLatList(intersection); // initEntity(marker, true);
for (int i = 0; i < latList.size(); i++) { // /*if (intersection.getGeometryType().equals("MultiPoint")) {
LatLng latL = latList.get(i); // List<LatLng> latList = GeometryTools.getLatList(intersection);
Geometry geometry = GeometryTools.createGeometry(latL); // for (int i = 0; i < latList.size(); i++) {
Log.d("TAG", "onMarkerClick: " + geometry.toString()); // LatLng latL = latList.get(i);
List<Marker> markerList = removableHashMap.get(geometry.toText()); // Geometry geometry = GeometryTools.createGeometry(latL);
if (markerList != null) { // Log.d("TAG", "onMarkerClick: " + geometry.toString());
for (Marker mar : markerList) { // List<Marker> markerList = removableHashMap.get(geometry.toText());
initEntity(mar, false); // if (markerList != null) {
} // for (Marker mar : markerList) {
} // initEntity(mar, false);
} // }
customDialog(poiEntityArrayList, marker); // }
} else { // }
initEntity(marker, true); // customDialog(poiEntityArrayList, marker);
}*/ // } else {
} // initEntity(marker, true);
// }*/
// }
return false; return false;
} }
}; };

96
app/src/main/java/com/navinfo/outdoor/http/HttpInterface.java
View File

@@ -5,7 +5,7 @@ import com.navinfo.outdoor.api.Constant;
public class HttpInterface { public class HttpInterface {
public static final String IP = "http://dtxbmaps.navinfo.com/dtxb/m4";//正式接口 public static final String IP = "http://dtxbmaps.navinfo.com/dtxb/m4";//正式接口
public static final String DATA_IP = "http://172.23.139.4:9999/m4";//接口 public static final String DATA_IP = "http://172.23.139.4:9999/m4";//接口
public static final String TEST_IP = "http://dtxbmaps.navinfo.com/dtxb_test/m4";//测试接口 public static final String IP_TEST = "http://dtxbmaps.navinfo.com/dtxb_test/m4";//测试接口
public static final String TEST_GUIDANCE_IP = "http://172.21.98.90:9999/m4";//引导页完成接口 public static final String TEST_GUIDANCE_IP = "http://172.21.98.90:9999/m4";//引导页完成接口
public static final String APKIP = "http://172.23.139.4:8001/"; public static final String APKIP = "http://172.23.139.4:8001/";
@@ -24,7 +24,7 @@ public class HttpInterface {
public static String APP_CHECK_VERSION ; //版本升级 public static String APP_CHECK_VERSION ; //版本升级
public static void initAppPath(String userId) { public static void initAppPath(String userId) {
APP_CHECK_VERSION = TEST_IP + USER_PATH + "appVersion/"+userId+"/checkVersion"; //版本升级 APP_CHECK_VERSION = IP + USER_PATH + "appVersion/"+userId+"/checkVersion"; //版本升级
} }
@@ -64,13 +64,13 @@ public class HttpInterface {
* Path=/m4/userlogin/** * Path=/m4/userlogin/**
*/ */
//http://172.23.139.4:9999/m4/userlogin/oauth/token //http://172.23.139.4:9999/m4/userlogin/oauth/token
public static String USER_LOGIN_OAUTH_TOKEN = TEST_IP + USER_LOGIN_PATH + "oauth/token"; //登录接口 public static String USER_LOGIN_OAUTH_TOKEN = IP + USER_LOGIN_PATH + "oauth/token"; //登录接口
///m4/user/user/register ///m4/user/user/register
public static String USER_REGISTER = TEST_IP + USER_PATH + "user/register";//注册接口 public static String USER_REGISTER = IP + USER_PATH + "user/register";//注册接口
///m4/user/ phone/message ///m4/user/ phone/message
public static String USER_MESSAGE = TEST_IP + USER_PATH + "phone/message";//获取验证码 type 1：注册获取 2：更新 public static String USER_MESSAGE = IP + USER_PATH + "phone/message";//获取验证码 type 1：注册获取 2：更新
///m4/user/user/forgetPassword ///m4/user/user/forgetPassword
public static String USER_FORGET_PASSWORD = TEST_IP + USER_PATH + "user/forgetPassword";//忘记密码 public static String USER_FORGET_PASSWORD = IP + USER_PATH + "user/forgetPassword";//忘记密码
//Flat //Flat
//dtxbmaps.navinfo.com/dtxb/m4/user/phone/message?mobile=18811794839&type=2 //dtxbmaps.navinfo.com/dtxb/m4/user/phone/message?mobile=18811794839&type=2
@@ -144,94 +144,94 @@ public class HttpInterface {
* Path=/m4/user/* * Path=/m4/user/*
*/ */
//172.23.139.4:8001/m4/user/update //172.23.139.4:8001/m4/user/update
USER_UPDATE = TEST_IP + USER_PATH + "user/" + USERID + "/update";//用户资料 USER_UPDATE = IP + USER_PATH + "user/" + USERID + "/update";//用户资料
//172.23.139.4:8001/m4/userBankcard/update //172.23.139.4:8001/m4/userBankcard/update
USER_BANKCARD_UP_DATA = TEST_IP + USER_PATH + "userBankcard/" + USERID + "/add"; //绑定银行卡 USER_BANKCARD_UP_DATA = IP + USER_PATH + "userBankcard/" + USERID + "/add"; //绑定银行卡
//172.23.139.4:8001/m4/userAuth/add //172.23.139.4:8001/m4/userAuth/add
USER_AUTH_ADD = TEST_IP + USER_PATH + "userAuth/" + USERID + "/add"; //实名认证 USER_AUTH_ADD = IP + USER_PATH + "userAuth/" + USERID + "/add"; //实名认证
//172.23.139.4:9999/m4/user/userLocation/1/userLocation post 参数 geom:geohash加密 //172.23.139.4:9999/m4/user/userLocation/1/userLocation post 参数 geom:geohash加密
USER_LOCATION = TEST_IP + USER_PATH + "userLocation/" + USERID + "/userLocation"; //上传用户坐标 USER_LOCATION = IP + USER_PATH + "userLocation/" + USERID + "/userLocation"; //上传用户坐标
//dtxbmaps.navinfo.com/dtxb/m4/user/user/1/getUserDetailByUserid/1?datetime=1628749294718 //dtxbmaps.navinfo.com/dtxb/m4/user/user/1/getUserDetailByUserid/1?datetime=1628749294718
USER_DETAIL_BY_USER_ID = TEST_IP + USER_PATH + "user/" + USERID + "/getUserDetailByUserid/" + USERID; //获取用户信息 USER_DETAIL_BY_USER_ID = IP + USER_PATH + "user/" + USERID + "/getUserDetailByUserid/" + USERID; //获取用户信息
//http://172.21.98.90:9999/m4/user/userGuide/1/insertUserGuide //http://172.21.98.90:9999/m4/user/userGuide/1/insertUserGuide
INSERT_USER_GUIDE = TEST_IP + USER_PATH + "userGuide/" + USERID + "/insertUserGuide";//引导页完成接口 INSERT_USER_GUIDE = IP + USER_PATH + "userGuide/" + USERID + "/insertUserGuide";//引导页完成接口
/** /**
* 发现 * 发现
* Path=/m4/msgList/** * Path=/m4/msgList/**
*/ */
// public static String IP1 = "http://dtxbmaps.navinfo.com/dtxb/msg/"; // public static String IP1 = "http://dtxbmaps.navinfo.com/dtxb/msg/";
MSG_CONTENT = TEST_IP + MSG_LIST_PATH + "findAndMessage/" + USERID + "/msg_content";//发现 -富文本详情页请求 MSG_CONTENT = IP + MSG_LIST_PATH + "findAndMessage/" + USERID + "/msg_content";//发现 -富文本详情页请求
LIST_TASK = TEST_IP + MSG_LIST_PATH + "findAndMessage/" + USERID + "/msg_list";//任务专区 LIST_TASK = IP + MSG_LIST_PATH + "findAndMessage/" + USERID + "/msg_list";//任务专区
LIST_EVENT = TEST_IP + MSG_LIST_PATH + "findAndMessage/" + USERID + "/msg_list";//活动专区 LIST_EVENT = IP + MSG_LIST_PATH + "findAndMessage/" + USERID + "/msg_list";//活动专区
LIST_TASK_EXPLAIN = TEST_IP + MSG_LIST_PATH + "findAndMessage/" + USERID + "/msg_list";//任务说明 LIST_TASK_EXPLAIN = IP + MSG_LIST_PATH + "findAndMessage/" + USERID + "/msg_list";//任务说明
//http://172.23.139.4:8002/findAndMessage/1/msg_list?fid=1&pageNum=1&pageSize=2 //http://172.23.139.4:8002/findAndMessage/1/msg_list?fid=1&pageNum=1&pageSize=2
MSG_LISt = TEST_IP + MSG_LIST_PATH + "findAndMessage/" + USERID + "/msg_list";//发现查询接口 MSG_LISt = IP + MSG_LIST_PATH + "findAndMessage/" + USERID + "/msg_list";//发现查询接口
//http://172.23.139.4:8002/findAndMessage/1/exam_content?id=11 //http://172.23.139.4:8002/findAndMessage/1/exam_content?id=11
EXAM_CONTENT = TEST_IP + MSG_LIST_PATH + "findAndMessage/" + USERID + "/exam_content";//发现 -能力测评获取试题接口 EXAM_CONTENT = IP + MSG_LIST_PATH + "findAndMessage/" + USERID + "/exam_content";//发现 -能力测评获取试题接口
//http://172.23.139.4:8002/findAndMessage/1/submitExam //http://172.23.139.4:8002/findAndMessage/1/submitExam
EXAM_SUBMIT = TEST_IP + MSG_LIST_PATH + "findAndMessage/" + USERID + "/submitExam";//发现 -能力测评提交试卷 post EXAM_SUBMIT = IP + MSG_LIST_PATH + "findAndMessage/" + USERID + "/submitExam";//发现 -能力测评提交试卷 post
MESSAGE_INFO_PUSH = TEST_IP+MSG_LIST_PATH+"InfoPush/"+USERID+"/push";//寻宝-消息通知 MESSAGE_INFO_PUSH = IP+MSG_LIST_PATH+"InfoPush/"+USERID+"/push";//寻宝-消息通知
/** /**
* 提现 金额 * 提现 金额
* Path=/m4/price/** * Path=/m4/price/**
*/ */
//http://172.23.139.4:8004/userPrice/1/getPrice //http://172.23.139.4:8004/userPrice/1/getPrice
GET_PRICE = TEST_IP + PRICE_PATH + "userPrice/" + USERID + "/getPrice";//我的-总资产 GET_PRICE = IP + PRICE_PATH + "userPrice/" + USERID + "/getPrice";//我的-总资产
//http://172.23.139.4:8004/userPrice/1/userPriceExchange?exchangeMoney=10&payType=1 //http://172.23.139.4:8004/userPrice/1/userPriceExchange?exchangeMoney=10&payType=1
USER_PRICE_EXCHANGE = TEST_IP + PRICE_PATH + "userPrice/" + USERID + "/userPriceExchange";//我的-财务信息-提现 USER_PRICE_EXCHANGE = IP + PRICE_PATH + "userPrice/" + USERID + "/userPriceExchange";//我的-财务信息-提现
//dtxbmaps.navinfo.com/dtxb/m4/price/priceExchange/1/getList?datetime=1628647356815 //dtxbmaps.navinfo.com/dtxb/m4/price/priceExchange/1/getList?datetime=1628647356815
PRICE_EXCHANGE = TEST_IP + PRICE_PATH + "priceExchange/" + USERID + "/getList";//提现记录 PRICE_EXCHANGE = IP + PRICE_PATH + "priceExchange/" + USERID + "/getList";//提现记录
/** /**
* 任务 * 任务
*Path=/m4/task/** *Path=/m4/task/**
*/ */
//172.23.139.4:8003/m4/task/1/getList //172.23.139.4:8003/m4/task/1/getList
TASK_LIST = TEST_IP + TASK_PATH + "task/" + USERID + "/getList"; //任务搜索 TASK_LIST = IP + TASK_PATH + "task/" + USERID + "/getList"; //任务搜索
//172.23.139.4:8003/othertask/1/receivedOthertask //172.23.139.4:8003/othertask/1/receivedOthertask
RECEIVED_OTHER_TASK = TEST_IP + TASK_PATH + "othertask/" + USERID + "/receivedOthertask";//其他-领取任务 RECEIVED_OTHER_TASK = IP + TASK_PATH + "othertask/" + USERID + "/receivedOthertask";//其他-领取任务
//172.23.139.4:8003/poitask/1/receivedPoitask/1 //172.23.139.4:8003/poitask/1/receivedPoitask/1
RECEIVED_POI_TASK = TEST_IP + TASK_PATH + "poitask/" + USERID + "/receivedPoitask";//poi-领取任务 RECEIVED_POI_TASK = IP + TASK_PATH + "poitask/" + USERID + "/receivedPoitask";//poi-领取任务
//172.23.139.4:8003/poitask/1/submitPoitask?taskId=5001&name=测试修改名称&address=测试修改地址&existence=1&geo=1rn7exd5uhxy&memo=测试备注...33. //172.23.139.4:8003/poitask/1/submitPoitask?taskId=5001&name=测试修改名称&address=测试修改地址&existence=1&geo=1rn7exd5uhxy&memo=测试备注...33.
SUBMIT_POI_TASK = TEST_IP + TASK_PATH + "poitask/" + USERID + "/submitPoitask";//poi-保存本地 SUBMIT_POI_TASK = IP + TASK_PATH + "poitask/" + USERID + "/submitPoitask";//poi-保存本地
//172.23.139.4:8003/othertask/1/submitOhtertask?taskId=5001&name=测试修改名称&address=测试修改地址&existence=1&geo=1rn7exd5uhxy&memo=测试备注 //172.23.139.4:8003/othertask/1/submitOhtertask?taskId=5001&name=测试修改名称&address=测试修改地址&existence=1&geo=1rn7exd5uhxy&memo=测试备注
SUBMIT_OTHER_TASK = TEST_IP + TASK_PATH + "othertask/" + USERID + "/submitOthertask";//其他-保存本地 SUBMIT_OTHER_TASK = IP + TASK_PATH + "othertask/" + USERID + "/submitOthertask";//其他-保存本地
//172.23.139.4:8003/othertask/1/uploadpic //172.23.139.4:8003/othertask/1/uploadpic
OTHER_TASK_UPLOAD_PIC = TEST_IP + TASK_PATH + "othertask/" + USERID + "/uploadpic";//其他-上传 OTHER_TASK_UPLOAD_PIC = IP + TASK_PATH + "othertask/" + USERID + "/uploadpic";//其他-上传
//172.23.139.4:8003/ctask/1/receivedCtask/8608 //172.23.139.4:8003/ctask/1/receivedCtask/8608
RECEIVED_CTASK = TEST_IP + TASK_PATH + "ctask/" + USERID + "/receivedCtask";//充电站-领取任务 RECEIVED_CTASK = IP + TASK_PATH + "ctask/" + USERID + "/receivedCtask";//充电站-领取任务
//172.23.139.4:8003/ctask/1/submitCtask?id=8608&name=充电站&address=地址&telephone=18812345678|14712345678&geo=1rn7exd5uhxy&memo=测试备注&sptype=1 //172.23.139.4:8003/ctask/1/submitCtask?id=8608&name=充电站&address=地址&telephone=18812345678|14712345678&geo=1rn7exd5uhxy&memo=测试备注&sptype=1
SUBMIT_CTASK = TEST_IP + TASK_PATH + "ctask/" + USERID + "/submitCtask";//充电站-保存本地 SUBMIT_CTASK = IP + TASK_PATH + "ctask/" + USERID + "/submitCtask";//充电站-保存本地
//172.23.139.4:8003/cstask/1/submitCstask?taskId=0&name=充电站&geo=1rn7exd5uhxy&memo=测试备注&sptype=1&ffid=104&existence=1&detail={"cp_openType":"1,2","cp_floor":1,"cp_availableState":0,"sign_exist":0} //172.23.139.4:8003/cstask/1/submitCstask?taskId=0&name=充电站&geo=1rn7exd5uhxy&memo=测试备注&sptype=1&ffid=104&existence=1&detail={"cp_openType":"1,2","cp_floor":1,"cp_availableState":0,"sign_exist":0}
SUBMIT_CSTASK = TEST_IP + TASK_PATH + "cstask/" + USERID + "/submitCstask";//充电桩保存 SUBMIT_CSTASK = IP + TASK_PATH + "cstask/" + USERID + "/submitCstask";//充电桩保存
//172.23.139.4:8003/poitask/1/uploadpic //172.23.139.4:8003/poitask/1/uploadpic
POI_TASK_UPLOAD_PIC = TEST_IP + TASK_PATH + "poitask/" + USERID + "/uploadpic";//poi-上传 POI_TASK_UPLOAD_PIC = IP + TASK_PATH + "poitask/" + USERID + "/uploadpic";//poi-上传
//172.23.139.4:8003/roadtask/1/receivedRoadtask/8569 //172.23.139.4:8003/roadtask/1/receivedRoadtask/8569
RECEIVED_ROAD_TASK = TEST_IP + TASK_PATH + "roadtask/" + USERID + "/receivedRoadtask";//道路任务获取 RECEIVED_ROAD_TASK = IP + TASK_PATH + "roadtask/" + USERID + "/receivedRoadtask";//道路任务获取
//172.23.139.4:8003/poivideotask/1/receivedPoivideotask/8569 //172.23.139.4:8003/poivideotask/1/receivedPoivideotask/8569
RECEIVED_POI_VIDEO_TASK = TEST_IP + TASK_PATH + "poivideotask/" + USERID + "/receivedPoivideotask";//poi录像任务获取 RECEIVED_POI_VIDEO_TASK = IP + TASK_PATH + "poivideotask/" + USERID + "/receivedPoivideotask";//poi录像任务获取
// 172.23.139.4:8003/poivideotask/1/submitPoivideotask // 172.23.139.4:8003/poivideotask/1/submitPoivideotask
INSIDE_API_LIST = TEST_IP + TASK_PATH + "poivideotask/" + USERID + "/submitPoivideotask";//poi录像 保存 INSIDE_API_LIST = IP + TASK_PATH + "poivideotask/" + USERID + "/submitPoivideotask";//poi录像 保存
//172.23.139.4:8003/poivideotask/1/uploadpic //172.23.139.4:8003/poivideotask/1/uploadpic
POI_VIDEO_UPLOAD_PIC = TEST_IP + TASK_PATH + "poivideotask/" + USERID + "/uploadpic";//poi录像-上传 POI_VIDEO_UPLOAD_PIC = IP + TASK_PATH + "poivideotask/" + USERID + "/uploadpic";//poi录像-上传
//172.23.139.4:8003/roadtask/1/submitRoadtask?taskId=0&name=段哥&address=二娃&memo=1rn7exd5uhxy&workType=2 //172.23.139.4:8003/roadtask/1/submitRoadtask?taskId=0&name=段哥&address=二娃&memo=1rn7exd5uhxy&workType=2
ROAD_TASK_SUBMIT = TEST_IP + TASK_PATH + "roadtask/" + USERID + "/submitRoadtask";//道路录像-保存本地 ROAD_TASK_SUBMIT = IP + TASK_PATH + "roadtask/" + USERID + "/submitRoadtask";//道路录像-保存本地
//172.23.139.4:8003/roadtask/1/uploadpic //172.23.139.4:8003/roadtask/1/uploadpic
ROAD_TASK_UPLOAD_PIC = TEST_IP + TASK_PATH + "roadtask/" + USERID + "/uploadpic";//道路录像—上传 ROAD_TASK_UPLOAD_PIC = IP + TASK_PATH + "roadtask/" + USERID + "/uploadpic";//道路录像—上传
//http://172.23.139.4:8003/m4/task/1/getPhone?geo=1rn7exd5uhxy //http://172.23.139.4:8003/m4/task/1/getPhone?geo=1rn7exd5uhxy
GET_PHONES = TEST_IP + TASK_PATH + "task/" + USERID + "/getPhone";//电话区号和电话位数 GET_PHONES = IP + TASK_PATH + "task/" + USERID + "/getPhone";//电话区号和电话位数
//172.23.139.4:8003/cstask/1/uploadpic //172.23.139.4:8003/cstask/1/uploadpic
CS_TASK_UP_LOAD_PIC = TEST_IP + TASK_PATH + "cstask/" + USERID + "/uploadpic";//充电桩-上传 CS_TASK_UP_LOAD_PIC = IP + TASK_PATH + "cstask/" + USERID + "/uploadpic";//充电桩-上传
//172.23.139.4:8003/ctask/1/uploadpic //172.23.139.4:8003/ctask/1/uploadpic
C_TASK_UP_LOAD_PIC = TEST_IP + TASK_PATH + "ctask/" + USERID + "/uploadpic";//充电站-上传 C_TASK_UP_LOAD_PIC = IP + TASK_PATH + "ctask/" + USERID + "/uploadpic";//充电站-上传
//172.23.139.4:8003/m4/task/1/taskName?geo=1rn7exd5uhxy&name=四维 //172.23.139.4:8003/m4/task/1/taskName?geo=1rn7exd5uhxy&name=四维
TASK_NAME = TEST_IP + TASK_PATH + "task/" + USERID + "/taskName";//poi-查重 TASK_NAME = IP + TASK_PATH + "task/" + USERID + "/taskName";//poi-查重
//172.23.139.4:8003/m4/task/1/getCommitList?type=2&pageSize=10&pageNum=1 //172.23.139.4:8003/m4/task/1/getCommitList?type=2&pageSize=10&pageNum=1
GET_COMMIT_LIST = TEST_IP + TASK_PATH + "task/" + USERID + "/getCommitList";//紀錄——已提交 GET_COMMIT_LIST = IP + TASK_PATH + "task/" + USERID + "/getCommitList";//紀錄——已提交
RECEIVED_POLYGON_TASK = TEST_IP + TASK_PATH + "polygonTask/" + USERID + "/receivedPolygontask"; //面状任务任务领取 RECEIVED_POLYGON_TASK = IP + TASK_PATH + "polygonTask/" + USERID + "/receivedPolygontask"; //面状任务任务领取
//172.23.139.4:8003/m4/task/1/unReceivedTask?taskIds=&auditIds=214,278 取消领取的接口 //172.23.139.4:8003/m4/task/1/unReceivedTask?taskIds=&auditIds=214,278 取消领取的接口
UNRECEIVED_POLYGON_TASK = TEST_IP + TASK_PATH + "task/" + USERID + "/unReceivedTask";//所有類型结束领取 UNRECEIVED_POLYGON_TASK = IP + TASK_PATH + "task/" + USERID + "/unReceivedTask";//所有類型结束领取
COMPLETE = TEST_IP + TASK_PATH + "polygonTask/" + USERID + "/complete";//面状任务结束领取 COMPLETE = IP + TASK_PATH + "polygonTask/" + USERID + "/complete";//面状任务结束领取
SUBMIT_POLYGON_TASK = TEST_IP + TASK_PATH + "polygonTask/" + USERID + "/submitPolygontask";//面状任务开始采集 SUBMIT_POLYGON_TASK = IP + TASK_PATH + "polygonTask/" + USERID + "/submitPolygontask";//面状任务开始采集
} }

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

@@ -10,10 +10,12 @@
<TextView <TextView
android:id="@+id/tv_view" android:id="@+id/tv_view"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:textColor="@color/white"
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent" app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" /> android:layout_marginBottom="20dp"
/>
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>

31
app/src/main/res/layout/mine_fragment.xml
View File

@@ -26,7 +26,7 @@
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/constraintLayout" android:id="@+id/constraintLayout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="140dp" android:layout_height="220dp"
android:background="@drawable/bg" android:background="@drawable/bg"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
@@ -40,7 +40,7 @@
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.2" /> app:layout_constraintVertical_bias="0.4" />
<TextView <TextView
android:id="@+id/tv_name" android:id="@+id/tv_name"
@@ -49,9 +49,9 @@
android:layout_marginLeft="20dp" android:layout_marginLeft="20dp"
android:text="NO7378" android:text="NO7378"
android:textColor="#fff" android:textColor="#fff"
android:textSize="18sp" android:textSize="22sp"
android:textStyle="bold" android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="@+id/image_heard"
app:layout_constraintStart_toEndOf="@+id/image_heard" app:layout_constraintStart_toEndOf="@+id/image_heard"
app:layout_constraintTop_toTopOf="@+id/image_heard" /> app:layout_constraintTop_toTopOf="@+id/image_heard" />
@@ -59,12 +59,11 @@
android:id="@+id/image_share" android:id="@+id/image_share"
android:layout_width="30dp" android:layout_width="30dp"
android:layout_height="30dp" android:layout_height="30dp"
android:layout_marginTop="10dp"
android:layout_marginRight="40dp"
android:background="@drawable/shares" android:background="@drawable/shares"
android:layout_marginRight="50dp"
app:layout_constraintBottom_toTopOf="@+id/tv_name" app:layout_constraintBottom_toTopOf="@+id/tv_name"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="@id/tv_name" />
<ImageView <ImageView
android:id="@+id/image_sign" android:id="@+id/image_sign"
@@ -77,10 +76,10 @@
<androidx.cardview.widget.CardView <androidx.cardview.widget.CardView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="80dp" android:layout_height="110dp"
android:layout_marginLeft="35dp" android:layout_marginLeft="30dp"
android:layout_marginTop="90dp" android:layout_marginTop="160dp"
android:layout_marginRight="35dp" android:layout_marginRight="30dp"
app:layout_constraintBottom_toTopOf="@+id/linearLayout" app:layout_constraintBottom_toTopOf="@+id/linearLayout"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
@@ -88,7 +87,8 @@
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent"
>
<TextView <TextView
android:id="@+id/tv_title" android:id="@+id/tv_title"
@@ -132,9 +132,9 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="0dp"
android:layout_marginLeft="20dp" android:layout_marginLeft="20dp"
android:layout_marginTop="50dp" android:layout_marginTop="55dp"
android:layout_marginRight="25dp" android:layout_marginRight="25dp"
android:layout_marginBottom="20dp" android:layout_marginBottom="15dp"
android:orientation="vertical" android:orientation="vertical"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
@@ -145,7 +145,7 @@
android:id="@+id/rl_grade" android:id="@+id/rl_grade"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="0dp"
android:layout_marginTop="8dp" android:layout_marginTop="10dp"
android:gravity="center_vertical" android:gravity="center_vertical"
android:layout_weight="1" android:layout_weight="1"
android:background="?android:attr/selectableItemBackground"> android:background="?android:attr/selectableItemBackground">
@@ -157,6 +157,7 @@
android:text="我的等级" /> android:text="我的等级" />
<TextView <TextView
android:id="@+id/main_grade"
android:layout_width="60dp" android:layout_width="60dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"

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

@@ -39,8 +39,8 @@
android:id="@+id/cb_unSubmit" android:id="@+id/cb_unSubmit"
android:layout_width="30dp" android:layout_width="30dp"
android:layout_height="30dp" android:layout_height="30dp"
android:scaleX="1.5" android:scaleX="1.1"
android:scaleY="1.5" android:scaleY="1.1"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintRight_toRightOf="parent"/> app:layout_constraintRight_toRightOf="parent"/>

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

@@ -1,5 +1,5 @@
<resources> <resources>
<string name="app_name">地图寻宝3.0</string> <string name="app_name">地图寻宝3.1</string>
<string name="title_activity_home">HomeActivity</string> <string name="title_activity_home">HomeActivity</string>
<!-- Strings used for fragments for navigation --> <!-- Strings used for fragments for navigation -->
<string name="first_fragment_label">First Fragment</string> <string name="first_fragment_label">First Fragment</string>