diff --git a/app/src/main/java/com/navinfo/outdoor/activity/GuidanceActivity.java b/app/src/main/java/com/navinfo/outdoor/activity/GuidanceActivity.java index 9626a32..170c7f0 100644 --- a/app/src/main/java/com/navinfo/outdoor/activity/GuidanceActivity.java +++ b/app/src/main/java/com/navinfo/outdoor/activity/GuidanceActivity.java @@ -283,7 +283,7 @@ public class GuidanceActivity extends BaseActivity { startActivity(new Intent(GuidanceActivity.this, HomeActivity.class)); GuidanceActivity.this.finish(); Toast.makeText(GuidanceActivity.this, "可以在发现版块的任务说明中,进行再次学习哦", Toast.LENGTH_LONG).show(); - } else if (response.getCode() == 203) { + } else if (response.getCode() == 230) { FlushTokenUtil.flushToken(GuidanceActivity.this); } else { Toast.makeText(GuidanceActivity.this, response.getMessage(), Toast.LENGTH_SHORT).show(); 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 100ca10..ee49ab4 100644 --- a/app/src/main/java/com/navinfo/outdoor/activity/HomeActivity.java +++ b/app/src/main/java/com/navinfo/outdoor/activity/HomeActivity.java @@ -10,6 +10,7 @@ import com.navinfo.outdoor.fragment.FindFragment; import com.navinfo.outdoor.fragment.MineFragment; import com.navinfo.outdoor.fragment.RecordFragment; import com.navinfo.outdoor.fragment.TreasureFragment; +import com.navinfo.outdoor.room.PoiDatabase; import com.navinfo.outdoor.util.BackHandlerHelper; import com.navinfo.outdoor.util.NoSlideViewPager; @@ -193,6 +194,7 @@ public class HomeActivity extends BaseActivity { if (EventBus.getDefault().isRegistered(this))//加上判断 EventBus.getDefault().unregister(this); super.onDestroy(); + PoiDatabase.destroy(); } } \ No newline at end of file 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 f4920c2..5d3d7d3 100644 --- a/app/src/main/java/com/navinfo/outdoor/activity/LoginActivity.java +++ b/app/src/main/java/com/navinfo/outdoor/activity/LoginActivity.java @@ -213,19 +213,21 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener Constant.initRootFolder(body.getUserId()); HttpInterface.initHttpInter(body.getUserId()); loginBuilder.append("userId:").append(body.getUserId()).append(","); + navInfoEditor.putString("access_token", body.getAccess_token()); + navInfoEditor.putString("refresh_token", body.getRefresh_token()); + navInfoEditor.putString("pass_word", paw); + navInfoEditor.putString("user_name", name); + navInfoEditor.putString("user_id", body.getUserId()); + navInfoEditor.commit(); + Constant.ACCESS_TOKEN = body.getAccess_token(); + Constant.REFRESH_TOKEN = body.getRefresh_token(); + Constant.USHERED = body.getUserId(); + Constant.PASS_WORD = paw; + loginBuilder.append("登录获取token ,"); + initGetUserInfo();//获取用户信息 + }else { + Toast.makeText(LoginActivity.this, "获取id 失败", Toast.LENGTH_SHORT).show(); } - navInfoEditor.putString("access_token", body.getAccess_token()); - navInfoEditor.putString("refresh_token", body.getRefresh_token()); - navInfoEditor.putString("pass_word", paw); - navInfoEditor.putString("user_name", name); - navInfoEditor.putString("user_id", body.getUserId()); - navInfoEditor.commit(); - Constant.ACCESS_TOKEN = body.getAccess_token(); - Constant.REFRESH_TOKEN = body.getRefresh_token(); - Constant.USHERED = body.getUserId(); - Constant.PASS_WORD = paw; - loginBuilder.append("登录获取token ,"); - initGetUserInfo();//获取用户信息 } else { Toast.makeText(LoginActivity.this, response.getMessage(), Toast.LENGTH_SHORT).show(); } diff --git a/app/src/main/java/com/navinfo/outdoor/activity/MainActivity.java b/app/src/main/java/com/navinfo/outdoor/activity/MainActivity.java index d125c6b..bcf98eb 100644 --- a/app/src/main/java/com/navinfo/outdoor/activity/MainActivity.java +++ b/app/src/main/java/com/navinfo/outdoor/activity/MainActivity.java @@ -64,7 +64,7 @@ public class MainActivity extends BaseActivity { //调用系统安装程序 //安装apk,也可以进行静默安装 Intent intent = new Intent(Intent.ACTION_VIEW); - File file = new File(Constant.NABISCO_APk + "DTXB.apk"); + File file = new File(Constant.NABISCO_APk , "DTXB.apk"); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { intent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION); Uri contentUri = FileProvider.getUriForFile(MainActivity.this, "com.navinfo.outdoor.fileprovider", file); @@ -383,15 +383,17 @@ public class MainActivity extends BaseActivity { if (body.getUserId() != null && !body.getUserId().equals("")) { Constant.initRootFolder(body.getUserId()); HttpInterface.initHttpInter(body.getUserId()); + navInfoEditor.putString("access_token", body.getAccess_token()); + Constant.ACCESS_TOKEN = body.getAccess_token(); + navInfoEditor.putString("refresh_token", body.getRefresh_token()); + Constant.REFRESH_TOKEN = body.getRefresh_token(); + navInfoEditor.putString("user_id", body.getUserId()); + Constant.USHERED = body.getUserId(); + navInfoEditor.commit(); + initGetUserInfo();//获取用户信息 + }else { + Toast.makeText(MainActivity.this, "获取用户id失败,请重试", Toast.LENGTH_SHORT).show(); } - navInfoEditor.putString("access_token", body.getAccess_token()); - Constant.ACCESS_TOKEN = body.getAccess_token(); - navInfoEditor.putString("refresh_token", body.getRefresh_token()); - Constant.REFRESH_TOKEN = body.getRefresh_token(); - navInfoEditor.putString("user_id", body.getUserId()); - Constant.USHERED = body.getUserId(); - navInfoEditor.commit(); - initGetUserInfo();//获取用户信息 } else { Intent intent = new Intent(MainActivity.this, LoginActivity.class); startActivity(intent); @@ -450,7 +452,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; diff --git a/app/src/main/java/com/navinfo/outdoor/activity/UserActivity.java b/app/src/main/java/com/navinfo/outdoor/activity/UserActivity.java index b5d48cc..6cfdff8 100644 --- a/app/src/main/java/com/navinfo/outdoor/activity/UserActivity.java +++ b/app/src/main/java/com/navinfo/outdoor/activity/UserActivity.java @@ -36,6 +36,7 @@ import com.navinfo.outdoor.http.OkGoBuilder; import com.navinfo.outdoor.util.FlushTokenUtil; import com.navinfo.outdoor.util.GetJsonDataUtil; import com.navinfo.outdoor.util.RegexUtil; +import com.navinfo.outdoor.util.TimestampUtil; import org.json.JSONArray; @@ -89,7 +90,7 @@ public class UserActivity extends BaseActivity implements View.OnClickListener { } } userBuilder = new StringBuilder(); - userBuilder.append("UserFragment-onCreate-initData ,"); + userBuilder.append(TimestampUtil.time()).append(" UserFragment-onCreate-initData ,"); if (Constant.USHERED != null) { userBuilder.append("userId:").append(Constant.USHERED).append(","); } @@ -148,11 +149,11 @@ public class UserActivity extends BaseActivity implements View.OnClickListener { public void onClick(View v) { switch (v.getId()) { case R.id.iv_user: - userBuilder.append("点击了用户资料的返回 ,"); + userBuilder.append(TimestampUtil.time()).append("点击了用户资料的返回 ,"); finish(); break; case R.id.btn_gathering: - userBuilder.append("点击了去绑定的返回 ,"); + userBuilder.append(TimestampUtil.time()).append("点击了去绑定的返回 ,"); if (Constant.AUDIOTAPES == -1) { Toast.makeText(this, "请先实名认证", Toast.LENGTH_SHORT).show(); } else if (Constant.AUDIOTAPES == 1) {//认证通过 @@ -164,34 +165,34 @@ public class UserActivity extends BaseActivity implements View.OnClickListener { } break; case R.id.btn_attestations: - userBuilder.append("点击了去认证的返回 ,"); + userBuilder.append(TimestampUtil.time()).append("点击了去认证的返回 ,"); Intent attestationIntent = new Intent(this, FragmentManagement.class); attestationIntent.putExtra("tag", 25); startActivity(attestationIntent); break; case R.id.ll_region: - userBuilder.append("点击了所在区域 ,"); + userBuilder.append(TimestampUtil.time()).append("点击了所在区域 ,"); showPickerView(); break; case R.id.edit_qq: - userBuilder.append("请输入qq ,"); + userBuilder.append(TimestampUtil.time()).append("请输入qq ,"); // qq(); break; case R.id.edit_mailbox: - userBuilder.append("请输入电子邮件 ,"); + userBuilder.append(TimestampUtil.time()).append("请输入电子邮件 ,"); break; case R.id.btn_save: netWork(); break; case R.id.btn_weChat_binding: - userBuilder.append("点击了微信 去提交的按钮 ,"); + userBuilder.append(TimestampUtil.time()).append("点击了微信 去提交的按钮 ,"); Toast.makeText(this, "此功能未开通", Toast.LENGTH_SHORT).show(); break; } } private void netWork() { - userBuilder.append("点击了保存的按钮 ,"); + userBuilder.append(TimestampUtil.time()).append("点击了保存的按钮 ,"); String userphone = etPhone.getText().toString().trim(); String userqq = etQq.getText().toString().trim(); String usermailbox = etMailbox.getText().toString().trim(); @@ -262,7 +263,7 @@ public class UserActivity extends BaseActivity implements View.OnClickListener { return false; } }); - }else if(response.getCode()==203){ + }else if(response.getCode()==230){ FlushTokenUtil.flushToken(UserActivity.this); } else { Toast.makeText(UserActivity.this, response.getMessage() + "", Toast.LENGTH_SHORT).show(); 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 29472e1..dbaf781 100644 --- a/app/src/main/java/com/navinfo/outdoor/activity/WebActivity.java +++ b/app/src/main/java/com/navinfo/outdoor/activity/WebActivity.java @@ -83,7 +83,7 @@ public class WebActivity extends BaseActivity implements View.OnClickListener { richBody = richBody.replace(" videoFileList = (List) fmRoadPic.getTag(); @@ -668,7 +670,7 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList } });} } - } else if (roadSaveBean.getCode() == 203) { + } else if (roadSaveBean.getCode() == 230) { FlushTokenUtil.flushToken(getActivity()); } else { if (getActivity()!=null){ @@ -757,13 +759,13 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList @Override public void onPause() { super.onPause(); - roadBuilder.append("onPause ,"); + roadBuilder.append(TimestampUtil.time()).append("onPause ,"); } @Override public void onStop() { super.onStop(); - roadBuilder.append("onStop ,"); + roadBuilder.append(TimestampUtil.time()).append("onStop ,"); } @Override @@ -774,7 +776,7 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList if (markerRoad != null) { markerRoad.remove(); } - roadBuilder.append("onDestroy"); + roadBuilder.append(TimestampUtil.time()).append("onDestroy"); roadBuilder.append("\r\n"); FileUtils.writeFile(logFile.getAbsolutePath(), roadBuilder.toString(), true); } @@ -817,7 +819,7 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList obtain.what = Constant.JOB_WORD_MONITOR; obtain.obj = true; EventBus.getDefault().post(obtain); - } else if (response.getCode() == 203) { + } else if (response.getCode() == 230) { FlushTokenUtil.flushToken(getActivity()); } else { if (getActivity()!=null){ diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/StaySubmitFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/StaySubmitFragment.java index 9e49102..356e5fe 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/StaySubmitFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/StaySubmitFragment.java @@ -347,7 +347,7 @@ public class StaySubmitFragment extends BaseFragment implements View.OnClickList dismissLoadingDialog(); if (response.getCode() == 200) { staySubmitAdapter.setAllCheckedDelete(); - } else if (response.getCode() == 203) { + } else if (response.getCode() == 230) { FlushTokenUtil.flushToken(getActivity()); } else { Toast.makeText(getActivity(), response.getMessage() + "", Toast.LENGTH_SHORT).show(); diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/TaskExplainFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/TaskExplainFragment.java index 53aacd4..b2b669e 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/TaskExplainFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/TaskExplainFragment.java @@ -156,7 +156,7 @@ public class TaskExplainFragment extends BaseFragment implements View.OnClickLis dismissLoadingDialog(); if (response.getCode() == 200) { initTaskPrefectureBean(response, aNet); - } else if (response.getCode() == 203) { + } else if (response.getCode() == 230) { FlushTokenUtil.flushToken(getActivity()); } else { Toast.makeText(getActivity(), response.getMessage() + "", Toast.LENGTH_SHORT).show(); diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/TaskExplainFragment2.java b/app/src/main/java/com/navinfo/outdoor/fragment/TaskExplainFragment2.java index 8e046f7..f0dde4e 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/TaskExplainFragment2.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/TaskExplainFragment2.java @@ -155,7 +155,7 @@ public class TaskExplainFragment2 extends BaseFragment implements View.OnClickLi dismissLoadingDialog(); if (response.getCode() == 200) { initTaskPrefectureBean(response, aBoolean); - } else if (response.getCode() == 203) { + } else if (response.getCode() == 230) { FlushTokenUtil.flushToken(getActivity()); } else { Toast.makeText(getActivity(), response.getMessage() + "", Toast.LENGTH_SHORT).show(); diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/TaskPrefectureFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/TaskPrefectureFragment.java index 22b275e..390371f 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/TaskPrefectureFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/TaskPrefectureFragment.java @@ -29,6 +29,7 @@ import com.navinfo.outdoor.http.OkGoBuilder; import com.jcodecraeer.xrecyclerview.ProgressStyle; import com.jcodecraeer.xrecyclerview.XRecyclerView; import com.navinfo.outdoor.util.FlushTokenUtil; +import com.navinfo.outdoor.util.TimestampUtil; import org.json.JSONObject; @@ -90,7 +91,7 @@ public class TaskPrefectureFragment extends BaseFragment implements View.OnClick taskPrefectureAdapter.setClickItem(new TaskPrefectureAdapter.clickItem() { @Override public void item(int id) { - taskPrefectureBuilder.append("点击了item ,"); + taskPrefectureBuilder.append(TimestampUtil.time()).append("点击了item ,"); HashMap paramMap = new HashMap<>(); paramMap.put("id", id + ""); intint2WebActivity(HttpInterface.MSG_CONTENT, paramMap); @@ -121,9 +122,9 @@ public class TaskPrefectureFragment extends BaseFragment implements View.OnClick } } taskPrefectureBuilder = new StringBuilder(); - taskPrefectureBuilder.append("TaskPrefectureFragment-onCreate-initData ,"); + taskPrefectureBuilder.append(TimestampUtil.time()).append("TaskPrefectureFragment-onCreate-initData ,"); if (Constant.USHERED != null) { - taskPrefectureBuilder.append("userId:").append(Constant.USHERED).append(","); + taskPrefectureBuilder.append(TimestampUtil.time()).append("userId:").append(Constant.USHERED).append(","); } } @@ -185,7 +186,7 @@ public class TaskPrefectureFragment extends BaseFragment implements View.OnClick taskPage++; } } - } else if (taskPrefectureBean.getCode() == 203) { + } else if (taskPrefectureBean.getCode() == 230) { FlushTokenUtil.flushToken(getActivity()); } else { Toast.makeText(getActivity(), taskPrefectureBean.getMessage(), Toast.LENGTH_SHORT).show(); @@ -197,26 +198,26 @@ public class TaskPrefectureFragment extends BaseFragment implements View.OnClick public void onClick(View v) { if (v.getId() == R.id.iv_find_task) { Objects.requireNonNull(getActivity()).finish(); - taskPrefectureBuilder.append("点击了返回的按钮 ,"); + taskPrefectureBuilder.append(TimestampUtil.time()).append("点击了返回的按钮 ,"); } } @Override public void onPause() { super.onPause(); - taskPrefectureBuilder.append("onPause ,"); + taskPrefectureBuilder.append(TimestampUtil.time()).append("onPause ,"); } @Override public void onStop() { super.onStop(); - taskPrefectureBuilder.append("onStop ,"); + taskPrefectureBuilder.append(TimestampUtil.time()).append("onStop ,"); } @Override public void onDestroy() { super.onDestroy(); - taskPrefectureBuilder.append("onDestroy"); + taskPrefectureBuilder.append(TimestampUtil.time()).append("onDestroy"); taskPrefectureBuilder.append("\r\n"); FileUtils.writeFile(logFile.getAbsolutePath(), taskPrefectureBuilder.toString(), true); } diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/TreasureFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/TreasureFragment.java index 7fa9c10..25a4ed4 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/TreasureFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/TreasureFragment.java @@ -430,7 +430,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen sharedEdit.putInt("type", messageType); sharedEdit.putString("dataTime", format); sharedEdit.commit(); - } else if (messageNoticeBean.getCode() == 203) { + } else if (messageNoticeBean.getCode() == 230) { FlushTokenUtil.flushToken(getActivity()); } else { if (getActivity()!=null){ @@ -509,7 +509,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen Constant.TelLength = telLength; } - } else if (getPhoneBean.getCode() == 203) { + } else if (getPhoneBean.getCode() == 230) { FlushTokenUtil.flushToken(getActivity()); } else { if (getActivity()!=null){ @@ -612,7 +612,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen } }); } - } else if (response.getCode() == 203) { + } else if (response.getCode() == 230) { FlushTokenUtil.flushToken(getActivity()); } else { if (getActivity()!=null){ @@ -908,7 +908,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen obtain.what = Constant.JOB_SEARCH_WORD; obtain.obj = response; EventBus.getDefault().post(obtain); - } else if (response.getCode() == 203) { + } else if (response.getCode() == 230) { FlushTokenUtil.flushToken(getActivity()); } else { if (getActivity()!=null){ diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/UserAttestationFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/UserAttestationFragment.java index 00fdbdc..7f57a2e 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/UserAttestationFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/UserAttestationFragment.java @@ -73,6 +73,7 @@ public class UserAttestationFragment extends BaseFragment implements View.OnClic private ImageView useCamera; private File logFile; private StringBuilder userAttestationBuilder; + private SharedPreferences.Editor sharedPreEditor; public static UserAttestationFragment newInstance(Bundle bundle) { UserAttestationFragment fragment = new UserAttestationFragment(); @@ -115,6 +116,8 @@ public class UserAttestationFragment extends BaseFragment implements View.OnClic @Override protected void initView() { super.initView(); + SharedPreferences sharedPreferences = Objects.requireNonNull(getActivity()).getSharedPreferences(Constant.DATA_FILE, Context.MODE_PRIVATE); + sharedPreEditor = sharedPreferences.edit(); ImageView ivAttestation = findViewById(R.id.iv_attestation); ivAttestation.setOnClickListener(this); ivAttestation1 = findViewById(R.id.iv_attestation1); @@ -173,6 +176,24 @@ public class UserAttestationFragment extends BaseFragment implements View.OnClic btnAttestation.setEnabled(false); useCamera.setEnabled(false); } + String tv1 = sharedPreferences.getString("tvCard1", null); + if (tv1!=null){ + File tvFile = new File(tv1); + String andGetPath = PhotoUtils.showPhotoAndGetPath(tvFile, ivAttestation1); + tvCard1.setTag(andGetPath); + } + String tv2 = sharedPreferences.getString("tvCard2", null); + if (tv2!=null){ + File tvFile = new File(tv2); + String andGetPath = PhotoUtils.showPhotoAndGetPath(tvFile, ivAttestation2); + tvCard1.setTag(andGetPath); + } + String tv3 = sharedPreferences.getString("tvCard3", null); + if (tv3!=null){ + File tvFile = new File(tv3); + String andGetPath = PhotoUtils.showPhotoAndGetPath(tvFile, ivAttestation3); + tvCard1.setTag(andGetPath); + } } @Override @@ -311,7 +332,7 @@ public class UserAttestationFragment extends BaseFragment implements View.OnClic return false; } }); - } else if (response.getCode() == 203) { + } else if (response.getCode() == 230) { FlushTokenUtil.flushToken(getActivity()); } else { Toast.makeText(getActivity(), "提交失败!", Toast.LENGTH_SHORT).show(); @@ -343,7 +364,14 @@ public class UserAttestationFragment extends BaseFragment implements View.OnClic assert file != null; File videoFile = new File(file); if (videoFile.exists()) { + if (tvCard1.getTag() != null) { + File fileElse = new File((String) tvCard1.getTag()); + fileElse.delete(); + tvCard1.setTag(null); + } String andGetPath = PhotoUtils.showPhotoAndGetPath(videoFile, ivAttestation1); + sharedPreEditor.putString("tvCard1",videoFile.getAbsolutePath()); + sharedPreEditor.apply(); tvCard1.setTag(andGetPath); } ivHera1.setVisibility(View.GONE); @@ -354,8 +382,15 @@ public class UserAttestationFragment extends BaseFragment implements View.OnClic assert file != null; File videoFile = new File(file); if (videoFile.exists()) { + if (tvCard2.getTag() != null) { + File fileElse = new File((String) tvCard2.getTag()); + fileElse.delete(); + tvCard2.setTag(null); + } String andGetPath = PhotoUtils.showPhotoAndGetPath(videoFile, ivAttestation2); tvCard2.setTag(andGetPath); + sharedPreEditor.putString("tvCard2",videoFile.getAbsolutePath()); + sharedPreEditor.apply(); } ivHera2.setVisibility(View.GONE); tvCard2.setVisibility(View.GONE); @@ -365,8 +400,15 @@ public class UserAttestationFragment extends BaseFragment implements View.OnClic assert file != null; File videoFile = new File(file); if (videoFile.exists()) { + if (tvCard3.getTag() != null) { + File fileElse = new File((String) tvCard3.getTag()); + fileElse.delete(); + tvCard3.setTag(null); + } String andGetPath = PhotoUtils.showPhotoAndGetPath(videoFile, ivAttestation3); tvCard3.setTag(andGetPath); + sharedPreEditor.putString("tvCard3",videoFile.getAbsolutePath()); + sharedPreEditor.apply(); } ivHera3.setVisibility(View.GONE); tvCard3.setVisibility(View.GONE); diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/WithdrawFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/WithdrawFragment.java index 5285db4..c89e643 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/WithdrawFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/WithdrawFragment.java @@ -172,7 +172,7 @@ public class WithdrawFragment extends BaseFragment implements View.OnClickListen } }); } - } else if (response.getCode() == 203) { + } else if (response.getCode() == 230) { FlushTokenUtil.flushToken(getActivity()); } else { Toast.makeText(getContext(), response.getMessage(), Toast.LENGTH_SHORT).show(); @@ -276,7 +276,7 @@ public class WithdrawFragment extends BaseFragment implements View.OnClickListen return false; } }); - } else if (response.getCode() == 203) { + } else if (response.getCode() == 230) { FlushTokenUtil.flushToken(getActivity()); } else { withdrawBuilder.append("提现了失败 ,"); diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/WithdrawalRecordFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/WithdrawalRecordFragment.java index 65ba934..23f62bb 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/WithdrawalRecordFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/WithdrawalRecordFragment.java @@ -104,7 +104,7 @@ public class WithdrawalRecordFragment extends BaseFragment implements View.OnCli if (withdrawalBean.getCode() == 200) { withdrawalAdapter.setDataBeans(withdrawalBean.getBody().getList()); withPage++; - } else if (withdrawalBean.getCode() == 203) { + } else if (withdrawalBean.getCode() == 230) { FlushTokenUtil.flushToken(getActivity()); } else { Toast.makeText(getActivity(), withdrawalBean.getMessage() + "", Toast.LENGTH_SHORT).show(); 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 5176303..7633aee 100644 --- a/app/src/main/java/com/navinfo/outdoor/http/HttpInterface.java +++ b/app/src/main/java/com/navinfo/outdoor/http/HttpInterface.java @@ -1,8 +1,8 @@ package com.navinfo.outdoor.http; 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/";//发现 public static final String USER_LOGIN_PATH ="/userlogin/";//登录 diff --git a/app/src/main/java/com/navinfo/outdoor/room/PoiDatabase.java b/app/src/main/java/com/navinfo/outdoor/room/PoiDatabase.java index 1bf7da8..01380b7 100644 --- a/app/src/main/java/com/navinfo/outdoor/room/PoiDatabase.java +++ b/app/src/main/java/com/navinfo/outdoor/room/PoiDatabase.java @@ -36,12 +36,18 @@ public abstract class PoiDatabase extends RoomDatabase { } return instance; } + public static void destroy(){ + instance=null; + } private static PoiDatabase create(final Context context) { - File dbFolder = new File(Constant.POI_DAO+""); // 数据库文件夹路径 + if (Constant.POI_DAO==null){ + return null; + } + File dbFolder = new File(Constant.POI_DAO); // 数据库文件夹路径 if (!dbFolder.exists()) { SdkFolderCreate.mkdirs(dbFolder.getAbsolutePath()); } - return Room.databaseBuilder(context, PoiDatabase.class, Constant.POI_DAO+DB_NAME) + return Room.databaseBuilder(context, PoiDatabase.class, Constant.POI_DAO+"/"+DB_NAME) .addMigrations(migration_1_2) //.fallbackToDestructiveMigration()//数据库更新时删除数据重新创建 改动特别大的时候在用 .build(); diff --git a/app/src/main/java/com/navinfo/outdoor/util/AWMp4ParserHelper.java b/app/src/main/java/com/navinfo/outdoor/util/AWMp4ParserHelper.java index 3e3ea12..3bf75b9 100644 --- a/app/src/main/java/com/navinfo/outdoor/util/AWMp4ParserHelper.java +++ b/app/src/main/java/com/navinfo/outdoor/util/AWMp4ParserHelper.java @@ -196,11 +196,11 @@ public class AWMp4ParserHelper { * */ public File obtainMp4FilePath(String uuid, Object tag) { if (tag == null) { - return new File(Constant.PICTURE_FOLDER+"/"+uuid+"-0.mp4"); + return new File(Constant.PICTURE_FOLDER,uuid+"-0.mp4"); } List fileList = (List) tag; if (fileList == null || fileList.isEmpty()) { - return new File(Constant.PICTURE_FOLDER+"/"+uuid+"-0.mp4"); + return new File(Constant.PICTURE_FOLDER,uuid+"-0.mp4"); } int maxIndex = 0; for (int i = 0; i < fileList.size(); i++) { @@ -215,7 +215,7 @@ public class AWMp4ParserHelper { } } } - return new File(Constant.PICTURE_FOLDER+"/"+uuid+"-"+(maxIndex+1)+".mp4"); + return new File(Constant.PICTURE_FOLDER,uuid+"-"+(maxIndex+1)+".mp4"); } /** diff --git a/app/src/main/java/com/navinfo/outdoor/util/FlushTokenUtil.java b/app/src/main/java/com/navinfo/outdoor/util/FlushTokenUtil.java index 92cbb43..7e500aa 100644 --- a/app/src/main/java/com/navinfo/outdoor/util/FlushTokenUtil.java +++ b/app/src/main/java/com/navinfo/outdoor/util/FlushTokenUtil.java @@ -75,19 +75,22 @@ public class FlushTokenUtil { if (body.getUserId() != null && !body.getUserId().equals("")) { Constant.initRootFolder(body.getUserId()); HttpInterface.initHttpInter(body.getUserId()); + navInfoEditor.putString("access_token", body.getAccess_token()); + Constant.ACCESS_TOKEN = body.getAccess_token(); + navInfoEditor.putString("refresh_token", body.getRefresh_token()); + Constant.REFRESH_TOKEN = body.getRefresh_token(); + navInfoEditor.putString("user_id", body.getUserId()); + Constant.USHERED = body.getUserId(); + navInfoEditor.apply(); + if (HttpInterface.USER_DETAIL_BY_USER_ID == null) { + Toast.makeText(activity, "token :更新成功", Toast.LENGTH_SHORT).show(); + } else { + initGetUserInfo(activity);//获取用户信息 + } + }else { + Toast.makeText(activity, "获取用户id 失败", Toast.LENGTH_SHORT).show(); } - navInfoEditor.putString("access_token", body.getAccess_token()); - Constant.ACCESS_TOKEN = body.getAccess_token(); - navInfoEditor.putString("refresh_token", body.getRefresh_token()); - Constant.REFRESH_TOKEN = body.getRefresh_token(); - navInfoEditor.putString("user_id", body.getUserId()); - Constant.USHERED = body.getUserId(); - navInfoEditor.apply(); - if (HttpInterface.USER_DETAIL_BY_USER_ID == null) { - Toast.makeText(activity, "token :更新成功", Toast.LENGTH_SHORT).show(); - } else { - initGetUserInfo(activity);//获取用户信息 - } + } else { Toast.makeText(activity, response.getMessage(), Toast.LENGTH_SHORT).show(); } diff --git a/app/src/main/java/com/navinfo/outdoor/util/PhotoPathUtil.java b/app/src/main/java/com/navinfo/outdoor/util/PhotoPathUtil.java index 8f309f8..6c4e94a 100644 --- a/app/src/main/java/com/navinfo/outdoor/util/PhotoPathUtil.java +++ b/app/src/main/java/com/navinfo/outdoor/util/PhotoPathUtil.java @@ -53,7 +53,7 @@ public class PhotoPathUtil { if (angle==0){ angle=90; } - File file = new File(Constant.PICTURE_FOLDER+d+time+"_p"+chord+"_a"+angle+".jpg"); + File file = new File(Constant.PICTURE_FOLDER,d+time+"_p"+chord+"_a"+angle+".jpg"); /*打开文件输出流*/ fileOutputStream = new FileOutputStream(file); // 生成图片文件 diff --git a/app/src/main/java/com/navinfo/outdoor/util/PreserveUtils.java b/app/src/main/java/com/navinfo/outdoor/util/PreserveUtils.java index a232cb5..0a328a8 100644 --- a/app/src/main/java/com/navinfo/outdoor/util/PreserveUtils.java +++ b/app/src/main/java/com/navinfo/outdoor/util/PreserveUtils.java @@ -81,7 +81,7 @@ public class PreserveUtils { obtain1.obj = "道路:" + poiEntity.getName() + " 保存失败"; EventBus.getDefault().post(obtain1); } - } else if (response.getCode() == 203) { + } else if (response.getCode() == 230) { FlushTokenUtil.flushToken(mContext); } else { Message obtain1 = Message.obtain(); @@ -141,7 +141,7 @@ public class PreserveUtils { obtain1.obj = "Poi:" + poiEntity.getName() + " 保存失败"; EventBus.getDefault().post(obtain1); } - } else if (response.getCode() == 203) { + } else if (response.getCode() == 230) { FlushTokenUtil.flushToken(mContext); } else { Message obtain1 = Message.obtain(); @@ -203,7 +203,7 @@ public class PreserveUtils { obtain1.obj = "Poi录像:" + poiEntity.getName() + " 保存失败"; EventBus.getDefault().post(obtain1); } - } else if (response.getCode() == 203) { + } else if (response.getCode() == 230) { FlushTokenUtil.flushToken(mContext); } else { Message obtain1 = Message.obtain(); @@ -264,7 +264,7 @@ public class PreserveUtils { obtain1.obj = "其他:" + poiEntity.getName() + " 保存失败"; EventBus.getDefault().post(obtain1); } - } else if (response.getCode() == 203) { + } else if (response.getCode() == 230) { FlushTokenUtil.flushToken(mContext); } else { Message obtain1 = Message.obtain(); @@ -326,7 +326,7 @@ public class PreserveUtils { obtain1.obj = "充电站:" + poiEntity.getName() + " 保存失败"; EventBus.getDefault().post(obtain1); } - } else if (chargingStationBean.getCode() == 203) { + } else if (chargingStationBean.getCode() == 230) { FlushTokenUtil.flushToken(mContext); } else { Message obtain1 = Message.obtain(); diff --git a/app/src/main/java/com/navinfo/outdoor/util/TimestampUtil.java b/app/src/main/java/com/navinfo/outdoor/util/TimestampUtil.java index 4332ba8..07e19b6 100644 --- a/app/src/main/java/com/navinfo/outdoor/util/TimestampUtil.java +++ b/app/src/main/java/com/navinfo/outdoor/util/TimestampUtil.java @@ -1,7 +1,9 @@ package com.navinfo.outdoor.util; +import java.text.DateFormat; import java.text.ParseException; import java.text.SimpleDateFormat; +import java.util.Calendar; import java.util.Date; public class TimestampUtil { @@ -28,4 +30,11 @@ public class TimestampUtil { res = simpleDateFormat.format(date); return res; } + + public static String time(){ + DateFormat formatter = new SimpleDateFormat("yyyyMMdd HHmmss"); + Calendar calendars = Calendar.getInstance(); + calendars.setTimeInMillis(System.currentTimeMillis()); + return formatter.format(calendars.getTime()); + } } diff --git a/app/src/main/java/com/navinfo/outdoor/util/UploadUtils.java b/app/src/main/java/com/navinfo/outdoor/util/UploadUtils.java index 179811d..6926f42 100644 --- a/app/src/main/java/com/navinfo/outdoor/util/UploadUtils.java +++ b/app/src/main/java/com/navinfo/outdoor/util/UploadUtils.java @@ -71,7 +71,7 @@ public class UploadUtils { }); } }).start(); - }else if (response.getCode()==203){ + }else if (response.getCode()==230){ FlushTokenUtil.flushToken(mContext); } else { Message obtain1 = Message.obtain(); @@ -128,7 +128,7 @@ public class UploadUtils { }); } }).start(); - }else if (response.getCode()==203){ + }else if (response.getCode()==230){ FlushTokenUtil.flushToken(mContext); } else { Message obtain1 = Message.obtain(); @@ -191,7 +191,7 @@ public class UploadUtils { }); } }).start(); - }else if (response.getCode()==203){ + }else if (response.getCode()==230){ FlushTokenUtil.flushToken(mContext); } else { Message obtain1 = Message.obtain(); @@ -248,7 +248,7 @@ public class UploadUtils { }); } }).start(); - }else if (response.getCode()==203){ + }else if (response.getCode()==230){ FlushTokenUtil.flushToken(mContext); } else { Message obtain1 = Message.obtain(); @@ -306,7 +306,7 @@ public class UploadUtils { }); } }).start(); - }else if (response.getCode()==203){ + }else if (response.getCode()==230){ FlushTokenUtil.flushToken(mContext); } else { Message obtain1 = Message.obtain();