From e59724bcfd021cb7b447076e2966a50c2cfb9b49 Mon Sep 17 00:00:00 2001 From: wangdongsheng Date: Thu, 14 Oct 2021 18:29:51 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9B=B8=E5=85=B3bug=20,?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../outdoor/activity/FragmentManagement.java | 5 +- .../outdoor/activity/HomeActivity.java | 5 +- .../outdoor/activity/LoginActivity.java | 13 ++--- .../outdoor/activity/PhotographActivity.java | 6 +- .../outdoor/activity/PicturesActivity.java | 9 +-- .../outdoor/activity/VideoActivity.java | 3 - .../navinfo/outdoor/activity/WebActivity.java | 5 +- .../outdoor/adapter/PoiTaskAdapter.java | 4 +- .../com/navinfo/outdoor/api/Constant.java | 2 +- .../navinfo/outdoor/bean/HasSubmitBean.java | 9 +++ .../outdoor/fragment/FindFragment.java | 8 +-- .../outdoor/fragment/HasSubmitFragment.java | 46 +++++++-------- .../outdoor/fragment/MessageFragment.java | 57 +++++++++++++++++++ .../outdoor/fragment/OtherFragment.java | 5 +- .../outdoor/fragment/PoiTaskFragment.java | 1 - .../outdoor/fragment/PoiVideoFragment.java | 1 + .../navinfo/outdoor/http/HttpInterface.java | 4 +- 17 files changed, 119 insertions(+), 64 deletions(-) diff --git a/app/src/main/java/com/navinfo/outdoor/activity/FragmentManagement.java b/app/src/main/java/com/navinfo/outdoor/activity/FragmentManagement.java index 441f146..38e1257 100644 --- a/app/src/main/java/com/navinfo/outdoor/activity/FragmentManagement.java +++ b/app/src/main/java/com/navinfo/outdoor/activity/FragmentManagement.java @@ -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(); } diff --git a/app/src/main/java/com/navinfo/outdoor/activity/HomeActivity.java b/app/src/main/java/com/navinfo/outdoor/activity/HomeActivity.java index 069edac..edab875 100644 --- a/app/src/main/java/com/navinfo/outdoor/activity/HomeActivity.java +++ b/app/src/main/java/com/navinfo/outdoor/activity/HomeActivity.java @@ -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() { diff --git a/app/src/main/java/com/navinfo/outdoor/activity/LoginActivity.java b/app/src/main/java/com/navinfo/outdoor/activity/LoginActivity.java index bd2fb46..d70bcfa 100644 --- a/app/src/main/java/com/navinfo/outdoor/activity/LoginActivity.java +++ b/app/src/main/java/com/navinfo/outdoor/activity/LoginActivity.java @@ -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 diff --git a/app/src/main/java/com/navinfo/outdoor/activity/PhotographActivity.java b/app/src/main/java/com/navinfo/outdoor/activity/PhotographActivity.java index 7ef8cb1..86f2f9b 100644 --- a/app/src/main/java/com/navinfo/outdoor/activity/PhotographActivity.java +++ b/app/src/main/java/com/navinfo/outdoor/activity/PhotographActivity.java @@ -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(); } diff --git a/app/src/main/java/com/navinfo/outdoor/activity/PicturesActivity.java b/app/src/main/java/com/navinfo/outdoor/activity/PicturesActivity.java index b908cbc..451dce4 100644 --- a/app/src/main/java/com/navinfo/outdoor/activity/PicturesActivity.java +++ b/app/src/main/java/com/navinfo/outdoor/activity/PicturesActivity.java @@ -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)) { diff --git a/app/src/main/java/com/navinfo/outdoor/activity/VideoActivity.java b/app/src/main/java/com/navinfo/outdoor/activity/VideoActivity.java index 2a46eb4..ff65e3a 100644 --- a/app/src/main/java/com/navinfo/outdoor/activity/VideoActivity.java +++ b/app/src/main/java/com/navinfo/outdoor/activity/VideoActivity.java @@ -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() { diff --git a/app/src/main/java/com/navinfo/outdoor/activity/WebActivity.java b/app/src/main/java/com/navinfo/outdoor/activity/WebActivity.java index de413d7..fdc0b6a 100644 --- a/app/src/main/java/com/navinfo/outdoor/activity/WebActivity.java +++ b/app/src/main/java/com/navinfo/outdoor/activity/WebActivity.java @@ -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) diff --git a/app/src/main/java/com/navinfo/outdoor/adapter/PoiTaskAdapter.java b/app/src/main/java/com/navinfo/outdoor/adapter/PoiTaskAdapter.java index bbab9a4..8c03480 100644 --- a/app/src/main/java/com/navinfo/outdoor/adapter/PoiTaskAdapter.java +++ b/app/src/main/java/com/navinfo/outdoor/adapter/PoiTaskAdapter.java @@ -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 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); + } } \ No newline at end of file diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/OtherFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/OtherFragment.java index 0696e90..f4005bc 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/OtherFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/OtherFragment.java @@ -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); diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/PoiTaskFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/PoiTaskFragment.java index 7e6d7f3..fbcbaf5 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/PoiTaskFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/PoiTaskFragment.java @@ -86,7 +86,6 @@ public class PoiTaskFragment extends BaseFragment implements View.OnClickListene page = 1; initWork(type,true); } - @Override public void onLoadMore() { initWork(type,false); diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/PoiVideoFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/PoiVideoFragment.java index 799277c..cff820c 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/PoiVideoFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/PoiVideoFragment.java @@ -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); diff --git a/app/src/main/java/com/navinfo/outdoor/http/HttpInterface.java b/app/src/main/java/com/navinfo/outdoor/http/HttpInterface.java index 0ee24b5..335fe71 100644 --- a/app/src/main/java/com/navinfo/outdoor/http/HttpInterface.java +++ b/app/src/main/java/com/navinfo/outdoor/http/HttpInterface.java @@ -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/";//发现