修改相关bug ,添加日志

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();
     }

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() {

app/src/main/java/com/navinfo/outdoor/activity/LoginActivity.java

@@ -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();

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();
     }
 

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) {
@@ -556,7 +554,6 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen
             removables.get(i).remove();
         }
         removables.clear();
-
         picturesBuilder.append("onDestroy");
         picturesBuilder.append("\r\n");
         FileUtils.writeFile(logFile.getAbsolutePath(), picturesBuilder.toString(), true);

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() {

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)

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<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

app/src/main/java/com/navinfo/outdoor/api/Constant.java

@@ -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群号
      */

app/src/main/java/com/navinfo/outdoor/bean/HasSubmitBean.java

@@ -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;

app/src/main/java/com/navinfo/outdoor/fragment/HasSubmitFragment.java

@@ -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;
@@ -99,8 +97,6 @@ public class HasSubmitFragment extends BaseFragment implements View.OnClickListe
         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);
     }
+
 }

app/src/main/java/com/navinfo/outdoor/fragment/MessageFragment.java

@@ -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);
+    }
 }

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);

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);

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);

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/m4";//正式接口
-    public static final String IP= "http://dtxbmaps.navinfo.com/dtxb_test/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/";//发现