修改寻宝上一直加载

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

@@ -99,6 +99,7 @@ public class MainActivity extends BaseActivity {
     }
 
 
+
     private void initPermission() {
         XXPermissions.with(this)
                 // 申请安装包权限
@@ -134,7 +135,7 @@ public class MainActivity extends BaseActivity {
                                 Constant.initRootFolder(Constant.USHERED);
                                 HttpInterface.initHttpInter(Constant.USHERED);
                                 initCheckVersion();
-                            } else {
+                            }else {
                                 initTime();
                             }
                             //initTime();
@@ -142,12 +143,11 @@ public class MainActivity extends BaseActivity {
                             initPermission();
                         }
                     }
-
                     @Override
                     public void onDenied(List<String> permissions, boolean never) {
                         if (never) {
                             DialogSettings.style = DialogSettings.STYLE.STYLE_IOS;
-                            DialogSettings.cancelable = false;
+                            DialogSettings.cancelable=false;
                             MessageDialog.show(MainActivity.this, "提示", permissions.toString() + " 被永久拒绝授权请手动授权,", "确定").setOkButton(new OnDialogButtonClickListener() {
                                 @Override
                                 public boolean onClick(BaseDialog baseDialog, View v) {
@@ -179,7 +179,7 @@ public class MainActivity extends BaseActivity {
                         dismissLoadingDialog();
                         if (response.getCode() == 200) {
                             int version = response.getBody().getVersion();
-                            if (versionCode < version) {//TODO 改成
+                            if (versionCode <version) {//TODO 改成
                                 //升级
                                 ApkVersionBean.bodyBean body = response.getBody();
                                 showUpdateDialog(body);
@@ -194,7 +194,7 @@ public class MainActivity extends BaseActivity {
                     @Override
                     public void onError(Throwable e, int id) {
                         dismissLoadingDialog();
-                        Toast.makeText(MainActivity.this, e.getMessage() + "", Toast.LENGTH_SHORT).show();
+                        Toast.makeText(MainActivity.this, e.getMessage()+"", Toast.LENGTH_SHORT).show();
                         initTime();
                     }
                 });
@@ -208,7 +208,7 @@ public class MainActivity extends BaseActivity {
         builder.setIcon(android.R.drawable.ic_dialog_info);
         builder.setMessage("请升级APP版本至" + bodyBean.getVersion());
         builder.setCancelable(false);
-        if (bodyBean.getUpdateState() == 0) {//非必须更新
+        if (bodyBean.getUpdateState()==0){//非必须更新
             builder.setPositiveButton("确定", new DialogInterface.OnClickListener() {
                 @Override
                 public void onClick(DialogInterface dialog, int which) {
@@ -226,7 +226,7 @@ public class MainActivity extends BaseActivity {
                     initTime();
                 }
             });
-        } else {//强制更新
+        }else{//强制更新
             builder.setPositiveButton("确定", new DialogInterface.OnClickListener() {
                 @Override
                 public void onClick(DialogInterface dialog, int which) {
@@ -243,18 +243,18 @@ public class MainActivity extends BaseActivity {
     }
 
     public void initTime() {
-        if (Constant.USHERED != null) {
+        if (Constant.USHERED!=null){
             HttpInterface.initAppPath(Constant.USHERED);
             Constant.initRootFolder(Constant.USHERED);
             HttpInterface.initHttpInter(Constant.USHERED);
-            if (Constant.ACCESS_TOKEN != null) {
+            if (Constant.ACCESS_TOKEN!=null){
                 initGetUserInfo();
-            } else {
+            }else {
                 Intent intent = new Intent(MainActivity.this, LoginActivity.class);
                 startActivity(intent);
                 finish();
             }
-        } else {
+        }else {
             Intent intent = new Intent(MainActivity.this, LoginActivity.class);
             startActivity(intent);
             finish();
@@ -269,7 +269,6 @@ public class MainActivity extends BaseActivity {
         }.start();
 */
     }
-
     private void initGetUserInfo() {
         OkGoBuilder.getInstance().Builder(this)
                 .url(HttpInterface.USER_DETAIL_BY_USER_ID)
@@ -337,7 +336,6 @@ public class MainActivity extends BaseActivity {
 
                         }
                     }
-
                     @Override
                     public void onError(Throwable e, int id) {
                         dismissLoadingDialog();
@@ -421,7 +419,7 @@ public class MainActivity extends BaseActivity {
                     con.connect();
                     if (con.getResponseCode() == 200) {
                         File files = new File(Constant.NABISCO_APk);
-                        if (!files.exists()) {
+                        if (!files.exists()){
                             files.mkdir();
                         }
                         int length = con.getContentLength();// 获取文件大小
@@ -430,7 +428,7 @@ public class MainActivity extends BaseActivity {
                         FileOutputStream fileOutputStream = null;
                         if (is != null) {
                             //对apk进行保存
-                            File file = new File(Constant.NABISCO_APk + "DTXB.apk");
+                            File file = new File(Constant.NABISCO_APk +"DTXB.apk");
                             fileOutputStream = new FileOutputStream(file);
                             byte[] buf = new byte[1024];
                             int ch;

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

@@ -221,6 +221,7 @@ public class PictureActivity extends BaseActivity implements View.OnClickListene
 //            }
 //        });
         removables = new ArrayList<>();//存储轨迹的marker
+        if (poiEntity!=null){
             if (poiEntity.getId() != null) {
                 List<File> fileListByUUID = AWMp4ParserHelper.getInstance().getFileListByUUID(poiEntity.getId());
                 if (fileListByUUID != null) {
@@ -237,6 +238,8 @@ public class PictureActivity extends BaseActivity implements View.OnClickListene
                     }
                 }
             }
+        }
+
         //相机预览监听
         camera.addCameraListener(new CameraListener() {
             @Override
@@ -379,6 +382,7 @@ public class PictureActivity extends BaseActivity implements View.OnClickListene
         ivMap.setLayoutParams(layoutParamsMap);
     }
     private void initLine() {
+        if (poiEntity!=null){
         String geoWkt = poiEntity.getGeoWkt();
         if (geoWkt != null) {
             String geo = Geohash.getInstance().decode(geoWkt);
@@ -409,6 +413,7 @@ public class PictureActivity extends BaseActivity implements View.OnClickListene
             }
         }
         }
+    }
 
     // 将秒转化成小时分钟秒
     private String formatMiss(long miss) {

app/src/main/java/com/navinfo/outdoor/adapter/PoiTaskAdapter.java

@@ -46,7 +46,6 @@ public class PoiTaskAdapter extends RecyclerView.Adapter<PoiTaskAdapter.ViewHold
             holder.tvAuditStatus.setText("审核通过");
         }else if (listBean.getAuditStatus() == 1){
             holder.tvAuditStatus.setText("审核未通过");
-            holder.tvMassage.setText(listBean.getAuditMsg());
         }else if (listBean.getAuditStatus() == -1){
             holder.tvAuditStatus.setText("待审核");
         }

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

@@ -156,7 +156,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 = "11.01";//版本日期
+    public static final String NAVIN_FO = "11.02";//版本日期
     //marker
     public static final BitmapDescriptor MARKER_POI_SHOW = BitmapDescriptorFactory.fromResource(R.drawable.marker_poi_show);
     public static final BitmapDescriptor MARKER_CHARGE_SHOW = BitmapDescriptorFactory.fromResource(R.drawable.marker_charge_show);

app/src/main/java/com/navinfo/outdoor/base/BaseActivity.java

@@ -132,6 +132,7 @@ public abstract class BaseActivity extends AppCompatActivity {
     @Override
     protected void onDestroy() {
         super.onDestroy();
+        dismissLoadingDialog();
         Collector.removeActivity(this);
     }
 
@@ -147,6 +148,4 @@ public abstract class BaseActivity extends AppCompatActivity {
             setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
         }
     }
-
-
 }

app/src/main/java/com/navinfo/outdoor/base/BaseFragment.java

@@ -154,4 +154,10 @@ public abstract class BaseFragment extends Fragment implements FragmentBackHandl
     public void onDestroyView() {
         super.onDestroyView();
     }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        dismissLoadingDialog();
+    }
 }

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

@@ -115,12 +115,17 @@ public class HasSubmitFragment extends BaseFragment implements View.OnClickListe
     }
 
     public void initRequest() {
+        if (Constant.USHERED!=null){
+            if (HttpInterface.GET_COMMIT_LIST!=null){
                 initPoiSubMitWork();//poi
                 initCaningSubMitWork();//充电站
                 initPoiVideoSubMitWork();//poi录像
                 initRoadSubMitWork();//道路录像
                 initOtherSubMitWork();//其他
             }
+        }
+
+    }
 
     private void initOtherSubMitWork() {
         HttpParams httpParams = new HttpParams();
@@ -140,12 +145,19 @@ public class HasSubmitFragment extends BaseFragment implements View.OnClickListe
                         if (hasSubmitBean.getCode() == 200) {
                             HasSubmitBean.BodyBean hasSubmitBeanBody = hasSubmitBean.getBody();
                             if (hasSubmitBeanBody != null) {
+                                if (getActivity()!=null){
+                                    getActivity().runOnUiThread(new Runnable() {
+                                        @SuppressLint("SetTextI18n")
+                                        @Override
+                                        public void run() {
                                             otherAuditProcess.setText(hasSubmitBeanBody.getAuditingCount() + "");
                                             otherAuditThrough.setText(hasSubmitBeanBody.getPassCount() + "");
                                             otherAuditNotThrough.setText(hasSubmitBeanBody.getNotPassCount() + "");
                                         }
-                        } else {
+                                    });
-                            Toast.makeText(getActivity(), hasSubmitBean.getMessage() + "", Toast.LENGTH_SHORT).show();
+                                }
+
+                            }
                         }
                     }
 
@@ -175,12 +187,18 @@ public class HasSubmitFragment extends BaseFragment implements View.OnClickListe
                         if (hasSubmitBean.getCode() == 200) {
                             HasSubmitBean.BodyBean hasSubmitBeanBody = hasSubmitBean.getBody();
                             if (hasSubmitBeanBody != null) {
+                                if (getActivity()!=null){
+                                    getActivity().runOnUiThread(new Runnable() {
+                                        @SuppressLint("SetTextI18n")
+                                        @Override
+                                        public void run() {
                                             chargingAuditProcess.setText(hasSubmitBeanBody.getAuditingCount() + "");
                                             chargingAuditThrough.setText(hasSubmitBeanBody.getPassCount() + "");
                                             chargingAuditNotThrough.setText(hasSubmitBeanBody.getNotPassCount() + "");
                                         }
-                        } else {
+                                    });
-                            Toast.makeText(getActivity(), hasSubmitBean.getMessage() + "", Toast.LENGTH_SHORT).show();
+                                }
+                            }
                         }
 
                     }
@@ -188,7 +206,6 @@ public class HasSubmitFragment extends BaseFragment implements View.OnClickListe
                     @Override
                     public void onError(Throwable e, int id) {
                         dismissLoadingDialog();
-                        Toast.makeText(getActivity(), e.getMessage() + "", Toast.LENGTH_SHORT).show();
                     }
                 });
     }
@@ -211,19 +228,25 @@ public class HasSubmitFragment extends BaseFragment implements View.OnClickListe
                         if (hasSubmitBean.getCode() == 200) {
                             HasSubmitBean.BodyBean hasSubmitBeanBody = hasSubmitBean.getBody();
                             if (hasSubmitBeanBody != null) {
+                                if (getActivity()!=null){
+                                    getActivity().runOnUiThread(new Runnable() {
+                                        @SuppressLint("SetTextI18n")
+                                        @Override
+                                        public void run() {
                                             roadAuditProcess.setText(hasSubmitBeanBody.getAuditingCount() + "");
                                             roadAuditThrough.setText(hasSubmitBeanBody.getPassCount() + "");
                                             roadAuditNotThrough.setText(hasSubmitBeanBody.getNotPassCount() + "");
                                         }
-                        } else {
+                                    });
-                            Toast.makeText(getActivity(), hasSubmitBean.getMessage(), Toast.LENGTH_SHORT).show();
+                                }
+
+                            }
                         }
                     }
 
                     @Override
                     public void onError(Throwable e, int id) {
                         dismissLoadingDialog();
-                        Toast.makeText(getActivity(), "请求失败", Toast.LENGTH_SHORT).show();
                     }
                 });
     }
@@ -246,19 +269,25 @@ public class HasSubmitFragment extends BaseFragment implements View.OnClickListe
                         if (hasSubmitBean.getCode() == 200) {
                             HasSubmitBean.BodyBean hasSubmitBeanBody = hasSubmitBean.getBody();
                             if (hasSubmitBeanBody != null) {
+                                if (getActivity()!=null){
+                                    getActivity().runOnUiThread(new Runnable() {
+                                        @SuppressLint("SetTextI18n")
+                                        @Override
+                                        public void run() {
                                             poiVideoAuditProcess.setText(hasSubmitBeanBody.getAuditingCount() + "");
                                             poiVideoAuditThrough.setText(hasSubmitBeanBody.getPassCount() + "");
                                             poiVideoAuditProcessAbleNotThrough.setText(hasSubmitBeanBody.getNotPassCount() + "");
                                         }
-                        } else {
+                                    });
-                            Toast.makeText(getActivity(), hasSubmitBean.getMessage() + "", Toast.LENGTH_SHORT).show();
+                                }
+
+                            }
                         }
                     }
 
                     @Override
                     public void onError(Throwable e, int id) {
                         dismissLoadingDialog();
-                        Toast.makeText(getActivity(), "请求失败", Toast.LENGTH_SHORT).show();
                     }
                 });
     }
@@ -281,19 +310,25 @@ public class HasSubmitFragment extends BaseFragment implements View.OnClickListe
                         if (hasSubmitBean.getCode() == 200) {
                             hasSubmitBeanBody = hasSubmitBean.getBody();
                             if (hasSubmitBeanBody != null) {
+                                if (getActivity()!=null){
+                                    getActivity().runOnUiThread(new Runnable() {
+                                        @SuppressLint("SetTextI18n")
+                                        @Override
+                                        public void run() {
                                             auditProcess.setText(hasSubmitBeanBody.getAuditingCount() + "");
                                             auditThrough.setText(hasSubmitBeanBody.getPassCount() + "");
                                             auditNotThrough.setText(hasSubmitBeanBody.getNotPassCount() + "");
                                         }
-                        } else {
+                                    });
-                            Toast.makeText(getActivity(), hasSubmitBean.getMessage() + "", Toast.LENGTH_SHORT).show();
+                                }
+
+                            }
                         }
                     }
 
                     @Override
                     public void onError(Throwable e, int id) {
                         dismissLoadingDialog();
-                        Toast.makeText(getActivity(), "请求失败", Toast.LENGTH_SHORT).show();
                     }
                 });
     }
@@ -325,7 +360,6 @@ public class HasSubmitFragment extends BaseFragment implements View.OnClickListe
         }
     }
 
-
     @Override
     public void onClick(View v) {
         switch (v.getId()) {

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

@@ -109,18 +109,22 @@ public class MineFragment extends BaseFragment implements View.OnClickListener {
             mainGrade.setText("LV." + Constant.LEVEL);
         }
         if (Constant.USHERED != null) {
+            if (HttpInterface.GET_PRICE!=null){
                 initNetWork();
             }
         }
+    }
 
     @Subscribe
     public void onEvent(Message data) {
         if (data.what == Constant.HOME_MINE) {
             if ((boolean) data.obj) {
+                if (HttpInterface.GET_PRICE!=null){
                     initNetWork();
                 }
             }
         }
+    }
 
     private void initNetWork() {
         showLoadingDialog();
@@ -138,11 +142,16 @@ public class MineFragment extends BaseFragment implements View.OnClickListener {
                             GetPriceBean.BodyBean body = response.getBody();
                             if (body != null) {
                                 Double userPrice = body.getUserPrice();
-                                /*String format2 = DoubleUtil.format2(userPrice);*/
+                                if (getActivity()!=null){
+                                    getActivity().runOnUiThread(new Runnable() {
+                                        @SuppressLint("SetTextI18n")
+                                        @Override
+                                        public void run() {
                                             tvMoney.setText(userPrice+"");
                                         }
-                        } else {
+                                    });
-                            Toast.makeText(getActivity(), response.getMessage() + "", Toast.LENGTH_SHORT).show();
+                                }
+                            }
                         }
                         Log.d("TAG", "onSuccess: " + response.toString());
                     }

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

@@ -159,15 +159,14 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
     private StringBuilder treasureBuilder;
     private Marker gatherMarker;
     private boolean isHandler=false;
-    private Handler handler = new Handler(new Handler.Callback() {
+    private Handler handler=new Handler(new Handler.Callback() {
         @Override
         public boolean handleMessage(@NonNull Message msg) {
-            if (msg.what == 0x101) {
+            if (msg.what==0x101){
                 if (!isHandler){
                     dismissLoadingDialog();
-                    OkGo.getInstance().cancelAll();
+                    OkGo.getInstance().cancelTag(this);
                 }
-
             }
             return false;
         }

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

@@ -162,8 +162,14 @@ public class WithdrawFragment extends BaseFragment implements View.OnClickListen
                         dismissLoadingDialog();
                         if (response.getCode() == 200) {
                             GetPriceBean.BodyBean body = response.getBody();
+                            if (getActivity()!=null){
+                                getActivity().runOnUiThread(new Runnable() {
+                                    @SuppressLint("SetTextI18n")
+                                    @Override
+                                    public void run() {
                                         tvTotal.setText(body.getUserPrice() + "");
-                            tvUnit.setText( body.getCanExchangePrice() + "");
+                                        canExchangePrice = body.getCanExchangePrice();
+                                        tvUnit.setText(canExchangePrice + "");
                                         tvAlready.setText(body.getHaveExchangePrice()+"");
                                         poiPushMoney.setText(body.getPoiPushPrice()+"元");
                                         poiReportMoney.setText(body.getPoiNonepushPrice()+"元");
@@ -175,8 +181,9 @@ public class WithdrawFragment extends BaseFragment implements View.OnClickListen
                                         chargingReportMoney.setText(body.getCsNonepushPrice() + "元");
                                         otherPushMoney.setText(body.getOtherPushPrice() + "元");
                                         otherReportMoney.setText(body.getOtherNonepushPrice() + "元");
-                        } else {
+                                    }
-                            Toast.makeText(getActivity(), response.getMessage() + "", Toast.LENGTH_SHORT).show();
+                                });
+                            }
                         }
                         Log.d("TAG", "onSuccess: " + response.toString());
                     }
@@ -184,7 +191,6 @@ public class WithdrawFragment extends BaseFragment implements View.OnClickListen
                     @Override
                     public void onError(Throwable e, int id) {
                         dismissLoadingDialog();
-                        Toast.makeText(getContext(), "获取失败" + e.getMessage(), Toast.LENGTH_SHORT).show();
                         Log.d("TAG", "onError: " + e.getMessage());
                     }
                 });
@@ -237,7 +243,9 @@ public class WithdrawFragment extends BaseFragment implements View.OnClickListen
                 break;
             case R.id.tv_all:
                 withdrawBuilder.append("点击了全部 ,");
+                if (canExchangePrice!=0){
                     etAllPrice.setText(canExchangePrice + "");
+                }
                 break;
         }
     }
@@ -261,7 +269,7 @@ public class WithdrawFragment extends BaseFragment implements View.OnClickListen
                         if (response.getCode() == 200) {
                             DialogSettings.style = DialogSettings.STYLE.STYLE_IOS;
                             DialogSettings.cancelable=false;
-                            MessageDialog.show((AppCompatActivity) getContext(), "提示", "该提现申请已提交", "确定").setOnOkButtonClickListener(new OnDialogButtonClickListener() {
+                            MessageDialog.show((AppCompatActivity) Objects.requireNonNull(getContext()), "提示", "该提现申请已提交", "确定").setOnOkButtonClickListener(new OnDialogButtonClickListener() {
                                 @Override
                                 public boolean onClick(BaseDialog baseDialog, View v) {
                                     withdrawBuilder.append("提现了成功 ，");

app/src/main/java/com/navinfo/outdoor/http/HttpInterface.java

@@ -3,9 +3,9 @@ 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/";//发现

app/src/main/res/layout/has_sumit_item.xml

@@ -44,6 +44,7 @@
         android:id="@+id/tv_auditMsg"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:visibility="gone"
         android:layout_marginRight="10dp"
         app:layout_constraintRight_toLeftOf="@+id/tv_auditStatus"
         app:layout_constraintTop_toTopOf="@+id/tv_createTime" />