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

修改1、2、3级bug(部分)

Browse Source
This commit is contained in:
md
2021-08-02 18:19:47 +08:00
parent be6f17f4cd
commit c87f5d5ffa
16 changed files with 66 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/com/navinfo/outdoor/activity/UserActivity.java
View File

@@ -230,7 +230,6 @@ public class UserActivity extends BaseActivity implements View.OnClickListener {
Toast.makeText(UserActivity.this, region_id, Toast.LENGTH_SHORT).show();
String tx = opt1tx + " " + opt2tx + " " + opt3tx;
region.setText(tx);
}
}).setSubmitText("确定")//确定按钮文字
.setCancelText("取消")//取消按钮文字

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

@@ -5,6 +5,7 @@ import android.os.Bundle;
import android.util.Log;
import android.view.View;
import android.widget.ImageView;
import android.widget.TextView;
import androidx.recyclerview.widget.DividerItemDecoration;
import androidx.recyclerview.widget.LinearLayoutManager;
@@ -30,6 +31,7 @@ public class MessageFragment extends BaseFragment implements View.OnClickListene
private ImageView messageFinal;
private XRecyclerView messageRecycler;
private MessageAdapter messageAdapter;
private TextView tvRoad;
public static MessageFragment newInstance(Bundle bundle) {
MessageFragment fragment = new MessageFragment();
@@ -49,7 +51,8 @@ public class MessageFragment extends BaseFragment implements View.OnClickListene
messageFinal.setOnClickListener(this::onClick);
messageRecycler = (XRecyclerView) findViewById(R.id.message_recycler);
messageRecycler.setLayoutManager(new LinearLayoutManager(getActivity()));
tvRoad = findViewById(R.id.tv_read);
tvRoad.setOnClickListener(this::onClick);
messageRecycler.addItemDecoration(new DividerItemDecoration(getActivity(), DividerItemDecoration.VERTICAL));
messageRecycler.setRefreshProgressStyle(ProgressStyle.BallSpinFadeLoader);
messageRecycler.setLoadingMoreProgressStyle(ProgressStyle.BallRotate);
@@ -121,6 +124,10 @@ public class MessageFragment extends BaseFragment implements View.OnClickListene
case R.id.message_final:
getActivity().finish();
break;
case R.id.tv_read:
break;
}
}
}

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

@@ -30,7 +30,7 @@ import com.umeng.commonsdk.debug.D;
public class PoiTaskFragment extends BaseFragment implements View.OnClickListener {
private ImageView ivPoiTaskFinish;
private XRecyclerView poiTaskXrv;
private int type;
public static PoiTaskFragment newInstance(Bundle bundle) {
PoiTaskFragment fragment = new PoiTaskFragment();

10
app/src/main/java/com/navinfo/outdoor/fragment/PoiVideoFragment.java
View File

@@ -268,7 +268,6 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick
initPoiSaveLocal(false);
break;
case R.id.tv_pictures:
// 根据用户点击的时间为视频名称赋值
DateFormat formatter = new SimpleDateFormat("yyyyMMddHHmmss");
String videoFormatName = formatter.format(new Date());
@@ -279,9 +278,9 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick
break;
case R.id.btn_poi_video_upload:
ArrayList<File> videoFileList = new ArrayList<>();
if (ivPoiVideoPicture.getTag() != null) {
showLoadingDialog();
File videoFile = (File) ivPoiVideoPicture.getTag();
videoFileList.add(videoFile);
File file = new File(videoFile.getPath()+".txt");
@@ -293,6 +292,7 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick
public void run() {
PoiEntity poiDaoPoiEntity = poiDao.getPoiEntity(showPoiEntity.getId());
if (poiDaoPoiEntity == null || poiDaoPoiEntity.getTaskStatus() == 1 || poiDaoPoiEntity.getTaskStatus() == 2 || poiDaoPoiEntity.getTaskStatus() == 0) {
dismissLoadingDialog();
initPoiSaveLocal(true);
} else {
getActivity().runOnUiThread(new Runnable() {
@@ -314,6 +314,7 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick
}
public void initPoiSaveLocal(boolean isLocal) {
XXPermissions.with(getContext())
.permission(Permission.MANAGE_EXTERNAL_STORAGE)
.request(new OnPermissionCallback() {
@@ -440,7 +441,6 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick
Toast.makeText(getActivity(), "未压缩完成", Toast.LENGTH_SHORT).show();
return;
}
showLoadingDialog();
OkGo
// 请求方式和请求url
.<OtherUploadPicBean>post(HttpInterface.POI_VIDEO_UPLOAD_PIC)
@@ -473,8 +473,8 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick
public void onError(Response<OtherUploadPicBean> response) {
super.onError(response);
dismissLoadingDialog();
Toast.makeText(getActivity(), response.code() + "", Toast.LENGTH_SHORT).show();
Log.d("TAG", "onError: " + response.code() + "");
Toast.makeText(getActivity(), "上传失败", Toast.LENGTH_SHORT).show();
Log.d("TAG", "onError: " + response.message() + "");
}
});
dismissDialog();

6
app/src/main/java/com/navinfo/outdoor/fragment/RoadFragment.java
View File

@@ -263,6 +263,7 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList
case R.id.road_upload:
ArrayList<File> videoFileList = new ArrayList<>();
if (ivRoadPicture.getTag() != null) {
showLoadingDialog();
File videoFile = (File) ivRoadPicture.getTag();
videoFileList.add(videoFile);
File file = new File(videoFile.getPath() + ".txt");
@@ -274,6 +275,7 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList
public void run() {
PoiEntity poiDaoPoiEntity = poiDao.getPoiEntity(showPoiEntity.getId());
if (poiDaoPoiEntity == null || poiDaoPoiEntity.getTaskStatus() == 1 || poiDaoPoiEntity.getTaskStatus() == 2 || poiDaoPoiEntity.getTaskStatus() == 0) {
dismissLoadingDialog();
initPoiSaveLocal(true);
} else {
getActivity().runOnUiThread(new Runnable() {
@@ -419,7 +421,6 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList
Toast.makeText(getContext(), "未压缩完成", Toast.LENGTH_SHORT).show();
return;
}
showLoadingDialog();
OkGo
// 请求方式和请求url
.<OtherUploadPicBean>post(HttpInterface.ROAD_TASK_UPLOAD_PIC)
@@ -431,7 +432,6 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList
@Override
public void onSuccess(Response<OtherUploadPicBean> otherUploadPicBeanResponse) {
dismissLoadingDialog();
new Thread(new Runnable() {
@Override
public void run() {
@@ -454,7 +454,7 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList
public void onError(Response<OtherUploadPicBean> response) {
super.onError(response);
dismissLoadingDialog();
Toast.makeText(getContext(), response.code() + "", Toast.LENGTH_SHORT).show();
Toast.makeText(getContext(), "上传失败", Toast.LENGTH_SHORT).show();
Log.d("TAG", "onError: " + response.code() + "");
}
});

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

@@ -110,7 +110,7 @@ public class StaySubmitFragment extends BaseFragment implements View.OnClickList
obtain.what = Constant.EVENT_WHAT_COMPLETE_TASK;
obtain.obj = poiEntity;
EventBus.getDefault().post(obtain);
}
});
cbSelect.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@@ -126,9 +126,9 @@ public class StaySubmitFragment extends BaseFragment implements View.OnClickList
public void onEvent(Message data) {
if (data.what == Constant.EVENT_STAY_REFRESH) {
if ((boolean)data.obj){
Toast.makeText(getContext(), "成功", Toast.LENGTH_SHORT).show();
Toast.makeText(getContext(), "提交成功", Toast.LENGTH_SHORT).show();
}else {
Toast.makeText(getContext(), "失败", Toast.LENGTH_SHORT).show();
Toast.makeText(getContext(), "提交失败", Toast.LENGTH_SHORT).show();
}
dismissLoadingDialog();
refreshData();
@@ -225,7 +225,7 @@ public class StaySubmitFragment extends BaseFragment implements View.OnClickList
}else {
Toast.makeText(getContext(), "请选择要删除的条目数据", Toast.LENGTH_SHORT).show();
}
break;
}
}
@@ -234,9 +234,13 @@ public class StaySubmitFragment extends BaseFragment implements View.OnClickList
if (roadEntities == null) {
roadEntities = new ArrayList<>();
}else {
roadEntities.clear();
}
if (newEntities == null) {
newEntities = new ArrayList<>();
}else {
newEntities.clear();
}
new Thread(new Runnable() {

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

@@ -955,7 +955,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
int type = data.arg1;
showPoiMarkerByType(type, latLng);
} else if (data.what == Constant.EVENT_WHAT_COMPLETE_TASK) {
initRemoveFragment();
// initRemoveFragment();
PoiEntity poiEntity = (PoiEntity) data.obj;
Bundle bundle = new Bundle();
bundle.putBoolean("isSliding", true); // 通知抽屉不收回

5
app/src/main/java/com/navinfo/outdoor/fragment/WithdrawFragment.java
View File

@@ -29,7 +29,7 @@ public class WithdrawFragment extends BaseFragment implements View.OnClickListen
private TextView tvText;
private TextView tvAll, tvUnit, tvAlready, tvTotal;
private Button btWithdraw;
private Double canExchangePrice;
private double canExchangePrice;
private EditText etAllPrice;
private TextView poiPushMoney;
private TextView poiReportMoney;
@@ -79,6 +79,7 @@ public class WithdrawFragment extends BaseFragment implements View.OnClickListen
chargingReportMoney = (TextView) findViewById(R.id.charging_report_money);
otherPushMoney = (TextView) findViewById(R.id.other_push_money);
otherReportMoney = (TextView) findViewById(R.id.other_report_money);
initNetWork();
}
@@ -164,7 +165,7 @@ public class WithdrawFragment extends BaseFragment implements View.OnClickListen
@Override
public void onSuccess(UserPriceExchangeBean response, int id) {
dismissLoadingDialog();
Toast.makeText(getContext(), "提现成功", Toast.LENGTH_SHORT).show();
Toast.makeText(getContext(), response.getMessage(), Toast.LENGTH_SHORT).show();
Log.d("TAG", "onSuccess: " + response.toString() + "tttttttt");
}

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

@@ -34,7 +34,7 @@ public class HttpInterface {
//http://172.23.139.4:8004/userPrice/1/getPrice
public static final String GET_PRICE = IPm5 + "userPrice/1/getPrice";//我的-总资产
//http://172.23.139.4:8004/userPrice/1/userPriceExchange?exchangeMoney=10&payType=1
public static final String USER_PRICE_EXCHANGE = IPm5 + "userPriceExchange";//我的-财务信息-提现
public static final String USER_PRICE_EXCHANGE = IPm5 + "userPrice/1/userPriceExchange";//我的-财务信息-提现
public static final String IPm6 = "http://dtxbmaps.navinfo.com/dtxb/task/";