diff --git a/app/build.gradle b/app/build.gradle index a59e543..6e2fa3a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -72,8 +72,8 @@ dependencies { api 'com.umeng.umsdk:asms:1.4.1' //友盟Push依赖 api 'com.umeng.umsdk:push:6.4.7' - //状态栏侵染 + //状态栏侵染 // 基础依赖包，必须要依赖 implementation 'com.gyf.immersionbar:immersionbar:3.0.0' implementation 'com.gyf.immersionbar:immersionbar-components:3.0.0' @@ -99,8 +99,9 @@ dependencies { //省市区 https://github.com/Bigkoo/Android-PickerView compile 'com.contrarywind:Android-PickerView:4.1.6' implementation 'com.contrarywind:Android-PickerView:4.1.8' -/* //加载html - implementation 'com.github.sendtion:XRichText:1.9.4'*/ + /*加载html + implementation 'com.github.sendtion:XRichText:1.9.4' + */ //加载图片的依赖包 implementation 'com.github.bumptech.glide:glide:4.8.0' //弹窗 https://github.com/kongzue/DialogV3 @@ -113,7 +114,7 @@ dependencies { //抽屉控件 https://github.com/umano/AndroidSlidingUpPanel implementation 'com.sothree.slidinguppanel:library:3.4.0' -//腾讯地图 + //腾讯地图 // 地图库 implementation 'com.tencent.map:tencent-map-vector-sdk:4.4.2' // 地图组件库，包括小车平移、点聚合等组件功能，详见开发指南。 diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 8164dec..bd7352f 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -79,7 +79,6 @@ - @@ -88,6 +87,11 @@ + + >() { + okGoBuilder.getRequest(new Callback() { @Override - public void onSuccess(BaseBean response, int id) { + public void onSuccess(UserBean response, int id) { dismissLoadingDialog(); if (response.getCode() == 200) { startActivity(new Intent(GuidanceActivity.this, HomeActivity.class)); GuidanceActivity.this.finish(); - Toast.makeText(GuidanceActivity.this, "可以在发现版块的任务说明中，进行再次学习哦", Toast.LENGTH_LONG).show(); + ToastUtils.Message(GuidanceActivity.this,"可以在发现版块的任务说明中，进行再次学习哦"); } else if (response.getCode() == 230) { FlushTokenUtil.flushToken(GuidanceActivity.this); } else { - Toast.makeText(GuidanceActivity.this, response.getMessage(), Toast.LENGTH_SHORT).show(); + ToastUtils.Message(GuidanceActivity.this,response.getMessage()); } } @@ -307,10 +294,10 @@ public class GuidanceActivity extends BaseActivity { dismissLoadingDialog(); String message = e.getMessage(); assert message != null; - if (message.contains("timeout")|| message.contains("Read time out")){ - Toast.makeText(GuidanceActivity.this, "请求超时", Toast.LENGTH_SHORT).show(); + if (message.equals("timeout")|| message.equals("Read time out")){ + ToastUtils.Message(GuidanceActivity.this,"请求超时"); }else { - Toast.makeText(GuidanceActivity.this, message, Toast.LENGTH_SHORT).show(); + ToastUtils.Message(GuidanceActivity.this,message); } } 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 1e4e651..1f4a970 100644 --- a/app/src/main/java/com/navinfo/outdoor/activity/HomeActivity.java +++ b/app/src/main/java/com/navinfo/outdoor/activity/HomeActivity.java @@ -1,5 +1,6 @@ package com.navinfo.outdoor.activity; +import com.google.gson.Gson; import com.kongzue.dialog.interfaces.OnDialogButtonClickListener; import com.kongzue.dialog.util.BaseDialog; import com.kongzue.dialog.util.DialogSettings; @@ -7,10 +8,12 @@ import com.kongzue.dialog.v3.MessageDialog; import com.navinfo.outdoor.api.Constant; import com.navinfo.outdoor.api.UserApplication; import com.navinfo.outdoor.base.BaseActivity; +import com.navinfo.outdoor.bean.NotificationBean; 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.http.HttpInterface; import com.navinfo.outdoor.room.PoiDatabase; import com.navinfo.outdoor.util.BackHandlerHelper; import com.navinfo.outdoor.util.NoSlideViewPager; @@ -42,6 +45,7 @@ import org.greenrobot.eventbus.Subscribe; import org.jetbrains.annotations.NotNull; import java.util.ArrayList; +import java.util.HashMap; import java.util.Objects; /** @@ -70,9 +74,9 @@ public class HomeActivity extends BaseActivity { @Override protected void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); - if (Constant.USHERED!=null){ + if (Constant.USHERED != null) { Constant.initRootFolder(Constant.USHERED); - }else { + } else { finish(); } } @@ -88,33 +92,48 @@ public class HomeActivity extends BaseActivity { @Override protected void onResume() { super.onResume(); + initUM(); + } + + private void initUM() { //自定义点击通知时的打开动作 UmengNotificationClickHandler notificationClickHandler = new UmengNotificationClickHandler() { @Override public void dealWithCustomAction(Context context, UMessage msg) { super.dealWithCustomAction(context, msg); - Log.i("TAG", "dealWithCustomAction: " + msg.getRaw().toString()); + Log.i("TAGEE", "dealWithCustomAction: " + msg.getRaw().toString()); } @Override public void openActivity(Context context, UMessage msg) { super.openActivity(context, msg); - Log.i("TAG", "click openActivity: " + msg.getRaw().toString()); + Log.i("TAGEE", "click openActivity: " + msg.getRaw().toString()); } @Override public void launchApp(Context context, UMessage msg) { super.launchApp(context, msg); Log.i("TAGEE", "click launchApp: " + msg.getRaw().toString()); - Intent messageIntent = new Intent(HomeActivity.this, FragmentManagement.class); - messageIntent.putExtra("tag", 35); - startActivity(messageIntent); + NotificationBean notificationBean = new Gson().fromJson(msg.getRaw().toString(), NotificationBean.class); + NotificationBean.ExtraBean extra = notificationBean.getExtra(); + if (extra!=null){ + HashMap paramMap = new HashMap<>(); + paramMap.put("id", extra.getId()+ ""); + Intent intent = new Intent(HomeActivity.this, WebActivity.class); + intent.putExtra("map", paramMap); + intent.putExtra("url", HttpInterface.MSG_CONTENT); + startActivity(intent); + }else { + Intent messageIntent = new Intent(HomeActivity.this, FragmentManagement.class); + messageIntent.putExtra("tag", 35); + startActivity(messageIntent); + } } @Override public void dismissNotification(Context context, UMessage msg) { super.dismissNotification(context, msg); - Log.i("TAG", "click dismissNotification: " + msg.getRaw().toString()); + Log.i("TAGEE", "click dismissNotification: " + msg.getRaw().toString()); } }; UserApplication.instance.setNotificationClickHandler(notificationClickHandler); @@ -140,6 +159,7 @@ public class HomeActivity extends BaseActivity { public Fragment getItem(int i) { return fragments.get(i); } + @Override public int getCount() { return fragments.size(); @@ -162,7 +182,6 @@ public class HomeActivity extends BaseActivity { obtain.what = Constant.JOB_WORD_MONITOR; obtain.obj = true; EventBus.getDefault().post(obtain); - } else if (tab.getPosition() == 1) { Message obtain = Message.obtain(); obtain.what = Constant.STAY_SUBMIT_ITEM; @@ -173,7 +192,6 @@ public class HomeActivity extends BaseActivity { obtain1.what = Constant.HAS_SUBMIT_ITEM; obtain1.obj = true; EventBus.getDefault().post(obtain1); - } else if (tab.getPosition() == 3) { Message obtain = Message.obtain(); obtain.what = Constant.HOME_MINE; @@ -181,14 +199,14 @@ public class HomeActivity extends BaseActivity { EventBus.getDefault().post(obtain); } } + //点击table layout效果 @Override public void onTabUnselected(TabLayout.Tab tab) { - } + @Override public void onTabReselected(TabLayout.Tab tab) { - } }); } 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 200f222..e69b329 100644 --- a/app/src/main/java/com/navinfo/outdoor/activity/LoginActivity.java +++ b/app/src/main/java/com/navinfo/outdoor/activity/LoginActivity.java @@ -35,6 +35,8 @@ import com.navinfo.outdoor.http.UploadCallBack; import com.navinfo.outdoor.util.Base64; import com.navinfo.outdoor.util.Md5Util; import com.navinfo.outdoor.util.TimestampUtil; +import com.navinfo.outdoor.util.ToastUtil; +import com.navinfo.outdoor.util.ToastUtils; import com.umeng.umcrash.UMCrash; import org.greenrobot.eventbus.EventBus; @@ -167,16 +169,16 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener handler.sendMessageDelayed(message, 500); String name = etLoginName.getText().toString().trim(); if (name.equals("")) { - Toast.makeText(this, "请输入账号", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(LoginActivity.this,"请输入账号"); return; } String paw = etLoginPaw.getText().toString().trim(); if (paw.equals("")) { - Toast.makeText(this, "请输入密码", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(LoginActivity.this,"请输入密码"); return; } if (!cbStatement.isChecked()) { - Toast.makeText(this, "请先同意用户协议", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(LoginActivity.this,"请先同意用户协议"); return; } else { initLogIn(name, paw); @@ -229,10 +231,10 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener loginBuilder.append(TimestampUtil.time()).append(",").append("登录获取token ,"); initGetUserInfo();//获取用户信息 }else { - Toast.makeText(LoginActivity.this, "获取id 失败", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(LoginActivity.this,"获取id 失败"); } } else { - Toast.makeText(LoginActivity.this, response.getMessage(), Toast.LENGTH_SHORT).show(); + ToastUtils.Message(LoginActivity.this,response.getMessage()); } } @@ -245,9 +247,9 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener String message = e.getMessage(); assert message != null; if (message.contains("timeout")|| message.contains("Read time out")) { - Toast.makeText(LoginActivity.this, "请求超时", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(LoginActivity.this,"请求超时"); } else { - Toast.makeText(LoginActivity.this, message, Toast.LENGTH_SHORT).show(); + ToastUtils.Message(LoginActivity.this,message); } } }); @@ -312,14 +314,14 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener startActivity(intent); } else { loginBuilder.append(TimestampUtil.time()).append(",").append("登录成功 ,"); - Toast.makeText(LoginActivity.this, "登录成功", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(LoginActivity.this,"登录成功"); Intent intent = new Intent(LoginActivity.this, HomeActivity.class); startActivity(intent); finish(); } } } else { - Toast.makeText(LoginActivity.this, response.getMessage() + "", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(LoginActivity.this,response.getMessage()+""); } } @@ -328,10 +330,10 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener dismissLoadingDialog(); String message = e.getMessage(); assert message != null; - if (message.contains("timeout")|| message.contains("Read time out")) { - Toast.makeText(LoginActivity.this, "请求超时", Toast.LENGTH_SHORT).show(); + if (message.equals("timeout")|| message.equals("Read time out")) { + ToastUtils.Message(LoginActivity.this,"请求超时"); } else { - Toast.makeText(LoginActivity.this, message, Toast.LENGTH_SHORT).show(); + ToastUtils.Message(LoginActivity.this,message); } } }); @@ -340,7 +342,6 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener @Override public void onConfigurationChanged(@NonNull Configuration newConfig) { super.onConfigurationChanged(newConfig); - } @Override 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 d9a319b..c1cc858 100644 --- a/app/src/main/java/com/navinfo/outdoor/activity/MainActivity.java +++ b/app/src/main/java/com/navinfo/outdoor/activity/MainActivity.java @@ -42,6 +42,8 @@ import com.navinfo.outdoor.http.UploadCallBack; import com.navinfo.outdoor.util.APKVersionCodeUtils; import com.navinfo.outdoor.util.Base64; import com.navinfo.outdoor.util.Md5Util; +import com.navinfo.outdoor.util.ToastUtil; +import com.navinfo.outdoor.util.ToastUtils; import java.io.File; @@ -60,7 +62,7 @@ public class MainActivity extends BaseActivity { @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 0) { - Toast.makeText(MainActivity.this, "下载完成", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(MainActivity.this, "下载完成"); //将下载进度对话框取消 pBar.cancel(); //调用系统安装程序 @@ -190,9 +192,9 @@ public class MainActivity extends BaseActivity { String message = e.getMessage(); assert message != null; if (message.equals("timeout") || message.equals("Read time out")) { - Toast.makeText(MainActivity.this, "请求超时", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(MainActivity.this,"请求超时"); } else { - Toast.makeText(MainActivity.this, message, Toast.LENGTH_SHORT).show(); + ToastUtils.Message(MainActivity.this,message); } initTime(); } @@ -214,7 +216,7 @@ public class MainActivity extends BaseActivity { if (Environment.getExternalStorageState().equals(Environment.MEDIA_MOUNTED)) { downFile(bodyBean.getApkUrl());//点击确定将apk下载 } else { - Toast.makeText(MainActivity.this, "SD卡不可用，请插入SD卡", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(MainActivity.this, "SD卡不可用，请插入SD卡"); } } }); @@ -233,7 +235,7 @@ public class MainActivity extends BaseActivity { Environment.MEDIA_MOUNTED)) { downFile(bodyBean.getApkUrl());//点击确定将apk下载 } else { - Toast.makeText(MainActivity.this, "SD卡不可用，请插入SD卡", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(MainActivity.this,"SD卡不可用，请插入SD卡"); } } }); @@ -337,10 +339,10 @@ public class MainActivity extends BaseActivity { dismissLoadingDialog(); String message = e.getMessage(); assert message != null; - if (message.contains("timeout")|| message.contains("Read time out")) { - Toast.makeText(MainActivity.this, "请求超时", Toast.LENGTH_SHORT).show(); + if (message.equals("timeout")|| message.equals("Read time out")) { + ToastUtils.Message(MainActivity.this,"请求超时"); } else { - Toast.makeText(MainActivity.this, message, Toast.LENGTH_SHORT).show(); + ToastUtils.Message(MainActivity.this,message); } } }); @@ -378,7 +380,7 @@ public class MainActivity extends BaseActivity { navInfoEditor.commit(); initGetUserInfo();//获取用户信息 } else { - Toast.makeText(MainActivity.this, "获取用户id失败，请重试", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(MainActivity.this,"获取用户id失败，请重试"); } } else { Intent intent = new Intent(MainActivity.this, LoginActivity.class); @@ -388,19 +390,17 @@ public class MainActivity extends BaseActivity { } @Override - public void uploadProgress(Progress progress) { - - } + public void uploadProgress(Progress progress) { } @Override public void onError(Throwable e, int id) { dismissLoadingDialog(); String message = e.getMessage(); assert message != null; - if (message.contains("timeout")|| message.contains("Read time out")) { - Toast.makeText(MainActivity.this, "请求超时", Toast.LENGTH_SHORT).show(); + if (message.equals("timeout")|| message.equals("Read time out")) { + ToastUtils.Message(MainActivity.this,"请求超时"); } else { - Toast.makeText(MainActivity.this, message, Toast.LENGTH_SHORT).show(); + ToastUtils.Message(MainActivity.this,message); } } }); 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 a70ccfd..07ac0b0 100644 --- a/app/src/main/java/com/navinfo/outdoor/activity/PhotographActivity.java +++ b/app/src/main/java/com/navinfo/outdoor/activity/PhotographActivity.java @@ -28,6 +28,7 @@ import com.navinfo.outdoor.api.Constant; import com.navinfo.outdoor.base.BaseActivity; import com.navinfo.outdoor.util.SystemTTS; import com.navinfo.outdoor.util.TimestampUtil; +import com.navinfo.outdoor.util.ToastUtils; import com.otaliastudios.cameraview.CameraListener; import com.otaliastudios.cameraview.CameraLogger; import com.otaliastudios.cameraview.CameraView; @@ -154,12 +155,7 @@ public class PhotographActivity extends BaseActivity implements View.OnClickList } }).start(); } else { - runOnUiThread(new Runnable() { - @Override - public void run() { - Toast.makeText(PhotographActivity.this, "源文件不存在", Toast.LENGTH_SHORT).show(); - } - }); + ToastUtils.Message(PhotographActivity.this, "源文件不存在"); } /* CompressImageTask.get().compressImage(ImageConfig.getDefaultConfig(file.getAbsolutePath(), file.getAbsolutePath()), new AsyncImageTask.OnImageResult(){ @Override @@ -176,7 +172,6 @@ public class PhotographActivity extends BaseActivity implements View.OnClickList });*/ } }); - } }); } diff --git a/app/src/main/java/com/navinfo/outdoor/activity/PictureActivity.java b/app/src/main/java/com/navinfo/outdoor/activity/PictureActivity.java index aece23b..33a5d89 100644 --- a/app/src/main/java/com/navinfo/outdoor/activity/PictureActivity.java +++ b/app/src/main/java/com/navinfo/outdoor/activity/PictureActivity.java @@ -1,7 +1,8 @@ - package com.navinfo.outdoor.activity; +package com.navinfo.outdoor.activity; import androidx.annotation.NonNull; import androidx.annotation.Nullable; + import android.annotation.SuppressLint; import android.content.Intent; import android.content.pm.ActivityInfo; @@ -23,6 +24,7 @@ import android.widget.FrameLayout; import android.widget.ImageView; import android.widget.TextView; import android.widget.Toast; + import com.github.lazylibrary.util.FileUtils; import com.navinfo.outdoor.R; import com.navinfo.outdoor.api.Constant; @@ -32,6 +34,7 @@ import com.navinfo.outdoor.util.AWMp4ParserHelper; import com.navinfo.outdoor.util.Geohash; import com.navinfo.outdoor.util.GeometryTools; import com.navinfo.outdoor.util.MyTecentLocationSource; +import com.navinfo.outdoor.util.ToastUtils; import com.otaliastudios.cameraview.CameraException; import com.otaliastudios.cameraview.CameraListener; import com.otaliastudios.cameraview.CameraLogger; @@ -59,10 +62,12 @@ import com.tencent.tencentmap.mapsdk.maps.model.MyLocationStyle; import com.tencent.tencentmap.mapsdk.maps.model.Polyline; import com.tencent.tencentmap.mapsdk.maps.model.PolylineOptions; import com.vividsolutions.jts.geom.Geometry; + import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; import org.greenrobot.eventbus.ThreadMode; import org.jetbrains.annotations.NotNull; + import java.io.File; import java.io.FileDescriptor; import java.io.FileOutputStream; @@ -77,6 +82,7 @@ import java.util.List; import java.util.Objects; import java.util.Timer; import java.util.TimerTask; + import static com.tencent.tencentmap.mapsdk.maps.model.MyLocationStyle.LOCATION_TYPE_LOCATION_ROTATE; import static com.tencent.tencentmap.mapsdk.maps.model.MyLocationStyle.LOCATION_TYPE_LOCATION_ROTATE_NO_CENTER; @@ -125,7 +131,7 @@ public class PictureActivity extends BaseActivity implements View.OnClickListene @Override protected int getLayout() { EventBus.getDefault().register(this); -// tmpFile = new File(Constant.PICTURE_FOLDER, "temp.mp4"); + //tmpFile = new File(Constant.PICTURE_FOLDER, "temp.mp4"); formatter = new SimpleDateFormat("yyyyMMdd HHmmss"); return R.layout.activity_picture; } @@ -139,15 +145,15 @@ public class PictureActivity extends BaseActivity implements View.OnClickListene oration = getIntent().getIntExtra(Constant.INTENT_VIDEO_OBLATION, -1); } videoChronometer = findViewById(R.id.video_chronometer); -// if (finalVideoPath == null) { -// finalVideoPath = Constant.PICTURE_FOLDER+"/final.mp4"; -// } + /* if (finalVideoPath == null) { + finalVideoPath = Constant.PICTURE_FOLDER+"/final.mp4"; + }*/ this.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE); ivZoomAdd = findViewById(R.id.iv_zoom_add); ivZoomAdd.setOnClickListener(this); ivZoomDel = findViewById(R.id.iv_zoom_del); ivZoomDel.setOnClickListener(this); -/* cbMapType = findViewById(R.id.cb_map_type); + /*cbMapType = findViewById(R.id.cb_map_type); cbMapType.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { @Override public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { @@ -158,11 +164,11 @@ public class PictureActivity extends BaseActivity implements View.OnClickListene ivLocation.setOnClickListener(this); layerChange = findViewById(R.id.layer_change); timer = new Timer(); - ivMap = (TextureMapView) findViewById(R.id.iv_map); - btnSwitch = (Button) findViewById(R.id.btn_switch); + ivMap = findViewById(R.id.iv_map); + btnSwitch = findViewById(R.id.btn_switch); btnSwitch.setOnClickListener(this); -// capturePicture = (ImageButton) findViewById(R.id.capturePicture); -// capturePicture.setOnClickListener(this::onClick); + /*capturePicture = (ImageButton) findViewById(R.id.capturePicture); + capturePicture.setOnClickListener(this::onClick);*/ ivPic = findViewById(R.id.iv_pic); //相机记录器 CameraLogger.setLogLevel(CameraLogger.LEVEL_VERBOSE); @@ -176,21 +182,20 @@ public class PictureActivity extends BaseActivity implements View.OnClickListene if (oration == 0) { // oblation为0时，拍摄视频必须为横屏 // 如果当前手机是竖向，则不允许拍摄 if (Objects.requireNonNull(camera.getVideoSize()).getWidth() < camera.getVideoSize().getHeight()) { - Toast.makeText(PictureActivity.this, "不允许竖向拍摄...", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(PictureActivity.this, "不允许竖向拍摄..."); return; } } captureVideo.setText("暂停采集"); -// stopVideo.setEnabled(false);// 开始采集视频后，禁用停止采集的按钮，必须暂停采集后才可点击停止采集 + //stopVideo.setEnabled(false);// 开始采集视频后，禁用停止采集的按钮，必须暂停采集后才可点击停止采集 startTakenVideo(); // 开始采集视频 } else { stopTakenVideo(); captureVideo.setText("开始采集"); -// stopVideoAndFinish(); + //stopVideoAndFinish(); } } }); - Button stopVideo = findViewById(R.id.btn_stop_video); stopVideo.setOnClickListener(this); /* @@ -221,7 +226,7 @@ public class PictureActivity extends BaseActivity implements View.OnClickListene // } // }); removables = new ArrayList<>();//存储轨迹的marker - if (poiEntity!=null){ + if (poiEntity != null) { if (poiEntity.getId() != null) { List fileListByUUID = AWMp4ParserHelper.getInstance().getFileListByUUID(poiEntity.getId()); if (fileListByUUID != null) { @@ -266,7 +271,7 @@ public class PictureActivity extends BaseActivity implements View.OnClickListene @Override public void onFileReady(@Nullable @org.jetbrains.annotations.Nullable File file) { assert file != null; - Toast.makeText(PictureActivity.this, "保存成功:" + pageNum++, Toast.LENGTH_SHORT).show(); + ToastUtils.Message(PictureActivity.this, "保存成功:" + pageNum++); } }); if (camera.isTakingVideo()) { @@ -287,11 +292,13 @@ public class PictureActivity extends BaseActivity implements View.OnClickListene PictureActivity.this.finish(); return; } + + if (captureVideo.isChecked() && !isFinishActivity) { startTakenVideo(); return; } - Toast.makeText(PictureActivity.this, "暂停摄像", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(PictureActivity.this, "暂停摄像"); /* new Thread(new Runnable() { @Override public void run() { @@ -332,10 +339,11 @@ public class PictureActivity extends BaseActivity implements View.OnClickListene } }).start();*/ } + @Override public void onCameraError(@NonNull @NotNull CameraException exception) { super.onCameraError(exception); - Toast.makeText(PictureActivity.this, exception.toString(), Toast.LENGTH_SHORT).show(); + ToastUtils.Message(PictureActivity.this, exception.toString()); } @Override @@ -344,16 +352,16 @@ public class PictureActivity extends BaseActivity implements View.OnClickListene /* * 获取当前视频的时间，记录csv文件时使用 * */ -// long currentTime = AWMp4ParserHelper.getInstance().getVedasTotalTime(new File(finalVideoPath)); + // long currentTime = AWMp4ParserHelper.getInstance().getVedasTotalTime(new File(finalVideoPath)); timerTask = new CsvTimerTask(new File(finalVideoPath + ".txt")); timer.schedule(timerTask, 0, period * 1000); -// // 开始采集，每隔2秒实时记录位置信息、视频时间以及设备时间 -// if (currentTime == 0) { -// timer.schedule(timerTask, 0, period*1000); -// } else { -// timerTask.setCurrentVideoTime(currentTime/1000+1); -// timer.schedule(timerTask, 1, period*1000); -// } + // 开始采集，每隔2秒实时记录位置信息、视频时间以及设备时间 + /*if (currentTime == 0) { + timer.schedule(timerTask, 0, period*1000); + } else { + timerTask.setCurrentVideoTime(currentTime/1000+1); + timer.schedule(timerTask, 1, period*1000); + }*/ } @Override @@ -361,8 +369,8 @@ public class PictureActivity extends BaseActivity implements View.OnClickListene super.onVideoRecordingEnd(); if (timerTask != null) { timerTask.cancel(); - } // Toast.makeText(PictureActivity.this, "请先拍照", Toast.LENGTH_SHORT).show(); - + } + // Toast.makeText(PictureActivity.this, "请先拍照", Toast.LENGTH_SHORT).show(); // 一段视频拍摄完成自动将当前拍摄路径加1 File finalVideoFile = new File(finalVideoPath); if (finalVideoFile.exists()) { @@ -380,38 +388,39 @@ public class PictureActivity extends BaseActivity implements View.OnClickListene layoutParamsMap.width = dm.heightPixels / 3; ivMap.setLayoutParams(layoutParamsMap); } + private void initLine() { - if (poiEntity!=null){ - String geoWkt = poiEntity.getGeoWkt(); - if (geoWkt != null) { - String geo = Geohash.getInstance().decode(geoWkt); - Geometry geometry = GeometryTools.createGeometry(geo); - if (geometry.getGeometryType().equals("LineString")) {//线 - BitmapDescriptor bitmapLine = null; - if (poiEntity.getType() == 3) {//poi录像 - bitmapLine = BitmapDescriptorFactory.fromResource(R.drawable.poi_video_arrows); - } else if (poiEntity.getType() == 4) {//道路录像 - bitmapLine = BitmapDescriptorFactory.fromResource(R.drawable.road_arrows); + if (poiEntity != null) { + String geoWkt = poiEntity.getGeoWkt(); + if (geoWkt != null) { + String geo = Geohash.getInstance().decode(geoWkt); + Geometry geometry = GeometryTools.createGeometry(geo); + if (geometry.getGeometryType().equals("LineString")) {//线 + BitmapDescriptor bitmapLine = null; + if (poiEntity.getType() == 3) {//poi录像 + bitmapLine = BitmapDescriptorFactory.fromResource(R.drawable.poi_video_arrows); + } else if (poiEntity.getType() == 4) {//道路录像 + bitmapLine = BitmapDescriptorFactory.fromResource(R.drawable.road_arrows); + } + List latLineString = GeometryTools.getLatLags(geo); + // 构造 PolylineOnions + PolylineOptions polylineOptions + = new PolylineOptions().addAll(latLineString) + // 折线设置圆形线头 + .lineCap(true) + // 折线的颜色为绿色 + .color(Color.parseColor("#0096FF")) + // 折线宽度为5像素 + .width(20) + .arrow(true) + .arrowSpacing(150) + .arrowTexture(bitmapLine); + // 绘制折线 + polyline = tencentMap.addPolyline(polylineOptions); + polyline.setZIndex(2); } - List latLineString = GeometryTools.getLatLags(geo); - // 构造 PolylineOnions - PolylineOptions polylineOptions - = new PolylineOptions().addAll(latLineString) - // 折线设置圆形线头 - .lineCap(true) - // 折线的颜色为绿色 - .color(Color.parseColor("#0096FF")) - // 折线宽度为5像素 - .width(20) - .arrow(true) - .arrowSpacing(150) - .arrowTexture(bitmapLine); - // 绘制折线 - polyline = tencentMap.addPolyline(polylineOptions); - polyline.setZIndex(2); } } - } } // 将秒转化成小时分钟秒 @@ -424,7 +433,7 @@ public class PictureActivity extends BaseActivity implements View.OnClickListene private void message(String content) { LOG.i(content); - Toast.makeText(this, content, Toast.LENGTH_SHORT).show(); + ToastUtils.Message(this,content); } @Override @@ -436,22 +445,22 @@ public class PictureActivity extends BaseActivity implements View.OnClickListene @Override public void onClick(View v) { switch (v.getId()) { -// case R.id.capturePicture: -// camera.setMode(Mode.PICTURE); -// if (!camera.isTakingPicture()) { -// captureTime = System.currentTimeMillis(); -// message("Capturing picture...", false); -// camera.takePicture(); -// } -// break; + /*case R.id.capturePicture: + camera.setMode(Mode.PICTURE); + if (!camera.isTakingPicture()) { + captureTime = System.currentTimeMillis(); + message("Capturing picture...", false); + camera.takePicture(); + } + break;*/ case R.id.btn_switch: v.setEnabled(false); handler.sendEmptyMessageDelayed(0, 2000); // 利用handler延迟发送更改状态信息 benSwitch(); break; -// case R.id.capuletVideo: -// startTakenVideo(); // 开始拍摄视频 -// break; + /*case R.id.capuletVideo: + startTakenVideo(); // 开始拍摄视频 + break;*/ case R.id.btn_stop_video: stopVideoAndFinish(); break; @@ -477,6 +486,7 @@ public class PictureActivity extends BaseActivity implements View.OnClickListene } } + @Override public void onSaveInstanceState(@NonNull Bundle outState) { super.onSaveInstanceState(outState); @@ -495,7 +505,7 @@ public class PictureActivity extends BaseActivity implements View.OnClickListene intent.putExtra(Constant.INTENT_VIDEO_PATH, finalVideoPath); setResult(0x101, intent); } else { - Toast.makeText(this, "本段视频没有计时！", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(this,"本段视频没有计时！"); } if (camera.isTakingVideo()) { // showLoadingDialog(); @@ -508,15 +518,15 @@ public class PictureActivity extends BaseActivity implements View.OnClickListene private void startTakenVideo() { if (camera.isTakingVideo()) { - Toast.makeText(this, "已经在拍摄中...", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(this,"已经在拍摄中..."); return; } -// DateFormat formatter = new SimpleDateFormat("yyyyMMddHHmmss"); -// Calendar calendar = Calendar.getInstance(); -// calendar.setTimeInMillis(System.currentTimeMillis()); -// String formatVideoName = formatter.format(calendar.getTime()); -// 文件 -// String path = finalVideoPath.substring(finalVideoPath.length()-20); + /*DateFormat formatter = new SimpleDateFormat("yyyyMMddHHmmss"); + Calendar calendar = Calendar.getInstance(); + calendar.setTimeInMillis(System.currentTimeMillis()); + String formatVideoName = formatter.format(calendar.getTime()); + 文件 + String path = finalVideoPath.substring(finalVideoPath.length()-20);*/ if (finalVideoPath != null) { File file = new File(finalVideoPath); if (file.exists()) { @@ -531,10 +541,8 @@ public class PictureActivity extends BaseActivity implements View.OnClickListene camera.takeVideo(file); } } else { - Toast.makeText(this, "请录像", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(this,"请录像"); } - - } private void stopTakenVideo() { @@ -558,20 +566,21 @@ public class PictureActivity extends BaseActivity implements View.OnClickListene } /** - * 设置定位图标样式 - */ - private void setLocMarkerStyle(int type) { - tencentMap.setLocationSource(new MyTecentLocationSource(this)); - tencentMap.setMyLocationEnabled(true); - MyLocationStyle locationStyle = new MyLocationStyle(); - locationStyle = locationStyle.myLocationType(type); - //创建图标 - BitmapDescriptor bitmapDescriptor = BitmapDescriptorFactory.fromBitmap(getBitMap()); - locationStyle.icon(bitmapDescriptor); - //设置定位圆形区域的边框宽度; - locationStyle.fillColor(getResources().getColor(android.R.color.transparent)); - locationStyle.strokeWidth(1); - tencentMap.setMyLocationStyle(locationStyle); + * 设置定位图标样式 + * @param type type + */ + private void setLocMarkerStyle(int type) { + tencentMap.setLocationSource(new MyTecentLocationSource(this)); + tencentMap.setMyLocationEnabled(true); + MyLocationStyle locationStyle = new MyLocationStyle(); + locationStyle = locationStyle.myLocationType(type); + //创建图标 + BitmapDescriptor bitmapDescriptor = BitmapDescriptorFactory.fromBitmap(getBitMap()); + locationStyle.icon(bitmapDescriptor); + //设置定位圆形区域的边框宽度; + locationStyle.fillColor(getResources().getColor(android.R.color.transparent)); + locationStyle.strokeWidth(1); + tencentMap.setMyLocationStyle(locationStyle); } public void benSwitch() { 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 d391c6b..f52ae15 100644 --- a/app/src/main/java/com/navinfo/outdoor/activity/PicturesActivity.java +++ b/app/src/main/java/com/navinfo/outdoor/activity/PicturesActivity.java @@ -48,6 +48,7 @@ import com.navinfo.outdoor.util.GeometryTools; import com.navinfo.outdoor.util.MyTecentLocationSource; import com.navinfo.outdoor.util.SystemTTS; import com.navinfo.outdoor.util.TimestampUtil; +import com.navinfo.outdoor.util.ToastUtils; import com.otaliastudios.cameraview.CameraListener; import com.otaliastudios.cameraview.CameraLogger; import com.otaliastudios.cameraview.CameraView; @@ -148,7 +149,6 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen } }); - @Override protected int getLayout() { EventBus.getDefault().register(this); @@ -182,7 +182,7 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen systemTTS = SystemTTS.getInstance(PicturesActivity.this); tvMapView = findViewById(R.id.text_map_view); tvMapView.setOnClickListener(this); - ivPicRoadImage = findViewById(R.id.iv_pic); + ivPicRoadImage = findViewById(R.id.iv_pic_road); ivPicVideoImage = findViewById(R.id.iv_pic_video); Button btnSwitch = findViewById(R.id.btn_switch); btnSwitch.setOnClickListener(this); @@ -258,8 +258,8 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen ivLocation.setOnClickListener(this); camera = findViewById(R.id.camera); camera.setOnClickListener(this); - imageView = findViewById(R.id.image_view); tvTitle = findViewById(R.id.tv_title); + imageView = findViewById(R.id.image_view); imageView.setOnClickListener(this); capturePicture = findViewById(R.id.capture_picture); capturePicture.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { @@ -268,7 +268,7 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen if (radioPicture == 0) { capturePicture.setChecked(false); capturePicture.setText("开始采集"); - Toast.makeText(PicturesActivity.this, "请选择模式", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(PicturesActivity.this,"请选择模式"); return; } if (isChecked) { @@ -303,14 +303,14 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen camera.addCameraListener(new CameraListener() { @Override public void onPictureTaken(@NonNull PictureResult result) { - if (result != null && result.getData() != null && result.getData().length > 0) { + if (result.getData()!=null&&result != null && result.getData().length > 0) { super.onPictureTaken(result); isBack = true; // 如果当前手机是竖向，则不 if (isOration) { if (Objects.requireNonNull(camera.getPictureSize()).getWidth() < camera.getPictureSize().getHeight()) { isOration = true; - Toast.makeText(PicturesActivity.this, "不允许竖向拍摄...", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(PicturesActivity.this,"不允许竖向拍摄..."); picturesBuilder.append("camera 用户竖屏拍照 ,"); stopTimer(); capturePicture.setChecked(false); @@ -363,12 +363,13 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen } class Jpg2WebpRunnable implements Runnable { -// private PictureResult pictureResult; + //private PictureResult pictureResult; private File file; - private int count; // 该转换执行次数，如果连续3次执行失败，则不再转换 + private int count; + // 该转换执行次数，如果连续3次执行失败，则不再转换 - public Jpg2WebpRunnable(/*PictureResult pictureResult, */File file, int count) { -// this.pictureResult = pictureResult; + public Jpg2WebpRunnable(/*PictureResult pictureResult,*/ File file, int count) { + //this.pictureResult = pictureResult; this.file = file; this.count = count; } @@ -377,7 +378,7 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen public void run() { if (file.exists() && file != null) { initWeb(file, count); - if (count<=0) { // 不是重新转换webp流程 + if (count <= 0) { // 不是重新转换webp流程 runOnUiThread(new Runnable() { @SuppressLint("SetTextI18n") @Override @@ -410,7 +411,7 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen runOnUiThread(new Runnable() { @Override public void run() { - Toast.makeText(PicturesActivity.this, "源文件不存在", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(PicturesActivity.this,"源文件不存在"); } }); } @@ -429,12 +430,13 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen initMarkerPaper(); } catch (RuntimeException e) { e.printStackTrace(); - // 如果是写入txt记录失败，上传失败记录 - UMCrashManager.reportCrash(this,e); + //如果是写入txt记录失败，上传失败记录 + UMCrashManager.reportCrash(this, e); } catch (Exception e) { e.printStackTrace(); - UMCrashManager.reportCrash(this,e); - if (count<3) { // 当尝试次数小于3次，则加入转换队列，尝试重新转换 + UMCrashManager.reportCrash(this, e); + if (count < 3) { + //当尝试次数小于3次，则加入转换队列，尝试重新转换 UserApplication.fixedThreadPool.execute(new Jpg2WebpRunnable(/*result, */file, count)); } } @@ -931,6 +933,20 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen if (timer == null) { timer = new Timer(); } + if (timerTask == null) { + timerTask = new TimerTask() { + @Override + public void run() { + if (radioPicture == 1) { + camera.takePicture(); + } else { + Message message = new Message(); + message.what = 0x101; + handler.sendMessage(message); + } + } + }; + } if (radioPicture == 1) { timer.schedule(timerTask, 0); } else if (radioPicture == 2) { diff --git a/app/src/main/java/com/navinfo/outdoor/activity/RegardMapActivity.java b/app/src/main/java/com/navinfo/outdoor/activity/RegardMapActivity.java index bbf4eac..0a39b99 100644 --- a/app/src/main/java/com/navinfo/outdoor/activity/RegardMapActivity.java +++ b/app/src/main/java/com/navinfo/outdoor/activity/RegardMapActivity.java @@ -51,4 +51,24 @@ public class RegardMapActivity extends BaseActivity implements View.OnClickLis break; } } + + @Override + protected void onStart() { + super.onStart(); + } + + @Override + protected void onPause() { + super.onPause(); + } + + @Override + protected void onStop() { + super.onStop(); + } + + @Override + protected void onDestroy() { + super.onDestroy(); + } } \ No newline at end of file diff --git a/app/src/main/java/com/navinfo/outdoor/activity/StatementActivity.java b/app/src/main/java/com/navinfo/outdoor/activity/StatementActivity.java index d10c138..e293c6d 100644 --- a/app/src/main/java/com/navinfo/outdoor/activity/StatementActivity.java +++ b/app/src/main/java/com/navinfo/outdoor/activity/StatementActivity.java @@ -8,7 +8,7 @@ import android.widget.TextView; import com.navinfo.outdoor.R; import com.navinfo.outdoor.base.BaseActivity; -public class StatementActivity extends BaseActivity { +public class StatementActivity extends BaseActivity implements View.OnClickListener{ @Override protected int getLayout() { @@ -20,16 +20,18 @@ public class StatementActivity extends BaseActivity { super.initView(); TextView tvTextStatement =findViewById(R.id.tv_textStatement); ImageView ivStatement =findViewById(R.id.iv_statement); - ivStatement.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - StatementActivity.this. finish(); - } - }); + ivStatement.setOnClickListener(this); } @Override protected void initData() { super.initData(); } + + @Override + public void onClick(View v) { + if (v.getId()==R.id.iv_statement){ + StatementActivity.this. finish(); + } + } } \ No newline at end of file diff --git a/app/src/main/java/com/navinfo/outdoor/activity/UMClickActivity.java b/app/src/main/java/com/navinfo/outdoor/activity/UMClickActivity.java new file mode 100644 index 0000000..e7d5d6c --- /dev/null +++ b/app/src/main/java/com/navinfo/outdoor/activity/UMClickActivity.java @@ -0,0 +1,74 @@ +package com.navinfo.outdoor.activity; + +import android.annotation.TargetApi; +import android.app.ActivityManager; +import android.content.ComponentName; +import android.content.Intent; +import android.os.Build; +import android.util.Log; + +import com.google.gson.Gson; +import com.navinfo.outdoor.api.Constant; +import com.navinfo.outdoor.bean.NotificationBean; +import com.navinfo.outdoor.http.HttpInterface; +import com.umeng.message.UmengNotifyClickActivity; + +import org.android.agoo.common.AgooConstants; + +import java.util.HashMap; +import java.util.List; +/* + 集成厂商通道才会调用执行 + */ +public class UMClickActivity extends UmengNotifyClickActivity { + @Override + public void onMessage(Intent intent) { + super.onMessage(intent); + String body = intent.getStringExtra(AgooConstants.MESSAGE_BODY); + Log.i("TAGEE", "onMessage: "+body); + NotificationBean notificationBean = new Gson().fromJson(body, NotificationBean.class); + NotificationBean.ExtraBean extra = notificationBean.getExtra(); + /* + * 判断栈中是否有MainActivity，有则意味着程序已启动，否则没有 + */ + if (isExistMainActivity(MainActivity.class)){ + if (extra!=null){ + HashMap paramMap = new HashMap<>(); + paramMap.put("id", extra.getId()+ ""); + intent = new Intent(this, WebActivity.class); + intent.putExtra("map", paramMap); + intent.putExtra("url", HttpInterface.MSG_CONTENT); + }else { + intent = new Intent(this, FragmentManagement.class); + intent.putExtra("tag", 35); + } + }else { + intent = new Intent(this, MainActivity.class); + intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + Constant.NOTIFICATION=body; + } + startActivity(intent); + finish(); + } + @TargetApi(Build.VERSION_CODES.Q) + private boolean isExistMainActivity(Class activity) { + Intent intent = new Intent(this, activity); + ComponentName cmpName = intent.resolveActivity(getPackageManager()); + boolean flag = false; + if (cmpName != null) { // 说明系统中存在这个activity     + ActivityManager am = (ActivityManager) getSystemService(ACTIVITY_SERVICE); + List taskInfoList = am.getRunningTasks(10); + //这里获取的是APP栈的数量，一般也就两个 + ActivityManager.RunningTaskInfo runningTaskInfo = taskInfoList.get(0); + // 只是拿当前运行的栈 + int numActivities = taskInfoList.get(0).numActivities; + for (ActivityManager.RunningTaskInfo taskInfo : taskInfoList) { + if (taskInfo.baseActivity.equals(cmpName)) {// 说明它已经启动了 + flag = true; + break;//跳出循环，优化效率 + } + } + } + return flag; + } +} 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 c964599..5bc0b3c 100644 --- a/app/src/main/java/com/navinfo/outdoor/activity/UserActivity.java +++ b/app/src/main/java/com/navinfo/outdoor/activity/UserActivity.java @@ -39,6 +39,7 @@ 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 com.navinfo.outdoor.util.ToastUtils; import org.json.JSONArray; @@ -157,13 +158,13 @@ public class UserActivity extends BaseActivity implements View.OnClickListener { case R.id.btn_gathering: userBuilder.append(TimestampUtil.time()).append(",").append("点击了去绑定的返回 ,"); if (Constant.AUDIOTAPES == -1) { - Toast.makeText(this, "请先实名认证", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(UserActivity.this,"请先实名认证"); } else if (Constant.AUDIOTAPES == 1) {//认证通过 Intent gatheringIntent = new Intent(this, FragmentManagement.class); gatheringIntent.putExtra("tag", 24); startActivity(gatheringIntent); } else if (Constant.AUDIOTAPES == 0) { - Toast.makeText(this, Constant.AUDITING + "", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(this,Constant.AUDITING + ""); } break; case R.id.btn_attestations: @@ -188,7 +189,7 @@ public class UserActivity extends BaseActivity implements View.OnClickListener { break; case R.id.btn_weChat_binding: userBuilder.append(TimestampUtil.time()).append(",").append("点击了微信 去提交的按钮 ,"); - Toast.makeText(this, "此功能未开通", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(UserActivity.this,"此功能未开通"); break; } } @@ -208,20 +209,21 @@ public class UserActivity extends BaseActivity implements View.OnClickListener { //user.length() < 11 && user.length() > 5 if (TextUtils.isEmpty(userphone) || TextUtils.isEmpty(userqq) || TextUtils.isEmpty(usermailbox) || TextUtils.isEmpty(region_id)) { if (region_id == null || region_id.equals("")) { - Toast.makeText(this, "所在地区，请重新选择", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(UserActivity.this,"所在地区，请重新选择"); return; } else { httpParams.put("regionId", region_id); } /* if (!RegexUtil.isPhone(userphone)) { - Toast.makeText(this, "手机号输入错误", Toast.LENGTH_SHORT).show(); + + ToastUtils.Message(UserActivity.this,"手机号输入错误"); return; } else { httpParams.put("mobile", userphone); }*/ if (!userqq.equals("")) { if (!isQQNum_matcher) { - Toast.makeText(this, "QQ号输入错误", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(UserActivity.this,"QQ号输入错误"); return; } else { httpParams.put("qq", userqq); @@ -229,7 +231,7 @@ public class UserActivity extends BaseActivity implements View.OnClickListener { } if (!usermailbox.equals("")) { if (!isEmail_matcher) { - Toast.makeText(this, "邮箱格式错误", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(UserActivity.this,"邮箱格式错误"); return; } else { httpParams.put("mailbox", usermailbox); //邮箱 @@ -268,7 +270,7 @@ public class UserActivity extends BaseActivity implements View.OnClickListener { }else if(response.getCode()==230){ FlushTokenUtil.flushToken(UserActivity.this); } else { - Toast.makeText(UserActivity.this, response.getMessage() + "", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(UserActivity.this,response.getMessage()); } } @@ -282,10 +284,10 @@ public class UserActivity extends BaseActivity implements View.OnClickListener { dismissLoadingDialog(); String message = e.getMessage(); assert message != null; - if (message.contains("timeout")|| message.contains("Read time out")){ - Toast.makeText(UserActivity.this, "请求超时", Toast.LENGTH_SHORT).show(); + if (message.equals("timeout")|| message.equals("Read time out")){ + ToastUtils.Message(UserActivity.this,"请求超时"); }else { - Toast.makeText(UserActivity.this, message, Toast.LENGTH_SHORT).show(); + ToastUtils.Message(UserActivity.this,message); } Log.d("TAG", "onError: " + e.getMessage()); } @@ -306,11 +308,9 @@ public class UserActivity extends BaseActivity implements View.OnClickListener { //返回的分别是三个级别的选中位置 String opt1tx = options1Items.size() > 0 ? options1Items.get(options1).getPickerViewText() : ""; - String opt2tx = options2Items.size() > 0 && options2Items.get(options1).size() > 0 ? options2Items.get(options1).get(options2) : ""; - String opt3tx = options2Items.size() > 0 && options3Items.get(options1).size() > 0 && options3Items.get(options1).get(options2).size() > 0 ? 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 f37bf3c..dc5f491 100644 --- a/app/src/main/java/com/navinfo/outdoor/activity/VideoActivity.java +++ b/app/src/main/java/com/navinfo/outdoor/activity/VideoActivity.java @@ -53,6 +53,7 @@ public class VideoActivity extends BaseActivity implements View.OnClickListener super.onPause(); Jzvd.releaseAllVideos(); } + @Override public void onBackPressed() { if (Jzvd.backPress()){ @@ -67,4 +68,5 @@ public class VideoActivity extends BaseActivity implements View.OnClickListener finish(); } } + } 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 a062d5b..5c2cc28 100644 --- a/app/src/main/java/com/navinfo/outdoor/activity/WebActivity.java +++ b/app/src/main/java/com/navinfo/outdoor/activity/WebActivity.java @@ -1,17 +1,13 @@ package com.navinfo.outdoor.activity; import android.annotation.SuppressLint; -import android.graphics.Bitmap; -import android.os.Build; import android.os.Bundle; import android.util.Log; import android.view.View; import android.webkit.WebSettings; import android.webkit.WebView; -import android.webkit.WebViewClient; import android.widget.ImageView; import android.widget.Toast; - import com.lzy.okgo.model.HttpParams; import com.navinfo.outdoor.R; import com.navinfo.outdoor.api.Constant; @@ -20,10 +16,10 @@ import com.navinfo.outdoor.bean.RichTextBean; import com.navinfo.outdoor.http.Callback; import com.navinfo.outdoor.http.OkGoBuilder; import com.navinfo.outdoor.util.FlushTokenUtil; +import com.navinfo.outdoor.util.ToastUtils; import java.util.HashMap; import java.util.Map; - /** * 详情页 */ @@ -46,6 +42,7 @@ public class WebActivity extends BaseActivity implements View.OnClickListener { nWebView.getSettings().setMixedContentMode(WebSettings.MIXED_CONTENT_ALWAYS_ALLOW); ImageView ivIcon = findViewById(R.id.iv_icon); ivIcon.setOnClickListener(this); + Constant.NOTIFICATION=null; initWebWork(); } @@ -54,7 +51,7 @@ public class WebActivity extends BaseActivity implements View.OnClickListener { if (bundle != null) { String url = bundle.getString("url"); if (url == null || url.equals("")) { - Toast.makeText(this, "连接失败", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(this,"连接失败"); return; } HttpParams httpParams = new HttpParams(); @@ -85,7 +82,7 @@ public class WebActivity extends BaseActivity implements View.OnClickListener { }else if(response.getCode()==230){ FlushTokenUtil.flushToken(WebActivity.this); } else { - Toast.makeText(WebActivity.this, response.getMessage() + "", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(WebActivity.this,response.getMessage() ); } } @@ -94,10 +91,10 @@ public class WebActivity extends BaseActivity implements View.OnClickListener { dismissLoadingDialog(); String message = e.getMessage(); assert message != null; - if (message.contains("timeout")|| message.contains("Read time out")){ - Toast.makeText(WebActivity.this, "请求超时", Toast.LENGTH_SHORT).show(); + if (message.equals("timeout")|| message.equals("Read time out")){ + ToastUtils.Message(WebActivity.this,"请求超时" ); }else { - Toast.makeText(WebActivity.this, message, Toast.LENGTH_SHORT).show(); + ToastUtils.Message(WebActivity.this,message ); } Log.d("TAG", "onError:失败" + e.getMessage() + ""); } @@ -112,4 +109,18 @@ public class WebActivity extends BaseActivity implements View.OnClickListener { } } + @Override + protected void onPause() { + super.onPause(); + } + + @Override + protected void onStop() { + super.onStop(); + } + + @Override + protected void onDestroy() { + super.onDestroy(); + } } diff --git a/app/src/main/java/com/navinfo/outdoor/adapter/BankAdapter.java b/app/src/main/java/com/navinfo/outdoor/adapter/BankAdapter.java index e120200..fa939ec 100644 --- a/app/src/main/java/com/navinfo/outdoor/adapter/BankAdapter.java +++ b/app/src/main/java/com/navinfo/outdoor/adapter/BankAdapter.java @@ -18,7 +18,7 @@ import java.util.ArrayList; import java.util.List; public class BankAdapter extends RecyclerView.Adapter { - private List bankPathBeans =new ArrayList<>(); + private List bankPathBeans = new ArrayList<>(); private Context context; public BankAdapter(Context context) { @@ -33,13 +33,13 @@ public class BankAdapter extends RecyclerView.Adapter { @NotNull @Override - public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { View inflate = LayoutInflater.from(context).inflate(R.layout.bankadapteritem, parent, false); return new ViewHolder(inflate); } @Override - public void onBindViewHolder(@NonNull ViewHolder holder, int position) { + public void onBindViewHolder(@NonNull ViewHolder holder, int position) { holder.titer.setText(bankPathBeans.get(position).getLabel()); holder.itemView.setOnClickListener(new View.OnClickListener() { @Override @@ -54,14 +54,14 @@ public class BankAdapter extends RecyclerView.Adapter { return bankPathBeans.size(); } - static class ViewHolder extends RecyclerView.ViewHolder { + public static class ViewHolder extends RecyclerView.ViewHolder { TextView titer; - public ViewHolder(@NonNull @NotNull View itemView) { super(itemView); titer = itemView.findViewById(R.id.tv_bank); } } + public interface OnBankClick { void onClick(BankPathBean bankPathBean); } diff --git a/app/src/main/java/com/navinfo/outdoor/adapter/CapacityEvaluationAdapter.java b/app/src/main/java/com/navinfo/outdoor/adapter/CapacityEvaluationAdapter.java index 460c4c9..0cabf91 100644 --- a/app/src/main/java/com/navinfo/outdoor/adapter/CapacityEvaluationAdapter.java +++ b/app/src/main/java/com/navinfo/outdoor/adapter/CapacityEvaluationAdapter.java @@ -41,7 +41,6 @@ public class CapacityEvaluationAdapter extends RecyclerView.Adapter impsUrl; LayoutInflater inflater = null; - ImageView full_image; + public ImagePagerAdapter(Context context, ArrayList imusUrl) { this.context = context; this.impsUrl = imusUrl; diff --git a/app/src/main/java/com/navinfo/outdoor/adapter/IssueProblemAdapter.java b/app/src/main/java/com/navinfo/outdoor/adapter/IssueProblemAdapter.java index 2ce898a..ee49b71 100644 --- a/app/src/main/java/com/navinfo/outdoor/adapter/IssueProblemAdapter.java +++ b/app/src/main/java/com/navinfo/outdoor/adapter/IssueProblemAdapter.java @@ -54,7 +54,7 @@ public class IssueProblemAdapter extends RecyclerView.Adapter File file = fileBean.getFile(); if (file.exists()) { AWMp4ParserHelper.getInstance().loadFirstWithGlide(context, Uri.fromFile(file).toString(), holder.ivPhoto, 500); - // Glide.with(context).load(file).apply(RequestOptions.bitmapTransform(new RotateTransformation(0))).into(holder.ivPhoto); } holder.ivPhoto.setOnClickListener(new View.OnClickListener() { @Override diff --git a/app/src/main/java/com/navinfo/outdoor/adapter/PoiRecycleAdapter.java b/app/src/main/java/com/navinfo/outdoor/adapter/PoiRecycleAdapter.java index 6dae81c..89fa8e1 100644 --- a/app/src/main/java/com/navinfo/outdoor/adapter/PoiRecycleAdapter.java +++ b/app/src/main/java/com/navinfo/outdoor/adapter/PoiRecycleAdapter.java @@ -178,7 +178,7 @@ public class PoiRecycleAdapter extends RecyclerView.Adapter { private List fileBeans; private Context context; - private List textFile=new ArrayList<>(); + private List textFile = new ArrayList<>(); public VideoAdapter(List files, Context context) { this.fileBeans = files; @@ -47,16 +47,16 @@ public class VideoAdapter extends RecyclerView.Adapter for (int i = 0; i < fileBeans.size(); i++) { String path = fileBeans.get(i).getFile().getPath(); if (fileBeanList.getFile().getPath().equals(path)) { - fileBeans.set(i,fileBeanList); + fileBeans.set(i, fileBeanList); } } for (int i = 0; i < fileBeans.size(); i++) { boolean check = fileBeans.get(i).isCheck(); - if (check){ + if (check) { fileBeans.get(i).getFile().delete(); - if (textFile!=null){ + if (textFile != null) { for (int i1 = 0; i1 < textFile.size(); i1++) { - if (textFile.get(i).getPath().contains(fileBeans.get(i).getFile().getPath())){ + if (textFile.get(i).getPath().contains(fileBeans.get(i).getFile().getPath())) { textFile.get(i).delete(); } } @@ -70,13 +70,13 @@ public class VideoAdapter extends RecyclerView.Adapter @NotNull @Override - public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { View inflate = LayoutInflater.from(context).inflate(R.layout.video_item, parent, false); return new ViewHolder(inflate); } @Override - public void onBindViewHolder(@NonNull ViewHolder holder, int position) { + public void onBindViewHolder(@NonNull ViewHolder holder, int position) { FileBean fileBean = fileBeans.get(position); File file = fileBean.getFile(); if (file.exists()) { @@ -86,7 +86,7 @@ public class VideoAdapter extends RecyclerView.Adapter @Override public void onClick(View v) { Intent intent = new Intent(context, VideoActivity.class); - intent.putExtra("video",fileBean.getFile().getPath()); + intent.putExtra("video", fileBean.getFile().getPath()); context.startActivity(intent); } }); @@ -107,18 +107,18 @@ public class VideoAdapter extends RecyclerView.Adapter return fileBeans.size(); } - class ViewHolder extends RecyclerView.ViewHolder { + public static class ViewHolder extends RecyclerView.ViewHolder { private ImageView ivVideo; private CheckBox cbVideo; - public ViewHolder(@NonNull @NotNull View itemView) { + public ViewHolder(@NonNull View itemView) { super(itemView); ivVideo = itemView.findViewById(R.id.iv_video); cbVideo = itemView.findViewById(R.id.check_video); } } - public photoClickItem photoClickItem; + private photoClickItem photoClickItem; public void setPhotoClickItem(photoClickItem photoClickItem) { this.photoClickItem = photoClickItem; diff --git a/app/src/main/java/com/navinfo/outdoor/adapter/WithdrawalAdapter.java b/app/src/main/java/com/navinfo/outdoor/adapter/WithdrawalAdapter.java index 9d7f11a..80a2351 100644 --- a/app/src/main/java/com/navinfo/outdoor/adapter/WithdrawalAdapter.java +++ b/app/src/main/java/com/navinfo/outdoor/adapter/WithdrawalAdapter.java @@ -54,7 +54,7 @@ public class WithdrawalAdapter extends RecyclerView.Adapter " + Constant.DEVICE_TOKEN); } + @Override public void onFailure(String s, String s1) { Log.e("TAGEE", "Failure 注册失败：--> " + "code:" + s + ", desc:" + s1); } }); + instance.onAppStart(); UmengMessageHandler msgHandler = new UmengMessageHandler() { //处理通知栏消息 @Override public void dealWithNotificationMessage(Context context, UMessage msg) { super.dealWithNotificationMessage(context, msg); Log.i("TAGEE", "dealWithNotificationMessage:" + msg.getRaw().toString()); + Constant.NOTIFICATION=msg.getRaw().toString(); } + //自定义通知样式，此方法可以修改通知样式等 @Override public Notification getNotification(Context context, UMessage msg) { - Log.i("TAGEE", "notification receiver:" + msg.getRaw().toString()); + Log.i("TAGEE", "getNotification: "+msg.getRaw().toString()); return super.getNotification(context, msg); + } //处理透传消息 @Override @@ -102,7 +118,7 @@ public class UserApplication extends Application { //App处于前台时不显示通知 //instance.setNotificationOnForeground(false); //设置显示通知的数量 - //instance.setDisplayNotificationNumber(0); + instance.setDisplayNotificationNumber(0); //服务端控制声音 //instance.setNotificationPlaySound(MsgConstant.NOTIFICATION_PLAY_SERVER); //通知免打扰时段 diff --git a/app/src/main/java/com/navinfo/outdoor/base/BaseActivity.java b/app/src/main/java/com/navinfo/outdoor/base/BaseActivity.java index 9d0d41b..72a1869 100644 --- a/app/src/main/java/com/navinfo/outdoor/base/BaseActivity.java +++ b/app/src/main/java/com/navinfo/outdoor/base/BaseActivity.java @@ -30,6 +30,7 @@ import com.navinfo.outdoor.util.NetWorkUtils; import com.umeng.message.PushAgent; import java.util.HashMap; +import java.util.Objects; import java.util.Timer; import java.util.TimerTask; @@ -83,12 +84,10 @@ public abstract class BaseActivity extends AppCompatActivity { alertDialog.dismiss(); } alertDialog = new AlertDialog.Builder(this).create(); - alertDialog.getWindow().setBackgroundDrawable(new ColorDrawable()); + Objects.requireNonNull(alertDialog.getWindow()).setBackgroundDrawable(new ColorDrawable()); alertDialog.setCancelable(false); alertDialog.setOnKeyListener((dialog, keyCode, event) -> { - if (keyCode == KeyEvent.KEYCODE_SEARCH || keyCode == KeyEvent.KEYCODE_BACK) - return true; - return false; + return keyCode == KeyEvent.KEYCODE_SEARCH || keyCode == KeyEvent.KEYCODE_BACK; }); //loading样式 diff --git a/app/src/main/java/com/navinfo/outdoor/base/BaseDrawerFragment.java b/app/src/main/java/com/navinfo/outdoor/base/BaseDrawerFragment.java index 1b35251..b4c2359 100644 --- a/app/src/main/java/com/navinfo/outdoor/base/BaseDrawerFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/base/BaseDrawerFragment.java @@ -89,8 +89,8 @@ public abstract class BaseDrawerFragment extends BaseFragment { Message obtain = Message.obtain(); obtain.what = Constant.POI_DRAWER; LatLng latLng = new LatLng(); - latLng.setLatitude(Double.valueOf(showPoiEntity.getY())); - latLng.setLongitude(Double.valueOf(showPoiEntity.getX())); + latLng.setLatitude(Double.parseDouble(showPoiEntity.getY())); + latLng.setLongitude(Double.parseDouble(showPoiEntity.getX())); obtain.obj = latLng; EventBus.getDefault().post(obtain); MapManager.getInstance().getTencentMap().setOnMarkerClickListener(null); diff --git a/app/src/main/java/com/navinfo/outdoor/base/BaseFragment.java b/app/src/main/java/com/navinfo/outdoor/base/BaseFragment.java index c7a6893..5e67ff8 100644 --- a/app/src/main/java/com/navinfo/outdoor/base/BaseFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/base/BaseFragment.java @@ -45,11 +45,11 @@ public abstract class BaseFragment extends Fragment implements FragmentBackHandl private AlertDialog alertDialog; public View mView; protected FragmentManager supportFragmentManager; -// private HomeActivity homeActivity; + // private HomeActivity homeActivity; private Handler handler = new Handler(new Handler.Callback() { @Override public boolean handleMessage(@NonNull Message msg) { - if(msg.what==0x200){ + if (msg.what == 0x200) { View view = (View) msg.obj; view.setEnabled(true); } @@ -97,17 +97,14 @@ public abstract class BaseFragment extends Fragment implements FragmentBackHandl protected abstract int getLayout(); public void showLoadingDialog() { - if (alertDialog!=null) { + if (alertDialog != null) { alertDialog.dismiss(); } - alertDialog = new AlertDialog.Builder(getContext()).create(); - alertDialog.getWindow().setBackgroundDrawable(new ColorDrawable()); + alertDialog = new AlertDialog.Builder(Objects.requireNonNull(getActivity())).create(); + Objects.requireNonNull(alertDialog.getWindow()).setBackgroundDrawable(new ColorDrawable()); alertDialog.setCancelable(false); alertDialog.setOnKeyListener((dialog, keyCode, event) -> { - if (keyCode == KeyEvent.KEYCODE_SEARCH || keyCode == KeyEvent.KEYCODE_BACK) - return true; - return false; - + return keyCode == KeyEvent.KEYCODE_SEARCH || keyCode == KeyEvent.KEYCODE_BACK; }); //loading样式 View view = LayoutInflater.from(getContext()).inflate(R.layout.loading, null); @@ -120,7 +117,7 @@ public abstract class BaseFragment extends Fragment implements FragmentBackHandl public void setLoadingDialogText(String s) { //给loading 添加文字 - if (alertDialog!=null){ + if (alertDialog != null) { TextView view = alertDialog.findViewById(R.id.progressBar_tx); view.setText(s); } @@ -134,7 +131,7 @@ public abstract class BaseFragment extends Fragment implements FragmentBackHandl protected void intentWebActivity(String url, HashMap paramMap) { Intent intent = new Intent(getContext(), WebActivity.class); - if (paramMap !=null) { + if (paramMap != null) { intent.putExtra("map", paramMap); } intent.putExtra("url", url); diff --git a/app/src/main/java/com/navinfo/outdoor/bean/ApkVersionBean.java b/app/src/main/java/com/navinfo/outdoor/bean/ApkVersionBean.java index 4c69635..669f857 100644 --- a/app/src/main/java/com/navinfo/outdoor/bean/ApkVersionBean.java +++ b/app/src/main/java/com/navinfo/outdoor/bean/ApkVersionBean.java @@ -29,7 +29,7 @@ public class ApkVersionBean { this.body = body; } - public static class bodyBean{ + public static class bodyBean { /** *     "version": 155, *         "operationType": null, diff --git a/app/src/main/java/com/navinfo/outdoor/bean/NotificationBean.java b/app/src/main/java/com/navinfo/outdoor/bean/NotificationBean.java new file mode 100644 index 0000000..24bd215 --- /dev/null +++ b/app/src/main/java/com/navinfo/outdoor/bean/NotificationBean.java @@ -0,0 +1,119 @@ +package com.navinfo.outdoor.bean; + +public class NotificationBean { + /** + * display_type : notification + * extra : {"id":10} + * body : {"after_open":"go_app","ticker":"","title":"测试2","play_sound":"true","text":"测试3"} + * msg_id : ulb4ld9163877340651501 + */ + + private String display_type; + private ExtraBean extra; + private BodyBean body; + private String msg_id; + + public String getDisplay_type() { + return display_type; + } + + public void setDisplay_type(String display_type) { + this.display_type = display_type; + } + + public ExtraBean getExtra() { + return extra; + } + + public void setExtra(ExtraBean extra) { + this.extra = extra; + } + + public BodyBean getBody() { + return body; + } + + public void setBody(BodyBean body) { + this.body = body; + } + + public String getMsg_id() { + return msg_id; + } + + public void setMsg_id(String msg_id) { + this.msg_id = msg_id; + } + + public static class ExtraBean { + /** + * id : 10 + */ + + private int id; + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + } + + public static class BodyBean { + /** + * after_open : go_app + * ticker : + * title : 测试2 + * play_sound : true + * text : 测试3 + */ + + private String after_open; + private String ticker; + private String title; + private String play_sound; + private String text; + + public String getAfter_open() { + return after_open; + } + + public void setAfter_open(String after_open) { + this.after_open = after_open; + } + + public String getTicker() { + return ticker; + } + + public void setTicker(String ticker) { + this.ticker = ticker; + } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + public String getPlay_sound() { + return play_sound; + } + + public void setPlay_sound(String play_sound) { + this.play_sound = play_sound; + } + + public String getText() { + return text; + } + + public void setText(String text) { + this.text = text; + } + } +} diff --git a/app/src/main/java/com/navinfo/outdoor/bean/PolygonTaskBean.java b/app/src/main/java/com/navinfo/outdoor/bean/PolygonTaskBean.java index c829390..8ac7038 100644 --- a/app/src/main/java/com/navinfo/outdoor/bean/PolygonTaskBean.java +++ b/app/src/main/java/com/navinfo/outdoor/bean/PolygonTaskBean.java @@ -4,12 +4,12 @@ package com.navinfo.outdoor.bean; * 面状任务-任务领取 */ public class PolygonTaskBean { + /** * code : 200 * message : 成功 * body : {"id":8602,"geo":"POLYGON((116.20818 39.87434,116.20842 39.87439,116.20857 39.87445,116.21227 39.87491,116.21214 39.87661,116.2108 39.87666,116.2108 39.87681,116.21064 39.87847,116.21302 39.87821,116.21424 39.87718,116.21823 39.87676,116.21898 39.88012,116.21958 39.88171,116.22301 39.8814,116.22329 39.8838,116.22786 39.88359,116.22754 39.88558,116.22757 39.8856,116.2277 39.8858,116.22774 39.88594,116.22775 39.88616,116.22773 39.88645,116.22769 39.88681,116.22766 39.88712,116.22765 39.88736,116.22764 39.88754,116.22767 39.88781,116.22771 39.88818,116.22773 39.88844,116.22776 39.88874,116.22779 39.88911,116.22791 39.8891,116.22796 39.8891,116.22801 39.88912,116.22804 39.88916,116.22807 39.88918,116.2281 39.88918,116.22813 39.88919,116.22834 39.88919,116.22934 39.88918,116.22952 39.88918,116.2296 39.88919,116.22966 39.88922,116.22989 39.88931,116.22998 39.88933,116.23005 39.88933,116.23057 39.88936,116.23077 39.88937,116.23093 39.88937,116.23129 39.88939,116.23158 39.8894,116.23166 39.8894,116.23174 39.8894,116.23183 39.8894,116.23227 39.89016,116.23237 39.89034,116.23248 39.89054,116.23261 39.89044,116.2328 39.89029,116.2331 39.89004,116.23342 39.8898,116.23348 39.88977,116.23352 39.88975,116.23355 39.88973,116.23366 39.88969,116.2338 39.88965,116.23414 39.88972,116.23418 39.88972,116.23413 39.88988,116.23413 39.8899,116.23412 39.88992,116.23405 39.88997,116.23386 39.89012,116.23424 39.89038,116.23369 39.89106,116.23368 39.89212,116.23763 39.89203,116.23758 39.89389,116.23916 39.89397,116.23951 39.89427,116.24088 39.89511,116.2425 39.89375,116.24387 39.89415,116.24395 39.89423,116.24403 39.89428,116.24419 39.89434,116.24438 39.89441,116.24455 39.89448,116.24475 39.89454,116.24485 39.89457,116.24506 39.89464,116.24519 39.89468,116.24527 39.89466,116.24812 39.89583,116.25 39.89583,116.25014 39.89583,116.25272 39.89586,116.25285 39.89586,116.25303 39.89587,116.25318 39.89587,116.25586 39.8959,116.25658 39.89594,116.25656 39.89553,116.25656 39.89528,116.25701 39.89509,116.25784 39.89502,116.25834 39.89508,116.25836 39.89548,116.25852 39.89588,116.25863 39.89615,116.25924 39.89637,116.25924 39.89663,116.25924 39.89674,116.25925 39.89689,116.25926 39.89706,116.25927 39.89717,116.25692 39.89716,116.25635 39.89715,116.25603 39.89715,116.25368 39.89717,116.25323 39.89718,116.25304 39.89718,116.25316 39.89726,116.2532 39.89729,116.2532 39.89737,116.25322 39.89811,116.25322 39.89849,116.25322 39.89934,116.25322 39.89975,116.25322 39.89983,116.25322 39.8999,116.25321 39.9002,116.25321 39.90028,116.25321 39.90074,116.25322 39.90149,116.25322 39.9028,116.25321 39.90387,116.2532 39.90429,116.25321 39.90516,116.25319 39.9062,116.25319 39.90633,116.25319 39.90643,116.2532 39.90727,116.2532 39.90734,116.25307 39.90733,116.25307 39.90741,116.25307 39.90749,116.25307 39.9078,116.25306 39.90798,116.25304 39.90829,116.25302 39.90888,116.25301 39.90935,116.25299 39.91034,116.25299 39.91091,116.25299 39.91105,116.25299 39.91193,116.25298 39.91285,116.25298 39.91301,116.25299 39.91364,116.25299 39.91496,116.25299 39.91511,116.25299 39.91541,116.25279 39.9154,116.25171 39.91539,116.25069 39.91538,116.2504 39.91538,116.25022 39.91538,116.25 39.91538,116.24993 39.91538,116.24968 39.91538,116.2496 39.91539,116.24956 39.91541,116.24949 39.9155,116.24945 39.91557,116.2494 39.91572,116.24934 39.9159,116.24931 39.91597,116.24928 39.916,116.24926 39.91602,116.24947 39.91639,116.24956 39.91667,116.24997 39.91796,116.25 39.91796,116.25258 39.91783,116.25286 39.91765,116.25286 39.91794,116.25272 39.91816,116.25267 39.91824,116.25171 39.91899,116.25132 39.91987,116.25274 39.91994,116.2529 39.91995,116.2529 39.92022,116.2529 39.92081,116.25289 39.92169,116.25289 39.92186,116.25279 39.92185,116.25268 39.92183,116.25241 39.92177,116.25225 39.92171,116.25216 39.92166,116.25165 39.92141,116.25154 39.92141,116.25149 39.92139,116.25104 39.92123,116.25058 39.92107,116.25 39.92086,116.24976 39.92079,116.24967 39.92077,116.24957 39.92075,116.24944 39.92073,116.24934 39.92072,116.24916 39.92071,116.2487 39.92073,116.24825 39.92075,116.24764 39.92081,116.24736 39.92082,116.24735 39.92075,116.24697 39.91904,116.24309 39.91897,116.2429 39.91873,116.24287 39.91867,116.24286 39.91862,116.24289 39.9183,116.23996 39.91842,116.23943 39.91848,116.2392 39.91847,116.23764 39.91847,116.23755 39.91816,116.2375 39.91809,116.23746 39.91805,116.23739 39.91803,116.23735 39.91802,116.23694 39.91794,116.23692 39.91789,116.23692 39.91786,116.23703 39.91722,116.23706 39.91688,116.23678 39.91688,116.23531 39.91694,116.23451 39.917,116.23441 39.91701,116.23428 39.91702,116.2338 39.91707,116.23363 39.91707,116.23342 39.91709,116.23326 39.91708,116.23302 39.91703,116.2327 39.91694,116.23257 39.91689,116.23242 39.91685,116.23228 39.9168,116.23218 39.91676,116.23206 39.91671,116.23196 39.91667,116.23191 39.91663,116.2319 39.91659,116.23189 39.91653,116.23189 39.91647,116.2319 39.91638,116.23191 39.91629,116.2317 39.91631,116.23169 39.91642,116.23168 39.91646,116.23167 39.9165,116.23164 39.91662,116.23163 39.91667,116.23162 39.91671,116.2316 39.91678,116.23158 39.9169,116.23154 39.91698,116.23152 39.91706,116.23149 39.9171,116.23146 39.91714,116.23143 39.91716,116.23138 39.91719,116.23134 39.91721,116.23129 39.91723,116.2311 39.91726,116.231 39.91726,116.23091 39.91725,116.23074 39.91721,116.23067 39.91719,116.23061 39.91718,116.23047 39.91717,116.2304 39.91717,116.23031 39.91717,116.23022 39.91718,116.23013 39.91722,116.23006 39.91729,116.23001 39.91737,116.22997 39.91744,116.22993 39.91751,116.22988 39.91757,116.22982 39.91763,116.22973 39.91769,116.22948 39.91776,116.22933 39.91779,116.22907 39.91783,116.22902 39.91784,116.22889 39.91786,116.22873 39.91788,116.22865 39.9179,116.22857 39.91791,116.2284 39.91792,116.22823 39.91793,116.22805 39.91793,116.22759 39.9179,116.22612 39.91785,116.22567 39.91783,116.22536 39.91781,116.22503 39.91781,116.22477 39.91781,116.22458 39.91782,116.22421 39.91783,116.22409 39.91783,116.22402 39.91784,116.22383 39.91785,116.22366 39.91786,116.22342 39.91787,116.22327 39.91788,116.2231 39.91788,116.22275 39.9179,116.22266 39.9179,116.22251 39.91791,116.22216 39.91792,116.22206 39.91792,116.22157 39.91792,116.22126 39.91791,116.22103 39.9179,116.22054 39.9179,116.22037 39.91789,116.2201 39.91788,116.2199 39.91788,116.21962 39.91786,116.21947 39.91783,116.21941 39.91782,116.21934 39.9178,116.21921 39.91776,116.21909 39.91771,116.21874 39.91756,116.21862 39.91751,116.21844 39.91743,116.21829 39.91737,116.21815 39.91732,116.21807 39.9173,116.21798 39.91727,116.21789 39.91724,116.21677 39.91793,116.21642 39.91805,116.21632 39.91811,116.21548 39.91791,116.21457 39.91768,116.21405 39.91751,116.21296 39.91705,116.21288 39.91702,116.21263 39.91692,116.21256 39.91689,116.21251 39.91688,116.21242 39.91687,116.21233 39.91685,116.21221 39.91685,116.21205 39.91684,116.21197 39.91684,116.21189 39.91684,116.2117 39.91702,116.21156 39.91705,116.21138 39.91708,116.2093 39.91743,116.20862 39.91808,116.2069 39.91809,116.20681 39.91809,116.20682 39.91872,116.20682 39.91878,116.20683 39.91937,116.20683 39.91954,116.20686 39.92123,116.20686 39.92132,116.20687 39.92202,116.20689 39.92268,116.20689 39.92296,116.20691 39.92441,116.20691 39.92449,116.20691 39.9246,116.20691 39.92475,116.20692 39.92495,116.20708 39.92475,116.20722 39.92475,116.20768 39.92475,116.20779 39.92476,116.20885 39.92477,116.20902 39.92497,116.20905 39.925,116.20913 39.92509,116.20937 39.92517,116.20951 39.92525,116.21021 39.92578,116.21078 39.92618,116.21088 39.92624,116.21099 39.92626,116.21106 39.92627,116.21127 39.92629,116.21152 39.92631,116.21213 39.92628,116.21234 39.92628,116.21261 39.92626,116.21328 39.92627,116.21334 39.92627,116.21352 39.92626,116.21357 39.92626,116.21495 39.92671,116.21567 39.92811,116.2157 39.92868,116.21313 39.92899,116.21335 39.92975,116.21424 39.93126,116.21648 39.93135,116.21648 39.93161,116.21619 39.93181,116.21562 39.93228,116.21381 39.93266,116.21381 39.93326,116.21381 39.93331,116.21381 39.93344,116.21381 39.93351,116.21381 39.93365,116.21381 39.93404,116.21466 39.93413,116.21461 39.93487,116.21411 39.93518,116.21462 39.93585,116.21469 39.93595,116.21605 39.93789,116.21854 39.94057,116.21894 39.94099,116.21896 39.94102,116.21899 39.9443,116.21644 39.94427,116.21652 39.94736,116.21596 39.94788,116.21535 39.94854,116.21498 39.9487,116.21481 39.94878,116.21464 39.94886,116.21433 39.94899,116.21291 39.95013,116.20777 39.95303,116.20512 39.95492,116.20334 39.95637,116.20284 39.95765,116.20223 39.95829,116.20248 39.96008,116.20148 39.96124,116.19889 39.96218,116.19696 39.96264,116.19535 39.96378,116.19181 39.96512,116.19091 39.96565,116.19142 39.96797,116.18825 39.96867,116.18626 39.97064,116.18576 39.972,116.18633 39.97313,116.18644 39.97677,116.1864 39.97699,116.18605 39.97858,116.18692 39.97961,116.18692 39.98134,116.18619 39.98204,116.18642 39.98245,116.18661 39.98369,116.18631 39.98424,116.18569 39.98501,116.18497 39.98595,116.18429 39.98621,116.18343 39.9865,116.18177 39.98703,116.18077 39.98738,116.18015 39.98772,116.17898 39.98835,116.17879 39.98648,116.17896 39.98556,116.17879 39.98443,116.17892 39.98324,116.17859 39.9823,116.17715 39.98186,116.17585 39.98046,116.17227 39.9777,116.17153 39.97691,116.16932 39.97735,116.16972 39.98029,116.16944 39.98322,116.16859 39.98366,116.16814 39.98733,116.16741 39.98777,116.16618 39.98744,116.16529 39.9871,116.16389 39.9859,116.16283 39.98569,116.16105 39.98428,116.15827 39.98386,116.15727 39.98484,116.15593 39.98548,116.15699 39.98689,116.15599 39.98838,116.15532 39.98949,116.15443 39.99038,116.15121 39.99367,116.15031 39.99307,116.14725 39.99183,116.14598 39.99079,116.1452 39.98964,116.14451 39.98944,116.14232 39.98984,116.1402 39.98954,116.13542 39.98804,116.13379 39.98843,116.13118 39.98851,116.13017 39.98848,116.12765 39.98733,116.125 39.98694,116.1203 39.98625,116.11938 39.98627,116.11624 39.98332,116.11385 39.98155,116.11567 39.97958,116.11515 39.97651,116.11625 39.97459,116.1169 39.97217,116.11878 39.97153,116.11982 39.97118,116.11992 39.97115,116.12049 39.97096,116.12101 39.96925,116.12323 39.96874,116.12342 39.96743,116.12211 39.96557,116.12194 39.96399,116.12122 39.96117,116.12029 39.96156,116.11981 39.96199,116.11812 39.96111,116.1177 39.95976,116.11759 39.95983,116.11753 39.95985,116.11715 39.95995,116.11689 39.96,116.11653 39.96008,116.11613 39.96016,116.11611 39.9601,116.11606 39.96001,116.11603 39.95995,116.11563 39.95913,116.11556 39.959,116.11535 39.95861,116.1152 39.95836,116.11517 39.95829,116.1151 39.95816,116.11495 39.95807,116.11488 39.95796,116.11486 39.95778,116.11525 39.95673,116.11531 39.95669,116.11551 39.95653,116.1158 39.95627,116.11589 39.95619,116.11599 39.95611,116.11693 39.9566,116.11905 39.95474,116.11716 39.95357,116.11713 39.95355,116.11816 39.95254,116.11899 39.95175,116.11973 39.95092,116.12004 39.95061,116.12012 39.95041,116.12012 39.95025,116.12014 39.95023,116.11963 39.95002,116.11959 39.95001,116.11912 39.94979,116.11856 39.94955,116.11815 39.94933,116.11807 39.94924,116.118 39.94918,116.1179 39.94911,116.11785 39.94907,116.11784 39.94905,116.11783 39.94903,116.11659 39.94894,116.11724 39.94834,116.11586 39.9481,116.11574 39.94808,116.11564 39.94822,116.11489 39.9493,116.11365 39.94834,116.11404 39.94734,116.11303 39.94489,116.1123 39.9432,116.11585 39.93869,116.11523 39.93818,116.11623 39.93694,116.11634 39.9368,116.11641 39.93666,116.11646 39.93654,116.11652 39.93638,116.11701 39.93538,116.11849 39.93525,116.11943 39.93316,116.12019 39.93244,116.12031 39.9325,116.12052 39.93262,116.12066 39.9327,116.12081 39.93278,116.12183 39.93344,116.12191 39.93345,116.12298 39.93397,116.12482 39.93499,116.125 39.93468,116.12712 39.93103,116.12795 39.92942,116.12879 39.92676,116.12911 39.92658,116.12955 39.92634,116.13026 39.92596,116.13058 39.92578,116.13072 39.9257,116.1313 39.92538,116.13356 39.92416,116.13361 39.92413,116.13479 39.92386,116.13568 39.92366,116.14086 39.92244,116.14296 39.91976,116.14348 39.91834,116.14409 39.91667,116.14481 39.91485,116.14535 39.91386,116.14629 39.91134,116.14897 39.90866,116.14966 39.90812,116.15151 39.90499,116.15155 39.90448,116.15123 39.90369,116.15113 39.90324,116.15158 39.90248,116.15225 39.90168,116.153 39.90088,116.1536 39.90039,116.15463 39.90005,116.15536 39.89957,116.15569 39.89892,116.15579 39.89838,116.15566 39.89788,116.15562 39.89763,116.15618 39.89723,116.15896 39.89682,116.16367 39.8926,116.16689 39.88965,116.16744 39.88921,116.16756 39.88912,116.16761 39.88908,116.1679 39.88883,116.16859 39.88829,116.16913 39.88786,116.17114 39.88725,116.17464 39.88546,116.17599 39.88501,116.17698 39.88469,116.17905 39.88401,116.17913 39.88398,116.18044 39.88355,116.1819 39.88309,116.18235 39.8827,116.18277 39.8821,116.1841 39.88065,116.1866 39.88037,116.18768 39.88026,116.18788 39.88031,116.19269 39.88165,116.19543 39.88342,116.19653 39.88338,116.19869 39.8833,116.19967 39.88327,116.19977 39.88321,116.20028 39.88289,116.20067 39.88265,116.20089 39.8825,116.20131 39.88224,116.20163 39.88203,116.20171 39.88198,116.2019 39.88187,116.20226 39.88164,116.20243 39.88154,116.20265 39.88137,116.2028 39.88125,116.20313 39.88096,116.20347 39.88072,116.20375 39.88054,116.20422 39.88024,116.20446 39.88009,116.20485 39.87981,116.20514 39.87959,116.20536 39.87937,116.20552 39.87919,116.20563 39.87908,116.20572 39.87898,116.20576 39.87894,116.20601 39.87867,116.20652 39.87815,116.20673 39.87795,116.20676 39.87792,116.20687 39.87782,116.20699 39.87766,116.20706 39.87756,116.20714 39.87744,116.20741 39.87694,116.20747 39.87685,116.20758 39.87662,116.2076 39.87656,116.20763 39.8765,116.2077 39.8763,116.20781 39.87589,116.20793 39.87539,116.20795 39.87533,116.20818 39.87434))","type":6,"name":"测试面状任务","isExclusive":0} */ - private int code; private String message; private BodyBean body; @@ -46,7 +46,6 @@ public class PolygonTaskBean { * name : 测试面状任务 * isExclusive : 0 */ - private int id; private String geo; private int type; diff --git a/app/src/main/java/com/navinfo/outdoor/bean/ReceivedPoiBean.java b/app/src/main/java/com/navinfo/outdoor/bean/ReceivedPoiBean.java index e15e3bc..61adad5 100644 --- a/app/src/main/java/com/navinfo/outdoor/bean/ReceivedPoiBean.java +++ b/app/src/main/java/com/navinfo/outdoor/bean/ReceivedPoiBean.java @@ -4,13 +4,11 @@ package com.navinfo.outdoor.bean; * 普通任务 */ public class ReceivedPoiBean { - /** * code : 200 * message : 成功 * body : {"id":6774,"address":"北京市海淀区","geo":"POINT(116.28759 40.049277)","type":5,"name":"启明星辰大厦(西门)","isExclusive":0} */ - private int code; private String message; private BodyBean body; @@ -47,8 +45,8 @@ public class ReceivedPoiBean { * type : 5 * name : 启明星辰大厦(西门) * isExclusive : 0 - * memo; - * endDate; + * memo; + * endDate; */ private int id; private String address; diff --git a/app/src/main/java/com/navinfo/outdoor/bean/RoadExtend.java b/app/src/main/java/com/navinfo/outdoor/bean/RoadExtend.java index 4d07eda..2a6d627 100644 --- a/app/src/main/java/com/navinfo/outdoor/bean/RoadExtend.java +++ b/app/src/main/java/com/navinfo/outdoor/bean/RoadExtend.java @@ -1,4 +1,5 @@ package com.navinfo.outdoor.bean; + /*** * 道路数据的附加信息 */ diff --git a/app/src/main/java/com/navinfo/outdoor/bean/TaskByNetBean.java b/app/src/main/java/com/navinfo/outdoor/bean/TaskByNetBean.java index de99723..7db0550 100644 --- a/app/src/main/java/com/navinfo/outdoor/bean/TaskByNetBean.java +++ b/app/src/main/java/com/navinfo/outdoor/bean/TaskByNetBean.java @@ -9,7 +9,6 @@ public class TaskByNetBean { * message : 成功 * body : {"name":"门头沟区道路录像21","address":"","geo":"LINESTRING(115.990024 39.969285,115.991332 39.970245,115.990608 39.970906,115.993168 39.972121,115.993446 39.973038,115.99403 39.973528,115.993863 39.972142,115.995644 39.971993,115.996451 39.972078,115.998482 39.971439,115.999094 39.970607,115.9994 39.970799)","price":4.860135,"type":4,"isExclusive":0} */ - private int code; private String message; private BodyBean body; @@ -49,7 +48,6 @@ public class TaskByNetBean { * memo * endDate */ - private String name; private String address; private String geo; diff --git a/app/src/main/java/com/navinfo/outdoor/bean/TaskExplainInfo.java b/app/src/main/java/com/navinfo/outdoor/bean/TaskExplainInfo.java index e965a85..0e54653 100644 --- a/app/src/main/java/com/navinfo/outdoor/bean/TaskExplainInfo.java +++ b/app/src/main/java/com/navinfo/outdoor/bean/TaskExplainInfo.java @@ -2,7 +2,7 @@ package com.navinfo.outdoor.bean; import java.util.List; -public class TaskExplainInfo { +public class TaskExplainInfo { /** diff --git a/app/src/main/java/com/navinfo/outdoor/bean/UnPolygonTaskBean.java b/app/src/main/java/com/navinfo/outdoor/bean/UnPolygonTaskBean.java index 1e4823c..03ffe29 100644 --- a/app/src/main/java/com/navinfo/outdoor/bean/UnPolygonTaskBean.java +++ b/app/src/main/java/com/navinfo/outdoor/bean/UnPolygonTaskBean.java @@ -11,7 +11,6 @@ public class UnPolygonTaskBean { * message : 成功 * body : 1 */ - private int code; private String message; private int body; diff --git a/app/src/main/java/com/navinfo/outdoor/bean/UserDetailBean.java b/app/src/main/java/com/navinfo/outdoor/bean/UserDetailBean.java index 89af242..66e963e 100644 --- a/app/src/main/java/com/navinfo/outdoor/bean/UserDetailBean.java +++ b/app/src/main/java/com/navinfo/outdoor/bean/UserDetailBean.java @@ -9,7 +9,6 @@ public class UserDetailBean { * message : 成功 * body : {"pid":1,"username":"C10000","password":"123456","createtime":"2021-06-11T07:56:06.117+0000","name":"李心榕","sex":0,"regionId":530902,"mobile":"18811794839","fatherid":null,"registerTime":null,"photoName":null,"alipayAccountName":null,"wechat":null,"qq":"","freezed":0,"locked":0,"userBankcard":{"userid":1,"name":"李心榕","bankName":"银行名称","bankAccount":"103100000026","lastUpdateTime":null,"idNumber":"8866214489652365478","name1":"李心榕","idNumber1":null,"modifydate":null},"userAuth":{"userid":1,"name":"我得","idnum":"411381200010265236","certorg":null,"idtimelimit":null,"p1":null,"p2":null,"p3":null,"modifytime":"2021-06-28T07:22:12.160+0000","audituid":null,"audittime":null,"reaudituid":null,"reaudittime":null,"auditstatus":1,"reaudited":0,"auditmsg":null},"role":[{"id":3,"name":"admin","description":"众包管理员"}]} */ - private int code; private String message; private BodyBean body; diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/AboutFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/AboutFragment.java index 6428f2a..b064615 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/AboutFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/AboutFragment.java @@ -26,6 +26,7 @@ public class AboutFragment extends BaseFragment implements View.OnClickListener fragment.setArguments(bundle); return fragment; } + @Override protected int getLayout() { return R.layout.about_fragment; diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/CapacityEvaluationFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/CapacityEvaluationFragment.java index c7ca284..d58413e 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/CapacityEvaluationFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/CapacityEvaluationFragment.java @@ -17,6 +17,7 @@ import com.github.lazylibrary.util.FileUtils; import com.lzy.okgo.model.HttpParams; import com.navinfo.outdoor.R; import com.navinfo.outdoor.activity.FragmentManagement; +import com.navinfo.outdoor.activity.GuidanceActivity; import com.navinfo.outdoor.adapter.CapacityEvaluationAdapter; import com.navinfo.outdoor.api.Constant; import com.navinfo.outdoor.base.BaseFragment; @@ -27,6 +28,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.ToastUtils; import com.umeng.umcrash.UMCrash; import org.greenrobot.eventbus.EventBus; @@ -167,7 +169,7 @@ public class CapacityEvaluationFragment extends BaseFragment implements View.OnC } else if (response.getCode() == 230) { FlushTokenUtil.flushToken(getActivity()); } else { - Toast.makeText(getActivity(), response.getMessage(), Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(),response.getMessage()); } Log.d("TAG", "onSuccess: " + response.getMessage() + "sassafrases"); } @@ -177,10 +179,10 @@ public class CapacityEvaluationFragment extends BaseFragment implements View.OnC dismissLoadingDialog(); String message = e.getMessage(); assert message != null; - if (message.contains("timeout") || message.contains("Read time out")) { - Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show(); + if (message.equals("timeout") || message.equals("Read time out")) { + ToastUtils.Message(getActivity(),"请求超时"); } else { - Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(),message); } Log.d("TAG", "onError: " + e.getMessage()); /* 友盟+ @@ -197,7 +199,7 @@ public class CapacityEvaluationFragment extends BaseFragment implements View.OnC capacityList.clear(); } if (taskPrefectureBean.getBody().getList() == null) { - Toast.makeText(getActivity(), "没有相关数据", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(),"没有相关数据"); } else { capacityList.addAll(taskPrefectureBean.getBody().getList()); capacityPage++; @@ -215,7 +217,7 @@ public class CapacityEvaluationFragment extends BaseFragment implements View.OnC } } } else { - Toast.makeText(getActivity(), taskPrefectureBean.getMessage(), Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(),taskPrefectureBean.getMessage()); Log.d("TAG", "" + taskPrefectureBean.getMessage()); } } diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/CapacityEvaluationFragment2.java b/app/src/main/java/com/navinfo/outdoor/fragment/CapacityEvaluationFragment2.java index 14c0c4b..a06a077 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/CapacityEvaluationFragment2.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/CapacityEvaluationFragment2.java @@ -21,6 +21,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.ToastUtils; import org.json.JSONObject; @@ -70,6 +71,7 @@ public class CapacityEvaluationFragment2 extends BaseFragment implements View.On public void onLoadMore() { } + }); capacityItemAdapter.setSetOnClick(new CapacityItemAdapter.setOnClick() { @Override @@ -104,7 +106,7 @@ public class CapacityEvaluationFragment2 extends BaseFragment implements View.On } else if (response.getCode() == 230) { FlushTokenUtil.flushToken(getActivity()); } else { - Toast.makeText(getActivity(), response.getMessage() + "", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(),response.getMessage()); } Log.d("TAG", "onSuccess: " + response.getMessage() + "sassafras's" + aBoolean); } @@ -114,10 +116,10 @@ public class CapacityEvaluationFragment2 extends BaseFragment implements View.On dismissLoadingDialog(); String message = e.getMessage(); assert message != null; - if (message.contains("timeout")|| message.contains("Read time out")) { - Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show(); + if (message.equals("timeout")|| message.equals("Read time out")) { + ToastUtils.Message(getActivity(),"请求超时"); } else { - Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(),message); } } }); diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/CapacityMeasurementFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/CapacityMeasurementFragment.java index c0638b7..a85dc23 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/CapacityMeasurementFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/CapacityMeasurementFragment.java @@ -40,6 +40,7 @@ import com.kongzue.dialog.util.BaseDialog; import com.kongzue.dialog.v3.MessageDialog; import com.navinfo.outdoor.util.FlushTokenUtil; import com.navinfo.outdoor.util.TimestampUtil; +import com.navinfo.outdoor.util.ToastUtils; import org.greenrobot.eventbus.EventBus; import org.json.JSONException; @@ -132,64 +133,64 @@ public class CapacityMeasurementFragment extends BaseFragment implements View.On if (id == null) { return; } + showLoadingDialog(); HttpParams httpParams = new HttpParams(); httpParams.put("id", id); - showLoadingDialog(); - OkGoBuilder.getInstance() + OkGoBuilder okGoBuilder = OkGoBuilder.getInstance() .time(30) .Builder(getActivity()) .url(HttpInterface.EXAM_CONTENT) .cls(MeasureBean.class) .params(httpParams) - .token(Constant.ACCESS_TOKEN) - .getRequest(new Callback() { - @Override - public void onSuccess(MeasureBean response, int id) { - dismissLoadingDialog(); - String title = response.getBody().getTitle(); - if (title != null) { - tvCapacity.setText(title); - } - //单选 - if (response.getBody().getSingleChoice() != null) { - List singleChoice = response.getBody().getSingleChoice(); - for (int i = 0; i < singleChoice.size(); i++) { - baleen.add(new BolBean(singleChoice.get(i).getId(), singleChoice.get(i).getQuestion(), singleChoice.get(i).getOption(), true)); - examId = singleChoice.get(i).getExamId(); - } - } - //多选 - if (response.getBody().getMultiChoice() != null) { - List multiChoice = response.getBody().getMultiChoice(); - for (int i = 0; i < multiChoice.size(); i++) { - baleen.add(new BolBean(multiChoice.get(i).getId(), multiChoice.get(i).getQuestion(), multiChoice.get(i).getOption(), false)); - examId = multiChoice.get(i).getExamId(); - } - } - if (baleen != null) { - if (baleen.size() > 0) { - capacityMeasureAdapter.setMeasureList(baleen); - btnSubmit.setVisibility(View.VISIBLE); - tvCapacity.setVisibility(View.VISIBLE); - } else { - btnSubmit.setVisibility(View.GONE); - tvCapacity.setVisibility(View.GONE); - } - } + .token(Constant.ACCESS_TOKEN); + okGoBuilder.getRequest(new Callback() { + @Override + public void onSuccess(MeasureBean response, int id) { + dismissLoadingDialog(); + String title = response.getBody().getTitle(); + if (title != null) { + tvCapacity.setText(title); + } + //单选 + if (response.getBody().getSingleChoice() != null) { + List singleChoice = response.getBody().getSingleChoice(); + for (int i = 0; i < singleChoice.size(); i++) { + baleen.add(new BolBean(singleChoice.get(i).getId(), singleChoice.get(i).getQuestion(), singleChoice.get(i).getOption(), true)); + examId = singleChoice.get(i).getExamId(); } + } + //多选 + if (response.getBody().getMultiChoice() != null) { + List multiChoice = response.getBody().getMultiChoice(); + for (int i = 0; i < multiChoice.size(); i++) { + baleen.add(new BolBean(multiChoice.get(i).getId(), multiChoice.get(i).getQuestion(), multiChoice.get(i).getOption(), false)); + examId = multiChoice.get(i).getExamId(); + } + } + if (baleen != null) { + if (baleen.size() > 0) { + capacityMeasureAdapter.setMeasureList(baleen); + btnSubmit.setVisibility(View.VISIBLE); + tvCapacity.setVisibility(View.VISIBLE); + } else { + btnSubmit.setVisibility(View.GONE); + tvCapacity.setVisibility(View.GONE); + } + } + } - @Override - public void onError(Throwable e, int id) { - dismissLoadingDialog(); - String message = e.getMessage(); - assert message != null; - if (message.contains("timeout") || message.contains("Read time out")) { - Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show(); - } else { - Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show(); - } - } - }); + @Override + public void onError(Throwable e, int id) { + dismissLoadingDialog(); + String message = e.getMessage(); + assert message != null; + if (message.equals("timeout") || message.equals("Read time out")) { + ToastUtils.Message(getActivity(),"请求超时"); + } else { + ToastUtils.Message(getActivity(),message); + } + } + }); } @Override @@ -209,7 +210,7 @@ public class CapacityMeasurementFragment extends BaseFragment implements View.On for (int i = 0; i < baleen.size(); i++) { final String id = baleen.get(i).getId(); if (!checkedMap.containsKey(id) || checkedMap.get(id) == null || ("").equals(checkedMap.get(id))) { - Toast.makeText(getActivity(), "有题目未填写答案，请仔细检查！", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(),"有题目未填写答案，请仔细检查！"); return; } } @@ -229,7 +230,7 @@ public class CapacityMeasurementFragment extends BaseFragment implements View.On } initExamSubmit(); } else { - Toast.makeText(getActivity(), "无数据，无法提交", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(),"无数据，无法提交"); } break; } @@ -278,7 +279,7 @@ public class CapacityMeasurementFragment extends BaseFragment implements View.On } else if (response.getCode() == 230) { FlushTokenUtil.flushToken(getActivity()); } else { - Toast.makeText(getActivity(), response.getMessage(), Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(),response.getMessage()); } } @@ -287,10 +288,10 @@ public class CapacityMeasurementFragment extends BaseFragment implements View.On dismissLoadingDialog(); String message = e.getMessage(); assert message != null; - if (message.contains("timeout") || message.contains("Read time out")) { - Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show(); + if (message.equals("timeout") || message.equals("Read time out")) { + ToastUtils.Message(getActivity(),"请求超时"); } else { - Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(),message); } } }); diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/ChargingPileFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/ChargingPileFragment.java index f45c75d..4c753df 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/ChargingPileFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/ChargingPileFragment.java @@ -53,6 +53,7 @@ import com.navinfo.outdoor.util.GeometryTools; import com.navinfo.outdoor.util.PhotoUtils; import com.navinfo.outdoor.util.TimestampUtil; import com.navinfo.outdoor.util.ToastUtil; +import com.navinfo.outdoor.util.ToastUtils; import com.tencent.tencentmap.mapsdk.maps.TencentMap; import com.tencent.tencentmap.mapsdk.maps.model.BitmapDescriptor; import com.tencent.tencentmap.mapsdk.maps.model.BitmapDescriptorFactory; @@ -186,7 +187,6 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC checkBoxLife.setTextColor(Color.WHITE); checkBoxLife.setChecked(true); } - @Override public void onCancel() { BitmapDescriptor pileDescriptor = BitmapDescriptorFactory.fromResource(R.drawable.marker_charge_pile_show); @@ -312,7 +312,6 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC public void onNothingSelected(AdapterView parent) { } }); - spinnerType = findViewById(R.id.spinner_type); ArrayAdapter adapterType = new ArrayAdapter<>(Objects.requireNonNull(getContext()), android.R.layout.simple_spinner_item, type); adapterType.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); //设置下拉列表框的下拉选项样式 @@ -1006,7 +1005,7 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC chargingPileEntity = initChargingPileEntityByUI(chargingPileEntity); PoiCheckResult poiCheckResult = checkChargingPileEntity(chargingPileEntity); if (poiCheckResult.getCode() == 1) { - Toast.makeText(getActivity(), poiCheckResult.getMsg() + "", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(),poiCheckResult.getMsg()); return; } new Thread(new Runnable() { @@ -1018,7 +1017,7 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC public void run() { if (result[0] != 0) { chargingPileEntity.setPileId(result[0]); - ToastUtil.showShort(getActivity(), "充电桩保存成功"); + ToastUtils.Message(getActivity(),"充电桩保存成功"); Message obtain = Message.obtain(); obtain.what = Constant.CHARGING_PILE_STATION; obtain.obj = chargingPileEntity; @@ -1031,7 +1030,7 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC // chargingPileByWork(chargingPileEntity); getActivity().onBackPressed(); } else { - ToastUtil.showShort(getActivity(), "充电桩保存失败，请重试！"); + ToastUtils.Message(getActivity(),"充电桩保存失败，请重试！"); } } @@ -1040,14 +1039,14 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC }).start(); } else { - Toast.makeText(getActivity(), "没有申请权限，请手动申请", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(),"没有申请权限，请手动申请"); } } @Override public void onDenied(List permissions, boolean never) { if (never) { - Toast.makeText(getActivity(), "被永久拒绝授权，请手动授予权限", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(),"被永久拒绝授权，请手动授予权限"); // 如果是被永久拒绝就跳转到应用权限系统设置页面 XXPermissions.startPermissionActivity(Objects.requireNonNull(getActivity()), permissions); } @@ -1124,7 +1123,6 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC intentNumber.putExtra(Constant.INTENT_PHOTO_PATH, numberFile.getPath()); startActivityForResult(intentNumber, 110); break; - } } diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/ChargingStationFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/ChargingStationFragment.java index 4c3f9c4..0eeff84 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/ChargingStationFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/ChargingStationFragment.java @@ -46,6 +46,7 @@ import com.kongzue.dialog.v3.WaitDialog; import com.lzy.okgo.model.HttpParams; import com.navinfo.outdoor.R; import com.navinfo.outdoor.activity.FragmentManagement; +import com.navinfo.outdoor.activity.LoginActivity; import com.navinfo.outdoor.activity.PhotographActivity; import com.navinfo.outdoor.adapter.ChargingPileAdapter; import com.navinfo.outdoor.api.Constant; @@ -53,6 +54,7 @@ import com.navinfo.outdoor.base.BaseDrawerFragment; import com.navinfo.outdoor.util.FlushTokenUtil; import com.navinfo.outdoor.util.PreserveUtils; import com.navinfo.outdoor.util.TimestampUtil; +import com.navinfo.outdoor.util.ToastUtils; import com.navinfo.outdoor.util.UploadUtils; import com.navinfo.outdoor.bean.ChargingPileSaveBean; import com.navinfo.outdoor.bean.ChargingStationBean; @@ -106,18 +108,18 @@ import okhttp3.Response; */ public class ChargingStationFragment extends BaseDrawerFragment implements View.OnClickListener { private EditText editDescribe; - private RelativeLayout rlPanorama, rlName, rlInternalPhotos, rlElse, rlScutcheon, rlNull,linearExist; + private RelativeLayout rlPanorama, rlName, rlInternalPhotos, rlElse, rlScutcheon, rlNull, linearExist; private ImageView ivPanorama, ivName, ivInternal, ivElse, ivScutcheon; private TextView tvExamine, tvPanorama, tvNamePic, tvInternal, tvElse, tvScutcheon; private EditText editNameContent, editSiteContent; private ArrayList poiBeans; private Button btnSaveLocal, btnUploading; private CheckBox checkBoxLife; - private Spinner spinnerType,spinnerExist; + private Spinner spinnerType, spinnerExist; String[] caye = new String[]{"充电站", "充换电站", "充电桩组", "换电站"};//1."充电站"2 "充换电站"3 "充电桩组"4 "换电站"5 , String[] spinner = new String[]{"存在", "不存在", "无法验证"}; private int existence = 0; - private LinearLayout linearChargingPile,linearContact; + private LinearLayout linearChargingPile, linearContact; private ChargingPileAdapter chargingPileAdapter; private int station_type = 1; private LatLng latLng; @@ -278,8 +280,8 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View. @Override protected void initView() { super.initView(); - checkBoxLife = findViewById(R.id.check_pot_life); CheckBox checkBoxRight = findViewById(R.id.check_pot_right); + checkBoxLife = findViewById(R.id.check_pot_life); nestedScrollView = findViewById(R.id.nested_scroll_view); removablesLocality = new ArrayList<>(); setSlidingUpPanelLayout(Constant.SLIDING_LAYOUT); @@ -756,18 +758,18 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View. private void initPhone() { String encode = Geohash.getInstance().encode(latLng.latitude, latLng.longitude); if (encode == null) { - Toast.makeText(getActivity(), "没有确定经纬度", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(),"没有确定经纬度"); return; } showLoadingDialog(); - OkGoBuilder.getInstance() + OkGoBuilder okGoBuilder = OkGoBuilder.getInstance() .time(30) .Builder(getActivity()) .url(HttpInterface.GET_PHONES) .params(new HttpParams("geo", encode)) .cls(GetPhoneBean.class) - .token(Constant.ACCESS_TOKEN) - .getRequest(new Callback() { + .token(Constant.ACCESS_TOKEN); + okGoBuilder.getRequest(new Callback() { @Override public void onSuccess(GetPhoneBean getPhoneBean, int id) { dismissLoadingDialog(); @@ -788,14 +790,7 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View. } else if (getPhoneBean.getCode() == 230) { FlushTokenUtil.flushToken(getActivity()); } else { - if (getActivity() != null) { - getActivity().runOnUiThread(new Runnable() { - @Override - public void run() { - Toast.makeText(getActivity(), getPhoneBean.getMessage(), Toast.LENGTH_SHORT).show(); - } - }); - } + ToastUtils.Message(getActivity(),getPhoneBean.getMessage()); } } @@ -804,30 +799,16 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View. dismissLoadingDialog(); String message = e.getMessage(); assert message != null; - if (message.contains("timeout") || message.contains("Read time out")) { - if (getActivity() != null) { - getActivity().runOnUiThread(new Runnable() { - @Override - public void run() { - Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show(); - } - }); - } + if (message.equals("timeout") || message.equals("Read time out")) { + ToastUtils.Message(getActivity(),"请求超时"); + } else { - if (getActivity() != null) { - getActivity().runOnUiThread(new Runnable() { - @Override - public void run() { - Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show(); - } - }); - } + ToastUtils.Message(getActivity(),message); } } }); } - public void initRemovePileSharePre() { //获取SharedPreferences对象，方法中两个参数的意思为：第一个name //表示文件名，系统将会在/dada/dada/包名/shared_prefs目录下生成 @@ -955,11 +936,11 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View. EventBus.getDefault().post(obtain); String name = editNameContent.getText().toString().trim();//名称 if (name.equals("")) { - Toast.makeText(getActivity(), "请输入充电站 名称", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(),"请输入充电站 名称"); return; } if (latLng == null) { - Toast.makeText(getActivity(), "请确定点位", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(),"请确定点位"); return; } if (chargingStationList != null) { @@ -967,14 +948,14 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View. } String tagPanorama = (String) tvPanorama.getTag(); if (tagPanorama == null) { - Toast.makeText(getActivity(), "请拍照", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(),"请拍照"); return; } else { chargingStationList.add(new File(tagPanorama)); } String tagName = (String) tvNamePic.getTag(); if (tagName == null) { - Toast.makeText(getActivity(), "请拍照", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(),"请拍照"); return; } else { chargingStationList.add(new File(tagName)); @@ -982,21 +963,21 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View. if (existence == 0) { String tagInternal = (String) tvInternal.getTag(); if (tagInternal == null) { - Toast.makeText(getActivity(), "请拍照", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(),"请拍照"); return; } else { chargingStationList.add(new File(tagInternal)); } String tagElse = (String) tvElse.getTag(); if (tagElse == null) { - Toast.makeText(getActivity(), "请拍照", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(),"请拍照"); return; } else { chargingStationList.add(new File(tagElse)); } String tagScutcheon = (String) tvScutcheon.getTag(); if (tagScutcheon == null) { - Toast.makeText(getActivity(), "请拍照", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(),"请拍照"); return; } else { chargingStationList.add(new File(tagScutcheon)); @@ -1051,7 +1032,7 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View. } }).start(); } else { - Toast.makeText(getContext(), "该任务正在提交中", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(),"该任务正在提交中"); } break; case R.id.tv_station_examine: @@ -1130,7 +1111,7 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View. } } - private void initRoadSaveLocal(boolean isLocal) { + private void initRoadSaveLocal(boolean isLocal) { XXPermissions.with(this) //读写权限 .permission(Permission.MANAGE_EXTERNAL_STORAGE) @@ -1142,7 +1123,7 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View. PoiEntity poiEntity = initPoiEntityByUI(showPoiEntity); PoiCheckResult poiCheckResult = checkPoiEntity(poiEntity); if (poiCheckResult.getCode() == 1) { - Toast.makeText(getActivity(), poiCheckResult.getMsg() + "", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(),poiCheckResult.getMsg() ); return; } poiEntity.setTaskStatus(2); @@ -1164,16 +1145,15 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View. } } }).start(); - } else { - Toast.makeText(getActivity(), "没有申请权限，请手动申请", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(),"没有申请权限，请手动申请"); } } @Override public void onDenied(List permissions, boolean never) { if (never) { - Toast.makeText(getActivity(), "被永久拒绝授权，请手动授予权限", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(),"被永久拒绝授权，请手动授予权限"); // 如果是被永久拒绝就跳转到应用权限系统设置页面 XXPermissions.startPermissionActivity(Objects.requireNonNull(getActivity()), permissions); } @@ -1198,13 +1178,14 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View. .cls(ChargingStationBean.class) .params(httpParams) .token(Constant.ACCESS_TOKEN); + okGoBuilder.getRequest(PreserveUtils.getInstance().getChargingPreserveCallback(getActivity(), poiEntity)); if (getActivity() != null) { - okGoBuilder.getRequest(PreserveUtils.getInstance().getChargingPreserveCallback(getActivity(), poiEntity)); getActivity().getSupportFragmentManager().popBackStack();//回退 WaitDialog.show((AppCompatActivity) getActivity(), "任务已保存本地,请稍后"); WaitDialog.dismiss(1000); } } + /*根据充电站数据检查充电桩数据，如果没有网络保存，则批量网络上传*/ private void saveChargingPileUploadChargingStation(PoiEntity chargingStationPoiEntity) { if (chargingStationPoiEntity != null) { @@ -1219,6 +1200,7 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View. } } } + /*上传充电桩数据*/ private void chargingPileUploadNetWork(ChargingPileEntity chargingPileEntity) { List chargingPileFileList = new ArrayList<>(); @@ -1258,7 +1240,7 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View. private void stationUploadByNetWork(PoiEntity poiEntity, ArrayList chargingStationList) { if (poiEntity == null) { - Toast.makeText(getActivity(), "没有保存本地", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(),"没有保存本地"); return; } showLoadingDialog(); @@ -1293,6 +1275,7 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View. } }).start(); } + /*保存充电站数据到服务器*/ private void chargingStationSaveByWork(PoiEntity poiEntity) { HttpParams httpParams = new HttpParams(); @@ -1340,26 +1323,13 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View. } }).start(); } else { - if (getActivity() != null) { - getActivity().runOnUiThread(new Runnable() { - @Override - public void run() { - Toast.makeText(getActivity(), chargingStationBean.getMessage(), Toast.LENGTH_SHORT).show(); - } - }); - } + ToastUtils.Message(getActivity(),chargingStationBean.getMessage()); + } } else if (chargingStationBean.getCode() == 230) { FlushTokenUtil.flushToken(getActivity()); } else { - if (getActivity() != null) { - getActivity().runOnUiThread(new Runnable() { - @Override - public void run() { - Toast.makeText(getActivity(), chargingStationBean.getMessage(), Toast.LENGTH_SHORT).show(); - } - }); - } + ToastUtils.Message(getActivity(),chargingStationBean.getMessage()); } } @@ -1368,24 +1338,10 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View. dismissLoadingDialog(); String message = e.getMessage(); assert message != null; - if (message.contains("timeout") || message.contains("Read time out")) { - if (getActivity() != null) { - getActivity().runOnUiThread(new Runnable() { - @Override - public void run() { - Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show(); - } - }); - } + if (message.equals("timeout") || message.equals("Read time out")) { + ToastUtils.Message(getActivity(),"请求超时"); } else { - if (getActivity() != null) { - getActivity().runOnUiThread(new Runnable() { - @Override - public void run() { - Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show(); - } - }); - } + ToastUtils.Message(getActivity(),message); } Log.d("TAG", "onError: " + e.getMessage()); } @@ -1421,9 +1377,9 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View. for (int i = 0; i < body.size(); i++) { stringBuilder.append(body.get(i)).append("；"); } - Toast.makeText(getActivity(), " 存在类似名称--" + stringBuilder.toString(), Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity()," 存在类似名称--"); } else { - Toast.makeText(getActivity(), "没有类似名称,可以作业", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(),"没有类似名称,可以作业"); } } }); @@ -1442,7 +1398,7 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View. getActivity().runOnUiThread(new Runnable() { @Override public void run() { - Toast.makeText(getActivity(), taskNameBean.getMessage() + "", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(),taskNameBean.getMessage()); editNameContent.setTextColor(Color.RED); btnSaveLocal.setEnabled(false); btnUploading.setEnabled(false); @@ -1460,20 +1416,10 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View. } String message = e.getMessage(); assert message != null; - if (message.contains("timeout") || message.contains("Read time out")) { - getActivity().runOnUiThread(new Runnable() { - @Override - public void run() { - Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show(); - } - }); + if (message.equals("timeout") || message.equals("Read time out")) { + ToastUtils.Message(getActivity(),"请求超时"); } else { - getActivity().runOnUiThread(new Runnable() { - @Override - public void run() { - Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show(); - } - }); + ToastUtils.Message(getActivity(),message); } Log.d("TAG", "onError: " + e.getMessage()); } @@ -1607,7 +1553,7 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View. hashMap.put("cp_availableState", chargingPileEntity.getCp_availableState()); hashMap.put("sign_exist", chargingPileEntity.getSign_exist()); String s = new Gson().toJson(hashMap); - httpParams.put("detail",s); + httpParams.put("detail", s); try { Response execute = OkGoBuilder .getInstance() @@ -1692,12 +1638,12 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View. private void initEndReceiveTask(String url, PoiEntity poiEntity) { if (poiEntity.getTaskId() == 0) { - Toast.makeText(getActivity(), "无此任务", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(),"无此任务"); return; } HttpParams httpParams = new HttpParams(); httpParams.put("taskIds", poiEntity.getTaskId()); - httpParams.put("auditIds", ""); + httpParams.put("auditIds",""); OkGoBuilder okGoBuilder = OkGoBuilder.getInstance() .time(30) .Builder(getActivity()) @@ -1741,14 +1687,7 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View. } else if (response.getCode() == 230) { FlushTokenUtil.flushToken(getActivity()); } else { - if (getActivity() != null) { - getActivity().runOnUiThread(new Runnable() { - @Override - public void run() { - Toast.makeText(getActivity(), "" + response.getMessage(), Toast.LENGTH_SHORT).show(); - } - }); - } + ToastUtils.Message(getActivity(), response.getMessage()); } } @@ -1758,23 +1697,10 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View. String message = e.getMessage(); assert message != null; if (message.contains("timeout") || message.contains("Read time out")) { - if (getActivity() != null) { - getActivity().runOnUiThread(new Runnable() { - @Override - public void run() { - Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show(); - } - }); - } + ToastUtils.Message(getActivity(),"请求超时"); + } else { - if (getActivity() != null) { - getActivity().runOnUiThread(new Runnable() { - @Override - public void run() { - Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show(); - } - }); - } + ToastUtils.Message(getActivity(),message); } Log.d("TAG", "onError: " + e.getMessage()); } diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/ContactFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/ContactFragment.java index fc59dfc..a7bdf56 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/ContactFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/ContactFragment.java @@ -15,6 +15,7 @@ import java.util.Objects; * 联系我们的Fragment */ public class ContactFragment extends BaseFragment implements View.OnClickListener { + public static ContactFragment newInstance(Bundle bundle) { ContactFragment fragment = new ContactFragment(); fragment.setArguments(bundle); @@ -26,11 +27,6 @@ public class ContactFragment extends BaseFragment implements View.OnClickListene return R.layout.contact_fragment; } - @Override - protected void initData() { - super.initData(); - } - @Override protected void initView() { super.initView(); diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/EventPrefectureFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/EventPrefectureFragment.java index 2c83683..cc579fc 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/EventPrefectureFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/EventPrefectureFragment.java @@ -30,6 +30,7 @@ import com.jcodecraeer.xrecyclerview.ProgressStyle; import com.jcodecraeer.xrecyclerview.XRecyclerView; import com.navinfo.outdoor.util.FlushTokenUtil; import com.navinfo.outdoor.util.TimestampUtil; +import com.navinfo.outdoor.util.ToastUtils; import org.json.JSONObject; @@ -108,32 +109,32 @@ public class EventPrefectureFragment extends BaseFragment implements View.OnClic .params(httpParams) .token(Constant.ACCESS_TOKEN); okGoBuilder.getRequest(new Callback() { - @Override - public void onSuccess(TaskPrefectureBean taskPrefectureBean, int id) { - dismissLoadingDialog(); - if (taskPrefectureBean.getCode() == 200){ - initTaskPrefectureBean(taskPrefectureBean,aNet); - }else if (taskPrefectureBean.getCode()==230){ - FlushTokenUtil.flushToken(getActivity()); - }else { - Toast.makeText(getActivity(), taskPrefectureBean.getMessage()+"", Toast.LENGTH_SHORT).show(); - } - Log.d("TAG", "onSuccess: " + taskPrefectureBean.getMessage()); - } + @Override + public void onSuccess(TaskPrefectureBean taskPrefectureBean, int id) { + dismissLoadingDialog(); + if (taskPrefectureBean.getCode() == 200) { + initTaskPrefectureBean(taskPrefectureBean, aNet); + } else if (taskPrefectureBean.getCode() == 230) { + FlushTokenUtil.flushToken(getActivity()); + } else { + ToastUtils.Message(getActivity(),taskPrefectureBean.getMessage()); + } + Log.d("TAG", "onSuccess: " + taskPrefectureBean.getMessage()); + } - @Override - public void onError(Throwable e, int id) { - dismissLoadingDialog(); - String message = e.getMessage(); - assert message != null; - if (message.contains("timeout")|| message.contains("Read time out")){ - Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show(); - }else { - Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show(); - } - Log.d("TAG", "onError: " + e.getMessage()); - } - }); + @Override + public void onError(Throwable e, int id) { + dismissLoadingDialog(); + String message = e.getMessage(); + assert message != null; + if (message.equals("timeout") || message.equals("Read time out")) { + ToastUtils.Message(getActivity(),"请求超时"); + } else { + ToastUtils.Message(getActivity(),message); + } + Log.d("TAG", "onError: " + e.getMessage()); + } + }); } private void initTaskPrefectureBean(TaskPrefectureBean taskPrefectureBean, boolean aBoolean) { @@ -142,8 +143,8 @@ public class EventPrefectureFragment extends BaseFragment implements View.OnClic if (taskExplainBean.size() > 0) { taskExplainBean.clear(); } - if (taskPrefectureBean.getBody().getList()== null) { - Toast.makeText(getActivity(), "没有相关数据", Toast.LENGTH_SHORT).show(); + if (taskPrefectureBean.getBody().getList() == null) { + ToastUtils.Message(getActivity(),"没有相关数据"); } else { taskExplainBean.addAll(taskPrefectureBean.getBody().getList()); eventPage++; @@ -161,7 +162,7 @@ public class EventPrefectureFragment extends BaseFragment implements View.OnClic } } } else { - Toast.makeText(getActivity(), taskPrefectureBean.getMessage(), Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(),taskPrefectureBean.getMessage()); Log.d("TAG", "" + taskPrefectureBean.getMessage()); } } @@ -175,12 +176,12 @@ public class EventPrefectureFragment extends BaseFragment implements View.OnClic eventRecycler.setLayoutManager(new LinearLayoutManager(getActivity())); eventRecycler.setRefreshProgressStyle(ProgressStyle.BallSpinFadeLoader); eventRecycler.setLoadingMoreProgressStyle(ProgressStyle.BallRotate); - eventPrefectureAdapter = new EventPrefectureAdapter(taskExplainBean,getActivity()); + eventPrefectureAdapter = new EventPrefectureAdapter(taskExplainBean, getActivity()); eventRecycler.setAdapter(eventPrefectureAdapter); eventRecycler.setLoadingListener(new XRecyclerView.LoadingListener() { @Override public void onRefresh() { - eventPage=1; + eventPage = 1; initNetwork(true); } @@ -194,7 +195,7 @@ public class EventPrefectureFragment extends BaseFragment implements View.OnClic public void item(int aInt) { eventPrefectureBuilder.append(TimestampUtil.time()).append(",").append("点击了item ,"); HashMap paramMap = new HashMap<>(); - paramMap.put("id",aInt+""); + paramMap.put("id", aInt + ""); intentWebActivity(HttpInterface.MSG_CONTENT, paramMap); } }); diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/FilterFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/FilterFragment.java index dd2fea2..b65d2c5 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/FilterFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/FilterFragment.java @@ -43,6 +43,7 @@ import com.navinfo.outdoor.util.FlushTokenUtil; import com.navinfo.outdoor.util.Geohash; import com.navinfo.outdoor.util.GeometryTools; import com.navinfo.outdoor.util.TimestampUtil; +import com.navinfo.outdoor.util.ToastUtils; import com.tencent.tencentmap.mapsdk.maps.model.LatLng; import com.vividsolutions.jts.geom.Geometry; @@ -277,12 +278,15 @@ public class FilterFragment extends BaseDrawerFragment implements View.OnClickLi } Button btnFilter = findViewById(R.id.btn_filter); btnFilter.setOnClickListener(this); + RelativeLayout rlDraw = findViewById(R.id.rl_draw); checkOk = findViewById(R.id.check_ok); Button btnDraw = findViewById(R.id.btn_draw); btnDraw.setOnClickListener(this); if (Constant.LEVEL == 1 || Constant.LEVEL == 2) { + rlDraw.setVisibility(View.VISIBLE); btnDraw.setBackgroundResource(R.drawable.shape_radius_bg); } else { + rlDraw.setVisibility(View.GONE); btnDraw.setBackgroundResource(R.drawable.shape_red_bg_disable); } setSlidingUpPanelLayout(Constant.SLIDING_LAYOUT); @@ -330,7 +334,7 @@ public class FilterFragment extends BaseDrawerFragment implements View.OnClickLi btnChock.clear(); } else { checkOk.setChecked(false); - Toast.makeText(getActivity(), "您的等级暂不具备此权限哦", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(), "您的等级暂不具备此权限哦"); } } }); @@ -371,6 +375,10 @@ public class FilterFragment extends BaseDrawerFragment implements View.OnClickLi if (btnChock == null) { return; } + if (btnChock.size() == 0) { + ToastUtils.Message(getActivity(), "请选择任务"); + return; + } StringBuilder a = new StringBuilder(); for (int i = 0; i < btnChock.size(); i++) { if (i == btnChock.size() - 1) { @@ -381,7 +389,7 @@ public class FilterFragment extends BaseDrawerFragment implements View.OnClickLi } initBatch(a.toString()); } else { - Toast.makeText(getActivity(), "您的等级暂不具备此权限哦", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(), "您的等级暂不具备此权限哦"); } break; case R.id.btn_filter: @@ -395,6 +403,7 @@ public class FilterFragment extends BaseDrawerFragment implements View.OnClickLi obtains.what = Constant.JOB_WORD_MONITOR; obtains.obj = true; EventBus.getDefault().post(obtains); + onBackPressed(); break; case R.id.cl_number: @@ -459,11 +468,10 @@ public class FilterFragment extends BaseDrawerFragment implements View.OnClickLi } }); break; - + /* + *1 "POI",2 "充电站",3 "POI录像",4 "道路录像",5 "其他",6 "面状任务" + */ case R.id.cl_exclusive: - /* - *1 "POI",2 "充电站",3 "POI录像",4 "道路录像",5 "其他",6 "面状任务" - */ filterBuilder.append(TimestampUtil.time()).append(",").append("点击了任务类型的按钮 ,"); BottomMenu.show((AppCompatActivity) Objects.requireNonNull(getContext()), new String[]{"全部", "POI", "充电站", "POI录像", "道路录像", "其他", "面状任务"}, new OnMenuItemClickListener() { @Override @@ -506,10 +514,10 @@ public class FilterFragment extends BaseDrawerFragment implements View.OnClickLi } }); break; + /* + *任务状态 0.未领取 1.已领取，2.未保存(保存到本地但未提交成功),3.已保存(保存到本地提交成功)，4已上传（结束采集）, + */ case R.id.cl_type: - /* - 任务状态 0.未领取 1.已领取，2.未保存(保存到本地但未提交成功),3.已保存(保存到本地提交成功)，4已上传（结束采集）, - */ filterBuilder.append(TimestampUtil.time()).append("点击了任务状态的按钮 ,"); BottomMenu.show((AppCompatActivity) Objects.requireNonNull(getContext()), new String[]{"全部", "未领取", "已领取", "已领取（网络）"/*, "未保存", "已保存"*/}, new OnMenuItemClickListener() { @Override @@ -574,11 +582,11 @@ public class FilterFragment extends BaseDrawerFragment implements View.OnClickLi obtain.what = Constant.JOB_WORD_MONITOR; obtain.obj = true; EventBus.getDefault().post(obtain); - Toast.makeText(getContext(), "领取成功", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(), "领取成功"); } else if (response.getCode() == 230) { FlushTokenUtil.flushToken(getActivity()); } else { - Toast.makeText(getContext(), response.getMessage(), Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(), response.getMessage()); } } @@ -587,10 +595,10 @@ public class FilterFragment extends BaseDrawerFragment implements View.OnClickLi dismissLoadingDialog(); String message = e.getMessage(); assert message != null; - if (message.contains("timeout") || message.contains("Read time out")) { - Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show(); + if (message.equals("timeout") || message.equals("Read time out")) { + ToastUtils.Message(getActivity(), "请求超时"); } else { - Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(), message); } } }); @@ -732,13 +740,17 @@ public class FilterFragment extends BaseDrawerFragment implements View.OnClickLi @Override public void onPause() { super.onPause(); - filterBuilder.append(TimestampUtil.time()).append(",").append("onPause ,"); + if (filterBuilder != null) { + filterBuilder.append(TimestampUtil.time()).append(",").append("onPause ,"); + } } @Override public void onStop() { super.onStop(); - filterBuilder.append(TimestampUtil.time()).append(",").append("onStop ,"); + if (filterBuilder != null) { + filterBuilder.append(TimestampUtil.time()).append(",").append("onStop ,"); + } } @Override @@ -746,9 +758,11 @@ public class FilterFragment extends BaseDrawerFragment implements View.OnClickLi if (EventBus.getDefault().isRegistered(this))//加上判断 EventBus.getDefault().unregister(this); super.onDestroy(); - filterBuilder.append(TimestampUtil.time()).append(",").append("onDestroy"); - filterBuilder.append("\r\n"); - FileUtils.writeFile(logFile.getAbsolutePath(), filterBuilder.toString(), true); + if (filterBuilder != null) { + filterBuilder.append(TimestampUtil.time()).append(",").append("onDestroy"); + filterBuilder.append("\r\n"); + FileUtils.writeFile(logFile.getAbsolutePath(), filterBuilder.toString(), true); + } } @Override diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/FindFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/FindFragment.java index 4de7d9f..8a590d8 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/FindFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/FindFragment.java @@ -87,7 +87,7 @@ public class FindFragment extends BaseFragment implements View.OnClickListener { } @Override - public void onClick(View v) { + public void onClick(View v) { switch (v.getId()) { case R.id.linear_task_prefecture: findBuilder.append(TimestampUtil.time()).append(",").append("点击了最新公告：任务专区 跳转 ,"); diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/ForgetPawFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/ForgetPawFragment.java index a4c3cf4..43796f9 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/ForgetPawFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/ForgetPawFragment.java @@ -31,6 +31,7 @@ import com.navinfo.outdoor.http.UploadCallBack; import com.navinfo.outdoor.util.Base64; import com.navinfo.outdoor.util.RegexUtil; import com.navinfo.outdoor.util.TimestampUtil; +import com.navinfo.outdoor.util.ToastUtils; import org.greenrobot.eventbus.EventBus; @@ -71,20 +72,20 @@ public class ForgetPawFragment extends BaseFragment implements View.OnClickListe 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); + 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)){ + } else { + if (pictures_time.equals(newFormat)) { logFile = new File(Constant.LOG_FOLDER + "/" + pictures_time + ".txt"); - }else { + } else { logFile = new File(Constant.LOG_FOLDER + "/" + newFormat + ".txt"); } } forgetPawBuilder = new StringBuilder(); forgetPawBuilder.append(TimestampUtil.time()).append(",").append("ForgetPawFragment-onViewCreated-initData,"); - if (Constant.USHERED!=null){ + if (Constant.USHERED != null) { forgetPawBuilder.append("userId:").append(Constant.USHERED).append(","); } } @@ -114,11 +115,10 @@ public class ForgetPawFragment extends BaseFragment implements View.OnClickListe case R.id.forgetPaw_get_note: forgetPawBuilder.append(TimestampUtil.time()).append(",").append("点击了获取短信验证码,"); if (!RegexUtil.isPhone(etForgetPawPhone.getText().toString())) { - Toast.makeText(getActivity(), "手机号错误，请重新输入", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(),"手机号错误，请重新输入"); return; } initGetNote(); - break; case R.id.btn_forgetPaw: forgetPawBuilder.append(TimestampUtil.time()).append(",").append("点击了提交,"); @@ -131,21 +131,21 @@ public class ForgetPawFragment extends BaseFragment implements View.OnClickListe HttpParams httpParams = new HttpParams(); String mobile = etForgetPawPhone.getText().toString().trim(); if (!RegexUtil.isPhone(mobile)) { - Toast.makeText(getActivity(), "手机号输入错误", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(),"手机号输入错误"); return; } else { httpParams.put("mobile", mobile); } String code = etForgetPawNote.getText().toString().trim(); if (code.equals("")) { - Toast.makeText(getActivity(), "请获取短信验证码", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(),"请获取短信验证码"); return; } else { httpParams.put("code", code); } String password = etForgetPawPaw.getText().toString().trim(); if (password.equals("")) { - Toast.makeText(getActivity(), "请输入密码", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(),"请输入密码"); return; } else { try { @@ -156,14 +156,14 @@ public class ForgetPawFragment extends BaseFragment implements View.OnClickListe } String conFirmPaw = etForgetPawConfirmPaw.getText().toString().trim(); if (conFirmPaw.equals("")) { - Toast.makeText(getActivity(), "请输入确认密码", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(),"请输入确认密码"); return; } if (!conFirmPaw.equals(password)) { - Toast.makeText(getActivity(), "密码和确认密码请保持一致", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(),"密码和确认密码请保持一致"); } if (sessionId == null || sessionId.equals("")) { - Toast.makeText(getActivity(), "请短信获取验证码", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(),"请短信获取验证码"); return; } else { httpParams.put("sessionId", sessionId); @@ -171,49 +171,48 @@ public class ForgetPawFragment extends BaseFragment implements View.OnClickListe long time = System.currentTimeMillis(); httpParams.put("datetime", time); showLoadingDialog(); - OkGoBuilder.getInstance() + OkGoBuilder okGoBuilder = OkGoBuilder.getInstance() .time(30) .Builder(getActivity()) .url(HttpInterface.USER_FORGET_PASSWORD) .token(null) - .params(httpParams) .cls(UserBean.class) - .postRequest(new UploadCallBack() { - @Override - public void onSuccess(UserBean response, int id) { - dismissLoadingDialog(); - if (response.getCode() == 200) { - Toast.makeText(getActivity(), "修改成功", Toast.LENGTH_SHORT).show(); - Constant.USER_NAME = mobile; - Constant.PASS_WORD = password; - Message obtain = Message.obtain(); - obtain.what = Constant.REGISTER_WORD; - obtain.obj = true; - EventBus.getDefault().post(obtain); - Objects.requireNonNull(getActivity()).finish(); - } else { - Toast.makeText(getActivity(), response.getMessage() + "", Toast.LENGTH_SHORT).show(); - } - } + .params(httpParams); + okGoBuilder.postRequest(new UploadCallBack() { + @Override + public void onSuccess(UserBean response, int id) { + dismissLoadingDialog(); + if (response.getCode() == 200) { + Constant.USER_NAME = mobile; + Constant.PASS_WORD = password; + Message obtain = Message.obtain(); + obtain.what = Constant.REGISTER_WORD; + obtain.obj = true; + EventBus.getDefault().post(obtain); + ToastUtils.Message(getActivity(),"修改成功"); + Objects.requireNonNull(getActivity()).finish(); + } else { + ToastUtils.Message(getActivity(),response.getMessage()); + } + } - @Override - public void uploadProgress(Progress progress) { + @Override + public void uploadProgress(Progress progress) { - } + } - @Override - public void onError(Throwable e, int id) { - dismissLoadingDialog(); - String message = e.getMessage(); - assert message != null; - if (message.contains("timeout")|| message.contains("Read time out")){ - Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show(); - }else { - Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show(); - - } - } - }); + @Override + public void onError(Throwable e, int id) { + dismissLoadingDialog(); + String message = e.getMessage(); + assert message != null; + if (message.contains("timeout") || message.contains("Read time out")) { + ToastUtils.Message(getActivity(),"请求超时"); + } else { + ToastUtils.Message(getActivity(),message); + } + } + }); } private void registerNote() { @@ -227,7 +226,6 @@ public class ForgetPawFragment extends BaseFragment implements View.OnClickListe public void onTick(long millisUntilFinished) { forgetPawGetNote.setText(millisUntilFinished / 1000 + "秒后重新获取验证码"); } - @Override public void onFinish() { forgetPawGetNote.setEnabled(true); @@ -245,44 +243,45 @@ public class ForgetPawFragment extends BaseFragment implements View.OnClickListe timer.cancel(); timer = null; } - Toast.makeText(getActivity(), "请输入手机号", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(),"请输入手机号"); return; } else { httpParams.put("mobile", mobile); } httpParams.put("type", 2); showLoadingDialog(); - OkGoBuilder.getInstance() + OkGoBuilder okGoBuilder = OkGoBuilder.getInstance() .time(30) .Builder(getActivity()) .url(HttpInterface.USER_MESSAGE) .cls(MessageCodeBean.class) .params(httpParams) - .token(null) - .getRequest(new Callback() { - @Override - public void onSuccess(MessageCodeBean response, int id) { - dismissLoadingDialog(); - if (response.getCode() == 200) { - sessionId = response.getBody(); - registerNote(); - Toast.makeText(getActivity(), "验证码已发送", Toast.LENGTH_SHORT).show(); - } else { - Toast.makeText(getActivity(), response.getMessage() + "", Toast.LENGTH_SHORT).show(); - } - } - @Override - public void onError(Throwable e, int id) { - dismissLoadingDialog(); - String message = e.getMessage(); - assert message != null; - if (message.contains("timeout")|| message.contains("Read time out")){ - Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show(); - }else { - Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show(); - } - } - }); + .token(null); + okGoBuilder.getRequest(new Callback() { + @Override + public void onSuccess(MessageCodeBean response, int id) { + dismissLoadingDialog(); + if (response.getCode() == 200) { + sessionId = response.getBody(); + registerNote(); + ToastUtils.Message(getActivity(),"验证码已发送"); + } else { + ToastUtils.Message(getActivity(),response.getMessage()); + } + } + + @Override + public void onError(Throwable e, int id) { + dismissLoadingDialog(); + String message = e.getMessage(); + assert message != null; + if (message.equals("timeout") || message.equals("Read time out")) { + ToastUtils.Message(getActivity(),"请求超时"); + } else { + ToastUtils.Message(getActivity(),message); + } + } + }); } @Override diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/GatherGetFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/GatherGetFragment.java index fa8d52a..a1910c7 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/GatherGetFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/GatherGetFragment.java @@ -41,6 +41,7 @@ import com.navinfo.outdoor.util.FlushTokenUtil; import com.navinfo.outdoor.util.Geohash; import com.navinfo.outdoor.util.GeometryTools; import com.navinfo.outdoor.util.TimestampUtil; +import com.navinfo.outdoor.util.ToastUtils; import com.tencent.lbssearch.httpresponse.Poi; import com.tencent.tencentmap.mapsdk.maps.model.LatLng; import com.vividsolutions.jts.geom.Geometry; @@ -189,6 +190,7 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe /** * 保存小数点后两位 + * * @param value value */ public static String format2(double value) { @@ -277,7 +279,7 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe LatLng endLatLng = new LatLng(Double.parseDouble(poiEntity.getY()), Double.parseDouble(poiEntity.getX())); double geometry = GeometryTools.distanceToDouble(startLatLng, endLatLng); if (geometry > 5000) { - Toast.makeText(getActivity(), "作业不在领取范围内,无法领取", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(),"作业不在领取范围内,无法采集"); return; } else { if (geometry > 50) { @@ -469,7 +471,7 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe } else if (response.getCode() == 230) { FlushTokenUtil.flushToken(getActivity()); } else { - Toast.makeText(getActivity(), "" + response.getMessage(), Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(),response.getMessage()); } } @@ -478,10 +480,10 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe dismissLoadingDialog(); String message = e.getMessage(); assert message != null; - if (message.contains("timeout") || message.contains("Read time out")) { - Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show(); + if (message.equals("timeout") || message.equals("Read time out")) { + ToastUtils.Message(getActivity(),"请求超时"); } else { - Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(),message); } Log.d("TAG", "onError: " + e.getMessage()); } @@ -493,7 +495,7 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe */ private void initPolygonTask(String url, PoiEntity poiEntity, boolean aBoolean) { if (poiEntity.getTaskId() == 0) { - Toast.makeText(getActivity(), "无此任务", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(),"无此任务"); return; } showLoadingDialog(); @@ -545,7 +547,7 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe @Override public void run() { initViewByTaskStatus(1); - Toast.makeText(getActivity(), "领取成功", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(),"领取成功"); if (aBoolean) { initCompleteTask(HttpInterface.SUBMIT_POLYGON_TASK, polygonEntity); } else { @@ -562,7 +564,7 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe } else if (response.getCode() == 230) { FlushTokenUtil.flushToken(getActivity()); } else { - Toast.makeText(getActivity(), "" + response.getMessage(), Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(),response.getMessage()); } } @@ -571,10 +573,10 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe dismissLoadingDialog(); String message = e.getMessage(); assert message != null; - if (message.contains("timeout") || message.contains("Read time out")) { - Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show(); + if (message.equals("timeout") || message.equals("Read time out")) { + ToastUtils.Message(getActivity(),"请求超时"); } else { - Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(),message); } Log.d("TAG", "onError: " + e.getMessage()); } @@ -587,7 +589,7 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe */ private void initEndReceiveTask(String url, PoiEntity poiEntity) { if (poiEntity.getTaskId() == 0) { - Toast.makeText(getActivity(), "无此任务", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(),"无此任务"); return; } showLoadingDialog(); @@ -631,7 +633,7 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe } else if (response.getCode() == 230) { FlushTokenUtil.flushToken(getActivity()); } else { - Toast.makeText(getActivity(), "" + response.getMessage(), Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(),response.getMessage()); } } @@ -640,10 +642,10 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe dismissLoadingDialog(); String message = e.getMessage(); assert message != null; - if (message.contains("timeout") || message.contains("Read time out")) { - Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show(); + if (message.equals("timeout") || message.equals("Read time out")) { + ToastUtils.Message(getActivity(),"请求超时"); } else { - Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(),message); } } }); @@ -654,7 +656,7 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe */ private void initCompleteTask(String url, PoiEntity poiEntity) { if (poiEntity.getTaskId() == 0) { - Toast.makeText(getActivity(), "无此任务", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(),"无此任务"); return; } showLoadingDialog(); @@ -698,7 +700,7 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe } else if (response.getCode() == 230) { FlushTokenUtil.flushToken(getActivity()); } else { - Toast.makeText(getActivity(), "" + response.getMessage(), Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(),response.getMessage()); } } @@ -707,10 +709,10 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe dismissLoadingDialog(); String message = e.getMessage(); assert message != null; - if (message.contains("timeout") || message.contains("Read time out")) { - Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show(); + if (message.equals("timeout") || message.equals("Read time out")) { + ToastUtils.Message(getActivity(),"请求超时"); } else { - Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(),message); } } }); @@ -721,7 +723,7 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe */ private void initSubmitPolygonTask(String url, PoiEntity poiEntity) { if (poiEntity.getTaskId() == 0) { - Toast.makeText(getActivity(), "无此任务", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(),"无此任务"); return; } HttpParams httpParams = new HttpParams(); @@ -748,7 +750,7 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe } else if (response.getCode() == 230) { FlushTokenUtil.flushToken(getActivity()); } else { - Toast.makeText(getActivity(), "" + response.getMessage(), Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(),response.getMessage()); } } @@ -757,10 +759,10 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe dismissLoadingDialog(); String message = e.getMessage(); assert message != null; - if (message.contains("timeout") || message.contains("Read time out")) { - Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show(); + if (message.equals("timeout") || message.equals("Read time out")) { + ToastUtils.Message(getActivity(),"请求超时"); } else { - Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(),message); } } }); @@ -771,7 +773,7 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe */ private void receivedTaskByNet(String url, PoiEntity poiEntity, boolean isSaver, int statusId) { if (poiEntity.getTaskId() != 0) { - Toast.makeText(getActivity(), "无此任务", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(),"无此任务"); return; } showLoadingDialog(); @@ -879,7 +881,7 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe } else if (response.getCode() == 230) { FlushTokenUtil.flushToken(getActivity()); } else { - Toast.makeText(getActivity(), "" + response.getMessage(), Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(),response.getMessage()); } } @@ -888,10 +890,10 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe dismissLoadingDialog(); String message = e.getMessage(); assert message != null; - if (message.contains("timeout") || message.contains("Read time out")) { - Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show(); + if (message.equals("timeout") || message.equals("Read time out")) { + ToastUtils.Message(getActivity(),"请求超时"); } else { - Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(),message); } } }); @@ -1009,7 +1011,7 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe } else if (response.getCode() == 230) { FlushTokenUtil.flushToken(getActivity()); } else { - Toast.makeText(getActivity(), "" + response.getMessage(), Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(),response.getMessage()); } } @@ -1018,10 +1020,10 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe dismissLoadingDialog(); String message = e.getMessage(); assert message != null; - if (message.contains("timeout") || message.contains("Read time out")) { - Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show(); + if (message.equals("timeout") || message.equals("Read time out")) { + ToastUtils.Message(getActivity(),"请求超时"); } else { - Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(),message); } } }); diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/GatheringFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/GatheringFragment.java index d767590..0f7c714 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/GatheringFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/GatheringFragment.java @@ -43,7 +43,6 @@ import com.navinfo.outdoor.base.BaseFragment; import com.navinfo.outdoor.bean.BankCardBean; import com.navinfo.outdoor.bean.BankPathBean; import com.navinfo.outdoor.bean.BankPhoneBean; -import com.navinfo.outdoor.http.Callback; import com.navinfo.outdoor.http.HttpInterface; import com.navinfo.outdoor.http.OkGoBuilder; import com.navinfo.outdoor.http.UploadCallBack; @@ -51,6 +50,7 @@ import com.navinfo.outdoor.util.FlushTokenUtil; import com.navinfo.outdoor.util.GetJsonDataUtil; import com.navinfo.outdoor.util.PhotoUtils; import com.navinfo.outdoor.util.TimestampUtil; +import com.navinfo.outdoor.util.ToastUtils; import org.json.JSONArray; @@ -226,7 +226,7 @@ public class GatheringFragment extends BaseFragment implements View.OnClickListe case R.id.btn_bank: gatheringBuilder.append(TimestampUtil.time()).append(",").append("点击绑定银行卡 ,"); if (etBankNum.getText().toString().equals("")) { - Toast.makeText(getActivity(), "银行卡号不能为空", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(),"银行卡号不能为空"); Log.e("TAG", "onClick: " + etBankNum); return; } @@ -249,9 +249,9 @@ public class GatheringFragment extends BaseFragment implements View.OnClickListe ArrayList gatheringList = new ArrayList<>(); if (gatheringCamera.getTag() == null) { if (Constant.BACKGROUND == null) { - Toast.makeText(getActivity(), "请先拍银行卡", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(),"请先拍银行卡"); } else { - Toast.makeText(getActivity(), "如果需要重新绑定请先拍照银行卡", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(),"如果需要重新绑定请先拍照银行卡"); } return; } @@ -260,7 +260,7 @@ public class GatheringFragment extends BaseFragment implements View.OnClickListe String etBankAccount = etBankNum.getText().toString().trim(); if (etBankAccount.equals("")) { if (!etBankAccount.matches("^\\\\d{19}$\"")) { - Toast.makeText(getActivity(), "银行卡号不能为空", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(),"银行卡号不能为空"); return; } } @@ -301,7 +301,7 @@ public class GatheringFragment extends BaseFragment implements View.OnClickListe } else if (response.getCode() == 230) { FlushTokenUtil.flushToken(getActivity()); } else { - Toast.makeText(getActivity(), "绑定失败！", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(),"绑定失败！"); } } @@ -316,10 +316,10 @@ public class GatheringFragment extends BaseFragment implements View.OnClickListe dismissLoadingDialog(); String message = e.getMessage(); assert message != null; - if (message.contains("timeout")||message.contains("Read time out")){ - Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show(); - }else { - Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show(); + if (message.contains("timeout") || message.contains("Read time out")) { + ToastUtils.Message(getActivity(),"请求超时"); + } else { + ToastUtils.Message(getActivity(),message); } } }); @@ -341,22 +341,22 @@ public class GatheringFragment extends BaseFragment implements View.OnClickListe //银行卡识别 BankCardBean bankCardBean = new Gson().fromJson(BankCard.bankCard(), BankCardBean.class); if (bankCardBean == null) { - Toast.makeText(getContext(), "识别失败，可以重新识别或则进行手动输入", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(),"识别失败，可以重新识别或则进行手动输入"); } else { if (bankCardBean.getResult() != null) { if (bankCardBean.getResult().getBank_card_number() != null) { String bankCardNumber = bankCardBean.getResult().getBank_card_number().trim(); String bank_card_number = bankCardNumber.replace(" ", ""); if (StringUtils.isEmpty(bank_card_number)) { - Toast.makeText(getActivity(), "识别失败，可以重新识别或则进行手动输入", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(),"识别失败，可以重新识别或则进行手动输入"); return; } etBankNum.setText(bank_card_number); } else { - Toast.makeText(getActivity(), "识别失败，可以重新识别或则进行手动输入", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(),"识别失败，可以重新识别或则进行手动输入"); } } else { - Toast.makeText(getActivity(), "识别失败，可以重新识别或则进行手动输入", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(),"识别失败，可以重新识别或则进行手动输入"); } } } diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/GradeFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/GradeFragment.java index da1cace..24e3ac7 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/GradeFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/GradeFragment.java @@ -13,6 +13,7 @@ import java.util.Objects; * 我的等级页面的fragment */ public class GradeFragment extends BaseFragment implements View.OnClickListener{ + public static GradeFragment newInstance(Bundle bundle) { GradeFragment fragment = new GradeFragment(); fragment.setArguments(bundle); @@ -29,7 +30,6 @@ public class GradeFragment extends BaseFragment implements View.OnClickListener{ super.initData(); } - @Override protected void initView() { ImageView ivGrade = findViewById(R.id.iv_grade); @@ -44,4 +44,18 @@ public class GradeFragment extends BaseFragment implements View.OnClickListener{ } } + @Override + public void onPause() { + super.onPause(); + } + + @Override + public void onStop() { + super.onStop(); + } + + @Override + public void onDestroy() { + super.onDestroy(); + } } diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/HasSubmitFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/HasSubmitFragment.java index 1e1872c..5e68c8e 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/HasSubmitFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/HasSubmitFragment.java @@ -35,6 +35,7 @@ import com.navinfo.outdoor.room.PoiDatabase; import com.navinfo.outdoor.util.FlushTokenUtil; import com.navinfo.outdoor.util.TimestampUtil; import com.navinfo.outdoor.util.ToastUtil; +import com.navinfo.outdoor.util.ToastUtils; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; @@ -80,25 +81,21 @@ public class HasSubmitFragment extends BaseFragment implements View.OnClickListe poiAuditProcess = findViewById(R.id.poi_audit_process); poiAuditThrough = findViewById(R.id.poi_audit_through); poiAuditNotThrough = findViewById(R.id.poi_audit_not_through); - 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); - 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); - 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); - ConstraintLayout clPoiVideo = findViewById(R.id.cl_poiVideo); clPoiVideo.setOnClickListener(this); poiVideoAuditProcess = findViewById(R.id.poiVideo_audit_process); @@ -168,14 +165,7 @@ public class HasSubmitFragment extends BaseFragment implements View.OnClickListe } else if (hasSubmitBean.getCode() == 230) { FlushTokenUtil.flushToken(getActivity()); } else { - if (getActivity() != null) { - getActivity().runOnUiThread(new Runnable() { - @Override - public void run() { - Toast.makeText(getContext(), hasSubmitBean.getMessage(), Toast.LENGTH_SHORT).show(); - } - }); - } + ToastUtils.Message(getActivity(),hasSubmitBean.getMessage()); } } @@ -184,24 +174,10 @@ public class HasSubmitFragment extends BaseFragment implements View.OnClickListe dismissLoadingDialog(); String message = e.getMessage(); assert message != null; - if (message.contains("timeout") || message.contains("Read time out")) { - if (getActivity() != null) { - getActivity().runOnUiThread(new Runnable() { - @Override - public void run() { - Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show(); - } - }); - } + if (message.equals("timeout") || message.equals("Read time out")) { + ToastUtils.Message(getActivity(),"请求超时"); } else { - if (getActivity() != null) { - getActivity().runOnUiThread(new Runnable() { - @Override - public void run() { - Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show(); - } - }); - } + ToastUtils.Message(getActivity(),message); } } }); @@ -241,14 +217,7 @@ public class HasSubmitFragment extends BaseFragment implements View.OnClickListe } else if (hasSubmitBean.getCode() == 230) { FlushTokenUtil.flushToken(getActivity()); } else { - if (getActivity() != null) { - getActivity().runOnUiThread(new Runnable() { - @Override - public void run() { - Toast.makeText(getContext(), hasSubmitBean.getMessage(), Toast.LENGTH_SHORT).show(); - } - }); - } + ToastUtils.Message(getActivity(),hasSubmitBean.getMessage()); } } @@ -257,24 +226,10 @@ public class HasSubmitFragment extends BaseFragment implements View.OnClickListe dismissLoadingDialog(); String message = e.getMessage(); assert message != null; - if (message.contains("timeout") || message.contains("Read time out")) { - if (getActivity() != null) { - getActivity().runOnUiThread(new Runnable() { - @Override - public void run() { - Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show(); - } - }); - } + if (message.equals("timeout") || message.equals("Read time out")) { + ToastUtils.Message(getActivity(),"请求超时"); } else { - if (getActivity() != null) { - getActivity().runOnUiThread(new Runnable() { - @Override - public void run() { - Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show(); - } - }); - } + ToastUtils.Message(getActivity(),message); } } }); @@ -314,14 +269,7 @@ public class HasSubmitFragment extends BaseFragment implements View.OnClickListe } else if (hasSubmitBean.getCode() == 230) { FlushTokenUtil.flushToken(getActivity()); } else { - if (getActivity() != null) { - getActivity().runOnUiThread(new Runnable() { - @Override - public void run() { - Toast.makeText(getContext(), hasSubmitBean.getMessage(), Toast.LENGTH_SHORT).show(); - } - }); - } + ToastUtils.Message(getActivity(),hasSubmitBean.getMessage()); } } @@ -330,24 +278,10 @@ public class HasSubmitFragment extends BaseFragment implements View.OnClickListe dismissLoadingDialog(); String message = e.getMessage(); assert message != null; - if (message.contains("timeout") || message.contains("Read time out")) { - if (getActivity() != null) { - getActivity().runOnUiThread(new Runnable() { - @Override - public void run() { - Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show(); - } - }); - } + if (message.equals("timeout") || message.equals("Read time out")) { + ToastUtils.Message(getActivity(),"请求超时"); } else { - if (getActivity() != null) { - getActivity().runOnUiThread(new Runnable() { - @Override - public void run() { - Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show(); - } - }); - } + ToastUtils.Message(getActivity(),message); } } }); @@ -387,14 +321,7 @@ public class HasSubmitFragment extends BaseFragment implements View.OnClickListe } else if (hasSubmitBean.getCode() == 230) { FlushTokenUtil.flushToken(getActivity()); } else { - if (getActivity() != null) { - getActivity().runOnUiThread(new Runnable() { - @Override - public void run() { - Toast.makeText(getContext(), hasSubmitBean.getMessage(), Toast.LENGTH_SHORT).show(); - } - }); - } + ToastUtils.Message(getActivity(),hasSubmitBean.getMessage()); } } @@ -403,24 +330,10 @@ public class HasSubmitFragment extends BaseFragment implements View.OnClickListe dismissLoadingDialog(); String message = e.getMessage(); assert message != null; - if (message.contains("timeout") || message.contains("Read time out")) { - if (getActivity() != null) { - getActivity().runOnUiThread(new Runnable() { - @Override - public void run() { - Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show(); - } - }); - } + if (message.equals("timeout") || message.equals("Read time out")) { + ToastUtils.Message(getActivity(),"请求超时"); } else { - if (getActivity() != null) { - getActivity().runOnUiThread(new Runnable() { - @Override - public void run() { - Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show(); - } - }); - } + ToastUtils.Message(getActivity(),message); } } }); @@ -461,14 +374,7 @@ public class HasSubmitFragment extends BaseFragment implements View.OnClickListe } else if (hasSubmitBean.getCode() == 230) { FlushTokenUtil.flushToken(getActivity()); } else { - if (getActivity() != null) { - getActivity().runOnUiThread(new Runnable() { - @Override - public void run() { - Toast.makeText(getContext(), hasSubmitBean.getMessage(), Toast.LENGTH_SHORT).show(); - } - }); - } + ToastUtils.Message(getActivity(),hasSubmitBean.getMessage()); } } @@ -477,24 +383,10 @@ public class HasSubmitFragment extends BaseFragment implements View.OnClickListe dismissLoadingDialog(); String message = e.getMessage(); assert message != null; - if (message.contains("timeout") || message.contains("Read time out")) { - if (getActivity() != null) { - getActivity().runOnUiThread(new Runnable() { - @Override - public void run() { - Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show(); - } - }); - } + if (message.equals("timeout") || message.equals("Read time out")) { + ToastUtils.Message(getActivity(),"请求超时"); } else { - if (getActivity() != null) { - getActivity().runOnUiThread(new Runnable() { - @Override - public void run() { - Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show(); - } - }); - } + ToastUtils.Message(getActivity(),message); } } }); diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/IssueFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/IssueFragment.java index b8cc182..23cd0d1 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/IssueFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/IssueFragment.java @@ -27,6 +27,7 @@ import com.navinfo.outdoor.http.Callback; import com.navinfo.outdoor.http.HttpInterface; import com.navinfo.outdoor.http.OkGoBuilder; import com.navinfo.outdoor.util.FlushTokenUtil; +import com.navinfo.outdoor.util.ToastUtils; import com.umeng.umcrash.UMCrash; import org.json.JSONObject; @@ -85,7 +86,7 @@ public class IssueFragment extends BaseFragment implements View.OnClickListener } else if (response.getCode() == 230) { FlushTokenUtil.flushToken(getActivity()); } else { - Toast.makeText(getActivity(), response.getMessage() + "", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(),response.getMessage()); } } @@ -94,10 +95,10 @@ public class IssueFragment extends BaseFragment implements View.OnClickListener dismissLoadingDialog(); String message = e.getMessage(); assert message != null; - if (message.contains("timeout")||message.contains("Read time out")){ - Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show(); + if (message.equals("timeout")||message.equals("Read time out")){ + ToastUtils.Message(getActivity(),"请求超时"); }else { - Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(),message); } } }); @@ -120,7 +121,6 @@ public class IssueFragment extends BaseFragment implements View.OnClickListener issueProblemAdapter = new IssueProblemAdapter(getActivity()); mainIssueRecycler.setAdapter(issueProblemAdapter); mainIssueRecycler.getDefaultFootView().setNoMoreHint("成功加载完毕"); - issueProblemAdapter.setOnIssueClick(new IssueProblemAdapter.OnIssueClick() { @Override public void onClick(int pos) { diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/IssueWebFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/IssueWebFragment.java index 08c6c89..6586167 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/IssueWebFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/IssueWebFragment.java @@ -16,7 +16,6 @@ import com.navinfo.outdoor.activity.WebActivity; import com.navinfo.outdoor.api.Constant; import com.navinfo.outdoor.base.BaseFragment; import com.navinfo.outdoor.bean.RichTextBean; -import com.navinfo.outdoor.http.Callback; import com.navinfo.outdoor.http.OkGoBuilder; import java.util.HashMap; diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/MapDownloadFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/MapDownloadFragment.java index 6028b02..6107828 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/MapDownloadFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/MapDownloadFragment.java @@ -14,7 +14,6 @@ import java.util.Objects; * 地图下载的Fragment */ public class MapDownloadFragment extends BaseFragment implements View.OnClickListener{ - public static MapDownloadFragment newInstance(Bundle bundle) { MapDownloadFragment fragment = new MapDownloadFragment(); fragment.setArguments(bundle); diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/MessageFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/MessageFragment.java index f389f8d..63e48ad 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/MessageFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/MessageFragment.java @@ -30,6 +30,7 @@ import com.navinfo.outdoor.http.HttpInterface; import com.navinfo.outdoor.http.OkGoBuilder; import com.navinfo.outdoor.util.FlushTokenUtil; import com.navinfo.outdoor.util.TimestampUtil; +import com.navinfo.outdoor.util.ToastUtils; import java.io.File; import java.text.DateFormat; @@ -77,7 +78,6 @@ public class MessageFragment extends BaseFragment implements View.OnClickListene messageAdapter.setMessageClickItem(new MessageAdapter.messageClickItem() { @Override public void item(int id) { - messageBuilder.append(TimestampUtil.time()).append(",").append("点击item ,"); HashMap paramMap = new HashMap<>(); paramMap.put("id", id + ""); @@ -86,11 +86,9 @@ public class MessageFragment extends BaseFragment implements View.OnClickListene }); messageRecycler.getDefaultFootView().setNoMoreHint("已全部加载完毕"); messageRecycler.setLoadingListener(new XRecyclerView.LoadingListener() { - @Override public void onRefresh() { } - @Override public void onLoadMore() { } @@ -120,9 +118,8 @@ public class MessageFragment extends BaseFragment implements View.OnClickListene } else if (taskPrefectureBean.getCode() == 230) { FlushTokenUtil.flushToken(getActivity()); } else { - Toast.makeText(getActivity(), taskPrefectureBean.getMessage() + "", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(),taskPrefectureBean.getMessage()); } - } @Override @@ -130,10 +127,10 @@ public class MessageFragment extends BaseFragment implements View.OnClickListene dismissLoadingDialog(); String message = e.getMessage(); assert message != null; - if (message.contains("timeout")||message.contains("Read time out")){ - Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show(); + if (message.equals("timeout")||message.equals("Read time out")){ + ToastUtils.Message(getActivity(),"请求超时"); }else { - Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(),message); } Log.d("TAG", "onError: " + e.getMessage()); } diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/MineFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/MineFragment.java index d9ab140..39dd862 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/MineFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/MineFragment.java @@ -29,8 +29,10 @@ import com.navinfo.outdoor.bean.GetPriceBean; import com.navinfo.outdoor.http.Callback; import com.navinfo.outdoor.http.HttpInterface; import com.navinfo.outdoor.http.OkGoBuilder; +import com.navinfo.outdoor.util.DoubleUtil; import com.navinfo.outdoor.util.FlushTokenUtil; import com.navinfo.outdoor.util.TimestampUtil; +import com.navinfo.outdoor.util.ToastUtils; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; @@ -146,7 +148,7 @@ public class MineFragment extends BaseFragment implements View.OnClickListener { if (response.getCode() == 200) { GetPriceBean.BodyBean body = response.getBody(); if (body != null) { - String minePrice = format2( body.getUserPrice()); + String minePrice = DoubleUtil.format2( body.getUserPrice()); if (getActivity() != null) { getActivity().runOnUiThread(new Runnable() { @SuppressLint("SetTextI18n") @@ -160,14 +162,7 @@ public class MineFragment extends BaseFragment implements View.OnClickListener { } else if (response.getCode() == 230) { FlushTokenUtil.flushToken(getActivity()); } else { - if (getActivity()!=null){ - getActivity().runOnUiThread(new Runnable() { - @Override - public void run() { - Toast.makeText(getActivity(), response.getMessage(), Toast.LENGTH_SHORT).show(); - } - }); - } + ToastUtils.Message(getActivity(),response.getMessage()); } Log.d("TAG", "onSuccess: " + response.toString()); } @@ -177,24 +172,10 @@ public class MineFragment extends BaseFragment implements View.OnClickListener { dismissLoadingDialog(); String message = e.getMessage(); assert message != null; - if (message.contains("timeout")||message.contains("Read time out")){ - if (getActivity()!=null){ - getActivity().runOnUiThread(new Runnable() { - @Override - public void run() { - Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show(); - } - }); - } + if (message.equals("timeout")||message.equals("Read time out")){ + ToastUtils.Message(getActivity(),"请求超时"); }else { - if (getActivity()!=null){ - getActivity().runOnUiThread(new Runnable() { - @Override - public void run() { - Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show(); - } - }); - } + ToastUtils.Message(getActivity(),message); } Log.d("TAG", "onError: " + e.getMessage()); } @@ -254,8 +235,7 @@ public class MineFragment extends BaseFragment implements View.OnClickListener { Intent intentGrade = new Intent(getActivity(), FragmentManagement.class); intentGrade.putExtra("tag", 17); startActivity(intentGrade);*/ - - Toast.makeText(getActivity(), "该功能以后上新，敬请期待", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(),"该功能以后上新，敬请期待"); break; case R.id.btn_withdraw://提现页面 @@ -286,7 +266,6 @@ public class MineFragment extends BaseFragment implements View.OnClickListener { intentAbout.putExtra("tag", 23); startActivity(intentAbout); break; - case R.id.btn_quit://退出登录 mainBuilder.append(TimestampUtil.time()).append(",").append("点击了退出登录的按钮 ,"); Intent intent = new Intent(getContext(), LoginActivity.class); @@ -308,14 +287,6 @@ public class MineFragment extends BaseFragment implements View.OnClickListener { mainBuilder.append(TimestampUtil.time()).append(",").append("onStop ,"); } - /** - * 保存小数点后两位 - */ - public static String format2(double value) { - DecimalFormat df = new DecimalFormat("0.00"); - df.setRoundingMode(RoundingMode.HALF_UP); - return df.format(value); - } @Override public void onDestroy() { 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 98bc56e..46b1c6b 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/OtherFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/OtherFragment.java @@ -46,6 +46,7 @@ import com.navinfo.outdoor.base.BaseDrawerFragment; import com.navinfo.outdoor.util.FlushTokenUtil; import com.navinfo.outdoor.util.PreserveUtils; import com.navinfo.outdoor.util.TimestampUtil; +import com.navinfo.outdoor.util.ToastUtils; import com.navinfo.outdoor.util.UploadUtils; import com.navinfo.outdoor.bean.Info; import com.navinfo.outdoor.bean.PoiSaveBean; @@ -331,6 +332,7 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis @Override public void onNothingSelected(AdapterView parent) { + } }); //数据展示 @@ -537,23 +539,23 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis } String name = editTaskName.getText().toString().trim();//名称 if (name.equals("")) { - Toast.makeText(getActivity(), "请输入poi 名称", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(),"请输入poi 名称"); return; } if (latLng == null) { - Toast.makeText(getActivity(), "请确定点位", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(),"请确定点位"); return; } String tagPicture = (String) tvPicture.getTag(); if (tagPicture == null) { - Toast.makeText(getActivity(), "请拍照", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(),"请拍照"); return; } else { otherUploadList.add(new File(tagPicture)); } String tagPictures = (String) tvPictures.getTag(); if (tagPictures == null) { - Toast.makeText(getActivity(), "请拍照", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(),"请拍照"); return; } else { otherUploadList.add(new File(tagPictures)); @@ -606,7 +608,7 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis } }).start(); } else { - Toast.makeText(getContext(), "该任务正在提交中", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(),"该任务正在提交中"); } break; } @@ -624,7 +626,7 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis PoiEntity poiEntity = initPoiEntityByUI(showPoiEntity); PoiCheckResult poiCheckResult = checkPoiEntity(poiEntity); if (poiCheckResult.getCode() == 1) { - Toast.makeText(getActivity(), poiCheckResult.getMsg() + "", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(),poiCheckResult.getMsg()); return; } poiEntity.setTaskStatus(2); @@ -646,14 +648,14 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis } }).start(); } else { - Toast.makeText(getActivity(), "没有申请权限，请手动申请", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(),"没有申请权限，请手动申请"); } } @Override public void onDenied(List permissions, boolean never) { if (never) { - Toast.makeText(getActivity(), "被永久拒绝授权，请手动授予权限", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(),"被永久拒绝授权，请手动授予权限"); // 如果是被永久拒绝就跳转到应用权限系统设置页面 XXPermissions.startPermissionActivity(Objects.requireNonNull(getActivity()), permissions); } @@ -686,7 +688,7 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis private void otherUploadByNet(int body, List otherUploadList) { if (body == 0) { - Toast.makeText(getActivity(), "没有保存本地", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(),"没有保存本地"); Log.e("TAG", "poiUploadByNetWork: " + body + otherUploadList); return; } @@ -750,26 +752,12 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis } }).start(); } else { - if (getActivity() != null) { - getActivity().runOnUiThread(new Runnable() { - @Override - public void run() { - Toast.makeText(getActivity(), poiSaveBean.getMessage(), Toast.LENGTH_SHORT).show(); - } - }); - } + ToastUtils.Message(getActivity(),poiSaveBean.getMessage()); } } else if (poiSaveBean.getCode() == 230) { FlushTokenUtil.flushToken(getActivity()); } else { - if (getActivity() != null) { - getActivity().runOnUiThread(new Runnable() { - @Override - public void run() { - Toast.makeText(getActivity(), poiSaveBean.getMessage(), Toast.LENGTH_SHORT).show(); - } - }); - } + ToastUtils.Message(getActivity(),poiSaveBean.getMessage()); } } @@ -779,23 +767,9 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis String message = e.getMessage(); assert message != null; if (message.equals("timeout") || message.equals("Read time out")) { - if (getActivity() != null) { - getActivity().runOnUiThread(new Runnable() { - @Override - public void run() { - Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show(); - } - }); - } + ToastUtils.Message(getActivity(),"请求超时"); } else { - if (getActivity() != null) { - getActivity().runOnUiThread(new Runnable() { - @Override - public void run() { - Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show(); - } - }); - } + ToastUtils.Message(getActivity(),message); } } }); @@ -909,7 +883,7 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis private void initEndReceiveTask(String url, PoiEntity poiEntity) { if (poiEntity.getTaskId() == 0) { - Toast.makeText(getActivity(), "无此任务", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(),"无此任务"); return; } HttpParams httpParams = new HttpParams(); @@ -942,14 +916,7 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis } else if (response.getCode() == 230) { FlushTokenUtil.flushToken(getActivity()); } else { - if (getActivity() != null) { - getActivity().runOnUiThread(new Runnable() { - @Override - public void run() { - Toast.makeText(getActivity(), response.getMessage(), Toast.LENGTH_SHORT).show(); - } - }); - } + ToastUtils.Message(getActivity(), response.getMessage()); } } @@ -959,23 +926,9 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis String message = e.getMessage(); assert message != null; if (message.equals("timeout") || message.equals("Read time out")) { - if (getActivity() != null) { - getActivity().runOnUiThread(new Runnable() { - @Override - public void run() { - Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show(); - } - }); - } + ToastUtils.Message(getActivity(), "请求超时"); } else { - if (getActivity() != null) { - getActivity().runOnUiThread(new Runnable() { - @Override - public void run() { - Toast.makeText(getActivity(), "" + message, Toast.LENGTH_SHORT).show(); - } - }); - } + ToastUtils.Message(getActivity(), message); } } }); diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/PhotoFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/PhotoFragment.java index 9a61f9d..09d3ca4 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/PhotoFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/PhotoFragment.java @@ -51,9 +51,8 @@ import java.util.Objects; public class PhotoFragment extends BaseFragment implements View.OnClickListener { private ArrayList fileBeans; private PhotoAdapter photoAdapter; - private File logFile; + private File logFile,fileTxt; private StringBuilder photoBuilder; - private File fileTxt; public static PhotoFragment newInstance(Bundle bundle) { PhotoFragment fragment = new PhotoFragment(); @@ -104,9 +103,9 @@ public class PhotoFragment extends BaseFragment implements View.OnClickListener protected void initView() { super.initView(); PoiEntity showPoiEntity = (PoiEntity) Objects.requireNonNull(getActivity()).getIntent().getSerializableExtra("showPoiEntity"); - ImageView ivPhotoFinal = (ImageView) findViewById(R.id.iv_photo_final); + ImageView ivPhotoFinal = findViewById(R.id.iv_photo_final); ivPhotoFinal.setOnClickListener(this); - TextView tvPhotoAlbumDelete = (TextView) findViewById(R.id.tv_photo_album_delete); + TextView tvPhotoAlbumDelete = findViewById(R.id.tv_photo_album_delete); tvPhotoAlbumDelete.setOnClickListener(this); if (showPoiEntity != null) { String id = showPoiEntity.getId(); @@ -126,8 +125,8 @@ public class PhotoFragment extends BaseFragment implements View.OnClickListener @Override public int compare(File o1, File o2) { String[] split = o1.getName().split(".webp"); - String[] split2 = o2.getName().split(".webp"); int i = Integer.parseInt(split[0]); + String[] split2 = o2.getName().split(".webp"); int i2 = Integer.parseInt(split2[0]); if (i > i2) { return 1; @@ -150,10 +149,15 @@ public class PhotoFragment extends BaseFragment implements View.OnClickListener } } RecyclerView photoRecycler = findViewById(R.id.photo_album_recycler); - photoRecycler.setLayoutManager(new GridLayoutManager(getContext(), 2)); - photoAdapter = new PhotoAdapter(fileTxt, getContext()); - photoAdapter.setFileBeans(fileBeans); - photoRecycler.setAdapter(photoAdapter); + try { + photoRecycler.setLayoutManager(new GridLayoutManager(getContext(), 2)); + photoAdapter = new PhotoAdapter(fileTxt, getContext()); + photoAdapter.setFileBeans(fileBeans); + photoRecycler.setAdapter(photoAdapter); + }catch (Exception e){ + e.getLocalizedMessage(); + } + } @Override @@ -177,7 +181,7 @@ public class PhotoFragment extends BaseFragment implements View.OnClickListener } } photoBuilder = new StringBuilder(); - photoBuilder.append(TimestampUtil.time()).append("PhotoActivity-onCreate-initData ,"); + photoBuilder.append(TimestampUtil.time()).append("PhotoFragment-onCreate-initData ,"); if (Constant.USHERED != null) { photoBuilder.append("userId:").append(Constant.USHERED).append(","); } diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/PoiFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/PoiFragment.java index 593bdbd..548504e 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/PoiFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/PoiFragment.java @@ -50,6 +50,7 @@ import com.navinfo.outdoor.util.AWMp4ParserHelper; import com.navinfo.outdoor.util.FlushTokenUtil; import com.navinfo.outdoor.util.PreserveUtils; import com.navinfo.outdoor.util.TimestampUtil; +import com.navinfo.outdoor.util.ToastUtils; import com.navinfo.outdoor.util.UploadUtils; import com.navinfo.outdoor.bean.GetPhoneBean; import com.navinfo.outdoor.bean.Info; @@ -259,6 +260,7 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe checkBoxLife.setTextColor(Color.BLACK); checkBoxLife.setChecked(false); } + }); } else { BitmapDescriptor poiDescriptor = BitmapDescriptorFactory.fromResource(R.drawable.marker_poi_show); @@ -595,7 +597,7 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe private void initPhone() { String encode = Geohash.getInstance().encode(latLng.latitude, latLng.longitude); if (encode == null) { - Toast.makeText(getActivity(), "没有确定经纬度", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(), "没有确定经纬度"); return; } showLoadingDialog(); @@ -627,15 +629,7 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe } else if (getPhoneBean.getCode() == 230) { FlushTokenUtil.flushToken(getActivity()); } else { - if (getActivity() != null) { - getActivity().runOnUiThread(new Runnable() { - @Override - public void run() { - Toast.makeText(getActivity(), getPhoneBean.getMessage(), Toast.LENGTH_SHORT).show(); - } - }); - } - + ToastUtils.Message(getActivity(), getPhoneBean.getMessage()); } } @@ -645,24 +639,9 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe String message = e.getMessage(); assert message != null; if (message.equals("timeout") || message.equals("Read time out")) { - if (getActivity() != null) { - getActivity().runOnUiThread(new Runnable() { - @Override - public void run() { - Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show(); - } - }); - } + ToastUtils.Message(getActivity(), "请求超时"); } else { - if (getActivity() != null) { - getActivity().runOnUiThread(new Runnable() { - @Override - public void run() { - Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show(); - } - }); - } - + ToastUtils.Message(getActivity(), message); } } }); @@ -746,23 +725,23 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe } String name = editNameContent.getText().toString().trim();//名称 if (name.equals("")) { - Toast.makeText(getActivity(), "请输入poi 名称", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(), "请输入poi 名称"); return; } if (latLng == null) { - Toast.makeText(getActivity(), "请确定点位", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(), "请确定点位"); return; } String tagPanorama = (String) tvPanorama.getTag(); if (tagPanorama == null) { - Toast.makeText(getActivity(), "请拍照", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(), "请拍照"); return; } else { poiPicList.add(new File(tagPanorama)); } String tagName = (String) tvPoiNamePic.getTag(); if (tagName == null) { - Toast.makeText(getActivity(), "请拍照", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(), "请拍照"); return; } else { poiPicList.add(new File(tagName)); @@ -827,7 +806,7 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe } }).start(); } else { - Toast.makeText(getContext(), "该任务正在提交中", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(), "该任务正在提交中"); } break; case R.id.tv_poi_examine: @@ -889,39 +868,35 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe public void onSuccess(TaskNameBean taskNameBean, int id) { dismissLoadingDialog(); if (taskNameBean.getCode() == 200) { - getActivity().runOnUiThread(new Runnable() { - @Override - public void run() { - btnUploading.setEnabled(true); - btnSaveLocal.setEnabled(true); - editNameContent.setTextColor(Color.BLACK); - StringBuilder stringBuilder = new StringBuilder(); - List body = taskNameBean.getBody(); - if (body != null) { - for (int i = 0; i < body.size(); i++) { - stringBuilder.append(body.get(i)).append("；"); - } - Toast.makeText(getActivity(), "存在类似名称---" + stringBuilder.toString(), Toast.LENGTH_SHORT).show(); - } else { - Toast.makeText(getActivity(), "没有类似名称,可以作业", Toast.LENGTH_SHORT).show(); - } - } - }); - } else if (taskNameBean.getCode() == 230) { - if (getActivity() != null) { + if (getActivity()!=null){ getActivity().runOnUiThread(new Runnable() { @Override public void run() { - FlushTokenUtil.flushToken(getActivity()); + btnUploading.setEnabled(true); + btnSaveLocal.setEnabled(true); + editNameContent.setTextColor(Color.BLACK); + StringBuilder stringBuilder = new StringBuilder(); + List body = taskNameBean.getBody(); + if (body != null) { + for (int i = 0; i < body.size(); i++) { + stringBuilder.append(body.get(i)).append("；"); + } + ToastUtils.Message(getActivity(), "存在类似名称---"+stringBuilder.toString()); + } else { + ToastUtils.Message(getActivity(), "没有类似名称,可以作业"); + } } }); + } + } else if (taskNameBean.getCode() == 230) { + FlushTokenUtil.flushToken(getActivity()); } else { if (getActivity() != null) { getActivity().runOnUiThread(new Runnable() { @Override public void run() { - Toast.makeText(getActivity(), taskNameBean.getMessage() + "", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(), taskNameBean.getMessage()); btnUploading.setEnabled(false); btnSaveLocal.setEnabled(false); editNameContent.setTextColor(Color.RED); @@ -939,24 +914,10 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe } String message = e.getMessage(); assert message != null; - if (message.contains("timeout") || message.contains("Read time out")) { - if (getActivity() != null) { - getActivity().runOnUiThread(new Runnable() { - @Override - public void run() { - Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show(); - } - }); - } + if (message.equals("timeout") || message.equals("Read time out")) { + ToastUtils.Message(getActivity(), "请求超时"); } else { - if (getActivity() != null) { - getActivity().runOnUiThread(new Runnable() { - @Override - public void run() { - Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show(); - } - }); - } + ToastUtils.Message(getActivity(), message); } } }); @@ -974,7 +935,7 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe PoiEntity poiEntity = initPoiEntityByUI(showPoiEntity); PoiCheckResult poiCheckResult = checkPoiEntity(poiEntity); if (poiCheckResult.getCode() == 1) { - Toast.makeText(getActivity(), poiCheckResult.getMsg() + "", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(), poiCheckResult.getMsg()); return; } poiEntity.setTaskStatus(2); @@ -996,14 +957,14 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe } }).start(); } else { - Toast.makeText(getActivity(), "没有申请权限，请手动申请", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(), "没有申请权限，请手动申请"); } } @Override public void onDenied(List permissions, boolean never) { if (never) { - Toast.makeText(getActivity(), "被永久拒绝授权，请手动授予权限", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(), "被永久拒绝授权，请手动授予权限"); // 如果是被永久拒绝就跳转到应用权限系统设置页面 XXPermissions.startPermissionActivity(Objects.requireNonNull(getActivity()), permissions); } @@ -1037,7 +998,7 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe private void poiUploadByNetWork(int body, ArrayList poiPicList) { if (body == 0) { - Toast.makeText(getActivity(), "没有保存本地", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(), "没有保存本地"); Log.e("TAG", "poiUploadByNetWork: " + body + poiPicList); return; } @@ -1101,26 +1062,12 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe } }).start(); } else { - if (getActivity() != null) { - getActivity().runOnUiThread(new Runnable() { - @Override - public void run() { - Toast.makeText(getActivity(), poiSaveBean.getMessage(), Toast.LENGTH_SHORT).show(); - } - }); - } + ToastUtils.Message(getActivity(), poiSaveBean.getMessage()); } } else if (poiSaveBean.getCode() == 230) { FlushTokenUtil.flushToken(getActivity()); } else { - if (getActivity() != null) { - getActivity().runOnUiThread(new Runnable() { - @Override - public void run() { - Toast.makeText(getActivity(), poiSaveBean.getMessage(), Toast.LENGTH_SHORT).show(); - } - }); - } + ToastUtils.Message(getActivity(), poiSaveBean.getMessage()); } } @@ -1129,24 +1076,10 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe dismissLoadingDialog(); String message = e.getMessage(); assert message != null; - if (message.contains("timeout") || message.contains("Read time out")) { - if (getActivity() != null) { - getActivity().runOnUiThread(new Runnable() { - @Override - public void run() { - Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show(); - } - }); - } + if (message.equals("timeout") || message.equals("Read time out")) { + ToastUtils.Message(getActivity(), "请求超时"); } else { - if (getActivity() != null) { - getActivity().runOnUiThread(new Runnable() { - @Override - public void run() { - Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show(); - } - }); - } + ToastUtils.Message(getActivity(), message); } Log.d("TAG", "onError: " + e.getMessage()); } @@ -1314,7 +1247,7 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe private void initEndReceiveTask(String url, PoiEntity poiEntity) { if (poiEntity.getTaskId() == 0) { - Toast.makeText(getActivity(), "无此任务", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(), "无此任务"); return; } showLoadingDialog(); @@ -1347,14 +1280,7 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe } else if (response.getCode() == 230) { FlushTokenUtil.flushToken(getActivity()); } else { - if (getActivity() != null) { - getActivity().runOnUiThread(new Runnable() { - @Override - public void run() { - Toast.makeText(getActivity(), "" + response.getMessage(), Toast.LENGTH_SHORT).show(); - } - }); - } + ToastUtils.Message(getActivity(), response.getMessage()); } } @@ -1363,24 +1289,10 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe dismissLoadingDialog(); String message = e.getMessage(); assert message != null; - if (message.contains("timeout") || message.contains("Read time out")) { - if (getActivity() != null) { - getActivity().runOnUiThread(new Runnable() { - @Override - public void run() { - Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show(); - } - }); - } + if (message.equals("timeout") || message.equals("Read time out")) { + ToastUtils.Message(getActivity(), "请求超时"); } else { - if (getActivity() != null) { - getActivity().runOnUiThread(new Runnable() { - @Override - public void run() { - Toast.makeText(getActivity(), "" + message, Toast.LENGTH_SHORT).show(); - } - }); - } + ToastUtils.Message(getActivity(), message); } Log.d("TAG", "onError: " + e.getMessage()); } 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 7938e7c..0cee954 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/PoiTaskFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/PoiTaskFragment.java @@ -32,6 +32,7 @@ import com.navinfo.outdoor.http.HttpInterface; import com.navinfo.outdoor.http.OkGoBuilder; import com.navinfo.outdoor.util.FlushTokenUtil; import com.navinfo.outdoor.util.TimestampUtil; +import com.navinfo.outdoor.util.ToastUtils; import com.umeng.commonsdk.debug.D; import java.io.File; @@ -43,6 +44,7 @@ import java.util.List; import java.util.Objects; /** + * * 记录-已提交-poi任务列表 */ public class PoiTaskFragment extends BaseFragment implements View.OnClickListener { @@ -65,6 +67,7 @@ public class PoiTaskFragment extends BaseFragment implements View.OnClickListene return R.layout.fragment_poi_task; } + @SuppressLint("SetTextI18n") @Override protected void initView() { super.initView(); @@ -167,7 +170,7 @@ public class PoiTaskFragment extends BaseFragment implements View.OnClickListene } else if (hasSubmitBean.getCode() == 230) { FlushTokenUtil.flushToken(getActivity()); } else { - Toast.makeText(getActivity(), hasSubmitBean.getMessage() + "", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(), hasSubmitBean.getMessage()); } } @@ -177,9 +180,9 @@ public class PoiTaskFragment extends BaseFragment implements View.OnClickListene String message = e.getMessage(); assert message != null; if (message.equals("timeout")||message.equals("Read time out")){ - Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(), "请求超时"); }else { - Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(), message); } } }); @@ -192,7 +195,7 @@ public class PoiTaskFragment extends BaseFragment implements View.OnClickListene listBeans.clear(); } if (hasSubmitBean.getBody().getList() == null) { - Toast.makeText(getActivity(), "没有相关数据", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(), "没有相关数据"); } else { listBeans.addAll(hasSubmitBean.getBody().getList()); page++; @@ -210,7 +213,7 @@ public class PoiTaskFragment extends BaseFragment implements View.OnClickListene } } } else { - Toast.makeText(getActivity(), hasSubmitBean.getMessage(), Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(), hasSubmitBean.getMessage()); Log.d("TAG", "" + hasSubmitBean.getMessage()); } } @@ -218,8 +221,8 @@ public class PoiTaskFragment extends BaseFragment implements View.OnClickListene @Override public void onClick(View v) { if (v.getId() == R.id.iv_poiTask_finish) { - Objects.requireNonNull(getActivity()).finish(); poiTaskBuilder.append(TimestampUtil.time()).append(",").append("点击返回按钮 ,"); + Objects.requireNonNull(getActivity()).finish(); } } @@ -242,4 +245,5 @@ public class PoiTaskFragment extends BaseFragment implements View.OnClickListene poiTaskBuilder.append("\r\n"); FileUtils.writeFile(logFile.getAbsolutePath(), poiTaskBuilder.toString(), true); } + } \ No newline at end of file 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 05a21f7..d509460 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/PoiVideoFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/PoiVideoFragment.java @@ -57,6 +57,7 @@ import com.navinfo.outdoor.util.Geohash; import com.navinfo.outdoor.util.GeometryTools; import com.navinfo.outdoor.util.PreserveUtils; import com.navinfo.outdoor.util.TimestampUtil; +import com.navinfo.outdoor.util.ToastUtils; import com.navinfo.outdoor.util.UploadUtils; import com.navinfo.outdoor.util.ZipUtils; import com.tencent.tencentmap.mapsdk.maps.model.BitmapDescriptor; @@ -78,9 +79,9 @@ import java.util.List; import java.util.Objects; /** + * * 寻宝-点击上传弹窗-poi录像 */ - public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClickListener { private EditText etRoadName, etDesc; private ImageView ivPoiVideoPicture; @@ -342,7 +343,6 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick moveLatlng(latLng, null); } } - } String memo = showPoiEntity.getMemo();//任务描述 if (memo != null && !memo.equals("")) { @@ -425,7 +425,7 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick photoAlbumIntent.putExtra("showPoiEntity", showPoiEntity); startActivity(photoAlbumIntent); } else { - Toast.makeText(getContext(), "请拍摄", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(),"请拍摄"); } break; case R.id.btn_poi_video_save: @@ -441,12 +441,12 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick double rearGeometry = GeometryTools.distanceToDouble(startLatLng, rearLatLng);//終點于用戶的距離 if (geometry > rearGeometry) {//用戶在终点开始作业 if (rearGeometry > 5000) { - Toast.makeText(getActivity(), "用户距离作业终点五公里以内才能拍摄", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(), "用户距离作业终点五公里以内才能拍摄"); return; } } else {//用户在起点开始作业 if (geometry > 5000) { - Toast.makeText(getActivity(), "用户距离作业起点五公里以内才能拍摄", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(), "用户距离作业终点五公里以内才能拍摄"); return; } } @@ -465,12 +465,12 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick double rearGeom = GeometryTools.distanceToDouble(startLng, rearLatLng); if (geom > rearGeom) {//用戶在终点开始作业 if (rearGeom > 5000) { - Toast.makeText(getActivity(), "用户距离作业终点五公里以内才能拍摄", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(), "用户距离作业终点五公里以内才能拍摄"); return; } } else {//用户在起点开始作业 if (geom > 5000) { - Toast.makeText(getActivity(), "用户距离作业起点五公里以内才能拍摄", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(), "用户距离作业终点五公里以内才能拍摄"); return; } } @@ -516,7 +516,7 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick @Override public void run() { fileZip.delete(); - Toast.makeText(getActivity(), "压缩文件失败,请重新提交", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(), "压缩文件失败,请重新提交"); } }); } @@ -525,11 +525,11 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick }).start(); } else { dismissLoadingDialog(); - Toast.makeText(getActivity(), "请录像", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(), "请录像"); return; } } else { - Toast.makeText(getContext(), "该任务正在提交中", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(), "该任务正在提交中"); } break; } @@ -545,7 +545,7 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick PoiEntity poiEntity = initPoiEntityByUI(showPoiEntity); PoiCheckResult poiCheckResult = checkPoiEntity(poiEntity); if (poiCheckResult.getCode() == 1) { - Toast.makeText(getActivity(), poiCheckResult.getMsg() + "", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(), poiCheckResult.getMsg()); return; } poiEntity.setTaskStatus(2); @@ -569,14 +569,14 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick } }).start(); } else { - Toast.makeText(getActivity(), "没有申请权限，请手动申请", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(), "没有申请权限，请手动申请"); } } @Override public void onDenied(List permissions, boolean never) { if (never) { - Toast.makeText(getActivity(), "被永久拒绝授权，请手动授予权限", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(), "被永久拒绝授权，请手动授予权限"); // 如果是被永久拒绝就跳转到应用权限系统设置页面 XXPermissions.startPermissionActivity(Objects.requireNonNull(getActivity()), permissions); } @@ -609,11 +609,11 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick private void poiVideoUpload(int poiVideoBody, File fileZip) { if (poiVideoBody == 0) { - Toast.makeText(getActivity(), "请先保存本地在上传", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(), "请先保存本地在上传"); return; } if (fileZip == null) { - Toast.makeText(getActivity(), "未压缩完成", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(), "未压缩完成"); return; } HttpParams httpParams = new HttpParams(); @@ -676,26 +676,12 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick } }).start(); } else { - if (getActivity() != null) { - getActivity().runOnUiThread(new Runnable() { - @Override - public void run() { - Toast.makeText(getContext(), "" + poiVideoBean.getMessage(), Toast.LENGTH_SHORT).show(); - } - }); - } + ToastUtils.Message(getActivity(), poiVideoBean.getMessage()); } } else if (poiVideoBean.getCode() == 230) { FlushTokenUtil.flushToken(getActivity()); } else { - if (getActivity() != null) { - getActivity().runOnUiThread(new Runnable() { - @Override - public void run() { - Toast.makeText(getContext(), poiVideoBean.getMessage(), Toast.LENGTH_SHORT).show(); - } - }); - } + ToastUtils.Message(getActivity(), poiVideoBean.getMessage()); } } @@ -704,24 +690,10 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick dismissLoadingDialog(); String message = e.getMessage(); assert message != null; - if (message.contains("timeout") || message.contains("Read time out")) { - if (getActivity() != null) { - getActivity().runOnUiThread(new Runnable() { - @Override - public void run() { - Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show(); - } - }); - } + if (message.equals("timeout") || message.equals("Read time out")) { + ToastUtils.Message(getActivity(), "请求超时"); } else { - if (getActivity() != null) { - getActivity().runOnUiThread(new Runnable() { - @Override - public void run() { - Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show(); - } - }); - } + ToastUtils.Message(getActivity(), message); } } }); @@ -795,8 +767,12 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick } private void initEndReceiveTask(String url, PoiEntity poiEntity) { + if (poiEntity==null){ + ToastUtils.Message(getActivity(), "无此任务"); + return; + } if (poiEntity.getTaskId() == 0) { - Toast.makeText(getActivity(), "无此任务", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(), "无此任务"); return; } HttpParams httpParams = new HttpParams(); @@ -835,14 +811,7 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick } else if (response.getCode() == 230) { FlushTokenUtil.flushToken(getActivity()); } else { - if (getActivity() != null) { - getActivity().runOnUiThread(new Runnable() { - @Override - public void run() { - Toast.makeText(getActivity(), "" + response.getMessage(), Toast.LENGTH_SHORT).show(); - } - }); - } + ToastUtils.Message(getActivity(), response.getMessage()); } } @@ -851,24 +820,10 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick dismissLoadingDialog(); String message = e.getMessage(); assert message != null; - if (message.contains("timeout") || message.contains("Read time out")) { - if (getActivity() != null) { - getActivity().runOnUiThread(new Runnable() { - @Override - public void run() { - Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show(); - } - }); - } + if (message.equals("timeout") || message.equals("Read time out")) { + ToastUtils.Message(getActivity(), "请求超时"); } else { - if (getActivity() != null) { - getActivity().runOnUiThread(new Runnable() { - @Override - public void run() { - Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show(); - } - }); - } + ToastUtils.Message(getActivity(), message); } } }); diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/PrivilegeFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/PrivilegeFragment.java index 8bc1db8..450f2c6 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/PrivilegeFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/PrivilegeFragment.java @@ -12,7 +12,7 @@ import java.util.Objects; /** * 我的等级页面的fragment */ -public class PrivilegeFragment extends BaseFragment implements View.OnClickListener{ +public class PrivilegeFragment extends BaseFragment implements View.OnClickListener { public static PrivilegeFragment newInstance(Bundle bundle) { PrivilegeFragment fragment = new PrivilegeFragment(); @@ -37,6 +37,7 @@ public class PrivilegeFragment extends BaseFragment implements View.OnClickListe ivPrivilege.setOnClickListener(this); } + @Override public void onClick(View v) { if (v.getId() == R.id.iv_privilege) { diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/RecordFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/RecordFragment.java index 9f4f8d4..638001e 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/RecordFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/RecordFragment.java @@ -45,8 +45,8 @@ public class RecordFragment extends BaseFragment { @Override protected void initView() { super.initView(); - TabLayout tabRecord = (TabLayout) findViewById(R.id.tab_record); - NoSlideViewPager vpRecord = (NoSlideViewPager) findViewById(R.id.vp_record); + TabLayout tabRecord = findViewById(R.id.tab_record); + NoSlideViewPager vpRecord = findViewById(R.id.vp_record); ArrayList fragments = new ArrayList<>(); // 待提交 fragments.add(new StaySubmitFragment()); @@ -91,4 +91,24 @@ public class RecordFragment extends BaseFragment { }); } + @Override + protected void initData() { + super.initData(); + } + + @Override + public void onStop() { + super.onStop(); + } + + @Override + public void onPause() { + super.onPause(); + } + + @Override + public void onDestroy() { + super.onDestroy(); + } + } \ No newline at end of file diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/RegisterFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/RegisterFragment.java index ff04e34..864dea3 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/RegisterFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/RegisterFragment.java @@ -34,6 +34,7 @@ import com.navinfo.outdoor.util.Base64; import com.navinfo.outdoor.util.Md5Util; import com.navinfo.outdoor.util.RegexUtil; import com.navinfo.outdoor.util.TimestampUtil; +import com.navinfo.outdoor.util.ToastUtils; import org.greenrobot.eventbus.EventBus; @@ -48,16 +49,14 @@ import java.util.Objects; * 注册页面 */ public class RegisterFragment extends BaseFragment implements View.OnClickListener { - private EditText etRegisterPhone; - private EditText etRegisterNote; - private EditText etRegisterPaw; - private EditText etRegisterConfirmPaw; + private EditText etRegisterPhone, etRegisterNote, etRegisterPaw, etRegisterConfirmPaw; private TextView registerGetNote; private String sessionId; private CountDownTimer timer; private CheckBox ivRegisterCheck; private File logFile; private StringBuilder registerBuilder; + private EditText etRegisterReferrer; public static RegisterFragment newInstance(Bundle bundle) { RegisterFragment fragment = new RegisterFragment(); @@ -79,7 +78,7 @@ public class RegisterFragment extends BaseFragment implements View.OnClickListen etRegisterNote = findViewById(R.id.et_register_note); registerGetNote = findViewById(R.id.register_get_note); registerGetNote.setOnClickListener(this); - EditText etRegisterReferrer = findViewById(R.id.et_register_referrer); + etRegisterReferrer = findViewById(R.id.et_register_referrer); etRegisterPaw = findViewById(R.id.et_register_paw); etRegisterConfirmPaw = findViewById(R.id.et_register_confirm_paw); ivRegisterCheck = findViewById(R.id.iv_register_check); @@ -135,7 +134,7 @@ public class RegisterFragment extends BaseFragment implements View.OnClickListen case R.id.register_get_note: registerBuilder.append(TimestampUtil.time()).append(",").append("点击了获取短信验证码,"); if (!RegexUtil.isPhone(etRegisterPhone.getText().toString())) { - Toast.makeText(getActivity(), "手机号错误，请重新输入", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(), "手机号错误，请重新输入"); return; } initGetNote(); @@ -151,7 +150,7 @@ public class RegisterFragment extends BaseFragment implements View.OnClickListen timer.cancel(); timer = null; } - Toast.makeText(getActivity(), "请输入手机号", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(), "请输入手机号"); return; } else { httpParams.put("mobile", mobile); @@ -172,11 +171,9 @@ public class RegisterFragment extends BaseFragment implements View.OnClickListen if (response.getCode() == 200) { sessionId = response.getBody(); registerNote(); - Toast.makeText(getActivity(), "验证码已发送", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(), "验证码已发送"); } else { - if (response.getMessage() != null) { - Toast.makeText(getActivity(), response.getMessage() + "", Toast.LENGTH_SHORT).show(); - } + ToastUtils.Message(getActivity(), response.getMessage()); } } @@ -185,10 +182,10 @@ public class RegisterFragment extends BaseFragment implements View.OnClickListen dismissLoadingDialog(); String message = e.getMessage(); assert message != null; - if (message.equals("timeout")||message.equals("Read time out")){ - Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show(); - }else { - Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show(); + if (message.equals("timeout") || message.equals("Read time out")) { + ToastUtils.Message(getActivity(), "请求超时"); + } else { + ToastUtils.Message(getActivity(), message); } } }); @@ -198,21 +195,21 @@ public class RegisterFragment extends BaseFragment implements View.OnClickListen HttpParams httpParams = new HttpParams(); String mobile = etRegisterPhone.getText().toString().trim(); if (!RegexUtil.isPhone(mobile)) { - Toast.makeText(getActivity(), "手机号错误", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(), "手机号错误"); return; } else { httpParams.put("mobile", mobile); } String code = etRegisterNote.getText().toString().trim(); if (code.equals("")) { - Toast.makeText(getActivity(), "请获取短信验证码", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(), "请获取短信验证码"); return; } else { httpParams.put("code", code); } String password = etRegisterPaw.getText().toString().trim(); if (password.equals("")) { - Toast.makeText(getActivity(), "请输入密码", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(), "请输入密码"); return; } else { try { @@ -223,21 +220,21 @@ public class RegisterFragment extends BaseFragment implements View.OnClickListen } String conFirmPaw = etRegisterConfirmPaw.getText().toString().trim(); if (conFirmPaw.equals("")) { - Toast.makeText(getActivity(), "请输入确认密码", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(), "请输入确认密码"); return; } if (!conFirmPaw.equals(password)) { - Toast.makeText(getActivity(), "密码和确认密码请保持一致", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(), "密码和确认密码请保持一致"); return; } if (sessionId == null || sessionId.equals("")) { - Toast.makeText(getActivity(), "请短信获取验证码", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(), "请短信获取验证码"); return; } else { httpParams.put("sessionId", sessionId); } if (!ivRegisterCheck.isChecked()) { - Toast.makeText(getActivity(), "请先同意用户协议", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(), "请先同意用户协议"); return; } long time = System.currentTimeMillis(); @@ -255,7 +252,7 @@ public class RegisterFragment extends BaseFragment implements View.OnClickListen public void onSuccess(UserBean response, int id) { dismissLoadingDialog(); if (response.getCode() == 200) { - Toast.makeText(getActivity(), "注册成功", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(), "注册成功"); Constant.USER_NAME = mobile; Constant.PASS_WORD = password; Message obtain = Message.obtain(); @@ -264,9 +261,7 @@ public class RegisterFragment extends BaseFragment implements View.OnClickListen EventBus.getDefault().post(obtain); Objects.requireNonNull(getActivity()).finish(); } else { - if (response.getMessage() != null) { - Toast.makeText(getActivity(), response.getMessage() + "", Toast.LENGTH_SHORT).show(); - } + ToastUtils.Message(getActivity(), response.getMessage()); } } @@ -280,10 +275,10 @@ public class RegisterFragment extends BaseFragment implements View.OnClickListen dismissLoadingDialog(); String message = e.getMessage(); assert message != null; - if (message.contains("timeout")||message.contains("Read time out")){ - Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show(); - }else { - Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show(); + if (message.contains("timeout") || message.contains("Read time out")) { + ToastUtils.Message(getActivity(), "请求超时"); + } else { + ToastUtils.Message(getActivity(), message); } } }); diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/RoadFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/RoadFragment.java index fb21ef9..39fab0a 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/RoadFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/RoadFragment.java @@ -43,6 +43,7 @@ import com.navinfo.outdoor.base.BaseDrawerFragment; import com.navinfo.outdoor.util.FlushTokenUtil; import com.navinfo.outdoor.util.PreserveUtils; import com.navinfo.outdoor.util.TimestampUtil; +import com.navinfo.outdoor.util.ToastUtils; import com.navinfo.outdoor.util.UploadUtils; import com.navinfo.outdoor.bean.OtherUploadPicBean; import com.navinfo.outdoor.bean.RoadSaveBean; @@ -337,7 +338,6 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList moveLatlng(latLng, null); } } - } String describe = showPoiEntity.getMemo();//任务描述 if (describe != null && !describe.equals("")) { @@ -385,7 +385,6 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList } fmRoadPic.setTag(videoFileList); } - } //禁用控件 @@ -445,7 +444,7 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList photoAlbumIntent.putExtra("showPoiEntity", showPoiEntity); startActivity(photoAlbumIntent); } else { - Toast.makeText(getContext(), "请拍摄", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(), "请拍摄"); } break; case R.id.tv_pictures: @@ -457,12 +456,12 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList double rearGeometry = GeometryTools.distanceToDouble(startLatLng, rearLatLng); if (geometry > rearGeometry) {//用戶在终点开始作业 if (rearGeometry > 5000) { - Toast.makeText(getActivity(), "用户距离作业终点五公里以内才能拍摄", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(), "用户距离作业终点五公里以内才能拍摄"); return; } } else {//用户在起点开始作业 if (geometry > 5000) { - Toast.makeText(getActivity(), "用户距离作业起点五公里以内才能拍摄", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(), "用户距离作业终点五公里以内才能拍摄"); return; } } @@ -508,7 +507,7 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList @Override public void run() { fileZip.delete(); - Toast.makeText(getActivity(), "压缩文件失败,请重新提交", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(),"压缩文件失败,请重新提交"); } }); } @@ -518,11 +517,11 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList }).start(); } else { dismissLoadingDialog(); - Toast.makeText(getActivity(), "请录像", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(), "请录像"); return; } } else { - Toast.makeText(getContext(), "该任务正在提交中", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(), "该任务正在提交中"); } break; } @@ -538,7 +537,7 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList PoiEntity poiEntity = initPoiEntityByUI(showPoiEntity); PoiCheckResult poiCheckResult = checkPoiEntity(poiEntity); if (poiCheckResult.getCode() == 1) { - Toast.makeText(getActivity(), poiCheckResult.getMsg() + "", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(), poiCheckResult.getMsg()); return; } poiEntity.setTaskStatus(2); @@ -559,13 +558,13 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList } }).start(); } else { - Toast.makeText(getActivity(), "没有申请权限，请手动申请", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(), "没有申请权限，请手动申请"); } } @Override public void onDenied(List permissions, boolean never) { if (never) { - Toast.makeText(getActivity(), "被永久拒绝授权，请手动授予权限", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(), "被永久拒绝授权，请手动授予权限"); // 如果是被永久拒绝就跳转到应用权限系统设置页面 XXPermissions.startPermissionActivity(Objects.requireNonNull(getActivity()), permissions); } @@ -598,11 +597,11 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList private void poiVideoUpload(int body, File fileZip) { if (body == 0) { - Toast.makeText(getActivity(), "请先保存本地上传", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(), "请先保存本地上传"); return; } if (fileZip == null) { - Toast.makeText(getActivity(), "未压缩完成", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(), "未压缩完成"); return; } HttpParams httpParams = new HttpParams(); @@ -666,26 +665,12 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList } }).start(); } else { - if (getActivity() != null) { - getActivity().runOnUiThread(new Runnable() { - @Override - public void run() { - Toast.makeText(getActivity(), roadSaveBean.getMessage(), Toast.LENGTH_SHORT).show(); - } - }); - } + ToastUtils.Message(getActivity(), roadSaveBean.getMessage()); } } else if (roadSaveBean.getCode() == 230) { FlushTokenUtil.flushToken(getActivity()); } else { - if (getActivity() != null) { - getActivity().runOnUiThread(new Runnable() { - @Override - public void run() { - Toast.makeText(getActivity(), roadSaveBean.getMessage(), Toast.LENGTH_SHORT).show(); - } - }); - } + ToastUtils.Message(getActivity(), roadSaveBean.getMessage()); } } @@ -694,24 +679,10 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList dismissLoadingDialog(); String message = e.getMessage(); assert message != null; - if (message.contains("timeout") || message.contains("Read time out")) { - if (getActivity() != null) { - getActivity().runOnUiThread(new Runnable() { - @Override - public void run() { - Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show(); - } - }); - } + if (message.equals("timeout") || message.equals("Read time out")) { + ToastUtils.Message(getActivity(), "请求超时"); } else { - if (getActivity() != null) { - getActivity().runOnUiThread(new Runnable() { - @Override - public void run() { - Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show(); - } - }); - } + ToastUtils.Message(getActivity(), message); } } }); @@ -791,7 +762,7 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList private void initEndReceiveTask(String url, PoiEntity poiEntity) { if (poiEntity.getTaskId() == 0) { - Toast.makeText(getActivity(), "无此任务", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(), "无此任务"); return; } HttpParams httpParams = new HttpParams(); @@ -830,14 +801,7 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList } else if (response.getCode() == 230) { FlushTokenUtil.flushToken(getActivity()); } else { - if (getActivity() != null) { - getActivity().runOnUiThread(new Runnable() { - @Override - public void run() { - Toast.makeText(getActivity(), response.getMessage(), Toast.LENGTH_SHORT).show(); - } - }); - } + ToastUtils.Message(getActivity(), response.getMessage()); } } @@ -847,23 +811,9 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList String message = e.getMessage(); assert message != null; if (message.equals("timeout") || message.equals("Read time out")) { - if (getActivity() != null) { - getActivity().runOnUiThread(new Runnable() { - @Override - public void run() { - Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show(); - } - }); - } + ToastUtils.Message(getActivity(), "请求超时"); } else { - if (getActivity() != null) { - getActivity().runOnUiThread(new Runnable() { - @Override - public void run() { - Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show(); - } - }); - } + ToastUtils.Message(getActivity(), message); } } }); diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/RoadTaskFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/RoadTaskFragment.java index 7ee55b1..edbf3e5 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/RoadTaskFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/RoadTaskFragment.java @@ -15,12 +15,12 @@ import com.navinfo.outdoor.base.BaseFragment; * 记录-已提交-道路任务列表的fragment */ public class RoadTaskFragment extends BaseFragment implements View.OnClickListener { - public static RoadTaskFragment newInstance(Bundle bundle) { RoadTaskFragment fragment = new RoadTaskFragment(); fragment.setArguments(bundle); return fragment; } + @Override protected int getLayout() { return R.layout.fragment_road_task; @@ -40,4 +40,5 @@ public class RoadTaskFragment extends BaseFragment implements View.OnClickListen public void onClick(View v) { } + } \ No newline at end of file diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/SetFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/SetFragment.java index 305ffd6..7e4be8f 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/SetFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/SetFragment.java @@ -36,7 +36,8 @@ public class SetFragment extends BaseFragment implements View.OnClickListener { @Override protected void initData() { - super.initData(); } + super.initData(); + } @Override protected void initView() { @@ -93,4 +94,19 @@ public class SetFragment extends BaseFragment implements View.OnClickListener { Objects.requireNonNull(getActivity()).finish(); } } + + @Override + public void onPause() { + super.onPause(); + } + + @Override + public void onStop() { + super.onStop(); + } + + @Override + public void onDestroy() { + super.onDestroy(); + } } 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 01ad267..a4e2f83 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/StaySubmitFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/StaySubmitFragment.java @@ -43,6 +43,7 @@ import com.navinfo.outdoor.util.FlushTokenUtil; import com.navinfo.outdoor.util.PoiEntityDeleteUtil; import com.navinfo.outdoor.util.PoiSaveUtils; import com.navinfo.outdoor.util.TimestampUtil; +import com.navinfo.outdoor.util.ToastUtils; import com.umeng.umcrash.UMCrash; import org.greenrobot.eventbus.EventBus; @@ -61,13 +62,12 @@ import java.util.Objects; */ public class StaySubmitFragment extends BaseFragment implements View.OnClickListener { private StaySubmitAdapter staySubmitAdapter; - private TextView tvStayType; + private TextView tvStayType,tvNumber; private List roadEntities; private ArrayList poiEntities; private CheckBox cbSelect; private File logFile; private StringBuilder staySubmitBuilder; - private TextView tvNumber; public static StaySubmitFragment newInstance(Bundle bundle) { StaySubmitFragment fragment = new StaySubmitFragment(); @@ -116,7 +116,6 @@ public class StaySubmitFragment extends BaseFragment implements View.OnClickList subObtain.what = Constant.EVENT_WORK_HOME; subObtain.obj = true; EventBus.getDefault().post(subObtain); - Message obtain = Message.obtain(); obtain.what = Constant.EVENT_WHAT_COMPLETE_TASK; obtain.obj = poiEntity; @@ -132,7 +131,8 @@ public class StaySubmitFragment extends BaseFragment implements View.OnClickList staySubmitAdapter.setAllDataChecked(isChecked); staySubmitAdapter.notifyDataSetChanged(); } else { - Toast.makeText(getContext(), "有正在提交的数据，等提交成功后，方可操作", Toast.LENGTH_SHORT).show(); + cbSelect.setChecked(false); + ToastUtils.Message(getActivity(), "有正在提交的数据，等提交成功后，方可操作"); } } }); @@ -252,11 +252,11 @@ public class StaySubmitFragment extends BaseFragment implements View.OnClickList } }).start(); } else { - Toast.makeText(getActivity(), "无法读取数据库，请尝试重启程序！", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(), "无法读取数据库，请尝试重启程序！"); UMCrash.generateCustomLog("无法读取数据库", "自定义"); } } else { - Toast.makeText(getActivity(), "数据库创建失败，请关闭程序重新进入", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(), "数据库创建失败，请关闭程序重新进入"); } } @@ -307,7 +307,7 @@ public class StaySubmitFragment extends BaseFragment implements View.OnClickList } }); } else { - Toast.makeText(getContext(), "有正在提交的数据，等提交成功后，方可操作", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(), "有正在提交的数据，等提交成功后，方可操作"); } break; @@ -330,10 +330,10 @@ public class StaySubmitFragment extends BaseFragment implements View.OnClickList staySubmitAdapter.setUpdateWork(); PoiSaveUtils.getInstance(getActivity()).uploadPoiEntityBatch(poiEntities); } else { - Toast.makeText(getActivity(), "请选择要提交的数据", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(), "请选择要提交的数据"); } } else { - Toast.makeText(getContext(), "有正在提交的数据，等提交成功后，方可操作", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(), "有正在提交的数据，等提交成功后，方可操作"); } break; } @@ -391,7 +391,7 @@ public class StaySubmitFragment extends BaseFragment implements View.OnClickList } else if (response.getCode() == 230) { FlushTokenUtil.flushToken(getActivity()); } else { - Toast.makeText(getActivity(), response.getMessage() + "", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(), response.getMessage() ); } } @@ -400,10 +400,10 @@ public class StaySubmitFragment extends BaseFragment implements View.OnClickList dismissLoadingDialog(); String message = e.getMessage(); assert message != null; - if (message.contains("timeout") || message.contains("Read time out")) { - Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show(); + if (message.equals("timeout") || message.equals("Read time out")) { + ToastUtils.Message(getActivity(), "请求超时"); } else { - Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(), message); } } }); @@ -436,7 +436,11 @@ public class StaySubmitFragment extends BaseFragment implements View.OnClickList @Override public void run() { if (Constant.USHERED != null) { - staySubmitBuilder.append("refreshData - userId:").append(Constant.USHERED).append(" path:").append(PoiDatabase.getDbName).append(","); + staySubmitBuilder.append("refreshData - userId:") + .append(Constant.USHERED) + .append(" path:") + .append(PoiDatabase.getDbName) + .append(","); } roadEntities.clear(); roadEntities.addAll(roadAll); @@ -454,11 +458,11 @@ public class StaySubmitFragment extends BaseFragment implements View.OnClickList } }).start(); } else { - Toast.makeText(getActivity(), "无法读取数据库，请尝试重启程序！", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(), "无法读取数据库，请尝试重启程序！"); UMCrash.generateCustomLog("无法读取数据库", "自定义"); } } else { - Toast.makeText(getActivity(), "数据库创建失败，请关闭程序重新进入", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(), "数据库创建失败，请关闭程序重新进入"); } } diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/TaskExWebFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/TaskExWebFragment.java index 34a6ad6..87ad55a 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/TaskExWebFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/TaskExWebFragment.java @@ -33,7 +33,5 @@ public class TaskExWebFragment extends BaseFragment implements View.OnClickListe } @Override - public void onClick(View v) { - - } + public void onClick(View v) { } } \ No newline at end of file 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 a4c45b4..1f220bc 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/TaskExplainFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/TaskExplainFragment.java @@ -30,6 +30,7 @@ import com.jcodecraeer.xrecyclerview.ProgressStyle; import com.jcodecraeer.xrecyclerview.XRecyclerView; import com.navinfo.outdoor.util.FlushTokenUtil; import com.navinfo.outdoor.util.TimestampUtil; +import com.navinfo.outdoor.util.ToastUtils; import org.json.JSONObject; @@ -46,13 +47,11 @@ import java.util.Objects; */ public class TaskExplainFragment extends BaseFragment implements View.OnClickListener { private XRecyclerView taskExplainRecycle; - private TaskExplainAdapter taskExplainAdapter; - private int taskPage = 1; private List explainList; private File logFile; private StringBuilder taskExplainBuilder; - + private int taskPage = 1; public static TaskExplainFragment newInstance(Bundle bundle) { TaskExplainFragment fragment = new TaskExplainFragment(); @@ -160,7 +159,7 @@ public class TaskExplainFragment extends BaseFragment implements View.OnClickLis } else if (response.getCode() == 230) { FlushTokenUtil.flushToken(getActivity()); } else { - Toast.makeText(getActivity(), response.getMessage() + "", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(), response.getMessage() ); } } @@ -169,10 +168,10 @@ public class TaskExplainFragment extends BaseFragment implements View.OnClickLis dismissLoadingDialog(); String message = e.getMessage(); assert message != null; - if (message.contains("timeout") || message.contains("Read time out")) { - Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show(); + if (message.equals("timeout") || message.equals("Read time out")) { + ToastUtils.Message(getActivity(), "请求超时" ); } else { - Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(), message ); } Log.d("TAG", "onError: " + e.getMessage()); } @@ -186,7 +185,7 @@ public class TaskExplainFragment extends BaseFragment implements View.OnClickLis explainList.clear(); } if (taskPrefectureBean.getBody().getList() == null) { - Toast.makeText(getActivity(), "没有相关数据", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(), "没有相关数据" ); } else { explainList.addAll(taskPrefectureBean.getBody().getList()); taskPage++; @@ -205,7 +204,7 @@ public class TaskExplainFragment extends BaseFragment implements View.OnClickLis } } } else { - Toast.makeText(getActivity(), taskPrefectureBean.getMessage(), Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(), taskPrefectureBean.getMessage() ); Log.d("TAG", "" + taskPrefectureBean.getMessage()); } } @@ -237,4 +236,5 @@ public class TaskExplainFragment extends BaseFragment implements View.OnClickLis taskExplainBuilder.append("\r\n"); FileUtils.writeFile(logFile.getAbsolutePath(), taskExplainBuilder.toString(), true); } + } 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 193790c..8bef970 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/TaskExplainFragment2.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/TaskExplainFragment2.java @@ -30,6 +30,7 @@ import com.jcodecraeer.xrecyclerview.ProgressStyle; import com.jcodecraeer.xrecyclerview.XRecyclerView; import com.navinfo.outdoor.util.FlushTokenUtil; import com.navinfo.outdoor.util.TimestampUtil; +import com.navinfo.outdoor.util.ToastUtils; import org.json.JSONObject; @@ -67,7 +68,6 @@ public class TaskExplainFragment2 extends BaseFragment implements View.OnClickLi @Override protected void initView() { super.initView(); - ImageView ivTaskExplain2 = findViewById(R.id.iv_task_explain2_finish); taskExplain2Recycler = findViewById(R.id.task_explain2_recycler); ivTaskExplain2.setOnClickListener(this); @@ -158,7 +158,7 @@ public class TaskExplainFragment2 extends BaseFragment implements View.OnClickLi } else if (response.getCode() == 230) { FlushTokenUtil.flushToken(getActivity()); } else { - Toast.makeText(getActivity(), response.getMessage() + "", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(), response.getMessage() ); } Log.d("TAG", "onSuccess: " + response.getMessage() + ""); } @@ -168,10 +168,10 @@ public class TaskExplainFragment2 extends BaseFragment implements View.OnClickLi dismissLoadingDialog(); String message = e.getMessage(); assert message != null; - if (message.contains("timeout") || message.contains("Read time out")) { - Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show(); + if (message.equals("timeout") || message.equals("Read time out")) { + ToastUtils.Message(getActivity(),"请求超时"); } else { - Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(),message); } } }); @@ -184,7 +184,7 @@ public class TaskExplainFragment2 extends BaseFragment implements View.OnClickLi explainList.clear(); } if (taskPrefectureBean.getBody().getList() == null) { - Toast.makeText(getActivity(), "没有相关数据", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(),"没有相关数据"); } else { explainList.addAll(taskPrefectureBean.getBody().getList()); taskExplainPage++; @@ -202,7 +202,7 @@ public class TaskExplainFragment2 extends BaseFragment implements View.OnClickLi } } } else { - Toast.makeText(getActivity(), taskPrefectureBean.getMessage(), Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(),taskPrefectureBean.getMessage()); Log.d("TAG", "" + taskPrefectureBean.getMessage()); } } @@ -234,4 +234,5 @@ public class TaskExplainFragment2 extends BaseFragment implements View.OnClickLi taskExplain2Builder.append("\r\n"); FileUtils.writeFile(logFile.getAbsolutePath(), taskExplain2Builder.toString(), true); } + } \ No newline at end of file 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 1885cad..393d166 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/TaskPrefectureFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/TaskPrefectureFragment.java @@ -30,6 +30,7 @@ import com.jcodecraeer.xrecyclerview.ProgressStyle; import com.jcodecraeer.xrecyclerview.XRecyclerView; import com.navinfo.outdoor.util.FlushTokenUtil; import com.navinfo.outdoor.util.TimestampUtil; +import com.navinfo.outdoor.util.ToastUtils; import org.json.JSONObject; @@ -46,7 +47,6 @@ import java.util.Objects; * 发现-任务专区 */ public class TaskPrefectureFragment extends BaseFragment implements View.OnClickListener { - private XRecyclerView taskRecycler; private List dataBeanList; private TaskPrefectureAdapter taskPrefectureAdapter; @@ -54,7 +54,6 @@ public class TaskPrefectureFragment extends BaseFragment implements View.OnClick private File logFile; private StringBuilder taskPrefectureBuilder; - public static TaskPrefectureFragment newInstance(Bundle bundle) { TaskPrefectureFragment fragment = new TaskPrefectureFragment(); fragment.setArguments(bundle); @@ -148,16 +147,15 @@ public class TaskPrefectureFragment extends BaseFragment implements View.OnClick dismissLoadingDialog(); initTaskPrefectureBean(taskPrefectureBean, aNet); } - @Override public void onError(Throwable e, int id) { dismissLoadingDialog(); String message = e.getMessage(); assert message != null; - if (message.contains("timeout") || message.contains("Read time out")) { - Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show(); + if (message.equals("timeout") || message.equals("Read time out")) { + ToastUtils.Message(getActivity(),"请求超时"); } else { - Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(),message); } } }); @@ -170,7 +168,7 @@ public class TaskPrefectureFragment extends BaseFragment implements View.OnClick dataBeanList.clear(); } if (taskPrefectureBean.getBody().getList() == null) { - Toast.makeText(getActivity(), "没有相关数据", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(),"没有相关数据"); } else { dataBeanList.addAll(taskPrefectureBean.getBody().getList()); taskPage++; @@ -190,7 +188,7 @@ public class TaskPrefectureFragment extends BaseFragment implements View.OnClick } else if (taskPrefectureBean.getCode() == 230) { FlushTokenUtil.flushToken(getActivity()); } else { - Toast.makeText(getActivity(), taskPrefectureBean.getMessage(), Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(),taskPrefectureBean.getMessage()); Log.d("TAG", "" + taskPrefectureBean.getMessage()); } } 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 2da8ef0..be4010d 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/TreasureFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/TreasureFragment.java @@ -24,8 +24,6 @@ import android.widget.CompoundButton; import android.widget.FrameLayout; import android.widget.ImageView; import android.widget.TextView; -import android.widget.Toast; - import androidx.annotation.NonNull; import androidx.appcompat.app.AlertDialog; import androidx.appcompat.app.AppCompatActivity; @@ -34,7 +32,6 @@ import androidx.fragment.app.FragmentTransaction; import androidx.recyclerview.widget.DividerItemDecoration; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; - import com.github.lazylibrary.util.DensityUtil; import com.github.lazylibrary.util.FileUtils; import com.google.gson.Gson; @@ -52,13 +49,17 @@ import com.lzy.okgo.model.HttpParams; import com.lzy.okgo.model.Progress; import com.navinfo.outdoor.R; import com.navinfo.outdoor.activity.FragmentManagement; +import com.navinfo.outdoor.activity.HomeActivity; +import com.navinfo.outdoor.activity.WebActivity; import com.navinfo.outdoor.adapter.MarkerAdapter; import com.navinfo.outdoor.api.Constant; +import com.navinfo.outdoor.api.UserApplication; import com.navinfo.outdoor.base.BaseDrawerFragment; import com.navinfo.outdoor.base.BaseFragment; import com.navinfo.outdoor.bean.GetPhoneBean; import com.navinfo.outdoor.bean.JobSearchBean; import com.navinfo.outdoor.bean.MessageNoticeBean; +import com.navinfo.outdoor.bean.NotificationBean; import com.navinfo.outdoor.bean.UserBean; import com.navinfo.outdoor.http.Callback; import com.navinfo.outdoor.http.HttpInterface; @@ -68,14 +69,13 @@ import com.navinfo.outdoor.room.ChargingPileEntity; import com.navinfo.outdoor.room.PoiDatabase; import com.navinfo.outdoor.room.PoiEntity; import com.navinfo.outdoor.util.FlushTokenUtil; -import com.navinfo.outdoor.util.GPSUtils; import com.navinfo.outdoor.util.Geohash; import com.navinfo.outdoor.util.GeometryTools; import com.navinfo.outdoor.util.MapManager; import com.navinfo.outdoor.util.MyTecentLocationSource; import com.navinfo.outdoor.util.NetWorkUtils; import com.navinfo.outdoor.util.TimestampUtil; -import com.navinfo.outdoor.util.ToastUtil; +import com.navinfo.outdoor.util.ToastUtils; import com.sothree.slidinguppanel.ScrollableViewHelper; import com.sothree.slidinguppanel.SlidingUpPanelLayout; import com.tencent.map.geolocation.TencentLocation; @@ -97,6 +97,8 @@ import com.tencent.tencentmap.mapsdk.maps.model.Polygon; import com.tencent.tencentmap.mapsdk.maps.model.PolygonOptions; import com.tencent.tencentmap.mapsdk.maps.model.Polyline; import com.tencent.tencentmap.mapsdk.maps.model.PolylineOptions; +import com.umeng.message.UmengNotificationClickHandler; +import com.umeng.message.entity.UMessage; import com.vividsolutions.jts.geom.Geometry; import com.vividsolutions.jts.geom.MultiPoint; import com.vividsolutions.jts.geom.Point; @@ -164,7 +166,6 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen return false; } }); - TextView tvGps; private TextView tvTenantGaps; public static TreasureFragment newInstance(Bundle bundle) { @@ -196,7 +197,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen ivSubmit.setOnClickListener(this); ivMessage = findViewById(R.id.iv_message); ivMessage.setOnClickListener(this); - tvGps = findViewById(R.id.tv_GPS); + TextView tvGps = findViewById(R.id.tv_GPS); tvTenantGaps = findViewById(R.id.tv_tencent_GPS); mapView = findViewById(R.id.treasure_map); tencentMap = mapView.getMap(); @@ -244,10 +245,8 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen removables = new ArrayList<>();//存储网络数据的marker数据（线，面，点） removablesLocality = new ArrayList<>();//存储本地的marker数据（线，面，点） removableScreenMarker = new ArrayList<>();//存储点击屏幕上的marker的marker数据（线，面，点） - //key wkt value :存储的数据类型 - removableHashMap = new HashMap<>(); - //存储的多点latlng - latList = new ArrayList<>(); + removableHashMap = new HashMap<>();//key wkt value :存储的数据类型 + latList = new ArrayList<>();//存储的多点latlng tencentMap.addOnMapLoadedCallback(new TencentMap.OnMapLoadedCallback() { @Override public void onMapLoaded() { @@ -269,6 +268,8 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen iniUserLocation(); //得到电话区号，电话位数 initPhone(); + //跳转到消息页面 + initUM(); //检查是否有没有填完的页面 initSharePre(); } @@ -282,7 +283,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen dismissLoadingDialog(); Intent intent = new Intent(Settings.ACTION_LOCATION_SOURCE_SETTINGS); startActivity(intent); - Toast.makeText(getActivity(), "请先开启位置信息，在重新打开程序", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(), "请先开启位置信息，在重新打开程序"); getActivity().finish(); } Constant.markerClickListener = markerClickListener; @@ -291,6 +292,25 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen }); } + private void initUM() { + if (Constant.NOTIFICATION!=null){ + NotificationBean notificationBean = new Gson().fromJson(Constant.NOTIFICATION, NotificationBean.class); + NotificationBean.ExtraBean extra = notificationBean.getExtra(); + if (extra!=null){ + HashMap paramMap = new HashMap<>(); + paramMap.put("id", extra.getId()+ ""); + Intent intent = new Intent(getActivity(), WebActivity.class); + intent.putExtra("map", paramMap); + intent.putExtra("url", HttpInterface.MSG_CONTENT); + startActivity(intent); + }else { + Intent messageIntent = new Intent(getActivity(), FragmentManagement.class); + messageIntent.putExtra("tag", 35); + startActivity(messageIntent); + } + } + } + /* * 刷新筛选界面数据 */ @@ -329,7 +349,8 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen if (Constant.currentLocation != null) { initList(Constant.currentLocation); // 刷新筛选的网络数据 } else { - Toast.makeText(getActivity(), "未开启定位服务", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(), "未开启定位服务"); + } } @@ -348,8 +369,9 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen } catch (Exception ex) { ex.printStackTrace(); } - if (date == null) + if (date == null) { return ""; + } System.out.println("front:" + format.format(date)); //显示输入的日期 Calendar cal = Calendar.getInstance(); cal.setTime(date); @@ -394,14 +416,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen } else if (messageNoticeBean.getCode() == 230) { FlushTokenUtil.flushToken(getActivity()); } else { - if (getActivity() != null) { - getActivity().runOnUiThread(new Runnable() { - @Override - public void run() { - Toast.makeText(getActivity(), messageNoticeBean.getMessage(), Toast.LENGTH_SHORT).show(); - } - }); - } + ToastUtils.Message(getActivity(), messageNoticeBean.getMessage()); } } @@ -411,23 +426,9 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen String message = e.getMessage(); assert message != null; if (message.equals("timeout") || message.equals("Read time out")) { - if (getActivity() != null) { - getActivity().runOnUiThread(new Runnable() { - @Override - public void run() { - Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show(); - } - }); - } + ToastUtils.Message(getActivity(), "请求超时"); } else { - if (getActivity() != null) { - getActivity().runOnUiThread(new Runnable() { - @Override - public void run() { - Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show(); - } - }); - } + ToastUtils.Message(getActivity(), message); } Log.d("TAG", "onError: " + e.getMessage()); } @@ -438,7 +439,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen private void initPhone() { String encode = Geohash.getInstance().encode(Constant.currentLocation.getLatitude(), Constant.currentLocation.getLongitude()); if (encode == null) { - Toast.makeText(getActivity(), "没有确定经纬度", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(), "没有确定经纬度"); return; } HttpParams httpParams = new HttpParams(); @@ -465,14 +466,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen } else if (getPhoneBean.getCode() == 230) { FlushTokenUtil.flushToken(getActivity()); } else { - if (getActivity() != null) { - getActivity().runOnUiThread(new Runnable() { - @Override - public void run() { - Toast.makeText(getActivity(), getPhoneBean.getMessage(), Toast.LENGTH_SHORT).show(); - } - }); - } + ToastUtils.Message(getActivity(), getPhoneBean.getMessage()); } } @@ -481,24 +475,10 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen dismissLoadingDialog(); String message = e.getMessage(); assert message != null; - if (message.contains("timeout") || message.contains("Read time out")) { - if (getActivity() != null) { - getActivity().runOnUiThread(new Runnable() { - @Override - public void run() { - Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show(); - } - }); - } + if (message.equals("timeout") || message.equals("Read time out")) { + ToastUtils.Message(getActivity(), "请求超时"); } else { - if (getActivity() != null) { - getActivity().runOnUiThread(new Runnable() { - @Override - public void run() { - Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show(); - } - }); - } + ToastUtils.Message(getActivity(), message); } Log.d("TAG", "onError: " + e.getMessage()); } @@ -533,13 +513,16 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen private void iniUserLocation() { String encode = Geohash.getInstance().encode(Constant.currentLocation.getLatitude(), Constant.currentLocation.getLongitude()); HttpParams httpParams = new HttpParams(); - httpParams.put("geom", encode); + if (encode != null) { + httpParams.put("geom", encode); + } long time = System.currentTimeMillis(); - httpParams.put("datetime", time); - /* httpParams.put("appkey",Constant.UM_APP_KEY); - if (Constant.DEVICE_TOKEN!=null){ - httpParams.put("device_tokens", Constant.DEVICE_TOKEN); - }*/ + if (time != 0) { + httpParams.put("datetime", time); + } + if (Constant.DEVICE_TOKEN != null) { + httpParams.put("deviceTokens", Constant.DEVICE_TOKEN); + } OkGoBuilder okGoBuilder = OkGoBuilder .getInstance() .Builder(getActivity()) @@ -553,25 +536,11 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen public void onSuccess(UserBean response, int id) { dismissLoadingDialog(); if (response.getCode() == 200) {//上传用户位置金纬度 寻宝删选接口请求成功 - if (getActivity() != null) { - getActivity().runOnUiThread(new Runnable() { - @Override - public void run() { - Toast.makeText(getActivity(), response.getMessage() + "", Toast.LENGTH_SHORT).show(); - } - }); - } + ToastUtils.Message(getActivity(), response.getMessage()); } else if (response.getCode() == 230) { FlushTokenUtil.flushToken(getActivity()); } else { - if (getActivity() != null) { - getActivity().runOnUiThread(new Runnable() { - @Override - public void run() { - Toast.makeText(getActivity(), response.getMessage() + "", Toast.LENGTH_SHORT).show(); - } - }); - } + ToastUtils.Message(getActivity(), response.getMessage()); } } @@ -585,24 +554,10 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen dismissLoadingDialog(); String message = e.getMessage(); assert message != null; - if (message.contains("timeout") || message.contains("Read time out")) { - if (getActivity() != null) { - getActivity().runOnUiThread(new Runnable() { - @Override - public void run() { - Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show(); - } - }); - } + if (message.equals("timeout") || message.equals("Read time out")) { + ToastUtils.Message(getActivity(), "请求超时"); } else { - if (getActivity() != null) { - getActivity().runOnUiThread(new Runnable() { - @Override - public void run() { - Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show(); - } - }); - } + ToastUtils.Message(getActivity(), message); } } }); @@ -610,7 +565,6 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen /** * 网络删选接口 - * * @param tencentLocation location */ private void initList(TencentLocation tencentLocation) { @@ -751,14 +705,16 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen .anchor(0.5f, 1.0f) .flat(true) .clockwise(false)); - if (listBean != null) { - poiMarker.setTag(listBean); + if (poiMarker != null) { + if (listBean != null) { + poiMarker.setTag(listBean); + } + poiMarker.setZIndex(MARKER_DOT); + removables.add(poiMarker); + String poiGeo = initGeo(latLng); + geoMarker(poiGeo, poiMarker); + poiMarker.setClickable(true); } - poiMarker.setZIndex(MARKER_DOT); - removables.add(poiMarker); - String poiGeo = initGeo(latLng); - geoMarker(poiGeo, poiMarker); - poiMarker.setClickable(true); break; case 2://充电站 BitmapDescriptor chargeDescriptor = BitmapDescriptorFactory.fromResource(R.drawable.marker_charge); @@ -767,14 +723,16 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen .anchor(0.5f, 1.0f) .flat(true) .clockwise(false)); - if (listBean != null) { - stationMarker.setTag(listBean); + if (stationMarker != null) { + if (listBean != null) { + stationMarker.setTag(listBean); + } + stationMarker.setZIndex(MARKER_DOT); + removables.add(stationMarker); + String stationGeo = initGeo(latLng); + geoMarker(stationGeo, stationMarker); + stationMarker.setClickable(true); } - stationMarker.setZIndex(MARKER_DOT); - removables.add(stationMarker); - String stationGeo = initGeo(latLng); - geoMarker(stationGeo, stationMarker); - stationMarker.setClickable(true); break; case 3://poi录像 BitmapDescriptor poiVideoDescriptor = BitmapDescriptorFactory.fromResource(R.drawable.marker_poi_video); @@ -783,14 +741,16 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen .anchor(0.5f, 1.0f) .flat(true) .clockwise(false)); - if (listBean != null) { - poiVideoMarker.setTag(listBean); + if (poiVideoMarker != null) { + if (listBean != null) { + poiVideoMarker.setTag(listBean); + } + poiVideoMarker.setZIndex(MARKER_DOT); + removables.add(poiVideoMarker); + String poiVideoGeo = initGeo(latLng); + geoMarker(poiVideoGeo, poiVideoMarker); + poiVideoMarker.setClickable(true); } - poiVideoMarker.setZIndex(MARKER_DOT); - removables.add(poiVideoMarker); - String poiVideoGeo = initGeo(latLng); - geoMarker(poiVideoGeo, poiVideoMarker); - poiVideoMarker.setClickable(true); break; case 4://道路录像 BitmapDescriptor roadDescriptor = BitmapDescriptorFactory.fromResource(R.drawable.marker_road); @@ -799,14 +759,16 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen .anchor(0.5f, 1.0f) .flat(true) .clockwise(false)); - if (listBean != null) { - roadMarker.setTag(listBean); + if (roadMarker != null) { + if (listBean != null) { + roadMarker.setTag(listBean); + } + roadMarker.setZIndex(MARKER_DOT); + removables.add(roadMarker); + String roadGeo = initGeo(latLng); + geoMarker(roadGeo, roadMarker); + roadMarker.setClickable(true); } - roadMarker.setZIndex(MARKER_DOT); - removables.add(roadMarker); - String roadGeo = initGeo(latLng); - geoMarker(roadGeo, roadMarker); - roadMarker.setClickable(true); break; case 5://其他 BitmapDescriptor otherDescriptor = BitmapDescriptorFactory.fromResource(R.drawable.marker_other); @@ -815,14 +777,16 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen .anchor(0.5f, 1.0f) .flat(true) .clockwise(false)); - if (listBean != null) { - otherMarker.setTag(listBean); + if (otherMarker != null) { + if (listBean != null) { + otherMarker.setTag(listBean); + } + otherMarker.setZIndex(MARKER_DOT); + removables.add(otherMarker); + String otherGeo = initGeo(latLng); + geoMarker(otherGeo, otherMarker); + otherMarker.setClickable(true); } - otherMarker.setZIndex(MARKER_DOT); - removables.add(otherMarker); - String otherGeo = initGeo(latLng); - geoMarker(otherGeo, otherMarker); - otherMarker.setClickable(true); break; case 6://面状任务 BitmapDescriptor Descriptor = BitmapDescriptorFactory.fromResource(R.drawable.marker_facet); @@ -831,14 +795,16 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen .anchor(0.5f, 1.0f) .flat(true) .clockwise(false)); - if (listBean != null) { - planarMarker.setTag(listBean); + if (planarMarker != null) { + if (listBean != null) { + planarMarker.setTag(listBean); + } + planarMarker.setZIndex(MARKER_DOT); + removables.add(planarMarker); + String planarGeo = initGeo(latLng); + geoMarker(planarGeo, planarMarker); + planarMarker.setClickable(true); } - planarMarker.setZIndex(MARKER_DOT); - removables.add(planarMarker); - String planarGeo = initGeo(latLng); - geoMarker(planarGeo, planarMarker); - planarMarker.setClickable(true); break; } } @@ -856,14 +822,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen } else if (response.getCode() == 230) { FlushTokenUtil.flushToken(getActivity()); } else { - if (getActivity() != null) { - getActivity().runOnUiThread(new Runnable() { - @Override - public void run() { - Toast.makeText(getActivity(), response.getMessage(), Toast.LENGTH_SHORT).show(); - } - }); - } + ToastUtils.Message(getActivity(), response.getMessage()); } } @@ -872,24 +831,10 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen dismissLoadingDialog(); String message = e.getMessage(); assert message != null; - if (message.contains("timeout") || message.contains("Read time out")) { - if (getActivity() != null) { - getActivity().runOnUiThread(new Runnable() { - @Override - public void run() { - Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show(); - } - }); - } + if (message.equals("timeout") || message.equals("Read time out")) { + ToastUtils.Message(getActivity(), "请求超时"); } else { - if (getActivity() != null) { - getActivity().runOnUiThread(new Runnable() { - @Override - public void run() { - Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show(); - } - }); - } + ToastUtils.Message(getActivity(), message); } } }); @@ -897,7 +842,6 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen /** * geo 坐标点转成 - * * @param latLng lat */ public String initGeo(LatLng latLng) { @@ -919,7 +863,6 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen /** * marker 选中的状态 - * * @param poiEntity PoiEntity * @param aBoolean boolean */ @@ -1736,7 +1679,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen 0));//目标旋转角 0~360° (正北方为0) tencentMap.animateCamera(cameraSigma); } else { - Toast.makeText(getActivity(), "无定位", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(), "无定位"); checkNetWork(); } break; @@ -1769,7 +1712,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen private void initSubmit() { debounce(ivSubmit); if (upload == null) { - Toast.makeText(getActivity(), "访问未授权", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(), "访问未授权"); return; } //分享 @@ -1802,7 +1745,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen PoiEntity poiEntity = new PoiEntity(); // 上报时以当前用户位置为准 if (Constant.currentLocation == null) { - ToastUtil.showShort(getContext(), "无法获取当前位置，请检查GPS是否打开！"); + ToastUtils.Message(getActivity(), "无法获取当前位置，请检查GPS是否打开！"); return; } LatLng newPoiLatLng = new LatLng(Constant.currentLocation.getLatitude(), Constant.currentLocation.getLongitude()); @@ -1894,7 +1837,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen checkMyLocation(); } else { // 当前网络不可用 dismissLoadingDialog(); - Toast.makeText(getActivity(), Constant.NETWORK_UNAVAILABLE, Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(), Constant.NETWORK_UNAVAILABLE + ""); } } @@ -1921,7 +1864,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen initLocation(); } else { dismissLoadingDialog(); - Toast.makeText(getActivity(), "申请权限失败", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(), "申请权限失败"); } } @@ -2056,6 +1999,8 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen }; /** + * initEntity + * * @param marker marker * @param isBack isBack */ @@ -2180,7 +2125,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen poiEntityArrayList.add(poiListEntity); } } else { - Toast.makeText(getActivity(), "数据为空", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(), "数据为空"); } } } @@ -2190,7 +2135,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen return tencentMap.getCameraPosition().target; } - /* 自定义dialog*/ + /*自定义dialog*/ public void customDialog(List list, Marker marker) { AlertDialog dialog = builder.create(); treasureBuilder.append(TimestampUtil.time()).append("customDialog-打开了自定义的dialog,"); 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 e2530fc..4c915d7 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/UserAttestationFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/UserAttestationFragment.java @@ -34,13 +34,13 @@ import com.navinfo.outdoor.api.IdCard; import com.navinfo.outdoor.base.BaseFragment; import com.navinfo.outdoor.bean.IdCardNumberBean; import com.navinfo.outdoor.bean.NameAuthenticationBean; -import com.navinfo.outdoor.http.Callback; import com.navinfo.outdoor.http.HttpInterface; import com.navinfo.outdoor.http.OkGoBuilder; import com.navinfo.outdoor.http.UploadCallBack; import com.navinfo.outdoor.util.FlushTokenUtil; import com.navinfo.outdoor.util.PhotoUtils; import com.navinfo.outdoor.util.TimestampUtil; +import com.navinfo.outdoor.util.ToastUtils; import java.io.File; import java.text.DateFormat; @@ -57,7 +57,6 @@ import static android.app.Activity.RESULT_OK; * 实名认证 */ public class UserAttestationFragment extends BaseFragment implements View.OnClickListener { - private ImageView ivAttestation2, ivAttestation1,ivAttestation3, ivHera1,ivHera2,ivHera3,useCamera; private EditText etAttestationName, etNamePhone; private TextView tvCard1, tvCard2, tvCard3; @@ -107,6 +106,7 @@ public class UserAttestationFragment extends BaseFragment implements View.OnClic } } + @SuppressLint("CommitPrefEdits") @Override protected void initView() { super.initView(); @@ -120,17 +120,17 @@ public class UserAttestationFragment extends BaseFragment implements View.OnClic ivAttestation2.setOnClickListener(this); ivAttestation3 = findViewById(R.id.iv_attestation3); ivAttestation3.setOnClickListener(this); - Button btnAttestation = (Button) findViewById(R.id.btn_attestation); + Button btnAttestation = findViewById(R.id.btn_attestation); btnAttestation.setOnClickListener(this); LinearLayout linearHint = findViewById(R.id.linear_hint); - etAttestationName = (EditText) findViewById(R.id.et_attestationName); - etNamePhone = (EditText) findViewById(R.id.et_namePhone); - ivHera1 = (ImageView) findViewById(R.id.iv_hera1); - tvCard1 = (TextView) findViewById(R.id.tv_card1); - ivHera2 = (ImageView) findViewById(R.id.iv_hera2); - tvCard2 = (TextView) findViewById(R.id.tv_card2); - ivHera3 = (ImageView) findViewById(R.id.iv_hera3); - tvCard3 = (TextView) findViewById(R.id.tv_card3); + etAttestationName = findViewById(R.id.et_attestationName); + etNamePhone = findViewById(R.id.et_namePhone); + ivHera1 = findViewById(R.id.iv_hera1); + tvCard1 = findViewById(R.id.tv_card1); + ivHera2 = findViewById(R.id.iv_hera2); + tvCard2 = findViewById(R.id.tv_card2); + ivHera3 = findViewById(R.id.iv_hera3); + tvCard3 = findViewById(R.id.tv_card3); TextView tvTitle = findViewById(R.id.tv_title); View userAttestView = findViewById(R.id.user_attestation_view); LinearLayout linearLayout = findViewById(R.id.ll_pic);//身份证照片 @@ -220,15 +220,15 @@ public class UserAttestationFragment extends BaseFragment implements View.OnClic break; case R.id.btn_attestation: if (etAttestationName.getText().toString().equals("")) { - Toast.makeText(getActivity(), "姓名不能为空，请输入姓名", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(),"姓名不能为空，请输入姓名"); return; } if (!chineseNameTest(etAttestationName.getText().toString())) { - Toast.makeText(getActivity(), "请输入中文名字", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(),"请输入中文名字"); return; } if (checkNumber(etNamePhone.getText().toString().trim())) { - Toast.makeText(getActivity(), "身份证号错误，请重新输入", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(),"身份证号错误，请重新输入"); return; } nameAuthentication(); @@ -263,23 +263,23 @@ public class UserAttestationFragment extends BaseFragment implements View.OnClic private void nameAuthentication() { if (etAttestationName.getText().toString().equals("")) { - Toast.makeText(getActivity(), "姓名不能为空，请输入姓名", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(),"姓名不能为空，请输入姓名"); return; } if (checkNumber(etNamePhone.getText().toString().trim())) { - Toast.makeText(getActivity(), "身份证错误，请重新输入", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(),"身份证错误，请重新输入"); return; } if (tvCard1.getTag() == null) { - Toast.makeText(getActivity(), "请拍照 身份证人像面", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(),"请拍照 身份证人像面"); return; } if (tvCard2.getTag() == null) { - Toast.makeText(getActivity(), "请拍照 身份证国徽面", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(),"请拍照 身份证国徽面"); return; } if (tvCard3.getTag() == null) { - Toast.makeText(getActivity(), "请拍照 手持身份证", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(),"请拍照 手持身份证"); return; } ArrayList takePhoneList = new ArrayList<>(); @@ -326,7 +326,7 @@ public class UserAttestationFragment extends BaseFragment implements View.OnClic } else if (response.getCode() == 230) { FlushTokenUtil.flushToken(getActivity()); } else { - Toast.makeText(getActivity(), "提交失败！", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(),"提交失败！"); } } @@ -341,9 +341,9 @@ public class UserAttestationFragment extends BaseFragment implements View.OnClic String message = e.getMessage(); assert message != null; if (message.contains("timeout") || message.contains("Read time out")) { - Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(),"请求超时"); } else { - Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(),message); } Log.d("TAG", "onSuccess: 失败" + e.getMessage() + ""); } @@ -423,14 +423,14 @@ public class UserAttestationFragment extends BaseFragment implements View.OnClic IdCardNumberBean idCardNumberBean = new Gson().fromJson(inward, IdCardNumberBean.class); if (idCardNumberBean == null) { userAttestationBuilder.append(TimestampUtil.time()).append("识别失败，可以重新识别或则进行手动输入 ,"); - Toast.makeText(getActivity(), "识别失败，可以重新识别或则进行手动输入", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(),"识别失败，可以重新识别或则进行手动输入"); } else { if (idCardNumberBean.getWords_result().get公民身份号码() != null) { String words = idCardNumberBean.getWords_result().get公民身份号码().getWords(); etNamePhone.setText(words); userAttestationBuilder.append(TimestampUtil.time()).append("身份号识别成功 ,"); } else { - Toast.makeText(getActivity(), "身份号识别失败，可以重新识别或则进行手动输入", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(),"身份号识别失败，可以重新识别或则进行手动输入"); userAttestationBuilder.append(TimestampUtil.time()).append("身份号识别失败，可以重新识别或则进行手动输入 ,"); } if (idCardNumberBean.getWords_result().get姓名() != null) { @@ -438,18 +438,18 @@ public class UserAttestationFragment extends BaseFragment implements View.OnClic etAttestationName.setText(words); userAttestationBuilder.append(TimestampUtil.time()).append("姓名识别成功 ,"); } else { - Toast.makeText(getActivity(), "姓名识别失败，可以重新识别或则进行手动输入", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(),"姓名识别失败，可以重新识别或则进行手动输入"); userAttestationBuilder.append(TimestampUtil.time()).append("姓名识别失败，可以重新识别或则进行手动输入 ,"); } } } else { userAttestationBuilder.append(TimestampUtil.time()).append("识别失败，可以重新识别或则进行手动输入 ,"); - Toast.makeText(getActivity(), "识别失败，可以重新识别或则进行手动输入", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(),"识别失败，可以重新识别或则进行手动输入"); } } } else { - Toast.makeText(getContext(), "请先拍照", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(),"请先拍照"); } } } diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/VideoFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/VideoFragment.java index ada83dd..a25b6f4 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/VideoFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/VideoFragment.java @@ -2,6 +2,7 @@ package com.navinfo.outdoor.fragment; import android.os.Bundle; import android.os.Message; +import android.util.Log; import android.view.KeyEvent; import android.view.View; import android.widget.ImageView; @@ -19,6 +20,7 @@ import com.navinfo.outdoor.base.BaseFragment; import com.navinfo.outdoor.bean.FileBean; import com.navinfo.outdoor.room.PoiEntity; import com.navinfo.outdoor.util.AWMp4ParserHelper; +import com.navinfo.outdoor.util.ToastUtils; import org.greenrobot.eventbus.EventBus; @@ -126,7 +128,6 @@ public class VideoFragment extends BaseFragment implements View.OnClickListener public void onClick(View v) { switch (v.getId()) { case R.id.iv_video_final: - Message message = new Message(); message.what = Constant.VIDEO_FINISH_ROAD; EventBus.getDefault().post(message); @@ -138,9 +139,27 @@ public class VideoFragment extends BaseFragment implements View.OnClickListener videoAdapter.deleteFile(fileBeans.get(i)); } } else { - Toast.makeText(getContext(), "请选择要删除的数据后才可以删除", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(),"请选择要删除的数据后才可以删除"); } break; } } + + @Override + public void onPause() { + super.onPause(); + Log.d("TAG", "onPause: "); + } + + @Override + public void onStop() { + super.onStop(); + Log.d("TAG", "onStop: "); + } + + @Override + public void onDestroy() { + super.onDestroy(); + Log.d("TAG", "onDestroy: "); + } } 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 fedae9e..5170c89 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/WithdrawFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/WithdrawFragment.java @@ -34,6 +34,7 @@ import com.navinfo.outdoor.http.HttpInterface; import com.navinfo.outdoor.http.OkGoBuilder; import com.navinfo.outdoor.util.FlushTokenUtil; import com.navinfo.outdoor.util.TimestampUtil; +import com.navinfo.outdoor.util.ToastUtils; import java.io.File; import java.text.DateFormat; @@ -109,7 +110,7 @@ public class WithdrawFragment extends BaseFragment implements View.OnClickListen public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { if (isChecked) { if (Constant.BACKGROUND == null) { - Toast.makeText(getActivity(), "没有绑定银行卡，请先绑定银行卡", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(),"没有绑定银行卡，请先绑定银行卡"); checkBox.setChecked(false); withdrawBuilder.append(TimestampUtil.time()).append(",").append("点击了银行卡的勾选,"); } else { @@ -181,7 +182,7 @@ public class WithdrawFragment extends BaseFragment implements View.OnClickListen } else if (response.getCode() == 230) { FlushTokenUtil.flushToken(getActivity()); } else { - Toast.makeText(getContext(), response.getMessage(), Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(),response.getMessage()); } Log.d("TAG", "onSuccess: " + response.toString()); } @@ -191,15 +192,16 @@ public class WithdrawFragment extends BaseFragment implements View.OnClickListen dismissLoadingDialog(); String message = e.getMessage(); assert message != null; - if (message.contains("timeout")||message.contains("Read time out")){ - Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show(); + if (message.equals("timeout")||message.equals("Read time out")){ + ToastUtils.Message(getActivity(),"请求超时"); }else { - Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(),message); } } }); } + @Override public void onClick(View v) { switch (v.getId()) { @@ -219,15 +221,15 @@ public class WithdrawFragment extends BaseFragment implements View.OnClickListen if (!price.equals("")) { double aDouble = Double.parseDouble(price); if (aDouble < 10) { - Toast.makeText(getActivity(), "提现金额不能低于10元", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(),"提现金额不能低于10元"); return; } } else { - Toast.makeText(getActivity(), "提现金额不能为空", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(),"提现金额不能为空"); return; } if (!checkBox.isChecked()) { - Toast.makeText(getActivity(), "请勾选银行卡", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(),"请勾选银行卡"); return; } if (Constant.BACKGROUND != null) { @@ -241,7 +243,7 @@ public class WithdrawFragment extends BaseFragment implements View.OnClickListen } }); } else { - Toast.makeText(getActivity(), "请先绑定银行卡", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(),"请先绑定银行卡"); return; } break; @@ -286,7 +288,7 @@ public class WithdrawFragment extends BaseFragment implements View.OnClickListen FlushTokenUtil.flushToken(getActivity()); } else { withdrawBuilder.append(TimestampUtil.time()).append(",").append("提现了失败 ，"); - Toast.makeText(getActivity(), response.getMessage() + "", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(),response.getMessage() ); } etAllPrice.getText().clear(); Log.d("TAG", "onSuccess: " + response.getMessage() + response.getCode()); @@ -297,10 +299,10 @@ public class WithdrawFragment extends BaseFragment implements View.OnClickListen dismissLoadingDialog(); String message = e.getMessage(); assert message != null; - if (message.contains("timeout")||message.contains("Read time out")){ - Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show(); + if (message.equals("timeout")||message.equals("Read time out")){ + ToastUtils.Message(getActivity(),"请求超时"); }else { - Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(),message); } Log.d("TAG", "onError: " + e.getMessage()); } @@ -308,6 +310,7 @@ public class WithdrawFragment extends BaseFragment implements View.OnClickListen } @Override + public void onPause() { super.onPause(); withdrawBuilder.append(TimestampUtil.time()).append(",").append("onPause,"); 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 dde0ac6..88cd306 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/WithdrawalRecordFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/WithdrawalRecordFragment.java @@ -28,6 +28,7 @@ import com.navinfo.outdoor.http.HttpInterface; import com.navinfo.outdoor.http.OkGoBuilder; import com.navinfo.outdoor.util.FlushTokenUtil; import com.navinfo.outdoor.util.TimestampUtil; +import com.navinfo.outdoor.util.ToastUtils; import java.io.File; import java.text.DateFormat; @@ -58,8 +59,6 @@ public class WithdrawalRecordFragment extends BaseFragment implements View.OnCli return R.layout.withdrawal_record_fragment; } - - @Override protected void initView() { super.initView(); @@ -67,11 +66,10 @@ public class WithdrawalRecordFragment extends BaseFragment implements View.OnCli ivWithdraw.setOnClickListener(this); rxlWithdraw = (XRecyclerView) findViewById(R.id.rxl_withdraw); rxlWithdraw.setLayoutManager(new LinearLayoutManager(getActivity())); - rxlWithdraw.setRefreshProgressStyle(ProgressStyle.BallSpinFadeLoader); rxlWithdraw.setLoadingMoreProgressStyle(ProgressStyle.BallRotate); //取消上拉加载，刷新功能。 -// taskRecycler.setPullRefreshEnabled(false); +// taskRecycler.setPullRefreshEnabled(false); // taskRecycler.setLoadingMoreEnabled(false); withdrawalAdapter = new WithdrawalAdapter(getContext()); rxlWithdraw.setAdapter(withdrawalAdapter); @@ -142,7 +140,7 @@ public class WithdrawalRecordFragment extends BaseFragment implements View.OnCli } else if (withdrawalBean.getCode() == 230) { FlushTokenUtil.flushToken(getActivity()); } else { - Toast.makeText(getActivity(), withdrawalBean.getMessage() + "", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(),withdrawalBean.getMessage() ); } rxlWithdraw.loadMoreComplete(); rxlWithdraw.refreshComplete(); @@ -157,9 +155,9 @@ public class WithdrawalRecordFragment extends BaseFragment implements View.OnCli String message = e.getMessage(); assert message != null; if (message.contains("timeout")||message.contains("Read time out")){ - Toast.makeText(getActivity(), "请求超时", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(),"请求超时" ); }else { - Toast.makeText(getActivity(), message, Toast.LENGTH_SHORT).show(); + ToastUtils.Message(getActivity(),message); } } }); diff --git a/app/src/main/java/com/navinfo/outdoor/http/Callback.java b/app/src/main/java/com/navinfo/outdoor/http/Callback.java index af88106..b8076d9 100644 --- a/app/src/main/java/com/navinfo/outdoor/http/Callback.java +++ b/app/src/main/java/com/navinfo/outdoor/http/Callback.java @@ -7,20 +7,19 @@ import com.lzy.okgo.model.Progress; */ public interface Callback { + /** * 数据成功时候回调 - * * @param response 成功回调接口 * @param id 成功码 */ void onSuccess(T response, int id); - /** * 数据失败时候回调 - * * @param e 失败回调异常 * @param id 失败码 */ void onError(Throwable e, int id); + } diff --git a/app/src/main/java/com/navinfo/outdoor/http/DialogCallback.java b/app/src/main/java/com/navinfo/outdoor/http/DialogCallback.java index e44c378..fe00ff9 100644 --- a/app/src/main/java/com/navinfo/outdoor/http/DialogCallback.java +++ b/app/src/main/java/com/navinfo/outdoor/http/DialogCallback.java @@ -10,23 +10,16 @@ import com.lzy.okgo.request.base.Request; public abstract class DialogCallback extends JsonCallback { @Override - public void onSuccess(Response response) { - - } + public void onSuccess(Response response) { } public DialogCallback( Class tClass) { super(tClass); } + @Override + public void onStart(Request request) { } @Override - public void onStart(Request request) { - - } - - @Override - public void onFinish() { - } - + public void onFinish() { } } 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 68eee2d..320b61b 100644 --- a/app/src/main/java/com/navinfo/outdoor/http/HttpInterface.java +++ b/app/src/main/java/com/navinfo/outdoor/http/HttpInterface.java @@ -1,26 +1,24 @@ 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://172.23.139.127:9999/m4";//测试接口 + public static final String IP1 = "http://dtxbmaps.navinfo.com/dtxb/m4";//正式接口 + public static final String IP2 = "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/";//登录 public static final String PRICE_PATH = "/price/";//提现 public static final String TASK_PATH = "/task/";//任务 - /* + /** public static final String TEST_GUIDANCE_IP = "http://172.21.98.90:9999/m4";//引导页完成接口 public static final String APK_IP = "http://172.23.139.4:8001/"; public static String IP1 = "http://dtxbmaps.navinfo.com/dtxb/msg/"; public static final String DATA_IP = "http://172.23.139.4:9999/m4";//接口 */ - /* - 用户版本升级 - */ - // dtxbmaps.navinfo.com/dtxb/m4/user/appVersion/checkVersion?version=155&operationType=android - // 172.23.139.4:8001/appVersion/checkVersion?version=155&operationType=android //version是版本 operationType固定值 安卓 get + /*用户版本升级*/ + // dtxbmaps.navinfo.com/dtxb/m4/user/appVersion/checkVersion?version=155&operationType=android //version是版本 operationType固定值 安卓 get public static String APP_CHECK_VERSION = null; //版本升级 public static void initAppPath(String userId) { @@ -28,8 +26,8 @@ public class HttpInterface { } /* 我的 - Path=/m4/user/* - */ + * Path=/m4/user/ + */ //172.23.139.4:8001/m4/user/update public static String USER_UPDATE = null;//用户资料 //172.23.139.4:8001/m4/userBankcard/update @@ -43,7 +41,7 @@ public class HttpInterface { //172.21.98.90:9999/m4/user/userGuide/1/insertUserGuide public static String INSERT_USER_GUIDE = null;//引导页完成接口 /* 发现 - * Path=/m4/msgList/** + * Path=/m4/msgList/ */ public static String MSG_CONTENT = null;//发现 -富文本详情页请求 public static String LIST_TASK = null;//任务专区 @@ -55,8 +53,9 @@ public class HttpInterface { public static String EXAM_CONTENT = null;//发现 -能力测评获取试题接口 //172.23.139.4:8002/findAndMessage/1/submitExam public static String EXAM_SUBMIT = null;//发现 -能力测评提交试卷 post + /* 登录 - * Path=/m4/userlogin/** + * Path=/m4/userlogin/ */ //172.23.139.4:9999/m4/userlogin/oauth/token public static String USER_LOGIN_OAUTH_TOKEN = IP + USER_LOGIN_PATH + "oauth/token"; //登录接口 @@ -66,10 +65,11 @@ public class HttpInterface { public static String USER_MESSAGE = IP + USER_PATH + "phone/message";//获取验证码 type 1：注册获取 2：更新 ///m4/user/user/forgetPassword public static String USER_FORGET_PASSWORD = IP + USER_PATH + "user/forgetPassword";//忘记密码 + //Flat //dtxbmaps.navinfo.com/dtxb/m4/user/phone/message?mobile=18811794839&type=2 - /* 提现 金额 - * Path=/m4/price/** + /* 提现-金额 + * Path=/m4/price/ */ //172.23.139.4:8004/userPrice/1/getPrice public static String GET_PRICE = null;//我的-总资产 @@ -77,10 +77,10 @@ public class HttpInterface { public static String USER_PRICE_EXCHANGE = null;//我的-财务信息-提现 //dtxbmaps.navinfo.com/dtxb/m4/price/priceExchange/1/getList?datetime=1628647356815 public static String PRICE_EXCHANGE = null;//提现记录 - /*任务 - * Path=/m4/task/** - */ + /* 任务 + * Path=/m4/task/ + */ ///m4/task/task/10/receiveTasks 参数：taskIds public static String RECEIVE_TASK = null;//批量领取 //172.23.139.4:8003/m4/task/1/getList @@ -138,96 +138,99 @@ public class HttpInterface { public static String MAP_AGREEMENT = "";//地图寻宝服务协议 public static String MAP_PRIVACY = "";//地图寻宝隐私 - public static void initHttpInter(String USERID) { + public static void initHttpInter(String userId) { /* 我的 - * Path=/m4/user/* + * Path=/m4/user/ */ //172.23.139.4:8001/m4/user/update - USER_UPDATE = IP + USER_PATH + "user/" + USERID + "/update";//用户资料 + USER_UPDATE = IP + USER_PATH + "user/" + userId + "/update";//用户资料 //172.23.139.4:8001/m4/userBankcard/update - USER_BANKCARD_UP_DATA = IP + USER_PATH + "userBankcard/" + USERID + "/add"; //绑定银行卡 + USER_BANKCARD_UP_DATA = IP + USER_PATH + "userBankcard/" + userId + "/add"; //绑定银行卡 //172.23.139.4:8001/m4/userAuth/add - USER_AUTH_ADD = IP + USER_PATH + "userAuth/" + USERID + "/add"; //实名认证 + USER_AUTH_ADD = IP + USER_PATH + "userAuth/" + userId + "/add"; //实名认证 //172.23.139.4:9999/m4/user/userLocation/1/userLocation post 参数 geom:geohash加密 - USER_LOCATION = IP + USER_PATH + "userLocation/" + USERID + "/userLocation"; //上传用户坐标 + USER_LOCATION = IP + USER_PATH + "userLocation/" + userId + "/userLocation"; //上传用户坐标 //dtxbmaps.navinfo.com/dtxb/m4/user/user/1/getUserDetailByUserid/1?datetime=1628749294718 - USER_DETAIL_BY_USER_ID = IP + USER_PATH + "user/" + USERID + "/getUserDetailByUserid/" + USERID; //获取用户信息 + USER_DETAIL_BY_USER_ID = IP + USER_PATH + "user/" + userId + "/getUserDetailByUserid/" + userId; //获取用户信息 //172.21.98.90:9999/m4/user/userGuide/1/insertUserGuide - INSERT_USER_GUIDE = IP + USER_PATH + "userGuide/" + USERID + "/insertUserGuide";//引导页完成接口 - /*发现 - * Path=/m4/msgList/** + INSERT_USER_GUIDE = IP + USER_PATH + "userGuide/" + userId + "/insertUserGuide";//引导页完成接口 + + /* 发现 + * Path=/m4/msgList/ */ - MSG_CONTENT = IP + MSG_LIST_PATH + "findAndMessage/" + USERID + "/msg_content";//发现 -富文本详情页请求 - LIST_TASK = IP + MSG_LIST_PATH + "findAndMessage/" + USERID + "/msg_list";//任务专区 - LIST_EVENT = IP + MSG_LIST_PATH + "findAndMessage/" + USERID + "/msg_list";//活动专区 - LIST_TASK_EXPLAIN = IP + MSG_LIST_PATH + "findAndMessage/" + USERID + "/msg_list";//任务说明 + MSG_CONTENT = IP + MSG_LIST_PATH + "findAndMessage/" + userId + "/msg_content";//发现 -富文本详情页请求 + LIST_TASK = IP + MSG_LIST_PATH + "findAndMessage/" + userId + "/msg_list";//任务专区 + LIST_EVENT = IP + MSG_LIST_PATH + "findAndMessage/" + userId + "/msg_list";//活动专区 + LIST_TASK_EXPLAIN = IP + MSG_LIST_PATH + "findAndMessage/" + userId + "/msg_list";//任务说明 //172.23.139.4:8002/findAndMessage/1/msg_list?fid=1&pageNum=1&pageSize=2 - MSG_LISt = IP + MSG_LIST_PATH + "findAndMessage/" + USERID + "/msg_list";//发现查询接口 + MSG_LISt = IP + MSG_LIST_PATH + "findAndMessage/" + userId + "/msg_list";//发现查询接口 //172.23.139.4:8002/findAndMessage/1/exam_content?id=11 - EXAM_CONTENT = IP + MSG_LIST_PATH + "findAndMessage/" + USERID + "/exam_content";//发现 -能力测评获取试题接口 + EXAM_CONTENT = IP + MSG_LIST_PATH + "findAndMessage/" + userId + "/exam_content";//发现 -能力测评获取试题接口 //172.23.139.4:8002/findAndMessage/1/submitExam - EXAM_SUBMIT = IP + MSG_LIST_PATH + "findAndMessage/" + USERID + "/submitExam";//发现 -能力测评提交试卷 post - MESSAGE_INFO_PUSH = IP + MSG_LIST_PATH + "InfoPush/" + USERID + "/push";//寻宝-消息通知 - /*提现 金额 - * Path=/m4/price/** + EXAM_SUBMIT = IP + MSG_LIST_PATH + "findAndMessage/" + userId + "/submitExam";//发现 -能力测评提交试卷 post + MESSAGE_INFO_PUSH = IP + MSG_LIST_PATH + "InfoPush/" + userId + "/push";//寻宝-消息通知 + + /* 提现 金额 + * Path=/m4/price/ */ //172.23.139.4:8004/userPrice/1/getPrice - GET_PRICE = IP + PRICE_PATH + "userPrice/" + USERID + "/getPrice";//我的-总资产 + GET_PRICE = IP + PRICE_PATH + "userPrice/" + userId + "/getPrice";//我的-总资产 //172.23.139.4:8004/userPrice/1/userPriceExchange?exchangeMoney=10&payType=1 - USER_PRICE_EXCHANGE = IP + PRICE_PATH + "userPrice/" + USERID + "/userPriceExchange";//我的-财务信息-提现 + USER_PRICE_EXCHANGE = IP + PRICE_PATH + "userPrice/" + userId + "/userPriceExchange";//我的-财务信息-提现 //dtxbmaps.navinfo.com/dtxb/m4/price/priceExchange/1/getList?datetime=1628647356815 - PRICE_EXCHANGE = IP + PRICE_PATH + "priceExchange/" + USERID + "/getList";//提现记录 - /*任务 - *Path=/m4/task/** + PRICE_EXCHANGE = IP + PRICE_PATH + "priceExchange/" + userId + "/getList";//提现记录 + + /* 任务 + * Path=/m4/task/ */ ///m4/task/task/10/receiveTasks 参数：taskIds - RECEIVE_TASK = IP + TASK_PATH + "task/" + USERID + "/receiveTasks";//批量领取 + RECEIVE_TASK = IP + TASK_PATH + "task/" + userId + "/receiveTasks";//批量领取 //172.23.139.4:8003/m4/task/1/getList - TASK_LIST = IP + TASK_PATH + "task/" + USERID + "/getList"; //任务搜索 + TASK_LIST = IP + TASK_PATH + "task/" + userId + "/getList"; //任务搜索 //172.23.139.4:8003/othertask/1/receivedOthertask - RECEIVED_OTHER_TASK = IP + TASK_PATH + "othertask/" + USERID + "/receivedOthertask";//其他-领取任务 + RECEIVED_OTHER_TASK = IP + TASK_PATH + "othertask/" + userId + "/receivedOthertask";//其他-领取任务 //172.23.139.4:8003/poitask/1/receivedPoitask/1 - RECEIVED_POI_TASK = IP + TASK_PATH + "poitask/" + USERID + "/receivedPoitask";//poi-领取任务 + RECEIVED_POI_TASK = IP + TASK_PATH + "poitask/" + userId + "/receivedPoitask";//poi-领取任务 //172.23.139.4:8003/poitask/1/submitPoitask?taskId=5001&name=测试修改名称&address=测试修改地址&existence=1&geo=1rn7exd5uhxy&memo=测试备注...33. - SUBMIT_POI_TASK = IP + TASK_PATH + "poitask/" + USERID + "/submitPoitask";//poi-保存本地 + SUBMIT_POI_TASK = IP + TASK_PATH + "poitask/" + userId + "/submitPoitask";//poi-保存本地 //172.23.139.4:8003/othertask/1/submitOhtertask?taskId=5001&name=测试修改名称&address=测试修改地址&existence=1&geo=1rn7exd5uhxy&memo=测试备注 - SUBMIT_OTHER_TASK = IP + TASK_PATH + "othertask/" + USERID + "/submitOthertask";//其他-保存本地 + SUBMIT_OTHER_TASK = IP + TASK_PATH + "othertask/" + userId + "/submitOthertask";//其他-保存本地 //172.23.139.4:8003/othertask/1/uploadpic - OTHER_TASK_UPLOAD_PIC = IP + TASK_PATH + "othertask/" + USERID + "/uploadpic";//其他-上传 + OTHER_TASK_UPLOAD_PIC = IP + TASK_PATH + "othertask/" + userId + "/uploadpic";//其他-上传 //172.23.139.4:8003/ctask/1/receivedCtask/8608 - RECEIVED_CTASK = IP + TASK_PATH + "ctask/" + USERID + "/receivedCtask";//充电站-领取任务 + RECEIVED_CTASK = IP + TASK_PATH + "ctask/" + userId + "/receivedCtask";//充电站-领取任务 //172.23.139.4:8003/ctask/1/submitCtask?id=8608&name=充电站&address=地址&telephone=18812345678|14712345678&geo=1rn7exd5uhxy&memo=测试备注&sptype=1 - SUBMIT_CTASK = IP + TASK_PATH + "ctask/" + USERID + "/submitCtask";//充电站-保存本地 + SUBMIT_CTASK = IP + TASK_PATH + "ctask/" + userId + "/submitCtask";//充电站-保存本地 //172.23.139.4:8003/cstask/1/submitCstask?taskId=0&name=充电站&geo=1rn7exd5uhxy&memo=测试备注&sptype=1&ffid=104&existence=1&detail={"cp_openType":"1,2","cp_floor":1,"cp_availableState":0,"sign_exist":0} - SUBMIT_CSTASK = IP + TASK_PATH + "cstask/" + USERID + "/submitCstask";//充电桩保存 + SUBMIT_CSTASK = IP + TASK_PATH + "cstask/" + userId + "/submitCstask";//充电桩保存 //172.23.139.4:8003/poitask/1/uploadpic - POI_TASK_UPLOAD_PIC = IP + TASK_PATH + "poitask/" + USERID + "/uploadpic";//poi-上传 + POI_TASK_UPLOAD_PIC = IP + TASK_PATH + "poitask/" + userId + "/uploadpic";//poi-上传 //172.23.139.4:8003/roadtask/1/receivedRoadtask/8569 - RECEIVED_ROAD_TASK = IP + TASK_PATH + "roadtask/" + USERID + "/receivedRoadtask";//道路任务获取 + RECEIVED_ROAD_TASK = IP + TASK_PATH + "roadtask/" + userId + "/receivedRoadtask";//道路任务获取 //172.23.139.4:8003/poivideotask/1/receivedPoivideotask/8569 - RECEIVED_POI_VIDEO_TASK = IP + TASK_PATH + "poivideotask/" + USERID + "/receivedPoivideotask";//poi录像任务获取 + RECEIVED_POI_VIDEO_TASK = IP + TASK_PATH + "poivideotask/" + userId + "/receivedPoivideotask";//poi录像任务获取 // 172.23.139.4:8003/poivideotask/1/submitPoivideotask - INSIDE_API_LIST = IP + TASK_PATH + "poivideotask/" + USERID + "/submitPoivideotask";//poi录像 保存 + INSIDE_API_LIST = IP + TASK_PATH + "poivideotask/" + userId + "/submitPoivideotask";//poi录像 保存 //172.23.139.4:8003/poivideotask/1/uploadpic - POI_VIDEO_UPLOAD_PIC = IP + TASK_PATH + "poivideotask/" + USERID + "/uploadpic";//poi录像-上传 + POI_VIDEO_UPLOAD_PIC = IP + TASK_PATH + "poivideotask/" + userId + "/uploadpic";//poi录像-上传 //172.23.139.4:8003/roadtask/1/submitRoadtask?taskId=0&name=段哥&address=二娃&memo=1rn7exd5uhxy&workType=2 - ROAD_TASK_SUBMIT = IP + TASK_PATH + "roadtask/" + USERID + "/submitRoadtask";//道路录像-保存本地 + ROAD_TASK_SUBMIT = IP + TASK_PATH + "roadtask/" + userId + "/submitRoadtask";//道路录像-保存本地 //172.23.139.4:8003/roadtask/1/uploadpic - ROAD_TASK_UPLOAD_PIC = IP + TASK_PATH + "roadtask/" + USERID + "/uploadpic";//道路录像—上传 + ROAD_TASK_UPLOAD_PIC = IP + TASK_PATH + "roadtask/" + userId + "/uploadpic";//道路录像—上传 //172.23.139.4:8003/m4/task/1/getPhone?geo=1rn7exd5uhxy - GET_PHONES = IP + TASK_PATH + "task/" + USERID + "/getPhone";//电话区号和电话位数 + GET_PHONES = IP + TASK_PATH + "task/" + userId + "/getPhone";//电话区号和电话位数 //172.23.139.4:8003/cstask/1/uploadpic - CS_TASK_UP_LOAD_PIC = IP + TASK_PATH + "cstask/" + USERID + "/uploadpic";//充电桩-上传 + CS_TASK_UP_LOAD_PIC = IP + TASK_PATH + "cstask/" + userId + "/uploadpic";//充电桩-上传 //172.23.139.4:8003/ctask/1/uploadpic - C_TASK_UP_LOAD_PIC = IP + TASK_PATH + "ctask/" + USERID + "/uploadpic";//充电站-上传 + C_TASK_UP_LOAD_PIC = IP + TASK_PATH + "ctask/" + userId + "/uploadpic";//充电站-上传 //172.23.139.4:8003/m4/task/1/taskName?geo=1rn7exd5uhxy&name=四维 - TASK_NAME = IP + TASK_PATH + "task/" + USERID + "/taskName";//poi-查重 + TASK_NAME = IP + TASK_PATH + "task/" + userId + "/taskName";//poi-查重 //172.23.139.4:8003/m4/task/1/getCommitList?type=2&pageSize=10&pageNum=1 - GET_COMMIT_LIST = IP + TASK_PATH + "task/" + USERID + "/getCommitList";//紀錄——已提交 - RECEIVED_POLYGON_TASK = IP + TASK_PATH + "polygonTask/" + USERID + "/receivedPolygontask"; //面状任务任务领取 + GET_COMMIT_LIST = IP + TASK_PATH + "task/" + userId + "/getCommitList";//紀錄——已提交 + RECEIVED_POLYGON_TASK = IP + TASK_PATH + "polygonTask/" + userId + "/receivedPolygontask"; //面状任务任务领取 //172.23.139.4:8003/m4/task/1/unReceivedTask?taskIds=&auditIds=214,278 取消领取的接口 - UNRECEIVED_POLYGON_TASK = IP + TASK_PATH + "task/" + USERID + "/unReceivedTask";//所有類型结束领取 - COMPLETE = IP + TASK_PATH + "polygonTask/" + USERID + "/complete";//面状任务结束领取 - SUBMIT_POLYGON_TASK = IP + TASK_PATH + "polygonTask/" + USERID + "/submitPolygontask";//面状任务开始采集 + UNRECEIVED_POLYGON_TASK = IP + TASK_PATH + "task/" + userId + "/unReceivedTask";//所有類型结束领取 + COMPLETE = IP + TASK_PATH + "polygonTask/" + userId + "/complete";//面状任务结束领取 + SUBMIT_POLYGON_TASK = IP + TASK_PATH + "polygonTask/" + userId + "/submitPolygontask";//面状任务开始采集 } } diff --git a/app/src/main/java/com/navinfo/outdoor/http/HttpUtil.java b/app/src/main/java/com/navinfo/outdoor/http/HttpUtil.java index 64b9956..cd058b2 100644 --- a/app/src/main/java/com/navinfo/outdoor/http/HttpUtil.java +++ b/app/src/main/java/com/navinfo/outdoor/http/HttpUtil.java @@ -13,14 +13,12 @@ import java.util.Map; */ public class HttpUtil { - public static String post(String requestUrl, String accessToken, String params) - throws Exception { + public static String post(String requestUrl, String accessToken, String params) throws Exception { String contentType = "application/x-www-form-urlencoded"; return HttpUtil.post(requestUrl, accessToken, contentType, params); } - public static String post(String requestUrl, String accessToken, String contentType, String params) - throws Exception { + public static String post(String requestUrl, String accessToken, String contentType, String params) throws Exception { String encoding = "UTF-8"; if (requestUrl.contains("nlp")) { encoding = "GBK"; @@ -28,14 +26,12 @@ public class HttpUtil { return HttpUtil.post(requestUrl, accessToken, contentType, params, encoding); } - public static String post(String requestUrl, String accessToken, String contentType, String params, String encoding) - throws Exception { + public static String post(String requestUrl, String accessToken, String contentType, String params, String encoding) throws Exception { String url = requestUrl + "?access_token=" + accessToken; return HttpUtil.postGeneralUrl(url, contentType, params, encoding); } - public static String postGeneralUrl(String generalUrl, String contentType, String params, String encoding) - throws Exception { + public static String postGeneralUrl(String generalUrl, String contentType, String params, String encoding) throws Exception { URL url = new URL(generalUrl); // 打开和URL之间的连接 HttpURLConnection connection = (HttpURLConnection) url.openConnection(); @@ -46,13 +42,11 @@ public class HttpUtil { connection.setUseCaches(false); connection.setDoOutput(true); connection.setDoInput(true); - // 得到请求的输出流对象 DataOutputStream out = new DataOutputStream(connection.getOutputStream()); out.write(params.getBytes(encoding)); out.flush(); out.close(); - // 建立实际的连接 connection.connect(); // 获取所有响应头字段 diff --git a/app/src/main/java/com/navinfo/outdoor/http/JsonCallback.java b/app/src/main/java/com/navinfo/outdoor/http/JsonCallback.java index 0a95d39..2f08ca1 100644 --- a/app/src/main/java/com/navinfo/outdoor/http/JsonCallback.java +++ b/app/src/main/java/com/navinfo/outdoor/http/JsonCallback.java @@ -1,6 +1,6 @@ package com.navinfo.outdoor.http; -import com.navinfo.outdoor.util.Whetherisempty; +import com.navinfo.outdoor.util.Weatherised; import com.google.gson.Gson; import com.lzy.okgo.callback.AbsCallback; @@ -39,7 +39,7 @@ public abstract class JsonCallback extends AbsCallback { } T data = null; Gson gson = new Gson(); - String str = Whetherisempty.getClfz(response.body().string()); + String str = Weatherised.getCafe(response.body().string()); if (mType != null) { data = gson.fromJson(str, mType); } diff --git a/app/src/main/java/com/navinfo/outdoor/http/OkGoBuilder.java b/app/src/main/java/com/navinfo/outdoor/http/OkGoBuilder.java index 90324ce..a33484e 100644 --- a/app/src/main/java/com/navinfo/outdoor/http/OkGoBuilder.java +++ b/app/src/main/java/com/navinfo/outdoor/http/OkGoBuilder.java @@ -20,6 +20,7 @@ import com.navinfo.outdoor.api.UserApplication; import com.navinfo.outdoor.bean.PoiUploadBean; import com.navinfo.outdoor.util.Md5Util; import com.navinfo.outdoor.util.NetWorkUtils; +import com.navinfo.outdoor.util.ToastUtils; import com.umeng.umcrash.UMCrash; import java.io.File; @@ -49,7 +50,6 @@ public class OkGoBuilder { private String url; private String file; private int time; - /** * 参数 */ @@ -60,23 +60,18 @@ public class OkGoBuilder { */ private Class clazz; private List files; - private String token; private String upString; - - /** * 单列模式 **/ private static OkGoBuilder mOkGoBuilder = null; - /** * 构造函数私有化 **/ private OkGoBuilder() { } - /** * 公有的静态函数，对外暴露获取单例对象的接口 **/ @@ -110,8 +105,6 @@ public class OkGoBuilder { this.file = file; return this; } - - public OkGoBuilder params(HttpParams params) { this.params = params; return this; @@ -179,7 +172,7 @@ public class OkGoBuilder { if (response.code() == 200) { callback.onSuccess(response.body(), 1); } else { - Toast.makeText(activity, response.message(), Toast.LENGTH_SHORT).show(); + ToastUtils.Message(activity, response.message()); } } @@ -229,7 +222,7 @@ public class OkGoBuilder { if (response.code() == 200) { callback.onSuccess(response.body(), 1); } else { - Toast.makeText(activity, response.message(), Toast.LENGTH_SHORT).show(); + ToastUtils.Message(activity, response.message()); } } @@ -303,6 +296,11 @@ public class OkGoBuilder { .execute(); } catch (IOException e) { e.printStackTrace(); + /* + * 友盟+ + * 使用自定义错误，查看时请在错误列表页面选择【自定义异常】 + */ + UMCrash.generateCustomLog("网络请求报错-位置：OKGOBuilder" + e, "UmengException"); } return null; } @@ -339,7 +337,7 @@ public class OkGoBuilder { if (response.code() == 200) { callback.onSuccess(response.body(), 1); } else { - Toast.makeText(activity, response.message(), Toast.LENGTH_SHORT).show(); + ToastUtils.Message(activity, response.message()); } } @@ -392,7 +390,7 @@ public class OkGoBuilder { if (response.code() == 200) { callback.onSuccess(response.body(), 1); } else { - Toast.makeText(activity, response.message(), Toast.LENGTH_SHORT).show(); + ToastUtils.Message(activity, response.message()); } } @@ -404,6 +402,11 @@ public class OkGoBuilder { throwable.printStackTrace(); callback.onError(throwable, 2); } + /* + * 友盟+ + * 使用自定义错误，查看时请在错误列表页面选择【自定义异常】 + */ + UMCrash.generateCustomLog("网络请求报错-位置：OKGOBuilder" + throwable, "UmengException"); } }); @@ -426,6 +429,11 @@ public class OkGoBuilder { .execute(); } catch (IOException e) { e.printStackTrace(); + /* + * 友盟+ + * 使用自定义错误，查看时请在错误列表页面选择【自定义异常】 + */ + UMCrash.generateCustomLog("网络请求报错-位置：OKGOBuilder" + e, "UmengException"); } return null; } diff --git a/app/src/main/java/com/navinfo/outdoor/http/UploadCallBack.java b/app/src/main/java/com/navinfo/outdoor/http/UploadCallBack.java index 84d0b9e..ecb6b1f 100644 --- a/app/src/main/java/com/navinfo/outdoor/http/UploadCallBack.java +++ b/app/src/main/java/com/navinfo/outdoor/http/UploadCallBack.java @@ -3,22 +3,22 @@ package com.navinfo.outdoor.http; import com.lzy.okgo.model.Progress; public interface UploadCallBack { + /** * 数据成功时候回调 - * * @param response 成功回调接口 * @param id 成功码 */ void onSuccess(T response, int id); + /** * 数据上传时候进度 - * - * @param progress 上传进度 + * @param progress 上传进度 */ void uploadProgress(Progress progress); + /** * 数据失败时候回调 - * * @param e 失败回调异常 * @param id 失败码 */ 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 4694f19..0922f9e 100644 --- a/app/src/main/java/com/navinfo/outdoor/room/PoiDatabase.java +++ b/app/src/main/java/com/navinfo/outdoor/room/PoiDatabase.java @@ -41,7 +41,8 @@ public abstract class PoiDatabase extends RoomDatabase { public static void destroy(){ instance=null; } - private static PoiDatabase create(final Context context) { + private static PoiDatabase create(final Context context) + { File dbFolder = new File(Constant.POI_DAO); // 数据库文件夹路径 if (!dbFolder.exists()) { SdkFolderCreate.mkdirs(dbFolder.getAbsolutePath()); @@ -57,31 +58,30 @@ public abstract class PoiDatabase extends RoomDatabase { private static Migration migration_1_2 = new Migration(1, 2) { @Override public void migrate(@NonNull SupportSQLiteDatabase database) { - database.execSQL("ALTER TABLE poi " - +" ADD COLUMN record_way INTEGER NOT NULL DEFAULT 0");//添加了一个 + database.execSQL("ALTER TABLE poi "+" ADD COLUMN record_way INTEGER NOT NULL DEFAULT 0");//添加了一个 } }; private static Migration migration_2_3 = new Migration(2, 3) { @Override public void migrate(@NonNull SupportSQLiteDatabase database) { - database.execSQL("ALTER TABLE video_list ADD stage TEXT DEFAULT ''"); + database.execSQL("ALTER TABLE poi ADD stage TEXT DEFAULT ''"); } }; private static Migration migration_3_4 = new Migration(3, 4) { @Override public void migrate(@NonNull SupportSQLiteDatabase database) { - database.execSQL("ALTER TABLE video_list ADD views INTEGER NOT NULL DEFAULT 0"); + database.execSQL("ALTER TABLE poi ADD views INTEGER NOT NULL DEFAULT 0"); } }; private static Migration migration_4_5 = new Migration(4, 5) { @Override public void migrate(@NonNull SupportSQLiteDatabase database) { - database.execSQL("ALTER TABLE user ADD partner INTEGER NOT NULL DEFAULT 0"); + database.execSQL("ALTER TABLE poi ADD partner INTEGER NOT NULL DEFAULT 0"); } }; - public abstract PoiDao getPoiDao(); - public abstract ChargingPileDao getChargingPileDao(); + public abstract PoiDao getPoiDao();//其他信息 + public abstract ChargingPileDao getChargingPileDao();//充电桩 } diff --git a/app/src/main/java/com/navinfo/outdoor/room/PoiEntity.java b/app/src/main/java/com/navinfo/outdoor/room/PoiEntity.java index efb890e..c52027d 100644 --- a/app/src/main/java/com/navinfo/outdoor/room/PoiEntity.java +++ b/app/src/main/java/com/navinfo/outdoor/room/PoiEntity.java @@ -32,7 +32,7 @@ public class PoiEntity implements Serializable { private String memo;//备注 private String precision;//金额 private String photo;//照片信息 - private boolean checked; + private boolean checked;//待提交中选中true ,不选中 false private String geoWkt; //原先的数据的wkt //ROOM不支持直接存储集合 @TypeConverters(PhotoInfoConverter.class) @@ -70,6 +70,7 @@ public class PoiEntity implements Serializable { public String getGeoWkt() { return geoWkt; } + public void setGeoWkt(String geoWkt) { this.geoWkt = geoWkt; } diff --git a/app/src/main/java/com/navinfo/outdoor/ui/view/ContactView.java b/app/src/main/java/com/navinfo/outdoor/ui/view/ContactView.java index 6e94f19..7a0c67b 100644 --- a/app/src/main/java/com/navinfo/outdoor/ui/view/ContactView.java +++ b/app/src/main/java/com/navinfo/outdoor/ui/view/ContactView.java @@ -63,7 +63,7 @@ public class ContactView { ViewParent parent = v.getParent(); rootView.removeView((View) parent); } -// rootView.removeViewAt(i); + //rootView.removeViewAt(i); } }); if (poiBean.getPhone() == null) { @@ -71,9 +71,7 @@ public class ContactView { } else { holder.editPhoneNumber.setText(poiBean.getPhone()); } - holder.editPhoneNumber.addTextChangedListener(new TextWatcher() { - @Override public void onTextChanged(CharSequence s, int start, int before, int count) { //正在输入 diff --git a/app/src/main/java/com/navinfo/outdoor/util/APKVersionCodeUtils.java b/app/src/main/java/com/navinfo/outdoor/util/APKVersionCodeUtils.java index d9c2529..870f25e 100644 --- a/app/src/main/java/com/navinfo/outdoor/util/APKVersionCodeUtils.java +++ b/app/src/main/java/com/navinfo/outdoor/util/APKVersionCodeUtils.java @@ -4,10 +4,10 @@ import android.content.Context; import android.content.pm.PackageManager; public class APKVersionCodeUtils { - /** - *获取本地版本号 - * + * 获取本地版本号 + * @param mContext context + * @return int */ public static int getVersionCode(Context mContext) { int versionCode = 0; @@ -22,7 +22,6 @@ public class APKVersionCodeUtils { /** * 获取版本号名称 - * * @param context 上下文 */ public static String getVerName(Context context) { 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 c7cd344..b3003f4 100644 --- a/app/src/main/java/com/navinfo/outdoor/util/AWMp4ParserHelper.java +++ b/app/src/main/java/com/navinfo/outdoor/util/AWMp4ParserHelper.java @@ -55,6 +55,7 @@ public class AWMp4ParserHelper { } private final static String PREFIX_VIDEO_HANDLER = "vide"; + private final static String PREFIX_AUDIO_HANDLER = "soun"; /** @@ -401,7 +402,7 @@ public class AWMp4ParserHelper { /** - * 根据图片文件列表，获取到对应的轨迹数据 + * 腾讯根据图片文件列表，获取到对应的轨迹数据 */ public List getLinePhotoByList(List videoFileList) { List latLags = new ArrayList<>(); @@ -430,4 +431,36 @@ public class AWMp4ParserHelper { } return latLags; } + /** + * GPS根据图片文件列表，获取到对应的轨迹数据 + */ + public List getGpsLineByList(List videoFileList) { + List latLags = new ArrayList<>(); + if (videoFileList == null || videoFileList.isEmpty()) { + return latLags; + } + + for (int m = 0; m < videoFileList.size(); m++) { + if (videoFileList.get(m).getPath().contains("paper.txt")) { + File path = videoFileList.get(m); + List strings = FileUtils.readFileToList(path.getPath(), "utf-8"); + if (strings != null) { + for (int i = 0; i < strings.size(); i++) { + String[] split = strings.get(i).split(","); + double latitude = Double.parseDouble(split[7]); + double longitude = Double.parseDouble(split[8]); + if (latitude!=0&&longitude!=0){ + LatLng latLng = new LatLng(latitude,longitude); + latLags.add(latLng); + } + } + if (strings.size() == 1) { + LatLng latLng = latLags.get(0); + latLags.add(latLng); + } + } + } + } + return latLags; + } } diff --git a/app/src/main/java/com/navinfo/outdoor/util/BackHandlerHelper.java b/app/src/main/java/com/navinfo/outdoor/util/BackHandlerHelper.java index 7e6dbae..763ea6c 100644 --- a/app/src/main/java/com/navinfo/outdoor/util/BackHandlerHelper.java +++ b/app/src/main/java/com/navinfo/outdoor/util/BackHandlerHelper.java @@ -17,17 +17,13 @@ public class BackHandlerHelper { */ public static boolean handleBackPress(FragmentManager fragmentManager) { List fragments = fragmentManager.getFragments(); - if (fragments == null) return false; - for (int i = fragments.size() - 1; i >= 0; i--) { Fragment child = fragments.get(i); - if (isFragmentBackHandled(child)) { return true; } } - if (fragmentManager.getBackStackEntryCount() > 0) { fragmentManager.popBackStack(); return true; diff --git a/app/src/main/java/com/navinfo/outdoor/util/Base64.java b/app/src/main/java/com/navinfo/outdoor/util/Base64.java index c6444c3..688de63 100644 --- a/app/src/main/java/com/navinfo/outdoor/util/Base64.java +++ b/app/src/main/java/com/navinfo/outdoor/util/Base64.java @@ -4,6 +4,7 @@ import javax.crypto.*; import javax.crypto.spec.DESKeySpec; import javax.crypto.spec.IvParameterSpec; import javax.crypto.spec.SecretKeySpec; + import java.io.*; import java.security.InvalidAlgorithmParameterException; import java.security.InvalidKeyException; @@ -17,9 +18,7 @@ public class Base64 { CharArrayWriter cw = new CharArrayWriter(4 * content.length / 3); int idx = 0; - int x = 0; - for (int i = 0; i < content.length; ++i) { if (idx == 0) x = (content[i] & 0xFF) << 16; @@ -247,6 +246,7 @@ public class Base64 { } } } + /** * 加密 * @@ -254,8 +254,8 @@ public class Base64 { * @return 返回加密结果 */ public static String desEncrypt(String message) throws Exception { - SecretKeyFactory keyFactory = SecretKeyFactory.getInstance("DES"); - SecretKey secretKey = keyFactory.generateSecret(new DESKeySpec(keyValue.getBytes("UTF-8"))); + SecretKeyFactory keyFactory = SecretKeyFactory.getInstance("DES"); + SecretKey secretKey = keyFactory.generateSecret(new DESKeySpec(keyValue.getBytes("UTF-8"))); IvParameterSpec iv = new IvParameterSpec(keyVector.getBytes("UTF-8")); Cipher cipher = Cipher.getInstance("DES/CBC/PKCS5Padding"); cipher.init(Cipher.ENCRYPT_MODE, secretKey, iv); @@ -290,7 +290,7 @@ public class Base64 { IvParameterSpec iv = new IvParameterSpec(keyVector.getBytes("UTF-8")); Cipher cipher = Cipher.getInstance("DES/CBC/PKCS5Padding"); cipher.init(Cipher.DECRYPT_MODE, key, iv); - return new String(cipher.doFinal(byteMi),"UTF-8"); + return new String(cipher.doFinal(byteMi), "UTF-8"); } public static void main(String[] args) throws Exception { diff --git a/app/src/main/java/com/navinfo/outdoor/util/Base64Util.java b/app/src/main/java/com/navinfo/outdoor/util/Base64Util.java index c3d98da..2bdbe91 100644 --- a/app/src/main/java/com/navinfo/outdoor/util/Base64Util.java +++ b/app/src/main/java/com/navinfo/outdoor/util/Base64Util.java @@ -19,7 +19,6 @@ public class Base64Util { StringBuilder to = new StringBuilder((int) ((double) from.length * 1.34D) + 3); int num = 0; char currentByte = 0; - int i; for (i = 0; i < from.length; ++i) { for (num %= 8; num < 8; num += 6) { @@ -49,17 +48,14 @@ public class Base64Util { currentByte = (char) (currentByte | (from[i + 1] & lead4byte) >>> 4); } } - to.append(encodeTable[currentByte]); } } - if (to.length() % 4 != 0) { for (i = 4 - to.length() % 4; i > 0; --i) { to.append("="); } } - return to.toString(); } } diff --git a/app/src/main/java/com/navinfo/outdoor/util/BounceZoomScrollView.java b/app/src/main/java/com/navinfo/outdoor/util/BounceZoomScrollView.java index 3c4adff..5daadfc 100644 --- a/app/src/main/java/com/navinfo/outdoor/util/BounceZoomScrollView.java +++ b/app/src/main/java/com/navinfo/outdoor/util/BounceZoomScrollView.java @@ -14,7 +14,6 @@ import android.widget.ScrollView; /** * 注意使用的时候需要放大的view,一般是第一个RelativeLayout或者LinearLayout。要加上 android:layout_gravity="center_horizontal" - */ public class BounceZoomScrollView extends ScrollView { diff --git a/app/src/main/java/com/navinfo/outdoor/util/CustomScrollView.java b/app/src/main/java/com/navinfo/outdoor/util/CustomScrollView.java index fb02e39..beb141e 100644 --- a/app/src/main/java/com/navinfo/outdoor/util/CustomScrollView.java +++ b/app/src/main/java/com/navinfo/outdoor/util/CustomScrollView.java @@ -31,4 +31,5 @@ public class CustomScrollView extends ScrollView { return false; } } + } diff --git a/app/src/main/java/com/navinfo/outdoor/util/DoubleUtil.java b/app/src/main/java/com/navinfo/outdoor/util/DoubleUtil.java index 11cca24..c87e019 100644 --- a/app/src/main/java/com/navinfo/outdoor/util/DoubleUtil.java +++ b/app/src/main/java/com/navinfo/outdoor/util/DoubleUtil.java @@ -8,12 +8,13 @@ import java.text.NumberFormat; * double 保存小数点后两位 */ public class DoubleUtil { + public static String format2(double value) { DecimalFormat df = new DecimalFormat("0.00"); df.setRoundingMode(RoundingMode.HALF_UP); return df.format(value); - } + public static String format3(double value) { NumberFormat nf = NumberFormat.getNumberInstance(); nf.setMaximumFractionDigits(2); @@ -28,7 +29,6 @@ public class DoubleUtil { */ nf.setGroupingUsed(false); return nf.format(value); - } public static String format5(double value) { diff --git a/app/src/main/java/com/navinfo/outdoor/util/FileUtil.java b/app/src/main/java/com/navinfo/outdoor/util/FileUtil.java index 70ed750..ea524d6 100644 --- a/app/src/main/java/com/navinfo/outdoor/util/FileUtil.java +++ b/app/src/main/java/com/navinfo/outdoor/util/FileUtil.java @@ -8,7 +8,10 @@ import java.io.*; public class FileUtil { /** - * 读取文件内容，作为字符串返回 + *读取文件内容，作为字符串返回 + * @param filePath path + * @return string + * @throws IOException e */ public static String readFileAsString(String filePath) throws IOException { File file = new File(filePath); @@ -36,6 +39,9 @@ public class FileUtil { /** * 根据文件路径读取byte[] 数组 + * @param filePath path + * @return byte[] + * @throws IOException e */ public static byte[] readFileByBytes(String filePath) throws IOException { File file = new File(filePath); @@ -53,9 +59,7 @@ public class FileUtil { while (-1 != (len1 = in.read(buffer, 0, bufSize))) { bos.write(buffer, 0, len1); } - - byte[] var7 = bos.toByteArray(); - return var7; + return bos.toByteArray(); } finally { try { if (in != null) { 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 b8ce71c..ed7db16 100644 --- a/app/src/main/java/com/navinfo/outdoor/util/FlushTokenUtil.java +++ b/app/src/main/java/com/navinfo/outdoor/util/FlushTokenUtil.java @@ -48,11 +48,11 @@ public class FlushTokenUtil { SharedPreferences navInfo = activity.getSharedPreferences(Constant.SHARED_PREFERENCES, Context.MODE_PRIVATE); navInfoEditor = navInfo.edit(); if (Constant.USHERED == null) { - Toast.makeText(activity, "token ：更新失败", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(activity,"token ：更新失败"); return; } else { if (HttpInterface.USER_LOGIN_OAUTH_TOKEN == null) { - Toast.makeText(activity, "token ：更新失败", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(activity,"token ：更新失败"); return; } } @@ -85,16 +85,16 @@ public class FlushTokenUtil { Constant.USHERED = body.getUserId(); navInfoEditor.apply(); if (HttpInterface.USER_DETAIL_BY_USER_ID == null) { - Toast.makeText(activity, "token ：更新成功", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(activity,"token ：更新成功"); } else { initGetUserInfo(activity);//获取用户信息 } }else { - Toast.makeText(activity, "获取用户id 失败", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(activity,"获取用户id 失败"); } } else { - Toast.makeText(activity, response.getMessage(), Toast.LENGTH_SHORT).show(); + ToastUtils.Message(activity,response.getMessage()); } } @@ -108,9 +108,9 @@ public class FlushTokenUtil { String message = e.getMessage(); assert message != null; if (message.contains("timeout") || message.contains("Read time out")) { - Toast.makeText(activity, "请求超时", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(activity,"请求超时"); } else { - Toast.makeText(activity, message, Toast.LENGTH_SHORT).show(); + ToastUtils.Message(activity,message); } } }); @@ -124,10 +124,10 @@ public class FlushTokenUtil { .getInstance() .time(30) .Builder(activity) + .cls(UserDetailBean.class) .url(HttpInterface.USER_DETAIL_BY_USER_ID) .token(Constant.ACCESS_TOKEN) - .params(new HttpParams()) - .cls(UserDetailBean.class); + .params(new HttpParams()); okGoBuilder.getRequest(new Callback() { @Override public void onSuccess(UserDetailBean response, int id) { @@ -167,10 +167,10 @@ public class FlushTokenUtil { Constant.AUDITING = userAuth.getAuditmsg(); } navInfoEditor.commit(); - Toast.makeText(activity, "token ：更新成功", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(activity,"token ：更新成功"); } } else { - Toast.makeText(activity, response.getMessage(), Toast.LENGTH_SHORT).show(); + ToastUtils.Message(activity,response.getMessage()); } } @@ -178,10 +178,10 @@ public class FlushTokenUtil { public void onError(Throwable e, int id) { String message = e.getMessage(); assert message != null; - if (message.contains("timeout") || message.contains("Read time out")) { - Toast.makeText(activity, "请求超时", Toast.LENGTH_SHORT).show(); + if (message.equals("timeout") || message.equals("Read time out")) { + ToastUtils.Message(activity,"请求超时"); } else { - Toast.makeText(activity, message, Toast.LENGTH_SHORT).show(); + ToastUtils.Message(activity,message); } } }); diff --git a/app/src/main/java/com/navinfo/outdoor/util/GPSUtils.java b/app/src/main/java/com/navinfo/outdoor/util/GPSUtils.java index 0f9e831..c3b63f0 100644 --- a/app/src/main/java/com/navinfo/outdoor/util/GPSUtils.java +++ b/app/src/main/java/com/navinfo/outdoor/util/GPSUtils.java @@ -39,7 +39,7 @@ public class GPSUtils { // 判断GPS是否正常启动 if (!mLocationManager.isProviderEnabled(LocationManager.GPS_PROVIDER)) { - Toast.makeText(context, "请开启GPS导航...", Toast.LENGTH_SHORT).show(); + ToastUtils.Message(context,"请开启GPS导航..."); // 返回开启GPS导航设置界面 Intent intent = new Intent(Settings.ACTION_LOCATION_SOURCE_SETTINGS); context.startActivityForResult(intent, 0); diff --git a/app/src/main/java/com/navinfo/outdoor/util/Geohash.java b/app/src/main/java/com/navinfo/outdoor/util/Geohash.java index 32c55c2..2f8dcdc 100644 --- a/app/src/main/java/com/navinfo/outdoor/util/Geohash.java +++ b/app/src/main/java/com/navinfo/outdoor/util/Geohash.java @@ -58,10 +58,10 @@ public class Geohash { //数据解密 /** - * @param geohash 需要被解密的字符串 + * @param georas 需要被解密的字符串 * @return double[] 经纬度double数组，纬度(latitude)在前,经度在后(longitude) */ - public String decode(String geohash) { + public String decode(String georas) { // try { // StringBuilder buffer = new StringBuilder(); // for (char c : geohash.toCharArray()) { @@ -104,7 +104,7 @@ public class Geohash { // return null; // } try { - return Base64.desDecrypt(geohash); + return Base64.desDecrypt(georas); } catch (UnsupportedEncodingException e) { e.printStackTrace(); } catch (NoSuchAlgorithmException e) { @@ -157,8 +157,8 @@ public class Geohash { return null; } - public String encodeList(List latLngs) { - String lineString = GeometryTools.getLineString(latLngs); + public String encodeList(List latLags) { + String lineString = GeometryTools.getLineString(latLags); try { return Base64.desEncrypt(lineString); } catch (Exception e) { @@ -198,5 +198,4 @@ public class Geohash { return new String(buf, charPos, (65 - charPos)); } - } diff --git a/app/src/main/java/com/navinfo/outdoor/util/GeometryTools.java b/app/src/main/java/com/navinfo/outdoor/util/GeometryTools.java index eab8e19..b6b2c9b 100644 --- a/app/src/main/java/com/navinfo/outdoor/util/GeometryTools.java +++ b/app/src/main/java/com/navinfo/outdoor/util/GeometryTools.java @@ -280,28 +280,16 @@ public class GeometryTools { if (geometry == null || geometry.equals("")) return null; - WKTReader reader = new WKTReader(); - Geometry geometers; - try { - geometers = reader.read(geometry); - if (geometers != null) { - - com.vividsolutions.jts.geom.Point point = geometers - .getInteriorPoint(); - + com.vividsolutions.jts.geom.Point point = geometers.getInteriorPoint(); LatLng geoInteriorPoint = new LatLng(point.getY(), point.getX()); - if (geometers.getGeometryType().equalsIgnoreCase("Point")) { - Coordinate coordinate = geometers.getCoordinate(); - return new LatLng(coordinate.y, coordinate.x); - } else if (geometers.getGeometryType().equalsIgnoreCase("LineString") || geometers.getGeometryType().equalsIgnoreCase("MultiLineString")) { Coordinate[] coordinates = geometers.getCoordinates(); if (coordinates != null && coordinates.length > 0) { @@ -309,15 +297,10 @@ public class GeometryTools { } else { return geoInteriorPoint; } - } else { - return geoInteriorPoint; - } - } - } catch (Exception e) { // TODO Auto-generated catch block e.printStackTrace(); @@ -340,7 +323,6 @@ public class GeometryTools { return d * 100000; } return 0; - } public static LatLng getLineStringCenter(String lineString) { @@ -486,11 +468,11 @@ public class GeometryTools { return null; } - /* + /** * LINESTRING (116.4206899999999933 39.9620999999999995, * 116.4184900000000056 39.9620600000000010) - * @param str - * @return + * @param str s + * @return list */ public static List getLatLags(String str) { if (isEmpty(str)) @@ -513,7 +495,7 @@ public class GeometryTools { List list = null; Coordinate[] coordinates = geo.getCoordinates(); if (coordinates != null && coordinates.length > 0) { - list = new ArrayList(); + list = new ArrayList<>(); for (Coordinate color : coordinates) { list.add(new LatLng(color.y, color.x)); } @@ -604,8 +586,8 @@ public class GeometryTools { /** * 获取线型的外扩矩形 * - * @param list - * @return + * @param list l + * @return h */ public static Polygon getPolygonEnvelope(List list) { LineString lineString = getLineStainGeo(list); @@ -627,7 +609,6 @@ public class GeometryTools { return null; } Coordinate[] coors = new Coordinate[list.size()]; - for (int i = 0; i < list.size(); i++) { LatLng gp = list.get(i); coors[i] = new Coordinate(gp.getLongitude(), gp.getLatitude()); @@ -697,8 +678,7 @@ public class GeometryTools { for (int i = 0; i < points.length; i++) { String point[] = points[i].trim().split(" "); if (point.length == 2) { - list.add(new LatLng(Double.parseDouble(point[1].trim()), - Double.parseDouble(point[0].trim()))); + list.add(new LatLng(Double.parseDouble(point[1].trim()), Double.parseDouble(point[0].trim()))); } } if (list != null && !list.isEmpty()) { @@ -831,7 +811,7 @@ public class GeometryTools { /** * 判断捕捉集合中是否包含传入的点位信息 - * @param geoList + * @param geoList geo * @return int; */ public int isListContain(List geoList, LatLng mLatLng) { @@ -901,10 +881,13 @@ public class GeometryTools { return false; } + /** + * @param list list + * @param endPoint point + * @return boolean + */ public static boolean isSimplePolygon(List list, Point endPoint) { - if (list != null && list.size() > 0) { - if (list != null && list.size() > 2) { Point frist = list.get(0); Point last = list.get(list.size() - 1); @@ -916,7 +899,6 @@ public class GeometryTools { size++; } Coordinate[] coors = new Coordinate[size]; - for (int i = 0; i < list.size(); i++) { Point gp = list.get(i); coors[i] = new Coordinate(gp.x, gp.y); @@ -932,7 +914,6 @@ public class GeometryTools { } } } - return false; } @@ -956,42 +937,28 @@ public class GeometryTools { * @return int */ public int isContainsGeo(List wkts, LatLng LatLng) { - if (wkts == null || wkts.size() == 0 || LatLng == null) { return -1; } - com.vividsolutions.jts.geom.Point point = createPoint(new Coordinate(LatLng.getLongitude(), LatLng.getLatitude())); - for (int i = 0; i < wkts.size(); i++) { - Geometry geometry = createGeometry(wkts.get(i)); - if (geometry != null && geometry.getGeometryType().equals("Polygon")) { - Polygon polygon = (Polygon) geometry; - - boolean result = geometry.contains(point); - if (result) return i; } } - return -1; } public static List getLineIntersectionLatLng(LineString lineString) { if (lineString != null) { - Coordinate[] coords = lineString.getCoordinates(); - List list = new ArrayList(); - GeometryFactory factory = new GeometryFactory(); - for (int i = 0; i < coords.length; i++) { if (i != coords.length - 1) { Coordinate[] coord = new Coordinate[2]; @@ -1002,14 +969,10 @@ public class GeometryTools { list.add(line); } } - List listLatLng = new ArrayList(); - if (list != null && list.size() > 0) { - for (int i = 0; i < list.size(); i++) { LineString line1 = list.get(i); - for (int j = 0; j < list.size(); j++) { if (i != j) { LineString line2 = list.get(j); @@ -1021,9 +984,7 @@ public class GeometryTools { } } } - } - } if (listLatLng != null && listLatLng.size() > 0) { return listLatLng; @@ -1041,41 +1002,27 @@ public class GeometryTools { * @author qiji */ public static LatLng getZuijinLatLng(List list, LatLng LatLng) {//MapManager.getInstance().getMap().getMapCenterGeoLocation()屏幕中心点 - if (list == null || list.size() == 0 || LatLng == null) return null; - double dis = 0; - LatLng geo = null; - for (LatLng latLng : list) { - double disTemp = distanceToDouble(latLng, latLng); - if (dis == 0 || dis < disTemp) { - dis = disTemp; - geo = LatLng; - } - } - return geo; } public static String GeometryFormatDouble5(String geometry) { try { - LatLng point = createLatLng(geometry); - return createGeometry(point).toString(); } catch (Exception e) { - + e.getLocalizedMessage(); } - return ""; } diff --git a/app/src/main/java/com/navinfo/outdoor/util/GetJsonDataUtil.java b/app/src/main/java/com/navinfo/outdoor/util/GetJsonDataUtil.java index e39402c..6659b52 100644 --- a/app/src/main/java/com/navinfo/outdoor/util/GetJsonDataUtil.java +++ b/app/src/main/java/com/navinfo/outdoor/util/GetJsonDataUtil.java @@ -13,7 +13,6 @@ import java.io.InputStreamReader; public class GetJsonDataUtil { public String getJson(Context context, String fileName) { - StringBuilder stringBuilder = new StringBuilder(); try { AssetManager assetManager = context.getAssets(); diff --git a/app/src/main/java/com/navinfo/outdoor/util/ImageUtils.java b/app/src/main/java/com/navinfo/outdoor/util/ImageUtils.java index e263233..1b7fa57 100644 --- a/app/src/main/java/com/navinfo/outdoor/util/ImageUtils.java +++ b/app/src/main/java/com/navinfo/outdoor/util/ImageUtils.java @@ -12,10 +12,8 @@ public class ImageUtils { * @param filePath 图片的决对路径 */ public static boolean checkImgDamage(String filePath) { - BitmapFactory.Options options=null; - if (options==null){ - options=new BitmapFactory.Options(); - } + BitmapFactory.Options options=new BitmapFactory.Options(); + options.inJustDecodeBounds =true; BitmapFactory.decodeFile(filePath, options); if (options.mCancel || options.outWidth == -1 || options.outHeight == -1){ diff --git a/app/src/main/java/com/navinfo/outdoor/util/MapManager.java b/app/src/main/java/com/navinfo/outdoor/util/MapManager.java index adc905c..6e53fdc 100644 --- a/app/src/main/java/com/navinfo/outdoor/util/MapManager.java +++ b/app/src/main/java/com/navinfo/outdoor/util/MapManager.java @@ -41,6 +41,7 @@ public class MapManager { tencentMap.animateCamera(cameraSigma); } } + public void moveLatlng(LatLng latLng, TencentMap.CancelableCallback cancelableCallback) { CameraUpdate cameraSigma = CameraUpdateFactory.newCameraPosition(new CameraPosition( latLng, //中心点坐标，地图目标经纬度 @@ -49,4 +50,5 @@ public class MapManager { tencentMap.getCameraPosition().bearing)); //目标旋转角 0~360° (正北方为0) tencentMap.animateCamera(cameraSigma, cancelableCallback); } + } diff --git a/app/src/main/java/com/navinfo/outdoor/util/MarkerClusterItem.java b/app/src/main/java/com/navinfo/outdoor/util/MarkerClusterItem.java deleted file mode 100644 index 50d1d1d..0000000 --- a/app/src/main/java/com/navinfo/outdoor/util/MarkerClusterItem.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.navinfo.outdoor.util; - -import com.tencent.tencentmap.mapsdk.maps.model.LatLng; -import com.tencent.tencentmap.mapsdk.vector.utils.clustering.ClusterItem; - -public class MarkerClusterItem implements ClusterItem { - private final LatLng mLatLng; - @Override - public LatLng getPosition() { - return mLatLng; - } - - public MarkerClusterItem(double al,double lon) { - this.mLatLng = new LatLng(al,lon); - } -} diff --git a/app/src/main/java/com/navinfo/outdoor/util/Md5Util.java b/app/src/main/java/com/navinfo/outdoor/util/Md5Util.java index 1acc40c..fe6dff1 100644 --- a/app/src/main/java/com/navinfo/outdoor/util/Md5Util.java +++ b/app/src/main/java/com/navinfo/outdoor/util/Md5Util.java @@ -10,10 +10,8 @@ public class Md5Util { * MD5加密类 * @param str 要加密的字符串 * @return 加密后的字符串 - * @throws UnsupportedEncodingException */ - public static String - toMD5(String str) throws UnsupportedEncodingException{ + public static String toMD5(String str) throws UnsupportedEncodingException{ try { MessageDigest md = MessageDigest.getInstance("MD5"); md.update(str.getBytes("UTF-8")); @@ -41,30 +39,30 @@ public class Md5Util { /** * 进行md5加密 - * @param value - * @param salt + * @param value str + * @param salt s * @return md5 */ public static String md5(String value, String salt) { - String resultStr = ""; + StringBuilder resultStr = new StringBuilder(); try { byte[] temp = salt.getBytes(); MessageDigest md5 = MessageDigest.getInstance("MD5"); md5.update(temp); // resultStr = new String(md5.digest()); byte[] b = md5.digest(); - for (int i = 0; i < b.length; i++) { - char[] digit = { '0', '1', '2', '3', '4', '5', '6', '7', '8', - '9', 'A', 'B', 'C', 'D', 'E', 'F' }; + for (byte item : b) { + char[] digit = {'0', '1', '2', '3', '4', '5', '6', '7', '8', + '9', 'A', 'B', 'C', 'D', 'E', 'F'}; char[] ob = new char[2]; - ob[0] = digit[(b[i] >>> 4) & 0X0F]; - ob[1] = digit[b[i] & 0X0F]; - resultStr += new String(ob); + ob[0] = digit[(item >>> 4) & 0X0F]; + ob[1] = digit[item & 0X0F]; + resultStr.append(new String(ob)); } } catch (NoSuchAlgorithmException e) { e.printStackTrace(); } - return resultStr; + return resultStr.toString(); } public static void main(String[] args) throws UnsupportedEncodingException { diff --git a/app/src/main/java/com/navinfo/outdoor/util/MyTecentLocationSource.java b/app/src/main/java/com/navinfo/outdoor/util/MyTecentLocationSource.java index 14cd230..7c929d1 100644 --- a/app/src/main/java/com/navinfo/outdoor/util/MyTecentLocationSource.java +++ b/app/src/main/java/com/navinfo/outdoor/util/MyTecentLocationSource.java @@ -29,6 +29,4 @@ public class MyTecentLocationSource implements LocationSource{ TalentLocationUtils.getInstance(mContext).getLocationChangedListenerList().remove(locationChangedListener); } } - - } diff --git a/app/src/main/java/com/navinfo/outdoor/util/NetWorkUtils.java b/app/src/main/java/com/navinfo/outdoor/util/NetWorkUtils.java index 04d476f..8c76897 100644 --- a/app/src/main/java/com/navinfo/outdoor/util/NetWorkUtils.java +++ b/app/src/main/java/com/navinfo/outdoor/util/NetWorkUtils.java @@ -44,7 +44,6 @@ public class NetWorkUtils { /** * Wifi是否已连接 - * * @return true:已连接 false:未连接 */ @SuppressWarnings("deprecation") diff --git a/app/src/main/java/com/navinfo/outdoor/util/NoSlideViewPager.java b/app/src/main/java/com/navinfo/outdoor/util/NoSlideViewPager.java index f750dd7..467aa93 100644 --- a/app/src/main/java/com/navinfo/outdoor/util/NoSlideViewPager.java +++ b/app/src/main/java/com/navinfo/outdoor/util/NoSlideViewPager.java @@ -23,6 +23,7 @@ public class NoSlideViewPager extends ViewPager { public NoSlideViewPager(@NonNull Context context, @Nullable AttributeSet attrs) { super(context, attrs); } + /** * 设置是否能左右滑动 * @param canScroll true 不能滑动 diff --git a/app/src/main/java/com/navinfo/outdoor/util/PhotoInfoConverter.java b/app/src/main/java/com/navinfo/outdoor/util/PhotoInfoConverter.java index 5ae7cdc..6e5ab47 100644 --- a/app/src/main/java/com/navinfo/outdoor/util/PhotoInfoConverter.java +++ b/app/src/main/java/com/navinfo/outdoor/util/PhotoInfoConverter.java @@ -21,9 +21,7 @@ public class PhotoInfoConverter { if (data == null) { return Collections.emptyList(); } - Type listType = new TypeToken>() {}.getType(); - return gson.fromJson(data, listType); } 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 6c4e94a..30134d7 100644 --- a/app/src/main/java/com/navinfo/outdoor/util/PhotoPathUtil.java +++ b/app/src/main/java/com/navinfo/outdoor/util/PhotoPathUtil.java @@ -41,7 +41,6 @@ public class PhotoPathUtil { return ""; } } - FileOutputStream fileOutputStream = null; try { @SuppressLint("SimpleDateFormat") DateFormat formatter = new SimpleDateFormat("yyyy-MM-ddHHmmss"); diff --git a/app/src/main/java/com/navinfo/outdoor/util/PhotoUtils.java b/app/src/main/java/com/navinfo/outdoor/util/PhotoUtils.java index 2538ca9..a449ad2 100644 --- a/app/src/main/java/com/navinfo/outdoor/util/PhotoUtils.java +++ b/app/src/main/java/com/navinfo/outdoor/util/PhotoUtils.java @@ -73,7 +73,6 @@ public class PhotoUtils { i /= 32; } buf[charPos] = digits[(int) (-i)]; - if (negative) buf[--charPos] = '-'; return new String(buf, charPos, (65 - charPos)); @@ -81,9 +80,8 @@ public class PhotoUtils { /** * 获取图片旋转角度 - * - * @param filepath - * @return + * @param filepath path + * @return int */ public static int getExifOrientation(String filepath) { int degree = 0; diff --git a/app/src/main/java/com/navinfo/outdoor/util/PictureUtil.java b/app/src/main/java/com/navinfo/outdoor/util/PictureUtil.java index 8c6cda2..c37011a 100644 --- a/app/src/main/java/com/navinfo/outdoor/util/PictureUtil.java +++ b/app/src/main/java/com/navinfo/outdoor/util/PictureUtil.java @@ -13,7 +13,6 @@ public class PictureUtil { //保存bitmap图片到本地 public static void saveBitmap(Bitmap bitmap, Context context, String path, String saveName) { try { - File dirFile = new File(path); if (!dirFile.exists()) { //如果不存在，那就建立这个文件夹 dirFile.mkdirs(); diff --git a/app/src/main/java/com/navinfo/outdoor/util/PoiEntityDeleteUtil.java b/app/src/main/java/com/navinfo/outdoor/util/PoiEntityDeleteUtil.java index 074f88e..1c51f4a 100644 --- a/app/src/main/java/com/navinfo/outdoor/util/PoiEntityDeleteUtil.java +++ b/app/src/main/java/com/navinfo/outdoor/util/PoiEntityDeleteUtil.java @@ -34,7 +34,6 @@ public class PoiEntityDeleteUtil { case 4: initPicture( poiEntity); break; - } } diff --git a/app/src/main/java/com/navinfo/outdoor/util/PoiSaveUtils.java b/app/src/main/java/com/navinfo/outdoor/util/PoiSaveUtils.java index 78d47bc..711bb7c 100644 --- a/app/src/main/java/com/navinfo/outdoor/util/PoiSaveUtils.java +++ b/app/src/main/java/com/navinfo/outdoor/util/PoiSaveUtils.java @@ -92,6 +92,10 @@ public class PoiSaveUtils { if (savePoiNet(poiEntity) == 200) { // 网络保存成功 //走上传流程： uploadPoiNet(poiEntity); + }else { + poiEntity.setChecked(false); + poiEntity.setWork_type(0); + PoiDatabase.getInstance(mContext).getPoiDao().updatePoiEntity(poiEntity); } } } @@ -324,18 +328,27 @@ public class PoiSaveUtils { return; } OtherUploadPicBean otherUploadPicBean = new Gson().fromJson(bodyStr, OtherUploadPicBean.class); - if (otherUploadPicBean.getCode() == 200) { - poiEntity.setChecked(false); - poiEntity.setTaskStatus(100); - PoiDatabase.getInstance(mContext).getPoiDao().updatePoiEntity(poiEntity); - for (int i = 0; i < list.size(); i++) { - list.get(i).delete(); + if (otherUploadPicBean!=null){ + if (otherUploadPicBean.getCode() == 200) { + poiEntity.setChecked(false); + poiEntity.setTaskStatus(100); + PoiDatabase.getInstance(mContext).getPoiDao().updatePoiEntity(poiEntity); + for (int i = 0; i < list.size(); i++) { + list.get(i).delete(); + } + PoiEntityDeleteUtil.getInstance().deleteUtil(mContext, poiEntity); + Log.d("TAGSS", "uploadPoiNet: 成功" + anInt); + anInt++; + return; + } else { + poiEntity.setChecked(false); + poiEntity.setWork_type(0); + PoiDatabase.getInstance(mContext).getPoiDao().updatePoiEntity(poiEntity); + Log.d("TAGSS", "uploadPoiNet: 失败" + bInt); + bInt++; + return; } - PoiEntityDeleteUtil.getInstance().deleteUtil(mContext, poiEntity); - Log.d("TAGSS", "uploadPoiNet: 成功" + anInt); - anInt++; - return; - } else { + }else { poiEntity.setChecked(false); poiEntity.setWork_type(0); PoiDatabase.getInstance(mContext).getPoiDao().updatePoiEntity(poiEntity); @@ -343,6 +356,7 @@ public class PoiSaveUtils { bInt++; return; } + } catch (IOException e) { e.printStackTrace(); } @@ -389,8 +403,7 @@ public class PoiSaveUtils { hashMap.put("cp_floor", chargingPileEntity.getCp_floor()); hashMap.put("cp_availableState", chargingPileEntity.getCp_availableState()); hashMap.put("sign_exist", chargingPileEntity.getSign_exist()); - String s = new Gson().toJson(hashMap); - httpParams.put("detail", s); + httpParams.put("detail", new Gson().toJson(hashMap)); try { Response execute = OkGoBuilder.getInstance() .time(30) 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 540cfbe..a183a92 100644 --- a/app/src/main/java/com/navinfo/outdoor/util/PreserveUtils.java +++ b/app/src/main/java/com/navinfo/outdoor/util/PreserveUtils.java @@ -98,8 +98,7 @@ public class PreserveUtils { /** * poi - * - * @param mContext + * @param mContext context */ public Callback getPoiPreserveCallback(Activity mContext, PoiEntity poiEntity) { return new Callback() { @@ -153,8 +152,7 @@ public class PreserveUtils { /** * PoiVideo - * - * @param mContext + * @param mContext context */ public Callback getPoiVideoPreserveCallback(Activity mContext, PoiEntity poiEntity) { return new Callback() { @@ -207,9 +205,9 @@ public class PreserveUtils { }; } - /* + /** * other - * @param mContext + * @param mContext context */ public Callback getOtherPreserveCallback(Activity mContext, PoiEntity poiEntity) { return new Callback() { @@ -264,7 +262,6 @@ public class PreserveUtils { /** * charging - * * @param mContext context */ public Callback getChargingPreserveCallback(Activity mContext, PoiEntity poiEntity) { diff --git a/app/src/main/java/com/navinfo/outdoor/util/RegexUtil.java b/app/src/main/java/com/navinfo/outdoor/util/RegexUtil.java index 8d2902d..9e61130 100644 --- a/app/src/main/java/com/navinfo/outdoor/util/RegexUtil.java +++ b/app/src/main/java/com/navinfo/outdoor/util/RegexUtil.java @@ -15,6 +15,7 @@ public class RegexUtil { Matcher m = p.matcher(name); return m.matches(); } + public static boolean checkPassword(String password) { if (TextUtils.isEmpty(password))return false; //字母+数字。最少6位的正则表达式 diff --git a/app/src/main/java/com/navinfo/outdoor/util/RotateTransformation.java b/app/src/main/java/com/navinfo/outdoor/util/RotateTransformation.java index c1dabd7..f288681 100644 --- a/app/src/main/java/com/navinfo/outdoor/util/RotateTransformation.java +++ b/app/src/main/java/com/navinfo/outdoor/util/RotateTransformation.java @@ -11,18 +11,22 @@ import java.security.MessageDigest; import io.reactivex.annotations.NonNull; public class RotateTransformation extends BitmapTransformation { + private float rotateRotationAngle = 0f; + public RotateTransformation(float rotateRotationAngle) { this.rotateRotationAngle = rotateRotationAngle; } + @Override protected Bitmap transform(@NonNull BitmapPool pool, @NonNull Bitmap toTransform, int outWidth, int outHeight) { Matrix matrix = new Matrix(); matrix.postRotate(rotateRotationAngle); return Bitmap.createBitmap(toTransform, 0, 0, toTransform.getWidth(), toTransform.getHeight(), matrix, true); } + @Override - public void updateDiskCacheKey(@NonNull MessageDigest messageDigest) { - } + public void updateDiskCacheKey(@NonNull MessageDigest messageDigest) {} + } diff --git a/app/src/main/java/com/navinfo/outdoor/util/SdkFolderCreate.java b/app/src/main/java/com/navinfo/outdoor/util/SdkFolderCreate.java index ef1305a..aaafe14 100644 --- a/app/src/main/java/com/navinfo/outdoor/util/SdkFolderCreate.java +++ b/app/src/main/java/com/navinfo/outdoor/util/SdkFolderCreate.java @@ -40,10 +40,10 @@ public class SdkFolderCreate { return path; } //创建文件夹 - private static String makedir(String path) { + private static String maced(String path) { String sdPath = getSDPath(); String[] dirs = path.replace(sdPath, "").split("/"); - StringBuffer filePath = new StringBuffer(sdPath); + StringBuilder filePath = new StringBuilder(sdPath); for (String dir : dirs) { if (!"".equals(dir) && !dir.equals(sdPath)) { filePath.append("/").append(dir); diff --git a/app/src/main/java/com/navinfo/outdoor/util/SearchUpdateTxt.java b/app/src/main/java/com/navinfo/outdoor/util/SearchUpdateTxt.java index 5510a74..1c9e0b2 100644 --- a/app/src/main/java/com/navinfo/outdoor/util/SearchUpdateTxt.java +++ b/app/src/main/java/com/navinfo/outdoor/util/SearchUpdateTxt.java @@ -13,14 +13,14 @@ public class SearchUpdateTxt { File file = new File(path); try { BufferedReader br = new BufferedReader(new FileReader(file));//读文件 - StringBuffer bf = new StringBuffer(); + StringBuilder bf = new StringBuilder(); String rl=null;//临时的每行数据 while ((rl=br.readLine())!=null){ String[] split = rl.split(","); if (split[1].equals(indexer)){ bf.append(""); }else { - bf.append(rl+"\r\n"); + bf.append(rl).append("\r\n"); } } br.close(); diff --git a/app/src/main/java/com/navinfo/outdoor/util/SoftHideKeyBoardUtil.java b/app/src/main/java/com/navinfo/outdoor/util/SoftHideKeyBoardUtil.java deleted file mode 100644 index cb31042..0000000 --- a/app/src/main/java/com/navinfo/outdoor/util/SoftHideKeyBoardUtil.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.navinfo.outdoor.util; - -import android.app.Activity; -import android.graphics.Rect; -import android.os.Build; -import android.view.View; -import android.view.ViewTreeObserver; -import android.widget.FrameLayout; - -/** - * 2021 5 25 - */ - -public class SoftHideKeyBoardUtil { - public static void assistActivity(Activity activity) { - new SoftHideKeyBoardUtil(activity); - } - - private View mChildOfContent; - private int usableHeightPrevious; - private FrameLayout.LayoutParams frameLayoutParams; //为适应华为小米等手机键盘上方出现黑条或不适配 - private int contentHeight;//获取setContentView本来view的高度 - private boolean isfirst = true;//只用获取一次 - private int statusBarHeight;//状态栏高度 - - private SoftHideKeyBoardUtil(Activity activity) { //1､找到Activity的最外层布局控件，它其实是一个DecorView,它所用的控件就是FrameLayout - FrameLayout content = (FrameLayout) activity.findViewById(android.R.id.content); //2､获取到setContentView放进去的View - mChildOfContent = content.getChildAt(0); //3､给Activity的xml布局设置View树监听，当布局有变化，如键盘弹出或收起时，都会回调此监听 - mChildOfContent.getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() { //4､软键盘弹起会使GlobalLayout发生变化 - public void onGlobalLayout() { - if (isfirst) { - contentHeight = mChildOfContent.getHeight();//兼容华为等机型 - isfirst = false; - } //5､当前布局发生变化时，对Activity的xml布局进行重绘 - possiblyResizeChildOfContent(); - } - }); //6､获取到Activity的xml布局的放置参数 - frameLayoutParams = (FrameLayout.LayoutParams) mChildOfContent.getLayoutParams(); - } // 获取界面可用高度，如果软键盘弹起后，Activity的xml布局可用高度需要减去键盘高度 - - private void possiblyResizeChildOfContent() { //1､获取当前界面可用高度，键盘弹起后，当前界面可用布局会减少键盘的高度 - int usableHeightNow = computeUsableHeight(); //2､如果当前可用高度和原始值不一样 - if (usableHeightNow != usableHeightPrevious) { //3､获取Activity中xml中布局在当前界面显示的高度 - int usableHeightSansKeyboard = mChildOfContent.getRootView().getHeight(); //4､Activity中xml布局的高度-当前可用高度 - int heightDifference = usableHeightSansKeyboard - usableHeightNow; //5､高度差大于屏幕1/4时，说明键盘弹出 - if (heightDifference > (usableHeightSansKeyboard / 4)) { // 6､键盘弹出了，Activity的xml布局高度应当减去键盘高度 - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) { - frameLayoutParams.height = usableHeightSansKeyboard - heightDifference + statusBarHeight; - } else { - frameLayoutParams.height = usableHeightSansKeyboard - heightDifference; - } - } else { - frameLayoutParams.height = contentHeight; - } //7､ 重绘Activity的xml布局 - mChildOfContent.requestLayout(); - usableHeightPrevious = usableHeightNow; - } - } - - private int computeUsableHeight() { - Rect r = new Rect(); - mChildOfContent.getWindowVisibleDisplayFrame(r); // 全屏模式下：直接返回r.bottom，r.top其实是状态栏的高度 - return (r.bottom - r.top); - } - -} diff --git a/app/src/main/java/com/navinfo/outdoor/util/SoftKeyboardStateHelper.java b/app/src/main/java/com/navinfo/outdoor/util/SoftKeyboardStateHelper.java deleted file mode 100644 index d5b4bc3..0000000 --- a/app/src/main/java/com/navinfo/outdoor/util/SoftKeyboardStateHelper.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.navinfo.outdoor.util; - -import android.graphics.Rect; -import android.view.View; -import android.view.ViewTreeObserver; - -import java.util.LinkedList; -import java.util.List; - -/** - * Created by yzb_android on - * 作用：监听软键盘 - */ - -public class SoftKeyboardStateHelper implements ViewTreeObserver.OnGlobalLayoutListener { - - public interface SoftKeyboardStateListener { - void onSoftKeyboardOpened(int keyboardHeightInPx); - void onSoftKeyboardClosed(); - } - - private final List listeners = new LinkedList(); - private final View activityRootView; - private int lastSoftKeyboardHeightInPx; - private boolean isSoftKeyboardOpened; - - public SoftKeyboardStateHelper(View activityRootView) { - this(activityRootView, false); - } - - public SoftKeyboardStateHelper(View activityRootView, boolean isSoftKeyboardOpened) { - this.activityRootView = activityRootView; - this.isSoftKeyboardOpened = isSoftKeyboardOpened; - activityRootView.getViewTreeObserver().addOnGlobalLayoutListener(this); - } - - @Override - public void onGlobalLayout() { - final Rect r = new Rect(); - //r will be populated with the coordinates of your view that area still visible. - activityRootView.getWindowVisibleDisplayFrame(r); - - final int heightDiff = activityRootView.getRootView().getHeight() - (r.bottom - r.top); - if (!isSoftKeyboardOpened && heightDiff > 100) { // if more than 100 pixels, its probably a keyboard... - isSoftKeyboardOpened = true; - notifyOnSoftKeyboardOpened(heightDiff); - } else if (isSoftKeyboardOpened && heightDiff < 100) { - isSoftKeyboardOpened = false; - notifyOnSoftKeyboardClosed(); - } - } - - public void setIsSoftKeyboardOpened(boolean isSoftKeyboardOpened) { - this.isSoftKeyboardOpened = isSoftKeyboardOpened; - } - - public boolean isSoftKeyboardOpened() { - return isSoftKeyboardOpened; - } - - /** - * Default value is zero (0) - * @return last saved keyboard height in px - */ - public int getLastSoftKeyboardHeightInPx() { - return lastSoftKeyboardHeightInPx; - } - - public void addSoftKeyboardStateListener(SoftKeyboardStateListener listener) { - listeners.add(listener); - } - - public void removeSoftKeyboardStateListener(SoftKeyboardStateListener listener) { - listeners.remove(listener); - } - - private void notifyOnSoftKeyboardOpened(int keyboardHeightInPx) { - this.lastSoftKeyboardHeightInPx = keyboardHeightInPx; - - for (SoftKeyboardStateListener listener : listeners) { - if (listener != null) { - listener.onSoftKeyboardOpened(keyboardHeightInPx); - } - } - } - - private void notifyOnSoftKeyboardClosed() { - for (SoftKeyboardStateListener listener : listeners) { - if (listener != null) { - listener.onSoftKeyboardClosed(); - } - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/navinfo/outdoor/util/StringTypeConverter.java b/app/src/main/java/com/navinfo/outdoor/util/StringTypeConverter.java index 0ad67f5..c72369d 100644 --- a/app/src/main/java/com/navinfo/outdoor/util/StringTypeConverter.java +++ b/app/src/main/java/com/navinfo/outdoor/util/StringTypeConverter.java @@ -20,9 +20,7 @@ public class StringTypeConverter { if (data == null) { return Collections.emptyList(); } - Type listType = new TypeToken>() {}.getType(); - return gson.fromJson(data, listType); } @@ -30,4 +28,5 @@ public class StringTypeConverter { public String someObjectListToString(List someObjects) { return gson.toJson(someObjects); } + } diff --git a/app/src/main/java/com/navinfo/outdoor/util/SystemTTS.java b/app/src/main/java/com/navinfo/outdoor/util/SystemTTS.java index 57e6435..c30078a 100644 --- a/app/src/main/java/com/navinfo/outdoor/util/SystemTTS.java +++ b/app/src/main/java/com/navinfo/outdoor/util/SystemTTS.java @@ -42,8 +42,7 @@ public class SystemTTS extends UtteranceProgressListener implements TTS, TextToS textToSpeech.setSpeechRate(1.0f); textToSpeech.setOnUtteranceProgressListener(SystemTTS.this); textToSpeech.setOnUtteranceCompletedListener(SystemTTS.this); - if (result == TextToSpeech.LANG_MISSING_DATA - || result == TextToSpeech.LANG_NOT_SUPPORTED) { + if (result == TextToSpeech.LANG_MISSING_DATA || result == TextToSpeech.LANG_NOT_SUPPORTED) { //系统不支持中文播报 isSuccess = false; } @@ -57,8 +56,7 @@ public class SystemTTS extends UtteranceProgressListener implements TTS, TextToS List engines = textToSpeech.getEngines(); String defaultEngine = textToSpeech.getDefaultEngine(); if (textToSpeech != null) { - textToSpeech.speak(playText, - TextToSpeech.QUEUE_ADD, null, null); + textToSpeech.speak(playText, TextToSpeech.QUEUE_ADD, null, null); } } @@ -68,10 +66,10 @@ public class SystemTTS extends UtteranceProgressListener implements TTS, TextToS } } - //播报完成回调 @Override public void onUtteranceCompleted(String utteranceId) { + } @Override diff --git a/app/src/main/java/com/navinfo/outdoor/util/TTS.java b/app/src/main/java/com/navinfo/outdoor/util/TTS.java index d465543..06ed24a 100644 --- a/app/src/main/java/com/navinfo/outdoor/util/TTS.java +++ b/app/src/main/java/com/navinfo/outdoor/util/TTS.java @@ -2,6 +2,5 @@ package com.navinfo.outdoor.util; public interface TTS { void playText(String playText); - void stopSpeak(); } diff --git a/app/src/main/java/com/navinfo/outdoor/util/TalentLocationUtils.java b/app/src/main/java/com/navinfo/outdoor/util/TalentLocationUtils.java index 0d3d1af..1faac44 100644 --- a/app/src/main/java/com/navinfo/outdoor/util/TalentLocationUtils.java +++ b/app/src/main/java/com/navinfo/outdoor/util/TalentLocationUtils.java @@ -84,10 +84,7 @@ public class TalentLocationUtils implements TencentLocationListener{ /** * 实现位置监听 - * - * @param tencentLocation - * @param i - * @param s + * @param tencentLocation location */ @Override public void onLocationChanged(TencentLocation tencentLocation, int i, String s) { 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 07e19b6..345bd64 100644 --- a/app/src/main/java/com/navinfo/outdoor/util/TimestampUtil.java +++ b/app/src/main/java/com/navinfo/outdoor/util/TimestampUtil.java @@ -1,5 +1,7 @@ package com.navinfo.outdoor.util; +import android.annotation.SuppressLint; + import java.text.DateFormat; import java.text.ParseException; import java.text.SimpleDateFormat; @@ -12,8 +14,9 @@ public class TimestampUtil { */ public static String dateToStamp(String s) throws ParseException { String res; - SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + @SuppressLint("SimpleDateFormat") SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); Date date = simpleDateFormat.parse(s); + assert date != null; long ts = date.getTime(); res = String.valueOf(ts); return res; @@ -24,15 +27,15 @@ public class TimestampUtil { */ public static String stampToDate(String s){ String res; - SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - long lt = new Long(s); + @SuppressLint("SimpleDateFormat") SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + long lt = Long.parseLong(s); Date date = new Date(lt); res = simpleDateFormat.format(date); return res; } public static String time(){ - DateFormat formatter = new SimpleDateFormat("yyyyMMdd HHmmss"); + @SuppressLint("SimpleDateFormat") 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/ToastUtil.java b/app/src/main/java/com/navinfo/outdoor/util/ToastUtil.java index 09babe5..920851b 100644 --- a/app/src/main/java/com/navinfo/outdoor/util/ToastUtil.java +++ b/app/src/main/java/com/navinfo/outdoor/util/ToastUtil.java @@ -152,7 +152,7 @@ public class ToastUtil { } } - /* + /** * 自定义Toast的位置 * @param duration 单位:毫秒 */ @@ -169,7 +169,7 @@ public class ToastUtil { } } - /* + /** * 自定义带图片和文字的Toast，最终的效果就是上面是图片，下面是文字 * @param iconResId 图片的资源id,如:R.drawable.icon */ @@ -194,7 +194,6 @@ public class ToastUtil { * 自定义Toast,针对类型CharSequence * @param isGravity true,表示后面的三个布局参数生效,false,表示不生效 * @param isMargin true,表示后面的两个参数生效，false,表示不生效 - */ @SuppressLint("ShowToast") public static void customToastAll(Context context, CharSequence message, int duration, View view, boolean isGravity, int gravity, int xOffset, int yOffset, boolean isMargin, float horizontalMargin, float verticalMargin) { diff --git a/app/src/main/java/com/navinfo/outdoor/util/ToastUtils.java b/app/src/main/java/com/navinfo/outdoor/util/ToastUtils.java new file mode 100644 index 0000000..23ed5bc --- /dev/null +++ b/app/src/main/java/com/navinfo/outdoor/util/ToastUtils.java @@ -0,0 +1,17 @@ +package com.navinfo.outdoor.util; + +import android.app.Activity; +import android.widget.Toast; + +public class ToastUtils { + public static void Message(Activity context, String message) { + if (context!=null){ + context.runOnUiThread(new Runnable() { + @Override + public void run() { + Toast.makeText(context, message, Toast.LENGTH_SHORT).show(); + } + }); + } + } +} 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 f9e0c68..d12b6fc 100644 --- a/app/src/main/java/com/navinfo/outdoor/util/UploadUtils.java +++ b/app/src/main/java/com/navinfo/outdoor/util/UploadUtils.java @@ -82,10 +82,23 @@ public class UploadUtils { } else if (response.getCode() == 230) { FlushTokenUtil.flushToken(mContext); } else { - Message obtain1 = Message.obtain(); - obtain1.what = Constant.NEST_WORD_SUBMIT; - obtain1.obj = "道路：" + showPoiEntity.getName() + " 上传失败"; - EventBus.getDefault().post(obtain1); + new Thread(new Runnable() { + @Override + public void run() { + showPoiEntity.setChecked(false); + showPoiEntity.setWork_type(0); + PoiDatabase.getInstance(mContext).getPoiDao().updatePoiEntity(showPoiEntity); + mContext.runOnUiThread(new Runnable() { + @Override + public void run() { + Message obtain1 = Message.obtain(); + obtain1.what = Constant.NEST_WORD_SUBMIT; + obtain1.obj = "道路：" + showPoiEntity.getName() + " 上传失败"; + EventBus.getDefault().post(obtain1); + } + }); + } + }).start(); } } @@ -101,11 +114,23 @@ public class UploadUtils { @Override public void onError(Throwable e, int id) { - Message obtain1 = Message.obtain(); - obtain1.what = Constant.NEST_WORD_SUBMIT; - obtain1.obj = "道路：" + showPoiEntity.getName() + " 上传失败"; - EventBus.getDefault().post(obtain1); - Log.d("TAG", "onError: " + e.getMessage() + ""); + new Thread(new Runnable() { + @Override + public void run() { + showPoiEntity.setChecked(false); + showPoiEntity.setWork_type(0); + PoiDatabase.getInstance(mContext).getPoiDao().updatePoiEntity(showPoiEntity); + mContext.runOnUiThread(new Runnable() { + @Override + public void run() { + Message obtain1 = Message.obtain(); + obtain1.what = Constant.NEST_WORD_SUBMIT; + obtain1.obj = "道路：" + showPoiEntity.getName() + " 上传失败"; + EventBus.getDefault().post(obtain1); + } + }); + } + }).start(); } }; } @@ -144,10 +169,23 @@ public class UploadUtils { } else if (response.getCode() == 230) { FlushTokenUtil.flushToken(mContext); } else { - Message obtain1 = Message.obtain(); - obtain1.what = Constant.NEST_WORD_SUBMIT; - obtain1.obj = "Poi：" + showPoiEntity.getName() + " 上传失败"; - EventBus.getDefault().post(obtain1); + new Thread(new Runnable() { + @Override + public void run() { + showPoiEntity.setChecked(false); + showPoiEntity.setWork_type(0); + PoiDatabase.getInstance(mContext).getPoiDao().updatePoiEntity(showPoiEntity); + mContext.runOnUiThread(new Runnable() { + @Override + public void run() { + Message obtain1 = Message.obtain(); + obtain1.what = Constant.NEST_WORD_SUBMIT; + obtain1.obj = "POI：" + showPoiEntity.getName() + " 上传失败"; + EventBus.getDefault().post(obtain1); + } + }); + } + }).start(); } } @@ -163,10 +201,23 @@ public class UploadUtils { @Override public void onError(Throwable e, int id) { - Message obtain1 = Message.obtain(); - obtain1.what = Constant.NEST_WORD_SUBMIT; - obtain1.obj = "Poi：" + showPoiEntity.getName() + " 上传失败"; - EventBus.getDefault().post(obtain1); + new Thread(new Runnable() { + @Override + public void run() { + showPoiEntity.setChecked(false); + showPoiEntity.setWork_type(0); + PoiDatabase.getInstance(mContext).getPoiDao().updatePoiEntity(showPoiEntity); + mContext.runOnUiThread(new Runnable() { + @Override + public void run() { + Message obtain1 = Message.obtain(); + obtain1.what = Constant.NEST_WORD_SUBMIT; + obtain1.obj = "POI：" + showPoiEntity.getName() + " 上传失败"; + EventBus.getDefault().post(obtain1); + } + }); + } + }).start(); } }; } @@ -211,10 +262,23 @@ public class UploadUtils { } else if (response.getCode() == 230) { FlushTokenUtil.flushToken(mContext); } else { - Message obtain1 = Message.obtain(); - obtain1.what = Constant.NEST_WORD_SUBMIT; - obtain1.obj = "poi录像：" + showPoiEntity.getName() + " 上传失败"; - EventBus.getDefault().post(obtain1); + new Thread(new Runnable() { + @Override + public void run() { + showPoiEntity.setChecked(false); + showPoiEntity.setWork_type(0); + PoiDatabase.getInstance(mContext).getPoiDao().updatePoiEntity(showPoiEntity); + mContext.runOnUiThread(new Runnable() { + @Override + public void run() { + Message obtain1 = Message.obtain(); + obtain1.what = Constant.NEST_WORD_SUBMIT; + obtain1.obj = "Poi录像：" + showPoiEntity.getName() + " 上传失败"; + EventBus.getDefault().post(obtain1); + } + }); + } + }).start(); } } @@ -230,11 +294,23 @@ public class UploadUtils { @Override public void onError(Throwable e, int id) { - Message obtain1 = Message.obtain(); - obtain1.what = Constant.NEST_WORD_SUBMIT; - obtain1.obj = "poi录像：" + showPoiEntity.getName() + " 上传失败"; - EventBus.getDefault().post(obtain1); - Log.d("TAG", "onError: " + e.getMessage() + ""); + new Thread(new Runnable() { + @Override + public void run() { + showPoiEntity.setChecked(false); + showPoiEntity.setWork_type(0); + PoiDatabase.getInstance(mContext).getPoiDao().updatePoiEntity(showPoiEntity); + mContext.runOnUiThread(new Runnable() { + @Override + public void run() { + Message obtain1 = Message.obtain(); + obtain1.what = Constant.NEST_WORD_SUBMIT; + obtain1.obj = "Poi录像：" + showPoiEntity.getName() + " 上传失败"; + EventBus.getDefault().post(obtain1); + } + }); + } + }).start(); } }; } @@ -273,10 +349,23 @@ public class UploadUtils { } else if (response.getCode() == 230) { FlushTokenUtil.flushToken(mContext); } else { - Message obtain1 = Message.obtain(); - obtain1.what = Constant.NEST_WORD_SUBMIT; - obtain1.obj = "其他：" + showPoiEntity.getName() + " 上传失败"; - EventBus.getDefault().post(obtain1); + new Thread(new Runnable() { + @Override + public void run() { + showPoiEntity.setChecked(false); + showPoiEntity.setWork_type(0); + PoiDatabase.getInstance(mContext).getPoiDao().updatePoiEntity(showPoiEntity); + mContext.runOnUiThread(new Runnable() { + @Override + public void run() { + Message obtain1 = Message.obtain(); + obtain1.what = Constant.NEST_WORD_SUBMIT; + obtain1.obj = "其他：" + showPoiEntity.getName() + " 上传失败"; + EventBus.getDefault().post(obtain1); + } + }); + } + }).start(); } } @@ -293,11 +382,23 @@ public class UploadUtils { @Override public void onError(Throwable e, int id) { - Message obtain1 = Message.obtain(); - obtain1.what = Constant.NEST_WORD_SUBMIT; - obtain1.obj = "其他：" + showPoiEntity.getName() + " 上传失败"; - EventBus.getDefault().post(obtain1); - Log.d("TAG", "onError: " + e.getMessage() + ""); + new Thread(new Runnable() { + @Override + public void run() { + showPoiEntity.setChecked(false); + showPoiEntity.setWork_type(0); + PoiDatabase.getInstance(mContext).getPoiDao().updatePoiEntity(showPoiEntity); + mContext.runOnUiThread(new Runnable() { + @Override + public void run() { + Message obtain1 = Message.obtain(); + obtain1.what = Constant.NEST_WORD_SUBMIT; + obtain1.obj = "其他：" + showPoiEntity.getName() + " 上传失败"; + EventBus.getDefault().post(obtain1); + } + }); + } + }).start(); } }; } @@ -341,10 +442,23 @@ public class UploadUtils { } else if (response.getCode() == 230) { FlushTokenUtil.flushToken(mContext); } else { - Message obtain1 = Message.obtain(); - obtain1.what = Constant.NEST_WORD_SUBMIT; - obtain1.obj = "充电站：" + showPoiEntity.getName() + " 上传失败"; - EventBus.getDefault().post(obtain1); + new Thread(new Runnable() { + @Override + public void run() { + showPoiEntity.setChecked(false); + showPoiEntity.setWork_type(0); + PoiDatabase.getInstance(mContext).getPoiDao().updatePoiEntity(showPoiEntity); + mContext.runOnUiThread(new Runnable() { + @Override + public void run() { + Message obtain1 = Message.obtain(); + obtain1.what = Constant.NEST_WORD_SUBMIT; + obtain1.obj = "充电站：" + showPoiEntity.getName() + " 上传失败"; + EventBus.getDefault().post(obtain1); + } + }); + } + }).start(); } } @@ -360,11 +474,23 @@ public class UploadUtils { @Override public void onError(Throwable e, int id) { - Message obtain1 = Message.obtain(); - obtain1.what = Constant.NEST_WORD_SUBMIT; - obtain1.obj = "充电站：" + showPoiEntity.getName() + " 上传失败"; - EventBus.getDefault().post(obtain1); - Log.d("TAG", "onError: " + e.getMessage() + ""); + new Thread(new Runnable() { + @Override + public void run() { + showPoiEntity.setChecked(false); + showPoiEntity.setWork_type(0); + PoiDatabase.getInstance(mContext).getPoiDao().updatePoiEntity(showPoiEntity); + mContext.runOnUiThread(new Runnable() { + @Override + public void run() { + Message obtain1 = Message.obtain(); + obtain1.what = Constant.NEST_WORD_SUBMIT; + obtain1.obj = "充电站：" + showPoiEntity.getName() + " 上传失败"; + EventBus.getDefault().post(obtain1); + } + }); + } + }).start(); } }; } diff --git a/app/src/main/java/com/navinfo/outdoor/util/Whetherisempty.java b/app/src/main/java/com/navinfo/outdoor/util/Weatherised.java similarity index 88% rename from app/src/main/java/com/navinfo/outdoor/util/Whetherisempty.java rename to app/src/main/java/com/navinfo/outdoor/util/Weatherised.java index c498d58..de2b2aa 100644 --- a/app/src/main/java/com/navinfo/outdoor/util/Whetherisempty.java +++ b/app/src/main/java/com/navinfo/outdoor/util/Weatherised.java @@ -4,8 +4,8 @@ import org.json.JSONException; import org.json.JSONObject; //去掉空的字符 -public class Whetherisempty { - public static String getClfz(String s) throws JSONException { +public class Weatherised { + public static String getCafe(String s) throws JSONException { JSONObject jsonObject = new JSONObject(s); if (!jsonObject.has("body") || String.valueOf(jsonObject.get("body")).equals("[]") || String.valueOf(jsonObject.get("body")).equals("")) { jsonObject.put("body", null); diff --git a/app/src/main/java/com/navinfo/outdoor/util/ZipUtils.java b/app/src/main/java/com/navinfo/outdoor/util/ZipUtils.java index e30a1aa..37f1d50 100644 --- a/app/src/main/java/com/navinfo/outdoor/util/ZipUtils.java +++ b/app/src/main/java/com/navinfo/outdoor/util/ZipUtils.java @@ -27,12 +27,10 @@ public class ZipUtils { /** * 批量压缩文件（夹） - * * @param resFileList 要压缩的文件（夹）列表 * @param zipFile 生成的压缩文件 */ public static void zipFiles(Collection resFileList, File zipFile) { - ZipOutputStream zipout = null; try { zipout = new ZipOutputStream(new BufferedOutputStream(new FileOutputStream( @@ -51,7 +49,6 @@ public class ZipUtils { /** * 批量压缩文件（夹） - * * @param resFileList 要压缩的文件（夹）列表 * @param zipFile 生成的压缩文件 * @param comment 压缩文件的注释 @@ -72,7 +69,6 @@ public class ZipUtils { /** * 解压缩一个文件 - * * @param zipFile 压缩文件 * @param folderPath 解压缩的目标目录 */ @@ -114,22 +110,17 @@ public class ZipUtils { /** * 解压文件名包含传入文字的文件 - * * @param zipFile 压缩文件 * @param folderPath 目标文件夹 * @param nameContains 传入的文件匹配名 * @return 返回的集合 */ - public static ArrayList upZipSelectedFile(File zipFile, String folderPath, - String nameContains) { - + public static ArrayList upZipSelectedFile(File zipFile, String folderPath, String nameContains) { ArrayList fileList = new ArrayList(); - File desDir = new File(folderPath); if (!desDir.exists()) { desDir.mkdir(); } - ZipFile zf = null; try { zf = new ZipFile(zipFile); @@ -169,12 +160,10 @@ public class ZipUtils { /** * 获得压缩文件内文件列表 - * * @param zipFile 压缩文件 * @return 压缩文件内文件名称 */ public static ArrayList getEntriesNames(File zipFile) { - ArrayList entryNames = new ArrayList(); Enumeration entries = null; try { @@ -192,7 +181,6 @@ public class ZipUtils { /** * 获得压缩文件内压缩文件对象以取得其属性 - * * @param zipFile 压缩文件 * @return 返回一个压缩文件列表 */ @@ -204,12 +192,10 @@ public class ZipUtils { e.printStackTrace(); } return zf.entries(); - } /** * 取得压缩文件对象的注释 - * * @param entry 压缩文件对象 * @return 压缩文件对象的注释 */ @@ -224,7 +210,6 @@ public class ZipUtils { /** * 取得压缩文件对象的名称 - * * @param entry 压缩文件对象 * @return 压缩文件对象的名称 */ @@ -239,15 +224,13 @@ public class ZipUtils { /** * 压缩文件 - * * @param resFile 需要压缩的文件（夹） * @param zipout 压缩的目的文件 * @param rootpath 压缩的文件路径 */ private static void zipFile(File resFile, ZipOutputStream zipout, String rootpath) { try { - rootpath = rootpath + (rootpath.trim().length() == 0 ? "" : File.separator) - + resFile.getName(); + rootpath = rootpath + (rootpath.trim().length() == 0 ? "" : File.separator) + resFile.getName(); rootpath = new String(rootpath.getBytes("8859_1"), "GB2312"); if (resFile.isDirectory()) { File[] fileList = resFile.listFiles(); diff --git a/app/src/main/res/layout/activity_link.xml b/app/src/main/res/layout/activity_link.xml index 8d48d19..241d128 100644 --- a/app/src/main/res/layout/activity_link.xml +++ b/app/src/main/res/layout/activity_link.xml @@ -6,6 +6,8 @@ android:layout_height="match_parent" android:orientation="vertical" tools:context=".activity.LinkActivity"> + + + tools:ignore="ContentDescription" /> - - - - - - - + + + + + + + + app:layout_constraintTop_toBottomOf="@+id/rl_filter"> - - - - + + + + + + + diff --git a/app/src/main/res/layout/activity_statement.xml b/app/src/main/res/layout/activity_statement.xml index 75f56f4..042dda3 100644 --- a/app/src/main/res/layout/activity_statement.xml +++ b/app/src/main/res/layout/activity_statement.xml @@ -35,18 +35,21 @@ android:layout_toRightOf="@id/iv_find_task" android:text="@string/tv_statement" /> + + app:layout_constraintTop_toBottomOf="@+id/rl_statement" /> \ No newline at end of file diff --git a/app/src/main/res/layout/charging_station_fragment.xml b/app/src/main/res/layout/charging_station_fragment.xml index 7ecdf97..8d2bf72 100644 --- a/app/src/main/res/layout/charging_station_fragment.xml +++ b/app/src/main/res/layout/charging_station_fragment.xml @@ -1,9 +1,11 @@ + + + android:layout_height="match_parent"> + + @@ -37,6 +41,7 @@ android:textSize="15sp" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> + + + android:textColor="#333" + tools:ignore="HardcodedText" /> + android:textSize="15sp" + tools:ignore="HardcodedText" /> + android:textColor="@color/design_default_color_primary" + tools:ignore="HardcodedText" /> + android:orientation="vertical" /> - + + app:layout_constraintLeft_toRightOf="@+id/tv_02" + app:layout_constraintTop_toTopOf="@+id/tv_02" /> + + android:layout_weight="1" /> @@ -611,9 +620,7 @@ android:paddingLeft="10dp" android:paddingTop="10dp" android:paddingBottom="30dp" - android:textSize="15sp" - - /> + android:textSize="15sp" /> + android:textColor="@color/white" + tools:ignore="HardcodedText" />