修改’我的‘得页面修改
This commit is contained in:
md
parent
13bf70c69a
commit
4911f5df93
@ -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"
|
||||
|
||||
@ -12,6 +12,7 @@ import android.os.Environment;
|
||||
import android.os.Handler;
|
||||
import android.os.Message;
|
||||
import android.view.View;
|
||||
import android.widget.TextView;
|
||||
import android.widget.Toast;
|
||||
|
||||
import androidx.annotation.NonNull;
|
||||
@ -77,12 +78,20 @@ public class MainActivity extends BaseActivity {
|
||||
private ProgressDialog pBar;
|
||||
private int progress;
|
||||
private String user_id;
|
||||
private TextView tvView;
|
||||
|
||||
@Override
|
||||
protected int getLayout() {
|
||||
return R.layout.activity_main;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void initMVP() {
|
||||
super.initMVP();
|
||||
tvView = findViewById(R.id.tv_view);
|
||||
tvView.setText(Constant.NAVIN_FO);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void initData() {
|
||||
super.initData();
|
||||
|
||||
@ -181,7 +181,7 @@ public class Constant {
|
||||
|
||||
public static TencentMap.OnMarkerClickListener markerClickListener=null;
|
||||
|
||||
|
||||
public static final String NAVIN_FO="9.06";
|
||||
|
||||
/**
|
||||
* 联系我们的QQ群名称和QQ群号
|
||||
|
||||
@ -22,11 +22,9 @@ import com.navinfo.outdoor.activity.UserActivity;
|
||||
import com.navinfo.outdoor.api.Constant;
|
||||
import com.navinfo.outdoor.base.BaseFragment;
|
||||
import com.navinfo.outdoor.bean.GetPriceBean;
|
||||
import com.navinfo.outdoor.bean.MeasureBean;
|
||||
import com.navinfo.outdoor.http.Callback;
|
||||
import com.navinfo.outdoor.http.HttpInterface;
|
||||
import com.navinfo.outdoor.http.OkGoBuilder;
|
||||
import com.tencent.tencentmap.mapsdk.maps.model.LatLng;
|
||||
|
||||
import org.greenrobot.eventbus.EventBus;
|
||||
import org.greenrobot.eventbus.Subscribe;
|
||||
@ -40,6 +38,7 @@ import java.util.Objects;
|
||||
public class MineFragment extends BaseFragment implements View.OnClickListener {
|
||||
|
||||
private TextView tvMoney;
|
||||
private TextView mainGrade;
|
||||
|
||||
public static MineFragment newInstance(Bundle bundle) {
|
||||
MineFragment fragment = new MineFragment();
|
||||
@ -93,7 +92,9 @@ public class MineFragment extends BaseFragment implements View.OnClickListener {
|
||||
rlAbout.setOnClickListener(this);
|
||||
Button btnQuit = findViewById(R.id.btn_quit);
|
||||
btnQuit.setOnClickListener(this);
|
||||
mainGrade = (TextView) findViewById(R.id.main_grade);
|
||||
initNetWork();
|
||||
|
||||
}
|
||||
|
||||
@Subscribe
|
||||
@ -121,7 +122,7 @@ public class MineFragment extends BaseFragment implements View.OnClickListener {
|
||||
GetPriceBean.BodyBean body = response.getBody();
|
||||
if (body != null) {
|
||||
Double userPrice = body.getUserPrice();
|
||||
tvMoney.setText(userPrice+"");
|
||||
tvMoney.setText(userPrice + "");
|
||||
}
|
||||
} else {
|
||||
Toast.makeText(getActivity(), response.getMessage() + "", Toast.LENGTH_SHORT).show();
|
||||
|
||||
@ -41,6 +41,7 @@ public class RegisterFragment extends BaseFragment implements View.OnClickListen
|
||||
private TextView registerGetNote;
|
||||
private String sessionId;
|
||||
private CountDownTimer timer;
|
||||
private CheckBox ivRegisterCheck;
|
||||
|
||||
public static RegisterFragment newInstance(Bundle bundle) {
|
||||
RegisterFragment fragment = new RegisterFragment();
|
||||
@ -65,7 +66,7 @@ public class RegisterFragment extends BaseFragment implements View.OnClickListen
|
||||
EditText etRegisterReferrer = findViewById(R.id.et_register_referrer);
|
||||
etRegisterPaw = findViewById(R.id.et_register_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);
|
||||
haveGoLogin.setOnClickListener(this);
|
||||
Button btnRegister = findViewById(R.id.btn_register);
|
||||
@ -89,6 +90,7 @@ public class RegisterFragment extends BaseFragment implements View.OnClickListen
|
||||
startActivity(registerLogin);
|
||||
break;
|
||||
case R.id.btn_register:
|
||||
|
||||
initRegister();
|
||||
break;
|
||||
case R.id.register_get_note:
|
||||
@ -180,6 +182,10 @@ public class RegisterFragment extends BaseFragment implements View.OnClickListen
|
||||
} else {
|
||||
httpParams.put("sessionId", sessionId);
|
||||
}
|
||||
if (!ivRegisterCheck.isChecked()){
|
||||
Toast.makeText(getActivity(), "请先同意免责声明", Toast.LENGTH_SHORT).show();
|
||||
return;
|
||||
}
|
||||
long time = System.currentTimeMillis();
|
||||
httpParams.put("datetime", time);
|
||||
showLoadingDialog();
|
||||
|
||||
@ -288,7 +288,7 @@ public class StaySubmitFragment extends BaseFragment implements View.OnClickList
|
||||
}
|
||||
|
||||
public void refreshData() {
|
||||
|
||||
cbSelect.setChecked(false);
|
||||
if (roadEntities == null) {
|
||||
roadEntities = new ArrayList<>();
|
||||
} else {
|
||||
|
||||
@ -192,7 +192,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
|
||||
if (dataTime!=null){
|
||||
Date parse1 = formatter.parse(dataTime);
|
||||
if (parse.getTime() + parse1.getTime() >= 1) {
|
||||
initMessageNotice();
|
||||
// initMessageNotice();
|
||||
Log.d("TAG", "refreshFilterData: " + parse + "和" + parse1);
|
||||
} else {
|
||||
return;
|
||||
@ -622,8 +622,8 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
|
||||
poiMarker.setZIndex(MARKER_DOT);
|
||||
poiMarker.setTag(listBean);
|
||||
removables.add(poiMarker);
|
||||
String poiGeo = initGeo(latLng);
|
||||
geoMarker(poiGeo, poiMarker);
|
||||
/*String poiGeo = initGeo(latLng);
|
||||
geoMarker(poiGeo, poiMarker);*/
|
||||
poiMarker.setClickable(true);
|
||||
break;
|
||||
case 2://充电站
|
||||
@ -636,8 +636,8 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
|
||||
stationMarker.setZIndex(MARKER_DOT);
|
||||
stationMarker.setTag(listBean);
|
||||
removables.add(stationMarker);
|
||||
String stationGeo = initGeo(latLng);
|
||||
geoMarker(stationGeo, stationMarker);
|
||||
/* String stationGeo = initGeo(latLng);
|
||||
geoMarker(stationGeo, stationMarker);*/
|
||||
stationMarker.setClickable(true);
|
||||
|
||||
break;
|
||||
@ -651,8 +651,8 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
|
||||
poiVideoMarker.setTag(listBean);
|
||||
poiVideoMarker.setZIndex(MARKER_DOT);
|
||||
removables.add(poiVideoMarker);
|
||||
String poiVideoGeo = initGeo(latLng);
|
||||
geoMarker(poiVideoGeo, poiVideoMarker);
|
||||
/* String poiVideoGeo = initGeo(latLng);
|
||||
geoMarker(poiVideoGeo, poiVideoMarker);*/
|
||||
poiVideoMarker.setClickable(true);
|
||||
break;
|
||||
case 4://道路录像
|
||||
@ -665,8 +665,8 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
|
||||
roadMarker.setZIndex(MARKER_DOT);
|
||||
roadMarker.setTag(listBean);
|
||||
removables.add(roadMarker);
|
||||
String roadGeo = initGeo(latLng);
|
||||
geoMarker(roadGeo, roadMarker);
|
||||
/* String roadGeo = initGeo(latLng);
|
||||
geoMarker(roadGeo, roadMarker);*/
|
||||
roadMarker.setClickable(true);
|
||||
break;
|
||||
case 5://其他
|
||||
@ -679,8 +679,8 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
|
||||
otherMarker.setZIndex(MARKER_DOT);
|
||||
otherMarker.setTag(listBean);
|
||||
removables.add(otherMarker);
|
||||
String otherGeo = initGeo(latLng);
|
||||
geoMarker(otherGeo, otherMarker);
|
||||
/* String otherGeo = initGeo(latLng);
|
||||
geoMarker(otherGeo, otherMarker);*/
|
||||
otherMarker.setClickable(true);
|
||||
break;
|
||||
case 6://面状任务
|
||||
@ -693,8 +693,8 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
|
||||
planarMarker.setZIndex(MARKER_DOT);
|
||||
planarMarker.setTag(listBean);
|
||||
removables.add(planarMarker);
|
||||
String planarGeo = initGeo(latLng);
|
||||
geoMarker(planarGeo, planarMarker);
|
||||
// String planarGeo = initGeo(latLng);
|
||||
// geoMarker(planarGeo, planarMarker);
|
||||
planarMarker.setClickable(true);
|
||||
break;
|
||||
}
|
||||
@ -953,8 +953,8 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
|
||||
poiMarker.setTitle(poiEntity.getName() + "");
|
||||
poiMarker.setTag(poiEntity);
|
||||
removablesLocality.add(poiMarker);
|
||||
String poiGeo = initGeo(latLng);
|
||||
geoMarker(poiGeo, poiMarker);
|
||||
// String poiGeo = initGeo(latLng);
|
||||
// geoMarker(poiGeo, poiMarker);
|
||||
break;
|
||||
case 2://充电站
|
||||
BitmapDescriptor chargeDescriptor = null;
|
||||
@ -973,8 +973,8 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
|
||||
stationMarker.setTitle(poiEntity.getName() + "");
|
||||
stationMarker.setTag(poiEntity);
|
||||
removablesLocality.add(stationMarker);
|
||||
String stationGeo = initGeo(latLng);
|
||||
geoMarker(stationGeo, stationMarker);
|
||||
// String stationGeo = initGeo(latLng);
|
||||
// geoMarker(stationGeo, stationMarker);
|
||||
break;
|
||||
case 3://poi录像
|
||||
BitmapDescriptor poiVideoDescriptor = null;
|
||||
@ -993,8 +993,8 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
|
||||
poiVideoMarker.setTitle(poiEntity.getName() + "");
|
||||
poiVideoMarker.setTag(poiEntity);
|
||||
removablesLocality.add(poiVideoMarker);
|
||||
String poiVideoGeo = initGeo(latLng);
|
||||
geoMarker(poiVideoGeo, poiVideoMarker);
|
||||
// String poiVideoGeo = initGeo(latLng);
|
||||
// geoMarker(poiVideoGeo, poiVideoMarker);
|
||||
break;
|
||||
case 4://道路录像
|
||||
BitmapDescriptor roadDescriptor = null;
|
||||
@ -1013,8 +1013,8 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
|
||||
roadMarker.setTitle(poiEntity.getName() + "");
|
||||
roadMarker.setTag(poiEntity);
|
||||
removablesLocality.add(roadMarker);
|
||||
String roadGeo = initGeo(latLng);
|
||||
geoMarker(roadGeo, roadMarker);
|
||||
// String roadGeo = initGeo(latLng);
|
||||
// geoMarker(roadGeo, roadMarker);
|
||||
break;
|
||||
case 5://其他
|
||||
BitmapDescriptor otherDescriptor = null;
|
||||
@ -1033,8 +1033,8 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
|
||||
otherMarker.setTitle(poiEntity.getName() + "");
|
||||
otherMarker.setTag(poiEntity);
|
||||
removablesLocality.add(otherMarker);
|
||||
String otherGeo = initGeo(latLng);
|
||||
geoMarker(otherGeo, otherMarker);
|
||||
// String otherGeo = initGeo(latLng);
|
||||
// geoMarker(otherGeo, otherMarker);
|
||||
break;
|
||||
case 6://面状任务
|
||||
BitmapDescriptor Descriptor = null;
|
||||
@ -1053,8 +1053,8 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
|
||||
planarMarker.setTitle(poiEntity.getName() + "");
|
||||
planarMarker.setTag(poiEntity);
|
||||
removablesLocality.add(planarMarker);
|
||||
String planarGeo = initGeo(latLng);
|
||||
geoMarker(planarGeo, planarMarker);
|
||||
// String planarGeo = initGeo(latLng);
|
||||
// geoMarker(planarGeo, planarMarker);
|
||||
break;
|
||||
}
|
||||
}
|
||||
@ -1646,52 +1646,54 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
|
||||
TencentMap.OnMarkerClickListener markerClickListener = new TencentMap.OnMarkerClickListener() {
|
||||
@Override
|
||||
public boolean onMarkerClick(Marker marker) {
|
||||
LatLng latLng = marker.getPosition();
|
||||
ArrayList<LatLng> lngArrayList = new ArrayList<>();//存储的是内部的屏幕点坐标
|
||||
Projection projection = tencentMap.getProjection();
|
||||
android.graphics.Point point = projection.toScreenLocation(latLng);//转换为屏幕坐标
|
||||
int minX = point.x - 200;
|
||||
int minY = point.y - 200;
|
||||
int maxX = point.x + 200;
|
||||
int maxY = point.y + 200;
|
||||
point.set(minX, minY);
|
||||
lngArrayList.add(new LatLng(projection.fromScreenLocation(point)));
|
||||
point.set(maxX, minY);
|
||||
lngArrayList.add(new LatLng(projection.fromScreenLocation(point)));
|
||||
point.set(maxX, maxY);
|
||||
lngArrayList.add(new LatLng(projection.fromScreenLocation(point)));
|
||||
point.set(minX, maxY);
|
||||
lngArrayList.add(new LatLng(projection.fromScreenLocation(point)));
|
||||
point.set(minX, minY);
|
||||
lngArrayList.add(new LatLng(projection.fromScreenLocation(point)));
|
||||
poiEntityArrayList = new ArrayList<>();
|
||||
com.vividsolutions.jts.geom.Polygon polygon = GeometryTools.createPolygon(lngArrayList);
|
||||
//多点
|
||||
MultiPoint multiPoint = GeometryTools.createMultiPoint(latList);
|
||||
//拿到覆蓋點
|
||||
Geometry intersection = polygon.intersection(multiPoint);
|
||||
if (intersection == null) {
|
||||
initEntity(marker, true);
|
||||
} else {
|
||||
initEntity(marker, true);
|
||||
/*if (intersection.getGeometryType().equals("MultiPoint")) {
|
||||
List<LatLng> latList = GeometryTools.getLatList(intersection);
|
||||
for (int i = 0; i < latList.size(); i++) {
|
||||
LatLng latL = latList.get(i);
|
||||
Geometry geometry = GeometryTools.createGeometry(latL);
|
||||
Log.d("TAG", "onMarkerClick: " + geometry.toString());
|
||||
List<Marker> markerList = removableHashMap.get(geometry.toText());
|
||||
if (markerList != null) {
|
||||
for (Marker mar : markerList) {
|
||||
initEntity(mar, false);
|
||||
}
|
||||
}
|
||||
}
|
||||
customDialog(poiEntityArrayList, marker);
|
||||
} else {
|
||||
initEntity(marker, true);
|
||||
}*/
|
||||
}
|
||||
initEntity(marker, true);
|
||||
|
||||
// LatLng latLng = marker.getPosition();
|
||||
// ArrayList<LatLng> lngArrayList = new ArrayList<>();//存储的是内部的屏幕点坐标
|
||||
// Projection projection = tencentMap.getProjection();
|
||||
// android.graphics.Point point = projection.toScreenLocation(latLng);//转换为屏幕坐标
|
||||
// int minX = point.x - 200;
|
||||
// int minY = point.y - 200;
|
||||
// int maxX = point.x + 200;
|
||||
// int maxY = point.y + 200;
|
||||
// point.set(minX, minY);
|
||||
// lngArrayList.add(new LatLng(projection.fromScreenLocation(point)));
|
||||
// point.set(maxX, minY);
|
||||
// lngArrayList.add(new LatLng(projection.fromScreenLocation(point)));
|
||||
// point.set(maxX, maxY);
|
||||
// lngArrayList.add(new LatLng(projection.fromScreenLocation(point)));
|
||||
// point.set(minX, maxY);
|
||||
// lngArrayList.add(new LatLng(projection.fromScreenLocation(point)));
|
||||
// point.set(minX, minY);
|
||||
// lngArrayList.add(new LatLng(projection.fromScreenLocation(point)));
|
||||
// poiEntityArrayList = new ArrayList<>();
|
||||
// com.vividsolutions.jts.geom.Polygon polygon = GeometryTools.createPolygon(lngArrayList);
|
||||
// //多点
|
||||
// MultiPoint multiPoint = GeometryTools.createMultiPoint(latList);
|
||||
// //拿到覆蓋點
|
||||
// Geometry intersection = polygon.intersection(multiPoint);
|
||||
// if (intersection == null) {
|
||||
// initEntity(marker, true);
|
||||
// } else {
|
||||
// initEntity(marker, true);
|
||||
// /*if (intersection.getGeometryType().equals("MultiPoint")) {
|
||||
// List<LatLng> latList = GeometryTools.getLatList(intersection);
|
||||
// for (int i = 0; i < latList.size(); i++) {
|
||||
// LatLng latL = latList.get(i);
|
||||
// Geometry geometry = GeometryTools.createGeometry(latL);
|
||||
// Log.d("TAG", "onMarkerClick: " + geometry.toString());
|
||||
// List<Marker> markerList = removableHashMap.get(geometry.toText());
|
||||
// if (markerList != null) {
|
||||
// for (Marker mar : markerList) {
|
||||
// initEntity(mar, false);
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// customDialog(poiEntityArrayList, marker);
|
||||
// } else {
|
||||
// initEntity(marker, true);
|
||||
// }*/
|
||||
// }
|
||||
return false;
|
||||
}
|
||||
};
|
||||
|
||||
@ -5,7 +5,7 @@ import com.navinfo.outdoor.api.Constant;
|
||||
public class HttpInterface {
|
||||
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 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 APKIP = "http://172.23.139.4:8001/";
|
||||
|
||||
@ -24,7 +24,7 @@ public class HttpInterface {
|
||||
public static String APP_CHECK_VERSION ; //版本升级
|
||||
|
||||
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/**
|
||||
*/
|
||||
//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
|
||||
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
|
||||
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
|
||||
public static String USER_FORGET_PASSWORD = TEST_IP + USER_PATH + "user/forgetPassword";//忘记密码
|
||||
public static String USER_FORGET_PASSWORD = IP + USER_PATH + "user/forgetPassword";//忘记密码
|
||||
|
||||
//Flat
|
||||
//dtxbmaps.navinfo.com/dtxb/m4/user/phone/message?mobile=18811794839&type=2
|
||||
@ -144,94 +144,94 @@ public class HttpInterface {
|
||||
* Path=/m4/user/*
|
||||
*/
|
||||
//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
|
||||
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
|
||||
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加密
|
||||
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
|
||||
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
|
||||
INSERT_USER_GUIDE = TEST_IP + USER_PATH + "userGuide/" + USERID + "/insertUserGuide";//引导页完成接口
|
||||
INSERT_USER_GUIDE = IP + USER_PATH + "userGuide/" + USERID + "/insertUserGuide";//引导页完成接口
|
||||
/**
|
||||
* 发现
|
||||
* Path=/m4/msgList/**
|
||||
*/
|
||||
// public static String IP1 = "http://dtxbmaps.navinfo.com/dtxb/msg/";
|
||||
MSG_CONTENT = TEST_IP + MSG_LIST_PATH + "findAndMessage/" + USERID + "/msg_content";//发现 -富文本详情页请求
|
||||
LIST_TASK = TEST_IP + MSG_LIST_PATH + "findAndMessage/" + USERID + "/msg_list";//任务专区
|
||||
LIST_EVENT = TEST_IP + MSG_LIST_PATH + "findAndMessage/" + USERID + "/msg_list";//活动专区
|
||||
LIST_TASK_EXPLAIN = TEST_IP + MSG_LIST_PATH + "findAndMessage/" + USERID + "/msg_list";//任务说明
|
||||
MSG_CONTENT = IP + MSG_LIST_PATH + "findAndMessage/" + USERID + "/msg_content";//发现 -富文本详情页请求
|
||||
LIST_TASK = IP + MSG_LIST_PATH + "findAndMessage/" + USERID + "/msg_list";//任务专区
|
||||
LIST_EVENT = 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
|
||||
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
|
||||
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
|
||||
EXAM_SUBMIT = TEST_IP + MSG_LIST_PATH + "findAndMessage/" + USERID + "/submitExam";//发现 -能力测评提交试卷 post
|
||||
MESSAGE_INFO_PUSH = TEST_IP+MSG_LIST_PATH+"InfoPush/"+USERID+"/push";//寻宝-消息通知
|
||||
EXAM_SUBMIT = IP + MSG_LIST_PATH + "findAndMessage/" + USERID + "/submitExam";//发现 -能力测评提交试卷 post
|
||||
MESSAGE_INFO_PUSH = IP+MSG_LIST_PATH+"InfoPush/"+USERID+"/push";//寻宝-消息通知
|
||||
/**
|
||||
* 提现 金额
|
||||
* Path=/m4/price/**
|
||||
*/
|
||||
//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
|
||||
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
|
||||
PRICE_EXCHANGE = TEST_IP + PRICE_PATH + "priceExchange/" + USERID + "/getList";//提现记录
|
||||
PRICE_EXCHANGE = IP + PRICE_PATH + "priceExchange/" + USERID + "/getList";//提现记录
|
||||
/**
|
||||
* 任务
|
||||
*Path=/m4/task/**
|
||||
*/
|
||||
//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
|
||||
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
|
||||
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.
|
||||
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=测试备注
|
||||
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
|
||||
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
|
||||
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
|
||||
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}
|
||||
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
|
||||
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
|
||||
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
|
||||
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
|
||||
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
|
||||
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
|
||||
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
|
||||
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
|
||||
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
|
||||
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
|
||||
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=四维
|
||||
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
|
||||
GET_COMMIT_LIST = TEST_IP + TASK_PATH + "task/" + USERID + "/getCommitList";//紀錄——已提交
|
||||
RECEIVED_POLYGON_TASK = TEST_IP + TASK_PATH + "polygonTask/" + USERID + "/receivedPolygontask"; //面状任务任务领取
|
||||
GET_COMMIT_LIST = IP + TASK_PATH + "task/" + USERID + "/getCommitList";//紀錄——已提交
|
||||
RECEIVED_POLYGON_TASK = IP + TASK_PATH + "polygonTask/" + USERID + "/receivedPolygontask"; //面状任务任务领取
|
||||
//172.23.139.4:8003/m4/task/1/unReceivedTask?taskIds=&auditIds=214,278 取消领取的接口
|
||||
UNRECEIVED_POLYGON_TASK = TEST_IP + TASK_PATH + "task/" + USERID + "/unReceivedTask";//所有類型结束领取
|
||||
COMPLETE = TEST_IP + TASK_PATH + "polygonTask/" + USERID + "/complete";//面状任务结束领取
|
||||
SUBMIT_POLYGON_TASK = TEST_IP + TASK_PATH + "polygonTask/" + USERID + "/submitPolygontask";//面状任务开始采集
|
||||
UNRECEIVED_POLYGON_TASK = IP + TASK_PATH + "task/" + USERID + "/unReceivedTask";//所有類型结束领取
|
||||
COMPLETE = IP + TASK_PATH + "polygonTask/" + USERID + "/complete";//面状任务结束领取
|
||||
SUBMIT_POLYGON_TASK = IP + TASK_PATH + "polygonTask/" + USERID + "/submitPolygontask";//面状任务开始采集
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -10,10 +10,12 @@
|
||||
<TextView
|
||||
android:id="@+id/tv_view"
|
||||
android:layout_width="wrap_content"
|
||||
android:textColor="@color/white"
|
||||
android:layout_height="wrap_content"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintLeft_toLeftOf="parent"
|
||||
app:layout_constraintRight_toRightOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
android:layout_marginBottom="20dp"
|
||||
/>
|
||||
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
@ -26,7 +26,7 @@
|
||||
<androidx.constraintlayout.widget.ConstraintLayout
|
||||
android:id="@+id/constraintLayout"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="140dp"
|
||||
android:layout_height="220dp"
|
||||
android:background="@drawable/bg"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
@ -40,7 +40,7 @@
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
app:layout_constraintVertical_bias="0.2" />
|
||||
app:layout_constraintVertical_bias="0.4" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tv_name"
|
||||
@ -49,9 +49,9 @@
|
||||
android:layout_marginLeft="20dp"
|
||||
android:text="NO7378"
|
||||
android:textColor="#fff"
|
||||
android:textSize="18sp"
|
||||
android:textSize="22sp"
|
||||
android:textStyle="bold"
|
||||
app:layout_constraintBottom_toBottomOf="@+id/image_heard"
|
||||
|
||||
app:layout_constraintStart_toEndOf="@+id/image_heard"
|
||||
app:layout_constraintTop_toTopOf="@+id/image_heard" />
|
||||
|
||||
@ -59,12 +59,11 @@
|
||||
android:id="@+id/image_share"
|
||||
android:layout_width="30dp"
|
||||
android:layout_height="30dp"
|
||||
android:layout_marginTop="10dp"
|
||||
android:layout_marginRight="40dp"
|
||||
android:background="@drawable/shares"
|
||||
android:layout_marginRight="50dp"
|
||||
app:layout_constraintBottom_toTopOf="@+id/tv_name"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
app:layout_constraintTop_toTopOf="@id/tv_name" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/image_sign"
|
||||
@ -77,10 +76,10 @@
|
||||
|
||||
<androidx.cardview.widget.CardView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="80dp"
|
||||
android:layout_marginLeft="35dp"
|
||||
android:layout_marginTop="90dp"
|
||||
android:layout_marginRight="35dp"
|
||||
android:layout_height="110dp"
|
||||
android:layout_marginLeft="30dp"
|
||||
android:layout_marginTop="160dp"
|
||||
android:layout_marginRight="30dp"
|
||||
app:layout_constraintBottom_toTopOf="@+id/linearLayout"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
@ -88,7 +87,8 @@
|
||||
|
||||
<androidx.constraintlayout.widget.ConstraintLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent">
|
||||
android:layout_height="match_parent"
|
||||
>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tv_title"
|
||||
@ -132,9 +132,9 @@
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="0dp"
|
||||
android:layout_marginLeft="20dp"
|
||||
android:layout_marginTop="50dp"
|
||||
android:layout_marginTop="55dp"
|
||||
android:layout_marginRight="25dp"
|
||||
android:layout_marginBottom="20dp"
|
||||
android:layout_marginBottom="15dp"
|
||||
android:orientation="vertical"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
@ -145,7 +145,7 @@
|
||||
android:id="@+id/rl_grade"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="0dp"
|
||||
android:layout_marginTop="8dp"
|
||||
android:layout_marginTop="10dp"
|
||||
android:gravity="center_vertical"
|
||||
android:layout_weight="1"
|
||||
android:background="?android:attr/selectableItemBackground">
|
||||
@ -157,6 +157,7 @@
|
||||
android:text="我的等级" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/main_grade"
|
||||
android:layout_width="60dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_alignParentRight="true"
|
||||
|
||||
@ -39,8 +39,8 @@
|
||||
android:id="@+id/cb_unSubmit"
|
||||
android:layout_width="30dp"
|
||||
android:layout_height="30dp"
|
||||
android:scaleX="1.5"
|
||||
android:scaleY="1.5"
|
||||
android:scaleX="1.1"
|
||||
android:scaleY="1.1"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintRight_toRightOf="parent"/>
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
<resources>
|
||||
<string name="app_name">地图寻宝3.0</string>
|
||||
<string name="app_name">地图寻宝3.1</string>
|
||||
<string name="title_activity_home">HomeActivity</string>
|
||||
<!-- Strings used for fragments for navigation -->
|
||||
<string name="first_fragment_label">First Fragment</string>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user