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

修改相关bug ,添加日志

Browse Source
This commit is contained in:
wangdongsheng 2021-10-14 18:29:51 +08:00
parent c86c914a9b
commit e59724bcfd
17 changed files with 119 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/com/navinfo/outdoor/activity/FragmentManagement.java
View File

@ -184,8 +184,6 @@ public class FragmentManagement extends BaseActivity {
fragmentTransaction.hide(photoFragment);
if (videoFragment!=null)//查看详情-视频 37
fragmentTransaction.hide(videoFragment);
}
public void selectorFragment(int i) {
@ -503,7 +501,8 @@ public class FragmentManagement extends BaseActivity {
private void setZtlTextColor() {
ImmersionBar.with(this).statusBarDarkFont(true, 0.2f)
ImmersionBar.with(this)
.statusBarDarkFont(true, 0.2f)
//原理：如果当前设备支持状态栏字体变色，会设置状态栏字体为黑色，如果当前设备不支持状态栏字体变色，会使当前状态栏加上透明度，否则不执行透明度
.init();
}

5
app/src/main/java/com/navinfo/outdoor/activity/HomeActivity.java
View File

@ -104,7 +104,8 @@ public class HomeActivity extends BaseActivity{
}
@Override
public void onPageScrollStateChanged(int state) { }
public void onPageScrollStateChanged(int state) {
}
});
mViewPager.setCanScroll(true);
mViewPager.setNoScrollAnim(false);
@ -133,7 +134,6 @@ public class HomeActivity extends BaseActivity{
//点击table layout效果
@Override
public void onTabUnselected(TabLayout.Tab tab) {}
@Override
public void onTabReselected(TabLayout.Tab tab) {}
});
@ -166,7 +166,6 @@ public class HomeActivity extends BaseActivity{
this.finish();
}
}
}
@Override
protected void onDestroy() {

13
app/src/main/java/com/navinfo/outdoor/activity/LoginActivity.java
View File

@ -145,19 +145,19 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
public void onClick(View v) {
switch (v.getId()) {
case R.id.tv_register:
loginBuilder.append("点击注册,");
loginBuilder.append("点击注册 ,");
Intent register = new Intent(this, FragmentManagement.class);
register.putExtra("tag", 5);
startActivity(register);
break;
case R.id.tv_forget_paw:
loginBuilder.append("点击忘记密码,");
loginBuilder.append("点击忘记密码 ,");
Intent forgetPaw = new Intent(this, FragmentManagement.class);
forgetPaw.putExtra("tag", 6);
startActivity(forgetPaw);
break;
case R.id.btn_login:
loginBuilder.append("点击登录,");
loginBuilder.append("点击登录 , ");
btnLogin.setEnabled(false);
Message message = new Message();
message.what = 0x103;
@ -180,7 +180,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
}
break;
case R.id.tv_statement:
loginBuilder.append("点击了用户协议,");
loginBuilder.append("点击了用户协议 ,");
Intent stateIntent = new Intent(this, StatementActivity.class);
startActivity(stateIntent);
break;
@ -300,7 +300,6 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
Toast.makeText(LoginActivity.this, response.getMessage() + "", Toast.LENGTH_SHORT).show();
}
}
@Override
public void onError(Throwable e, int id) {
dismissLoadingDialog();
@ -317,13 +316,13 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
@Override
protected void onPause() {
super.onPause();
loginBuilder.append("onPause,");
loginBuilder.append("onPause ,");
}
@Override
protected void onStop() {
super.onStop();
loginBuilder.append("onStop,");
loginBuilder.append("onStop ,");
}
@Override

6
app/src/main/java/com/navinfo/outdoor/activity/PhotographActivity.java
View File

@ -191,7 +191,6 @@ public class PhotographActivity extends BaseActivity implements View.OnClickList
}
});
*/
}
});
@ -210,19 +209,20 @@ public class PhotographActivity extends BaseActivity implements View.OnClickList
@Subscribe
public void onEvent(Message data) {
}
@Override
protected void onResume() {
super.onResume();
photographBuilder.append("onResume， ");
photographBuilder.append("onResume ,");
cameraView.open();
}
@Override
protected void onPause() {
super.onPause();
photographBuilder.append("onPause， ");
photographBuilder.append("onPause ,");
cameraView.close();
}

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

@ -132,7 +132,6 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen
private File logFile;
private StringBuilder picturesBuilder;
@Override
protected int getLayout() {
EventBus.getDefault().register(this);
@ -143,7 +142,6 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen
@Override
protected void initView() {
super.initView();
removables = new ArrayList<>();//存储轨迹的marker
layerChange = findViewById(R.id.layer_change);
if (getIntent() != null) {
@ -532,7 +530,7 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen
@Override
protected void onPause() {
super.onPause();
picturesBuilder.append("onPause, ");
picturesBuilder.append("onPause ,");
camera.close();
stopTimer();
}
@ -540,7 +538,7 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen
@Override
protected void onStop() {
super.onStop();
picturesBuilder.append("onStop, ");
picturesBuilder.append("onStop ,");
}
@Override
@ -556,8 +554,7 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen
removables.get(i).remove();
}
removables.clear();
picturesBuilder.append("onDestroy ");
picturesBuilder.append("onDestroy");
picturesBuilder.append("\r\n");
FileUtils.writeFile(logFile.getAbsolutePath(), picturesBuilder.toString(), true);
if (EventBus.getDefault().isRegistered(this)) {

3
app/src/main/java/com/navinfo/outdoor/activity/VideoActivity.java
View File

@ -46,15 +46,12 @@ public class VideoActivity extends BaseActivity implements View.OnClickListener
imageVideo.setOnClickListener(this);
jzvdStd.setUp(videoPath,"", Jzvd.SCREEN_NORMAL);
Glide.with(this).asDrawable().load(videoPath).into(jzvdStd.posterImageView); //设置图片
}
@Override
protected void onPause() {
super.onPause();
Jzvd.releaseAllVideos();
}
@Override
public void onBackPressed() {

5
app/src/main/java/com/navinfo/outdoor/activity/WebActivity.java
View File

@ -47,11 +47,10 @@ public class WebActivity extends BaseActivity implements View.OnClickListener {
}
private void initWebWork() {
showLoadingDialog();
Bundle bundle = getIntent().getExtras();
if (bundle!=null){
String url = bundle.getString("url");
if (url != null && !url.equals("")) {
if (url == null || url.equals("")) {
Toast.makeText(this, "连接失败", Toast.LENGTH_SHORT).show();
return;
}
@ -62,7 +61,7 @@ public class WebActivity extends BaseActivity implements View.OnClickListener {
httpParams.put(entry.getKey(),entry.getValue());
}
}
showLoadingDialog();
OkGoBuilder.getInstance()
.Builder(this)
.url(url)

4
app/src/main/java/com/navinfo/outdoor/adapter/PoiTaskAdapter.java
View File

@ -1,5 +1,6 @@
package com.navinfo.outdoor.adapter;
import android.annotation.SuppressLint;
import android.content.Context;
import android.view.LayoutInflater;
import android.view.View;
@ -35,6 +36,7 @@ public class PoiTaskAdapter extends RecyclerView.Adapter<PoiTaskAdapter.ViewHold
return new ViewHolder(inflate);
}
@SuppressLint("SetTextI18n")
@Override
public void onBindViewHolder(@NonNull @NotNull ViewHolder holder, int position) {
HasSubmitBean.BodyBean.ListBean listBean = listBeans.get(position);
@ -48,7 +50,7 @@ public class PoiTaskAdapter extends RecyclerView.Adapter<PoiTaskAdapter.ViewHold
}else if (listBean.getAuditStatus() == -1){
holder.tvAuditStatus.setText("待审核");
}
holder.tvMany.setText("￥0.0");
holder.tvMany.setText("￥"+listBean.getPrice());
}
@Override

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

@ -183,7 +183,7 @@ public class Constant {
public static SlidingUpPanelLayout SLIDING_LAYOUT = null;//設置
public static boolean IS_FILTER_LIST_ITEM = true;//poi页面的查重
public static TencentMap.OnMarkerClickListener markerClickListener = null;
public static final String NAVIN_FO = "10.12";//版本日期
public static final String NAVIN_FO = "10.14";//版本日期
/*
*联系我们的QQ群名称和QQ群号
*/

9
app/src/main/java/com/navinfo/outdoor/bean/HasSubmitBean.java
View File

@ -122,6 +122,15 @@ public class HasSubmitBean {
private Integer userId;
private String createTime;
private Integer type;
private double price;
public double getPrice() {
return price;
}
public void setPrice(double price) {
this.price = price;
}
public Integer getAuditStatus() {
return auditStatus;

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

@ -86,25 +86,25 @@ public class FindFragment extends BaseFragment implements View.OnClickListener{
public void onClick(View v) {
switch (v.getId()) {
case R.id.linear_task_prefecture:
findBuilder.append("点击了最新公告：任务专区 跳转,");
findBuilder.append("点击了最新公告：任务专区 跳转 ,");
Intent prefectureIntent = new Intent(getActivity(), FragmentManagement.class);
prefectureIntent.putExtra("tag", 7);
startActivity(prefectureIntent);
break;
case R.id.linear_task_explain:
findBuilder.append("点击了帮助中心：任务说明 跳转,");
findBuilder.append("点击了帮助中心：任务说明 跳转 ,");
Intent explainIntent = new Intent(getActivity(), FragmentManagement.class);
explainIntent.putExtra("tag", 8);
startActivity(explainIntent);
break;
case R.id.linear_event_prefecture:
findBuilder.append("点击了最新公告：活动专区 跳转,");
findBuilder.append("点击了最新公告：活动专区 跳转 ,");
Intent eventIntent = new Intent(getActivity(), FragmentManagement.class);
eventIntent.putExtra("tag",9);
startActivity(eventIntent);
break;
case R.id.linear_end:
findBuilder.append("点击了帮助中心：能力测评 跳转,");
findBuilder.append("点击了帮助中心：能力测评 跳转 ,");
Intent endIntent = new Intent(getActivity(), FragmentManagement.class);
endIntent.putExtra("tag", 11);
startActivity(endIntent);

46
app/src/main/java/com/navinfo/outdoor/fragment/HasSubmitFragment.java
View File

@ -33,8 +33,6 @@ import java.util.Objects;
* 记录-已提交
*/
public class HasSubmitFragment extends BaseFragment implements View.OnClickListener {
private TextView auditProcess;
private TextView auditThrough;
private TextView auditNotThrough;
@ -67,40 +65,38 @@ public class HasSubmitFragment extends BaseFragment implements View.OnClickListe
protected void initView() {
super.initView();
ConstraintLayout clPoi = findViewById(R.id.cl_poi);
ConstraintLayout clPoi = findViewById(R.id.cl_poi);
clPoi.setOnClickListener(this);
auditProcess = findViewById(R.id.audit_process);
auditThrough = findViewById(R.id.audit_through);
auditNotThrough = findViewById(R.id.audit_not_through);
auditProcess = findViewById(R.id.audit_process);
auditThrough = findViewById(R.id.audit_through);
auditNotThrough = findViewById(R.id.audit_not_through);
ConstraintLayout clRoad = findViewById(R.id.cl_road);
ConstraintLayout clRoad = findViewById(R.id.cl_road);
clRoad.setOnClickListener(this);
roadAuditProcess = findViewById(R.id.road_audit_process);
roadAuditThrough = findViewById(R.id.road_audit_through);
roadAuditNotThrough = findViewById(R.id.road_audit_not_through);
roadAuditProcess = findViewById(R.id.road_audit_process);
roadAuditThrough = findViewById(R.id.road_audit_through);
roadAuditNotThrough = findViewById(R.id.road_audit_not_through);
ConstraintLayout clCharging = findViewById(R.id.cl_charging);
ConstraintLayout clCharging = findViewById(R.id.cl_charging);
clCharging.setOnClickListener(this);
chargingAuditProcess = findViewById(R.id.charging_audit_process);
chargingAuditThrough = findViewById(R.id.charging_audit_through);
chargingAuditNotThrough = findViewById(R.id.charging_audit_not_through);
chargingAuditProcess = findViewById(R.id.charging_audit_process);
chargingAuditThrough = findViewById(R.id.charging_audit_through);
chargingAuditNotThrough = findViewById(R.id.charging_audit_not_through);
ConstraintLayout clOther = findViewById(R.id.cl_other);
ConstraintLayout clOther = findViewById(R.id.cl_other);
clOther.setOnClickListener(this);
otherAuditProcess = findViewById(R.id.other_audit_process);
otherAuditThrough = findViewById(R.id.other_audit_through);
otherAuditNotThrough = findViewById(R.id.other_audit_not_through);
otherAuditProcess = findViewById(R.id.other_audit_process);
otherAuditThrough = findViewById(R.id.other_audit_through);
otherAuditNotThrough = findViewById(R.id.other_audit_not_through);
ConstraintLayout clPoiVideo = findViewById(R.id.cl_poiVideo);
ConstraintLayout clPoiVideo = findViewById(R.id.cl_poiVideo);
clPoiVideo.setOnClickListener(this);
poiVideoAuditProcess = findViewById(R.id.poiVideo_audit_process);
poiVideoAuditThrough = findViewById(R.id.poiVideo_audit_through);
poiVideoAuditProcessAbleNotThrough = findViewById(R.id.poiVideo_audit_process_audit_not_through);
poiVideoAuditProcess = findViewById(R.id.poiVideo_audit_process);
poiVideoAuditThrough = findViewById(R.id.poiVideo_audit_through);
poiVideoAuditProcessAbleNotThrough = findViewById(R.id.poiVideo_audit_process_audit_not_through);
initRequest();
}
public void initRequest() {
initPoiSubMitWork();//poi
initCaningSubMitWork();//充电站
@ -109,7 +105,6 @@ public class HasSubmitFragment extends BaseFragment implements View.OnClickListe
initOtherSubMitWork();//其他
}
private void initOtherSubMitWork() {
HttpParams httpParams = new HttpParams();
httpParams.put("type", "5");
@ -388,4 +383,5 @@ public class HasSubmitFragment extends BaseFragment implements View.OnClickListe
hasSubmitBuilder.append("\r\n");
FileUtils.writeFile(logFile.getAbsolutePath(), hasSubmitBuilder.toString(), true);
}
}

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

@ -1,6 +1,9 @@
package com.navinfo.outdoor.fragment;
import android.annotation.SuppressLint;
import android.content.Context;
import android.content.Intent;
import android.content.SharedPreferences;
import android.os.Bundle;
import android.util.Log;
import android.view.View;
@ -11,6 +14,7 @@ import android.widget.Toast;
import androidx.recyclerview.widget.DividerItemDecoration;
import androidx.recyclerview.widget.LinearLayoutManager;
import com.github.lazylibrary.util.FileUtils;
import com.jcodecraeer.xrecyclerview.ProgressStyle;
import com.jcodecraeer.xrecyclerview.XRecyclerView;
import com.lzy.okgo.model.HttpParams;
@ -25,6 +29,10 @@ import com.navinfo.outdoor.http.Callback;
import com.navinfo.outdoor.http.HttpInterface;
import com.navinfo.outdoor.http.OkGoBuilder;
import java.io.File;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.HashMap;
import java.util.Objects;
@ -35,6 +43,8 @@ public class MessageFragment extends BaseFragment implements View.OnClickListen
private MessageAdapter messageAdapter;
private int messagePage = 1;
private File logFile;
private StringBuilder messageBuilder;
public static MessageFragment newInstance(Bundle bundle) {
MessageFragment fragment = new MessageFragment();
@ -67,6 +77,7 @@ public class MessageFragment extends BaseFragment implements View.OnClickListen
messageAdapter.setMessageClickItem(new MessageAdapter.messageClickItem() {
@Override
public void item(int id) {
messageBuilder.append("点击item ,");
HashMap<String, String> paramMap = new HashMap<>();
paramMap.put("id",id+"");
intint2WebActivity(HttpInterface.MSG_CONTENT, paramMap);
@ -119,16 +130,62 @@ public class MessageFragment extends BaseFragment implements View.OnClickListen
protected void initData() {
super.initData();
initNetwork();
SharedPreferences sharedPreferences = Objects.requireNonNull(getActivity()).getSharedPreferences(Constant.MESSAGE_TYPE, Context.MODE_PRIVATE);
SharedPreferences.Editor sharedEdit = sharedPreferences.edit();
@SuppressLint("SimpleDateFormat")
DateFormat formatter = new SimpleDateFormat("yyyyMMdd");
String newFormat = formatter.format(new Date(System.currentTimeMillis()));
String pictures_time = sharedPreferences.getString("pictures_time", null);
if (pictures_time==null){
sharedEdit.putString("pictures_time",newFormat);
sharedEdit.apply();
logFile = new File(Constant.LOG_FOLDER + "/" + newFormat + ".txt");
}else {
if (pictures_time.equals(newFormat)){
logFile = new File(Constant.LOG_FOLDER + "/" + pictures_time + ".txt");
}else {
logFile = new File(Constant.LOG_FOLDER + "/" + newFormat + ".txt");
}
}
messageBuilder = new StringBuilder();
messageBuilder.append("MessageFragment-onCreate-initData ,");
if (Constant.USHERED!=null){
messageBuilder.append("userId:").append(Constant.USHERED).append(",");
}
}
@Override
public void onClick(View v) {
switch (v.getId()) {
case R.id.message_final:
messageBuilder.append("点击返回,");
Objects.requireNonNull(getActivity()).finish();
break;
case R.id.tv_read:
messageBuilder.append("点击全部领取,");
break;
}
}
@Override
public void onPause() {
super.onPause();
messageBuilder.append("onPause ,");
}
@Override
public void onStop() {
super.onStop();
messageBuilder.append("onStop ,");
}
@Override
public void onDestroy() {
super.onDestroy();
messageBuilder.append("onDestroy");
messageBuilder.append("\r\n");
FileUtils.writeFile(logFile.getAbsolutePath(), messageBuilder.toString(), true);
}
}

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

@ -357,6 +357,7 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis
logFile = new File(Constant.LOG_FOLDER + "/" + newFormat + ".txt");
}
}
otherBuilder = new StringBuilder();
otherBuilder.append("OtherActivity-onCreate-initData ,");
if (Constant.USHERED!=null){
@ -389,7 +390,7 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis
latLng = latLineString.get(0);
break;
}
BitmapDescriptor otherDescriptor = Constant.MARKER_OTHER_SHOW;
BitmapDescriptor otherDescriptor = BitmapDescriptorFactory.fromResource(R.drawable.marker_other_show);
markerOther = tencentMap.addMarker(new MarkerOptions(latLng).icon(otherDescriptor).anchor(0.5f, 1.0f));
markerOther.setZIndex(4);
moveLatlng(latLng, null);
@ -400,7 +401,7 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis
latLng = new LatLng();
latLng.setLongitude(Double.parseDouble(x));
latLng.setLatitude(Double.parseDouble(y));
BitmapDescriptor otherDescriptor = Constant.MARKER_OTHER_SHOW;
BitmapDescriptor otherDescriptor = BitmapDescriptorFactory.fromResource(R.drawable.marker_other_show);
markerOther = tencentMap.addMarker(new MarkerOptions(latLng).icon(otherDescriptor).anchor(0.5f, 1.0f));
markerOther.setZIndex(4);
moveLatlng(latLng, null);

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

@ -86,7 +86,6 @@ public class PoiTaskFragment extends BaseFragment implements View.OnClickListene
page = 1;
initWork(type,true);
}
@Override
public void onLoadMore() {
initWork(type,false);

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

@ -92,6 +92,7 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick
private File logFile;
private StringBuilder poiVideoBuilder;
public static PoiVideoFragment newInstance(Bundle bundle) {
PoiVideoFragment fragment = new PoiVideoFragment();
fragment.setArguments(bundle);

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

@ -3,8 +3,8 @@ package com.navinfo.outdoor.http;
import com.navinfo.outdoor.api.Constant;
public class HttpInterface {
public static final String IP_= "http://dtxbmaps.navinfo.com/dtxb/m4";//正式接口
public static final String IP= "http://dtxbmaps.navinfo.com/dtxb_test/m4";//测试接口
public static final String IP = "http://dtxbmaps.navinfo.com/dtxb/m4";//正式接口
public static final String IP_= "http://dtxbmaps.navinfo.com/dtxb_test/m4";//测试接口
public static final String USER_PATH ="/user/";//我的
public static final String MSG_LIST_PATH ="/msgList/";//发现