diff --git a/app/build.gradle b/app/build.gradle index 6e2fa3a..2467df2 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ android { applicationId "com.navinfo.outdoor" minSdkVersion 22 targetSdkVersion 30 - versionCode 10 - versionName "7.1130" + versionCode 11 + versionName "8.1210" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } lintOptions { diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index bd7352f..684f37b 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -51,7 +51,6 @@ android:supportsRtl="true" android:theme="@style/Theme.WhiteScreen" tools:targetApi="n"> - () { - @Override - public void onSuccess(ApkVersionBean response, int id) { - dismissLoadingDialog(); - if (response.getCode() == 200) { - int version = response.getBody().getVersion(); - if (versionCode < version) {//TODO 改成 - //升级 - ApkVersionBean.bodyBean body = response.getBody(); - showUpdateDialog(body); - } else {//不需要升级 - initTime(); - } - } else { - initTime(); - } - } - @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(MainActivity.this,"请求超时"); - } else { - ToastUtils.Message(MainActivity.this,message); - } + .token(Constant.ACCESS_TOKEN); + okGoBuilder.getRequest(new Callback() { + @Override + public void onSuccess(ApkVersionBean response, int id) { + dismissLoadingDialog(); + if (response.getCode() == 200) { + int version = response.getBody().getVersion(); + if (versionCode < version) {//TODO 改成 + //升级 + ApkVersionBean.bodyBean body = response.getBody(); + showUpdateDialog(body); + } else {//不需要升级 initTime(); } - }); + } else { + initTime(); + } + } + + @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(MainActivity.this, "请求超时"); + } else { + ToastUtils.Message(MainActivity.this, message); + } + initTime(); + } + }); } /** @@ -235,7 +245,7 @@ public class MainActivity extends BaseActivity { Environment.MEDIA_MOUNTED)) { downFile(bodyBean.getApkUrl());//点击确定将apk下载 } else { - ToastUtils.Message(MainActivity.this,"SD卡不可用，请插入SD卡"); + ToastUtils.Message(MainActivity.this, "SD卡不可用，请插入SD卡"); } } }); @@ -268,6 +278,9 @@ public class MainActivity extends BaseActivity { } } + /** + * 获取用户信息 + */ private void initGetUserInfo() { OkGoBuilder okGoBuilder = OkGoBuilder.getInstance() .time(30) @@ -330,7 +343,6 @@ public class MainActivity extends BaseActivity { Intent intent = new Intent(MainActivity.this, LoginActivity.class); startActivity(intent); finish(); - } } @@ -339,15 +351,17 @@ public class MainActivity extends BaseActivity { dismissLoadingDialog(); String message = e.getMessage(); assert message != null; - if (message.equals("timeout")|| message.equals("Read time out")) { - ToastUtils.Message(MainActivity.this,"请求超时"); + if (message.equals("timeout") || message.equals("Read time out")) { + ToastUtils.Message(MainActivity.this, "请求超时"); } else { - ToastUtils.Message(MainActivity.this,message); + ToastUtils.Message(MainActivity.this, message); } } }); } - + /* + *获取token + */ private void initLogIn() { try { HttpParams httpParams = new HttpParams(); @@ -380,7 +394,7 @@ public class MainActivity extends BaseActivity { navInfoEditor.commit(); initGetUserInfo();//获取用户信息 } else { - ToastUtils.Message(MainActivity.this,"获取用户id失败，请重试"); + ToastUtils.Message(MainActivity.this, "获取用户id失败，请重试"); } } else { Intent intent = new Intent(MainActivity.this, LoginActivity.class); @@ -390,17 +404,18 @@ 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.equals("timeout")|| message.equals("Read time out")) { - ToastUtils.Message(MainActivity.this,"请求超时"); + if (message.equals("timeout") || message.equals("Read time out")) { + ToastUtils.Message(MainActivity.this, "请求超时"); } else { - ToastUtils.Message(MainActivity.this,message); + 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 07ac0b0..f942c05 100644 --- a/app/src/main/java/com/navinfo/outdoor/activity/PhotographActivity.java +++ b/app/src/main/java/com/navinfo/outdoor/activity/PhotographActivity.java @@ -52,9 +52,9 @@ import java.util.Objects; /** - * 照片对应 + * 相机拍照 */ -public class PhotographActivity extends BaseActivity implements View.OnClickListener { +public class PhotographActivity extends BaseActivity implements View.OnClickListener { private static final CameraLogger LOG = CameraLogger.create("Picture"); private CameraView cameraView; private String photo_path; @@ -208,9 +208,11 @@ public class PhotographActivity extends BaseActivity implements View.OnClickList protected void onDestroy() { super.onDestroy(); cameraView.destroy(); - photographBuilder.append(TimestampUtil.time()).append(",").append("onDestroy "); - photographBuilder.append("\r\n"); - FileUtils.writeFile(logFile.getAbsolutePath(), photographBuilder.toString(), true); + if (photographBuilder!=null) { + photographBuilder.append(TimestampUtil.time()).append(",").append("onDestroy "); + photographBuilder.append("\r\n"); + FileUtils.writeFile(logFile.getAbsolutePath(), photographBuilder.toString(), true); + } if (EventBus.getDefault().isRegistered(this)) { EventBus.getDefault().unregister(this); } 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 33a5d89..e5e94a5 100644 --- a/app/src/main/java/com/navinfo/outdoor/activity/PictureActivity.java +++ b/app/src/main/java/com/navinfo/outdoor/activity/PictureActivity.java @@ -86,6 +86,9 @@ 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; +/** + * 视频 + */ public class PictureActivity extends BaseActivity implements View.OnClickListener { private static final CameraLogger LOG = CameraLogger.create("Picture"); private CameraView camera; 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 f52ae15..e1c84ed 100644 --- a/app/src/main/java/com/navinfo/outdoor/activity/PicturesActivity.java +++ b/app/src/main/java/com/navinfo/outdoor/activity/PicturesActivity.java @@ -45,6 +45,7 @@ import com.navinfo.outdoor.util.BackHandlerHelper; import com.navinfo.outdoor.util.GPSUtils; import com.navinfo.outdoor.util.Geohash; import com.navinfo.outdoor.util.GeometryTools; +import com.navinfo.outdoor.util.Gps; import com.navinfo.outdoor.util.MyTecentLocationSource; import com.navinfo.outdoor.util.SystemTTS; import com.navinfo.outdoor.util.TimestampUtil; @@ -97,6 +98,10 @@ import java.util.concurrent.Future; 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; +/** + * 拍照 + * （poi录像 和 道路） + */ public class PicturesActivity extends BaseActivity implements View.OnClickListener { private static final CameraLogger LOG = CameraLogger.create("Picture"); private CameraView camera; @@ -106,7 +111,7 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen private Polyline polyline; private String finalVideoPath, geoWkt, detail; // 摄像后最终保存的文件名 private ViewGroup layerChange; // 切换地图和相机的父控件 - private CheckBox capturePicture, cbMapType; //拍照 + private CheckBox capturePicture; //拍照 private File paperFile, logFile; private ImageView ivZoomAdd, ivZoomDel, ivLocation, ivPicRoadImage, ivPicVideoImage, imageView; private TencentLocation oldCurrentLocation = null; @@ -148,6 +153,7 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen return false; } }); + private boolean booleanExtra; @Override protected int getLayout() { @@ -164,6 +170,7 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen type = getIntent().getIntExtra(Constant.INTENT_TYPE, 0); geoWkt = getIntent().getStringExtra(Constant.INTENT_GEO_WKT); detail = getIntent().getStringExtra(Constant.INTENT_DETAIL); + booleanExtra = getIntent().getBooleanExtra(Constant.INTENT_BOOLEAN, true); if (finalVideoPath != null) { File file = new File(finalVideoPath); paperFile = new File(Objects.requireNonNull(file.getParentFile()).getAbsoluteFile() + "/" + "paper.txt"); @@ -268,7 +275,7 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen if (radioPicture == 0) { capturePicture.setChecked(false); capturePicture.setText("开始采集"); - ToastUtils.Message(PicturesActivity.this,"请选择模式"); + ToastUtils.Message(PicturesActivity.this, "请选择模式"); return; } if (isChecked) { @@ -303,14 +310,14 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen camera.addCameraListener(new CameraListener() { @Override public void onPictureTaken(@NonNull PictureResult result) { - if (result.getData()!=null&&result != 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; - ToastUtils.Message(PicturesActivity.this,"不允许竖向拍摄..."); + ToastUtils.Message(PicturesActivity.this, "不允许竖向拍摄..."); picturesBuilder.append("camera 用户竖屏拍照 ,"); stopTimer(); capturePicture.setChecked(false); @@ -327,7 +334,7 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen result.toFile(file, new FileCallback() { @Override public void onFileReady(@Nullable File file) { - UserApplication.fixedThreadPool.execute(new Jpg2WebpRunnable(/*result, */file, 0)); + UserApplication.fixedThreadPool.execute(new Jpg2WebpRunnable(/*result, */file, 0, booleanExtra)); } }); } else { @@ -366,18 +373,20 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen //private PictureResult pictureResult; private File file; private int count; + private boolean isBoolean; // 该转换执行次数，如果连续3次执行失败，则不再转换 - public Jpg2WebpRunnable(/*PictureResult pictureResult,*/ File file, int count) { + public Jpg2WebpRunnable(/*PictureResult pictureResult,*/ File file, int count, boolean isBoolean) { //this.pictureResult = pictureResult; this.file = file; this.count = count; + this.isBoolean = isBoolean; } @Override public void run() { if (file.exists() && file != null) { - initWeb(file, count); + initWeb(file, count, isBoolean); if (count <= 0) { // 不是重新转换webp流程 runOnUiThread(new Runnable() { @SuppressLint("SetTextI18n") @@ -385,7 +394,7 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen public void run() { if (PicturesActivity.this != null) { if (file.exists()) { - initMarker(); + initMarker(isBoolean); videoIndex = Integer.parseInt(file.getName().replace(".webp", "")); finalVideoPath = Objects.requireNonNull(file.getParentFile()).getAbsolutePath() + "/" + (videoIndex + 1) + ".webp"; tvTitle.setText("保存成功:" + (videoIndex + 1)); @@ -411,14 +420,14 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen runOnUiThread(new Runnable() { @Override public void run() { - ToastUtils.Message(PicturesActivity.this,"源文件不存在"); + ToastUtils.Message(PicturesActivity.this, "源文件不存在"); } }); } } } - private void initWeb(File file, int count) { + private void initWeb(File file, int count, boolean isBoolean) { try { count++; WebPNative webPNative = new WebPNative(); @@ -437,7 +446,7 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen UMCrashManager.reportCrash(this, e); if (count < 3) { //当尝试次数小于3次，则加入转换队列，尝试重新转换 - UserApplication.fixedThreadPool.execute(new Jpg2WebpRunnable(/*result, */file, count)); + UserApplication.fixedThreadPool.execute(new Jpg2WebpRunnable(/*result, */file, count, isBoolean)); } } } @@ -546,6 +555,7 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen Intent intent = new Intent(); finalVideoPath = Objects.requireNonNull(paperFile.getParentFile()).getAbsolutePath() + "/" + videoIndex + ".webp"; intent.putExtra(Constant.INTENT_PICTURES_PATH, finalVideoPath); + intent.putExtra(Constant.INTENT_BOOLEAN,booleanExtra); setResult(0x111, intent); PicturesActivity.this.finish(); break; @@ -736,9 +746,11 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen removables.get(i).remove(); } removables.clear(); - picturesBuilder.append(TimestampUtil.time()).append(",").append("onDestroy"); - picturesBuilder.append("\r\n"); - FileUtils.writeFile(logFile.getAbsolutePath(), picturesBuilder.toString(), true); + if (picturesBuilder != null) { + picturesBuilder.append(TimestampUtil.time()).append(",").append("onDestroy"); + picturesBuilder.append("\r\n"); + FileUtils.writeFile(logFile.getAbsolutePath(), picturesBuilder.toString(), true); + } if (EventBus.getDefault().isRegistered(this)) { EventBus.getDefault().unregister(this); } @@ -800,9 +812,10 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen sb.append(initCount); sb.append(","); if (gpsLocation != null) { - sb.append(gpsLocation.getLatitude()); + double[] doubles = Gps.toGCJ02Point(gpsLocation.getLatitude(), gpsLocation.getLongitude()); + sb.append(doubles[0]); sb.append(","); - sb.append(gpsLocation.getLongitude()); + sb.append(doubles[1]); } else { sb.append(0); sb.append(","); @@ -917,8 +930,21 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen }); } - public void initMarker() { - LatLng latLng = new LatLng(Constant.currentLocation.getLatitude(), Constant.currentLocation.getLongitude()); + /** + * 腾讯轨迹点 + */ + public void initMarker(boolean isOration) { + LatLng latLng = null; + if (isOration) { + latLng = new LatLng(Constant.currentLocation.getLatitude(), Constant.currentLocation.getLongitude()); + } else { + if (gpsLocation == null) { + latLng = new LatLng(Constant.currentLocation.getLatitude(), Constant.currentLocation.getLongitude()); + } else { + double[] doubles = Gps.toGCJ02Point(gpsLocation.getLatitude(), gpsLocation.getLongitude()); + latLng = new LatLng(doubles[0],doubles[1]); + } + } BitmapDescriptor pileDescriptor = BitmapDescriptorFactory .fromResource(R.drawable.circle); Marker marker = tencentMap.addMarker(new MarkerOptions(latLng) 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 0a39b99..c9ee870 100644 --- a/app/src/main/java/com/navinfo/outdoor/activity/RegardMapActivity.java +++ b/app/src/main/java/com/navinfo/outdoor/activity/RegardMapActivity.java @@ -9,7 +9,7 @@ import com.navinfo.outdoor.R; import com.navinfo.outdoor.base.BaseActivity; /* - * 地图寻宝-关于地图的web页面 + * 地图寻宝-我的-关于地图的web页面 * */ public class RegardMapActivity extends BaseActivity implements View.OnClickListener { 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 e293c6d..e3e7721 100644 --- a/app/src/main/java/com/navinfo/outdoor/activity/StatementActivity.java +++ b/app/src/main/java/com/navinfo/outdoor/activity/StatementActivity.java @@ -8,6 +8,9 @@ import android.widget.TextView; import com.navinfo.outdoor.R; import com.navinfo.outdoor.base.BaseActivity; +/** + * 登录-用户协议展示页面 + */ public class StatementActivity extends BaseActivity implements View.OnClickListener{ @Override 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 5bc0b3c..4509374 100644 --- a/app/src/main/java/com/navinfo/outdoor/activity/UserActivity.java +++ b/app/src/main/java/com/navinfo/outdoor/activity/UserActivity.java @@ -157,7 +157,11 @@ public class UserActivity extends BaseActivity implements View.OnClickListener { break; case R.id.btn_gathering: userBuilder.append(TimestampUtil.time()).append(",").append("点击了去绑定的返回 ,"); - if (Constant.AUDIOTAPES == -1) { + Intent gatheringIntent = new Intent(this, FragmentManagement.class); + gatheringIntent.putExtra("tag", 24); + startActivity(gatheringIntent); + + /* if (Constant.AUDIOTAPES == -1) { ToastUtils.Message(UserActivity.this,"请先实名认证"); } else if (Constant.AUDIOTAPES == 1) {//认证通过 Intent gatheringIntent = new Intent(this, FragmentManagement.class); @@ -165,7 +169,7 @@ public class UserActivity extends BaseActivity implements View.OnClickListener { startActivity(gatheringIntent); } else if (Constant.AUDIOTAPES == 0) { ToastUtils.Message(this,Constant.AUDITING + ""); - } + }*/ break; case R.id.btn_attestations: userBuilder.append(TimestampUtil.time()).append(",").append("点击了去认证的返回 ,"); @@ -415,8 +419,10 @@ public class UserActivity extends BaseActivity implements View.OnClickListener { @Override protected void onDestroy() { super.onDestroy(); - userBuilder.append(TimestampUtil.time()).append(",").append("onDestroy"); - userBuilder.append("\r\n"); - FileUtils.writeFile(logFile.getAbsolutePath(), userBuilder.toString(), true); + if (userBuilder!=null) { + userBuilder.append(TimestampUtil.time()).append(",").append("onDestroy"); + userBuilder.append("\r\n"); + FileUtils.writeFile(logFile.getAbsolutePath(), userBuilder.toString(), true); + } } } 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 5c2cc28..0bfe944 100644 --- a/app/src/main/java/com/navinfo/outdoor/activity/WebActivity.java +++ b/app/src/main/java/com/navinfo/outdoor/activity/WebActivity.java @@ -21,7 +21,7 @@ import com.navinfo.outdoor.util.ToastUtils; import java.util.HashMap; import java.util.Map; /** - * 详情页 + * 统一的详情页 */ public class WebActivity extends BaseActivity implements View.OnClickListener { private WebView nWebView; 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 0cabf91..f764ba8 100644 --- a/app/src/main/java/com/navinfo/outdoor/adapter/CapacityEvaluationAdapter.java +++ b/app/src/main/java/com/navinfo/outdoor/adapter/CapacityEvaluationAdapter.java @@ -1,5 +1,6 @@ package com.navinfo.outdoor.adapter; +import android.annotation.SuppressLint; import android.content.Context; import android.view.LayoutInflater; import android.view.View; @@ -37,6 +38,7 @@ public class CapacityEvaluationAdapter extends RecyclerView.Adapter { - private List capItemList = new ArrayList<>(); - private Context context; - - public CapacityItemAdapter(Context context) { - this.context = context; - } - - public void setCapItemList(List capItemList) { - this.capItemList.addAll(capItemList); - notifyDataSetChanged(); - } - - @NonNull - @Override - public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - final View capItem = LayoutInflater.from(context).inflate(R.layout.capacity_item, parent, false); - return new ViewHolder(capItem); - } - - @Override - public void onBindViewHolder(@NonNull ViewHolder holder, int position) { - holder.tvCapItem.setText(capItemList.get(position).getTitle()); - holder.tvReams.setText((Integer) capItemList.get(position).getStatus()); - Glide.with(context).load(capItemList.get(position).getIconurl()).apply(RequestOptions.bitmapTransform(new CircleCrop())).into(holder.ivCapItem); - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (setOnClick!=null){ - setOnClick.onClick(position); - } - } - }); - - } - - @Override - public int getItemCount() { - return capItemList.size(); - } - - public static class ViewHolder extends RecyclerView.ViewHolder { - ImageView ivCapItem; - TextView tvCapItem; - TextView tvReams; - public ViewHolder(@NonNull View itemView) { - super(itemView); - ivCapItem = itemView.findViewById(R.id.iv_tas_capacity); - tvCapItem = itemView.findViewById(R.id.tas_capacity_title); - tvReams = itemView.findViewById(R.id.tv_capacity_through); - } - } - - public interface setOnClick{ - void onClick(int position); - } - - private setOnClick setOnClick; - - public void setSetOnClick(setOnClick setOnClick) { - this.setOnClick = setOnClick; - } -} diff --git a/app/src/main/java/com/navinfo/outdoor/adapter/ChargingPileAdapter.java b/app/src/main/java/com/navinfo/outdoor/adapter/ChargingPileAdapter.java index 843c57a..19140cc 100644 --- a/app/src/main/java/com/navinfo/outdoor/adapter/ChargingPileAdapter.java +++ b/app/src/main/java/com/navinfo/outdoor/adapter/ChargingPileAdapter.java @@ -56,8 +56,6 @@ public class ChargingPileAdapter extends RecyclerView.Adapter static class ViewHolder extends RecyclerView.ViewHolder { private ImageView ivPhoto; private CheckBox cbPhoto; - public ViewHolder(@NonNull View itemView) { super(itemView); ivPhoto = itemView.findViewById(R.id.iv_photo); diff --git a/app/src/main/java/com/navinfo/outdoor/adapter/PoiRecycleAdapter.java b/app/src/main/java/com/navinfo/outdoor/adapter/PoiRecycleAdapter.java deleted file mode 100644 index 89fa8e1..0000000 --- a/app/src/main/java/com/navinfo/outdoor/adapter/PoiRecycleAdapter.java +++ /dev/null @@ -1,197 +0,0 @@ -package com.navinfo.outdoor.adapter; - -import android.content.Context; -import android.text.Editable; -import android.text.TextWatcher; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.EditText; -import android.widget.ImageView; -import android.widget.LinearLayout; -import android.widget.TextView; - -import androidx.recyclerview.widget.RecyclerView; - -import com.navinfo.outdoor.R; -import com.navinfo.outdoor.bean.PhoneBean; - -import org.jetbrains.annotations.NotNull; - -import java.util.ArrayList; -import java.util.List; - -/** - * poi 适配器 - */ -public class PoiRecycleAdapter extends RecyclerView.Adapter { - private Context context; - private List list=new ArrayList<>(); - - public PoiRecycleAdapter(Context context) { - this.context = context; - } - - public void setList(List list) { - this.list.addAll(list); - notifyDataSetChanged(); - } - public boolean getPhoneBean(){ - for (int i = 0; i < list.size(); i++) { - PhoneBean poiBean = list.get(i); - if (poiBean.getPhone()==null){ - return false; - } - } - return true; - } - - - public String getList() { - StringBuilder a= new StringBuilder(); - for (int i = 0; i < list.size(); i++) { - PhoneBean poiBean = list.get(i); - if (list.size()==1){ - if(poiBean.getPhone().indexOf('1')==0){ - a = new StringBuilder(poiBean.getPhone()); - }else { - a = new StringBuilder(poiBean.getArea() + "-" + poiBean.getPhone()); - } - }else { - if (i==list.size()-1){ - if(poiBean.getPhone().indexOf('1')==0){ - a.append(poiBean.getPhone()); - }else { - a.append(poiBean.getArea()).append("-").append(poiBean.getPhone()); - } - }else{ - if(poiBean.getPhone().indexOf('1')==0){ - a.append(poiBean.getPhone()).append("|"); - }else { - a.append(poiBean.getArea()).append("-").append(poiBean.getPhone()).append("|"); - } - } - - } - - } - return a.toString(); - } - - @NotNull - @Override - public MyViewHolder onCreateViewHolder(@NotNull ViewGroup parent, int viewType) { - return new MyViewHolder(LayoutInflater.from( - context).inflate(R.layout.item_poi, parent, - false)); - } - - @Override - public void onBindViewHolder(@NotNull final MyViewHolder holder, final int position) { - PhoneBean poiBean = list.get(position); - if(poiBean.getPhone().startsWith("1")){ - holder.llPoi.setVisibility(View.GONE); - }else { - holder.llPoi.setVisibility(View.VISIBLE); - } - holder.editAreaCode.setText(poiBean.getArea()); - holder.tvPhone.setText(poiBean.getName()); - holder.image.setImageResource(poiBean.getImage()); - holder.editPhoneNumber.setText(poiBean.getPhone()); - holder.image.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (position == 0) { - addData(new PhoneBean("", "","", R.drawable.icon_del_bg)); - } else { - removeData(position); - } - } - }); - holder.editAreaCode.addTextChangedListener(new TextWatcher() { - @Override - public void beforeTextChanged(CharSequence s, int start, int count, int after) { - - } - - @Override - public void onTextChanged(CharSequence s, int start, int before, int count) { - - } - - @Override - public void afterTextChanged(Editable s) { - String area = s.toString().trim(); - poiBean.setArea(area); - } - }); - - holder.editPhoneNumber.addTextChangedListener(new TextWatcher() { - - @Override - public void onTextChanged(CharSequence s, int start, int before, int count) { - //正在输入 - String str = holder.editPhoneNumber.getText().toString().trim(); - if(str.indexOf('1')==0){ - holder.llPoi.setVisibility(View.GONE); - }else { - holder.llPoi.setVisibility(View.VISIBLE); - } - - } - @Override - public void beforeTextChanged(CharSequence s, int start, int count, int after) { - //输入之前 - - } - - @Override - public void afterTextChanged(Editable s) { - String str = s.toString().trim(); - poiBean.setPhone(str); - } - }); - - } - - @Override - public int getItemCount() { - return list.size(); - } - - // 添加数据 - public void addData(PhoneBean poiBean) { - //在list中添加数据，并通知条目加入一条 - list.add(poiBean); - //添加动画 - notifyDataSetChanged(); - } - - // 删除数据 - public void removeData(int position) { - list.remove(position); - //删除动画 - notifyItemRemoved(position); - - } - - /** - * ViewHolder的类，用于缓存控件 - */ - public static class MyViewHolder extends RecyclerView.ViewHolder { - TextView tvPhone; - EditText editAreaCode, editPhoneNumber; - ImageView image; - LinearLayout llPoi; - - //因为删除有可能会删除中间条目，然后会造成角标越界，所以必须整体刷新一下！ - public MyViewHolder(View view) { - super(view); - tvPhone = view.findViewById(R.id.tv_phone); - editAreaCode = view.findViewById(R.id.edit_area_code); - llPoi = view.findViewById(R.id.ll_poi); - editPhoneNumber = view.findViewById(R.id.edit_phone_number); - image = view.findViewById(R.id.image); - } - } -} diff --git a/app/src/main/java/com/navinfo/outdoor/adapter/PoiTaskAdapter.java b/app/src/main/java/com/navinfo/outdoor/adapter/PoiTaskAdapter.java index 6e5490d..831ae13 100644 --- a/app/src/main/java/com/navinfo/outdoor/adapter/PoiTaskAdapter.java +++ b/app/src/main/java/com/navinfo/outdoor/adapter/PoiTaskAdapter.java @@ -22,7 +22,6 @@ public class PoiTaskAdapter extends RecyclerView.Adapter listBeans; - public PoiTaskAdapter(Context context, List listBeans) { this.context = context; this.listBeans = listBeans; @@ -64,7 +63,6 @@ public class PoiTaskAdapter extends RecyclerView.Adapter iterator = allRoad.iterator(); while (iterator.hasNext()) { PoiEntity poiEntity = (PoiEntity) iterator.next(); diff --git a/app/src/main/java/com/navinfo/outdoor/adapter/TaskPrefectureAdapter.java b/app/src/main/java/com/navinfo/outdoor/adapter/TaskPrefectureAdapter.java index 0043da8..635b045 100644 --- a/app/src/main/java/com/navinfo/outdoor/adapter/TaskPrefectureAdapter.java +++ b/app/src/main/java/com/navinfo/outdoor/adapter/TaskPrefectureAdapter.java @@ -62,6 +62,7 @@ public class TaskPrefectureAdapter extends RecyclerView.Adapter() { - @Override - public void onSuccess(TaskPrefectureBean response, int id) { - dismissLoadingDialog(); - if (response.getCode() == 200) { - capacityItemAdapter.setCapItemList(response.getBody().getList()); - } else if (response.getCode() == 230) { - FlushTokenUtil.flushToken(getActivity()); - } else { - ToastUtils.Message(getActivity(),response.getMessage()); - } - Log.d("TAG", "onSuccess: " + response.getMessage() + "sassafras's" + aBoolean); - } - - @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 - public void onClick(View v) { - if (v.getId() == R.id.iv_task_capacity2_finish) { - Objects.requireNonNull(getActivity()).finish(); - } - } -} \ No newline at end of file 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 a85dc23..1753937 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/CapacityMeasurementFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/CapacityMeasurementFragment.java @@ -58,7 +58,7 @@ import java.util.Objects; import okhttp3.MediaType; /** - * 发现-能力测评条目点击进入测试页面 + * 发现-能力测评条目-能力测评页面 */ public class CapacityMeasurementFragment extends BaseFragment implements View.OnClickListener { private CapacityMeasureAdapter capacityMeasureAdapter; @@ -185,9 +185,9 @@ public class CapacityMeasurementFragment extends BaseFragment implements View.On String message = e.getMessage(); assert message != null; if (message.equals("timeout") || message.equals("Read time out")) { - ToastUtils.Message(getActivity(),"请求超时"); + ToastUtils.Message(getActivity(), "请求超时"); } else { - ToastUtils.Message(getActivity(),message); + ToastUtils.Message(getActivity(), message); } } }); @@ -210,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))) { - ToastUtils.Message(getActivity(),"有题目未填写答案，请仔细检查！"); + ToastUtils.Message(getActivity(), "有题目未填写答案，请仔细检查！"); return; } } @@ -230,7 +230,7 @@ public class CapacityMeasurementFragment extends BaseFragment implements View.On } initExamSubmit(); } else { - ToastUtils.Message(getActivity(),"无数据，无法提交"); + ToastUtils.Message(getActivity(), "无数据，无法提交"); } break; } @@ -279,7 +279,7 @@ public class CapacityMeasurementFragment extends BaseFragment implements View.On } else if (response.getCode() == 230) { FlushTokenUtil.flushToken(getActivity()); } else { - ToastUtils.Message(getActivity(),response.getMessage()); + ToastUtils.Message(getActivity(), response.getMessage()); } } @@ -289,9 +289,9 @@ public class CapacityMeasurementFragment extends BaseFragment implements View.On String message = e.getMessage(); assert message != null; if (message.equals("timeout") || message.equals("Read time out")) { - ToastUtils.Message(getActivity(),"请求超时"); + ToastUtils.Message(getActivity(), "请求超时"); } else { - ToastUtils.Message(getActivity(),message); + ToastUtils.Message(getActivity(), message); } } }); @@ -312,9 +312,11 @@ public class CapacityMeasurementFragment extends BaseFragment implements View.On @Override public void onDestroy() { super.onDestroy(); - capacityMeasureBuilder.append(TimestampUtil.time()).append(",").append("onDestroy"); - capacityMeasureBuilder.append("\r\n"); - FileUtils.writeFile(logFile.getAbsolutePath(), capacityMeasureBuilder.toString(), true); + if (capacityMeasureBuilder != null) { + capacityMeasureBuilder.append(TimestampUtil.time()).append(",").append("onDestroy"); + capacityMeasureBuilder.append("\r\n"); + FileUtils.writeFile(logFile.getAbsolutePath(), capacityMeasureBuilder.toString(), true); + } } } \ No newline at end of file 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 4c753df..3b74a8f 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/ChargingPileFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/ChargingPileFragment.java @@ -74,8 +74,7 @@ import java.util.List; import java.util.Objects; /** - * 充电站中的充电桩的Fragment - * 2021-5-25 + * 寻宝-上报-充电站中的充电桩的Fragment */ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnClickListener { private EditText editDescribe; @@ -904,11 +903,6 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC private void disables() { checkBoxLife.setEnabled(false); tvNameContent.setEnabled(false); - /*checkButton1.setEnabled(false);//开放状态1 - checkButton2.setEnabled(false);//开放状态2 - checkButton3.setEnabled(false);//开放状态3 - checkButton4.setEnabled(false);//开放状态4 - checkButton5.setEnabled(false);//开放状态5*/ spinnerType.setEnabled(false);//充电地面层 rlPanorama.setEnabled(false);//全景照片 rlCoding.setEnabled(false);//充电桩编码 @@ -979,7 +973,6 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC } } - @Subscribe public void onEvent(Message data) { if (data.what == Constant.PICTURE_VIDEO_WORD) { @@ -989,7 +982,6 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC } } - @Override public void onClick(View v) { switch (v.getId()) { @@ -1324,9 +1316,11 @@ public class ChargingPileFragment extends BaseDrawerFragment implements View.OnC if (markerPile != null) { markerPile.remove(); } - chargingPileBuilder.append("onDestroy"); - chargingPileBuilder.append("\r\n"); - FileUtils.writeFile(logFile.getAbsolutePath(), chargingPileBuilder.toString(), true); + if (chargingPileBuilder!=null) { + chargingPileBuilder.append("onDestroy"); + chargingPileBuilder.append("\r\n"); + FileUtils.writeFile(logFile.getAbsolutePath(), chargingPileBuilder.toString(), true); + } } @Override 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 0eeff84..6d6115a 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/ChargingStationFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/ChargingStationFragment.java @@ -103,8 +103,7 @@ import java.util.Objects; import okhttp3.Response; /** - * 充电站的Fragment - * 2021-5-25 + * 寻宝-上报-充电站的Fragment */ public class ChargingStationFragment extends BaseDrawerFragment implements View.OnClickListener { private EditText editDescribe; @@ -758,7 +757,7 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View. private void initPhone() { String encode = Geohash.getInstance().encode(latLng.latitude, latLng.longitude); if (encode == null) { - ToastUtils.Message(getActivity(),"没有确定经纬度"); + ToastUtils.Message(getActivity(), "没有确定经纬度"); return; } showLoadingDialog(); @@ -770,43 +769,43 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View. .cls(GetPhoneBean.class) .token(Constant.ACCESS_TOKEN); okGoBuilder.getRequest(new Callback() { - @Override - public void onSuccess(GetPhoneBean getPhoneBean, int id) { - dismissLoadingDialog(); - if (getPhoneBean.getCode() == 200) { - String code = getPhoneBean.getBody().getCode(); - Integer telLength = getPhoneBean.getBody().getTelLength(); - if (!code.equals(Constant.CODE)) { - DialogSettings.style = DialogSettings.STYLE.STYLE_IOS; - MessageDialog.show((AppCompatActivity) Objects.requireNonNull(getContext()), "提示", "此地区区号为" + code + "，请手动修改", "确定", "取消").setOkButton(new OnDialogButtonClickListener() { - @Override - public boolean onClick(BaseDialog baseDialog, View v) { - Constant.CODE = code; - Constant.TelLength = telLength; - return false; - } - }); + @Override + public void onSuccess(GetPhoneBean getPhoneBean, int id) { + dismissLoadingDialog(); + if (getPhoneBean.getCode() == 200) { + String code = getPhoneBean.getBody().getCode(); + Integer telLength = getPhoneBean.getBody().getTelLength(); + if (!code.equals(Constant.CODE)) { + DialogSettings.style = DialogSettings.STYLE.STYLE_IOS; + MessageDialog.show((AppCompatActivity) Objects.requireNonNull(getContext()), "提示", "此地区区号为" + code + "，请手动修改", "确定", "取消").setOkButton(new OnDialogButtonClickListener() { + @Override + public boolean onClick(BaseDialog baseDialog, View v) { + Constant.CODE = code; + Constant.TelLength = telLength; + return false; } - } else if (getPhoneBean.getCode() == 230) { - FlushTokenUtil.flushToken(getActivity()); - } else { - ToastUtils.Message(getActivity(),getPhoneBean.getMessage()); - } + }); } + } else if (getPhoneBean.getCode() == 230) { + FlushTokenUtil.flushToken(getActivity()); + } else { + ToastUtils.Message(getActivity(), getPhoneBean.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(),"请求超时"); + @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); - } - } - }); + } else { + ToastUtils.Message(getActivity(), message); + } + } + }); } public void initRemovePileSharePre() { @@ -936,11 +935,11 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View. EventBus.getDefault().post(obtain); String name = editNameContent.getText().toString().trim();//名称 if (name.equals("")) { - ToastUtils.Message(getActivity(),"请输入充电站 名称"); + ToastUtils.Message(getActivity(), "请输入充电站 名称"); return; } if (latLng == null) { - ToastUtils.Message(getActivity(),"请确定点位"); + ToastUtils.Message(getActivity(), "请确定点位"); return; } if (chargingStationList != null) { @@ -948,14 +947,14 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View. } String tagPanorama = (String) tvPanorama.getTag(); if (tagPanorama == null) { - ToastUtils.Message(getActivity(),"请拍照"); + ToastUtils.Message(getActivity(), "请拍照"); return; } else { chargingStationList.add(new File(tagPanorama)); } String tagName = (String) tvNamePic.getTag(); if (tagName == null) { - ToastUtils.Message(getActivity(),"请拍照"); + ToastUtils.Message(getActivity(), "请拍照"); return; } else { chargingStationList.add(new File(tagName)); @@ -963,21 +962,21 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View. if (existence == 0) { String tagInternal = (String) tvInternal.getTag(); if (tagInternal == null) { - ToastUtils.Message(getActivity(),"请拍照"); + ToastUtils.Message(getActivity(), "请拍照"); return; } else { chargingStationList.add(new File(tagInternal)); } String tagElse = (String) tvElse.getTag(); if (tagElse == null) { - ToastUtils.Message(getActivity(),"请拍照"); + ToastUtils.Message(getActivity(), "请拍照"); return; } else { chargingStationList.add(new File(tagElse)); } String tagScutcheon = (String) tvScutcheon.getTag(); if (tagScutcheon == null) { - ToastUtils.Message(getActivity(),"请拍照"); + ToastUtils.Message(getActivity(), "请拍照"); return; } else { chargingStationList.add(new File(tagScutcheon)); @@ -1032,7 +1031,7 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View. } }).start(); } else { - ToastUtils.Message(getActivity(),"该任务正在提交中"); + ToastUtils.Message(getActivity(), "该任务正在提交中"); } break; case R.id.tv_station_examine: @@ -1123,7 +1122,7 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View. PoiEntity poiEntity = initPoiEntityByUI(showPoiEntity); PoiCheckResult poiCheckResult = checkPoiEntity(poiEntity); if (poiCheckResult.getCode() == 1) { - ToastUtils.Message(getActivity(),poiCheckResult.getMsg() ); + ToastUtils.Message(getActivity(), poiCheckResult.getMsg()); return; } poiEntity.setTaskStatus(2); @@ -1146,14 +1145,14 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View. } }).start(); } else { - ToastUtils.Message(getActivity(),"没有申请权限，请手动申请"); + ToastUtils.Message(getActivity(), "没有申请权限，请手动申请"); } } @Override public void onDenied(List permissions, boolean never) { if (never) { - ToastUtils.Message(getActivity(),"被永久拒绝授权，请手动授予权限"); + ToastUtils.Message(getActivity(), "被永久拒绝授权，请手动授予权限"); // 如果是被永久拒绝就跳转到应用权限系统设置页面 XXPermissions.startPermissionActivity(Objects.requireNonNull(getActivity()), permissions); } @@ -1240,7 +1239,7 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View. private void stationUploadByNetWork(PoiEntity poiEntity, ArrayList chargingStationList) { if (poiEntity == null) { - ToastUtils.Message(getActivity(),"没有保存本地"); + ToastUtils.Message(getActivity(), "没有保存本地"); return; } showLoadingDialog(); @@ -1323,13 +1322,12 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View. } }).start(); } else { - ToastUtils.Message(getActivity(),chargingStationBean.getMessage()); - + ToastUtils.Message(getActivity(), chargingStationBean.getMessage()); } } else if (chargingStationBean.getCode() == 230) { FlushTokenUtil.flushToken(getActivity()); } else { - ToastUtils.Message(getActivity(),chargingStationBean.getMessage()); + ToastUtils.Message(getActivity(), chargingStationBean.getMessage()); } } @@ -1339,9 +1337,9 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View. String message = e.getMessage(); assert message != null; if (message.equals("timeout") || message.equals("Read time out")) { - ToastUtils.Message(getActivity(),"请求超时"); + ToastUtils.Message(getActivity(), "请求超时"); } else { - ToastUtils.Message(getActivity(),message); + ToastUtils.Message(getActivity(), message); } Log.d("TAG", "onError: " + e.getMessage()); } @@ -1377,9 +1375,9 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View. for (int i = 0; i < body.size(); i++) { stringBuilder.append(body.get(i)).append("；"); } - ToastUtils.Message(getActivity()," 存在类似名称--"); + ToastUtils.Message(getActivity(), " 存在类似名称--"); } else { - ToastUtils.Message(getActivity(),"没有类似名称,可以作业"); + ToastUtils.Message(getActivity(), "没有类似名称,可以作业"); } } }); @@ -1398,7 +1396,7 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View. getActivity().runOnUiThread(new Runnable() { @Override public void run() { - ToastUtils.Message(getActivity(),taskNameBean.getMessage()); + ToastUtils.Message(getActivity(), taskNameBean.getMessage()); editNameContent.setTextColor(Color.RED); btnSaveLocal.setEnabled(false); btnUploading.setEnabled(false); @@ -1417,9 +1415,9 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View. String message = e.getMessage(); assert message != null; if (message.equals("timeout") || message.equals("Read time out")) { - ToastUtils.Message(getActivity(),"请求超时"); + ToastUtils.Message(getActivity(), "请求超时"); } else { - ToastUtils.Message(getActivity(),message); + ToastUtils.Message(getActivity(), message); } Log.d("TAG", "onError: " + e.getMessage()); } @@ -1627,23 +1625,27 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View. if (markerStation != null) { markerStation.remove(); } - for (int i = 0; i < removablesLocality.size(); i++) { - removablesLocality.get(i).remove(); + if (removablesLocality != null) { + for (int i = 0; i < removablesLocality.size(); i++) { + removablesLocality.get(i).remove(); + } + removablesLocality.clear(); + } + if (chargingStationBuilder != null) { + chargingStationBuilder.append(TimestampUtil.time()).append("onDestroy"); + chargingStationBuilder.append("\r\n"); + FileUtils.writeFile(logFile.getAbsolutePath(), chargingStationBuilder.toString(), true); } - removablesLocality.clear(); - chargingStationBuilder.append(TimestampUtil.time()).append("onDestroy"); - chargingStationBuilder.append("\r\n"); - FileUtils.writeFile(logFile.getAbsolutePath(), chargingStationBuilder.toString(), true); } private void initEndReceiveTask(String url, PoiEntity poiEntity) { if (poiEntity.getTaskId() == 0) { - ToastUtils.Message(getActivity(),"无此任务"); + 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()) @@ -1697,10 +1699,10 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View. String message = e.getMessage(); assert message != null; if (message.contains("timeout") || message.contains("Read time out")) { - ToastUtils.Message(getActivity(),"请求超时"); + ToastUtils.Message(getActivity(), "请求超时"); } else { - ToastUtils.Message(getActivity(),message); + 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 a7bdf56..c4cb466 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/ContactFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/ContactFragment.java @@ -12,7 +12,7 @@ import com.navinfo.outdoor.base.BaseFragment; import java.util.Objects; /** - * 联系我们的Fragment + *我的-联系我们的Fragment */ public class ContactFragment extends BaseFragment implements View.OnClickListener { 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 cc579fc..9e4c3fe 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/EventPrefectureFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/EventPrefectureFragment.java @@ -224,8 +224,10 @@ public class EventPrefectureFragment extends BaseFragment implements View.OnClic @Override public void onDestroy() { super.onDestroy(); - eventPrefectureBuilder.append(TimestampUtil.time()).append(",").append("onDestroy"); - eventPrefectureBuilder.append("\r\n"); - FileUtils.writeFile(logFile.getAbsolutePath(), eventPrefectureBuilder.toString(), true); + if (eventPrefectureBuilder!=null) { + eventPrefectureBuilder.append(TimestampUtil.time()).append(",").append("onDestroy"); + eventPrefectureBuilder.append("\r\n"); + FileUtils.writeFile(logFile.getAbsolutePath(), eventPrefectureBuilder.toString(), true); + } } } 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 b65d2c5..fe4891d 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/FilterFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/FilterFragment.java @@ -61,7 +61,7 @@ import java.util.List; import java.util.Objects; /** - * 筛选的Fragment + * 寻宝-筛选的Fragment */ public class FilterFragment extends BaseDrawerFragment implements View.OnClickListener { private XRecyclerView recyclerFilter; 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 8a590d8..0137344 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/FindFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/FindFragment.java @@ -26,7 +26,6 @@ import java.util.Objects; /** * 发现的Fragment - * 2021-5-25 */ public class FindFragment extends BaseFragment implements View.OnClickListener { @@ -87,7 +86,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("点击了最新公告：任务专区 跳转 ,"); @@ -132,9 +131,11 @@ public class FindFragment extends BaseFragment implements View.OnClickListener { @Override public void onDestroy() { super.onDestroy(); - findBuilder.append(TimestampUtil.time()).append(",").append("onDestroy"); - findBuilder.append("\r\n"); - FileUtils.writeFile(logFile.getAbsolutePath(), findBuilder.toString(), true); + if (findBuilder != null) { + findBuilder.append(TimestampUtil.time()).append(",").append("onDestroy"); + findBuilder.append("\r\n"); + FileUtils.writeFile(logFile.getAbsolutePath(), findBuilder.toString(), true); + } } } 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 43796f9..48f5aa7 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/ForgetPawFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/ForgetPawFragment.java @@ -42,7 +42,7 @@ import java.util.Date; import java.util.Objects; /** - * 忘记密码页面 + * 登录-忘记密码页面 */ public class ForgetPawFragment extends BaseFragment implements View.OnClickListener { private TextView forgetPawGetNote; @@ -299,8 +299,10 @@ public class ForgetPawFragment extends BaseFragment implements View.OnClickListe @Override public void onDestroy() { super.onDestroy(); - forgetPawBuilder.append(TimestampUtil.time()).append(",").append("onDestroy"); - forgetPawBuilder.append("\r\n"); - FileUtils.writeFile(logFile.getAbsolutePath(), forgetPawBuilder.toString(), true); + if (forgetPawBuilder!=null) { + forgetPawBuilder.append(TimestampUtil.time()).append(",").append("onDestroy"); + forgetPawBuilder.append("\r\n"); + FileUtils.writeFile(logFile.getAbsolutePath(), forgetPawBuilder.toString(), true); + } } } \ No newline at end of file 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 a1910c7..2ca32c0 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/GatherGetFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/GatherGetFragment.java @@ -58,7 +58,7 @@ import java.util.List; import java.util.Objects; /** - * 领取采集的fragment + * 寻宝——领取采集的fragment */ public class GatherGetFragment extends BaseFragment implements View.OnClickListener { private Button btnCancelGet, btnGetTask, btnGather, btnFinishGather; @@ -1048,9 +1048,11 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe @Override public void onDestroy() { super.onDestroy(); - gatherGetBuilder.append(TimestampUtil.time()).append(",").append("onDestroy"); - gatherGetBuilder.append("\r\n"); - FileUtils.writeFile(logFile.getAbsolutePath(), gatherGetBuilder.toString(), true); + if (gatherGetBuilder!=null) { + gatherGetBuilder.append(TimestampUtil.time()).append(",").append("onDestroy"); + gatherGetBuilder.append("\r\n"); + FileUtils.writeFile(logFile.getAbsolutePath(), gatherGetBuilder.toString(), true); + } } } 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 0f7c714..836fbb8 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/GatheringFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/GatheringFragment.java @@ -62,7 +62,8 @@ import java.util.Date; import java.util.Objects; /* -收款信息 + * 我的-用户资料-收款信息的fragment + * （绑定银行卡） */ public class GatheringFragment extends BaseFragment implements View.OnClickListener { private TextView tvBank; @@ -115,7 +116,6 @@ public class GatheringFragment extends BaseFragment implements View.OnClickListe } else { tvBank.setText(Constant.BACKGROUND_NAME); } - btnBank.setText("重新绑定"); } } @@ -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("")) { - ToastUtils.Message(getActivity(),"银行卡号不能为空"); + 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) { - ToastUtils.Message(getActivity(),"请先拍银行卡"); + ToastUtils.Message(getActivity(), "请先拍银行卡"); } else { - ToastUtils.Message(getActivity(),"如果需要重新绑定请先拍照银行卡"); + 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}$\"")) { - ToastUtils.Message(getActivity(),"银行卡号不能为空"); + 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 { - ToastUtils.Message(getActivity(),"绑定失败！"); + ToastUtils.Message(getActivity(), "绑定失败！"); } } @@ -317,9 +317,9 @@ public class GatheringFragment extends BaseFragment implements View.OnClickListe String message = e.getMessage(); assert message != null; if (message.contains("timeout") || message.contains("Read time out")) { - ToastUtils.Message(getActivity(),"请求超时"); + ToastUtils.Message(getActivity(), "请求超时"); } else { - ToastUtils.Message(getActivity(),message); + ToastUtils.Message(getActivity(), message); } } }); @@ -339,24 +339,27 @@ public class GatheringFragment extends BaseFragment implements View.OnClickListe Constant.FILE_PATH = absolutePath; gatheringCamera.setTag(absolutePath); //银行卡识别 - BankCardBean bankCardBean = new Gson().fromJson(BankCard.bankCard(), BankCardBean.class); - if (bankCardBean == null) { - 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)) { - ToastUtils.Message(getActivity(),"识别失败，可以重新识别或则进行手动输入"); - return; - } - etBankNum.setText(bank_card_number); - } else { - ToastUtils.Message(getActivity(),"识别失败，可以重新识别或则进行手动输入"); - } + String bankCard = BankCard.bankCard(); + if (bankCard != null) { + BankCardBean bankCardBean = new Gson().fromJson(bankCard, BankCardBean.class); + if (bankCardBean == null) { + ToastUtils.Message(getActivity(), "识别失败，可以重新识别或则进行手动输入"); } else { - ToastUtils.Message(getActivity(),"识别失败，可以重新识别或则进行手动输入"); + 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)) { + ToastUtils.Message(getActivity(), "识别失败，可以重新识别或则进行手动输入"); + return; + } + etBankNum.setText(bank_card_number); + } else { + ToastUtils.Message(getActivity(), "识别失败，可以重新识别或则进行手动输入"); + } + } else { + ToastUtils.Message(getActivity(), "识别失败，可以重新识别或则进行手动输入"); + } } } } @@ -395,8 +398,10 @@ public class GatheringFragment extends BaseFragment implements View.OnClickListe @Override public void onDestroy() { super.onDestroy(); - gatheringBuilder.append(TimestampUtil.time()).append(",").append("onDestroy"); - gatheringBuilder.append("\r\n"); - FileUtils.writeFile(logFile.getAbsolutePath(), gatheringBuilder.toString(), true); + if (gatheringBuilder != null) { + gatheringBuilder.append(TimestampUtil.time()).append(",").append("onDestroy"); + gatheringBuilder.append("\r\n"); + FileUtils.writeFile(logFile.getAbsolutePath(), gatheringBuilder.toString(), true); + } } } 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 24e3ac7..2a7e79f 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/GradeFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/GradeFragment.java @@ -10,7 +10,7 @@ import com.navinfo.outdoor.base.BaseFragment; import java.util.Objects; /** - * 我的等级页面的fragment + * 我的-等级页面的fragment */ public class GradeFragment extends BaseFragment implements View.OnClickListener{ 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 5e68c8e..0ab5480 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/HasSubmitFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/HasSubmitFragment.java @@ -232,6 +232,7 @@ public class HasSubmitFragment extends BaseFragment implements View.OnClickListe ToastUtils.Message(getActivity(),message); } } + }); } @@ -477,8 +478,10 @@ public class HasSubmitFragment extends BaseFragment implements View.OnClickListe if (EventBus.getDefault().isRegistered(this))//加上判断 EventBus.getDefault().unregister(this); super.onDestroy(); - hasSubmitBuilder.append(TimestampUtil.time()).append(",").append("onDestroy"); - hasSubmitBuilder.append("\r\n"); - FileUtils.writeFile(logFile.getAbsolutePath(), hasSubmitBuilder.toString(), true); + if (hasSubmitBuilder!=null) { + hasSubmitBuilder.append(TimestampUtil.time()).append(",").append("onDestroy"); + hasSubmitBuilder.append("\r\n"); + FileUtils.writeFile(logFile.getAbsolutePath(), hasSubmitBuilder.toString(), true); + } } } \ No newline at end of file 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 23cd0d1..19e6795 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/IssueFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/IssueFragment.java @@ -39,7 +39,7 @@ import java.util.Objects; import okhttp3.OkHttpClient; /** - * 常见问题页面的fragment + * 我的-常见问题页面的fragment */ public class IssueFragment extends BaseFragment implements View.OnClickListener { private IssueProblemAdapter issueProblemAdapter; 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 6586167..3ab8996 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/IssueWebFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/IssueWebFragment.java @@ -24,8 +24,8 @@ import java.util.Objects; /** - * 我的-常见问题-web - */ + * 我的-常见问题-web页面 + * */ public class IssueWebFragment extends BaseFragment implements View.OnClickListener { public static IssueWebFragment newInstance(Bundle bundle) { 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 6107828..bc6e243 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/MapDownloadFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/MapDownloadFragment.java @@ -10,10 +10,11 @@ import com.navinfo.outdoor.base.BaseFragment; import java.util.Objects; -/** - * 地图下载的Fragment +/* +*我的-地图下载的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 63e48ad..af0a0db 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/MessageFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/MessageFragment.java @@ -63,9 +63,9 @@ public class MessageFragment extends BaseFragment implements View.OnClickListene @Override protected void initView() { super.initView(); - ImageView messageFinal = (ImageView) findViewById(R.id.message_final); + ImageView messageFinal = findViewById(R.id.message_final); messageFinal.setOnClickListener(this); - XRecyclerView messageRecycler = (XRecyclerView) findViewById(R.id.message_recycler); + XRecyclerView messageRecycler = findViewById(R.id.message_recycler); messageRecycler.setLayoutManager(new LinearLayoutManager(getActivity())); messageRecycler.addItemDecoration(new DividerItemDecoration(Objects.requireNonNull(getActivity()), DividerItemDecoration.VERTICAL)); messageRecycler.setRefreshProgressStyle(ProgressStyle.BallSpinFadeLoader); @@ -89,6 +89,7 @@ public class MessageFragment extends BaseFragment implements View.OnClickListene @Override public void onRefresh() { } + @Override public void onLoadMore() { } @@ -118,7 +119,7 @@ public class MessageFragment extends BaseFragment implements View.OnClickListene } else if (taskPrefectureBean.getCode() == 230) { FlushTokenUtil.flushToken(getActivity()); } else { - ToastUtils.Message(getActivity(),taskPrefectureBean.getMessage()); + ToastUtils.Message(getActivity(), taskPrefectureBean.getMessage()); } } @@ -127,10 +128,10 @@ public class MessageFragment extends BaseFragment implements View.OnClickListene 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); + if (message.equals("timeout") || message.equals("Read time out")) { + ToastUtils.Message(getActivity(), "请求超时"); + } else { + ToastUtils.Message(getActivity(), message); } Log.d("TAG", "onError: " + e.getMessage()); } @@ -188,8 +189,10 @@ public class MessageFragment extends BaseFragment implements View.OnClickListene @Override public void onDestroy() { super.onDestroy(); - messageBuilder.append(TimestampUtil.time()).append(",").append("onDestroy"); - messageBuilder.append("\r\n"); - FileUtils.writeFile(logFile.getAbsolutePath(), messageBuilder.toString(), true); + if (messageBuilder != null) { + messageBuilder.append(TimestampUtil.time()).append(",").append("onDestroy"); + messageBuilder.append("\r\n"); + FileUtils.writeFile(logFile.getAbsolutePath(), messageBuilder.toString(), true); + } } } \ No newline at end of file diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/MineFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/MineFragment.java index 39dd862..1a970d2 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/MineFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/MineFragment.java @@ -47,7 +47,6 @@ import java.util.Objects; /** * 我的Fragment - * 2021-5-25 */ public class MineFragment extends BaseFragment implements View.OnClickListener { private TextView tvMoney; @@ -148,7 +147,7 @@ public class MineFragment extends BaseFragment implements View.OnClickListener { if (response.getCode() == 200) { GetPriceBean.BodyBean body = response.getBody(); if (body != null) { - String minePrice = DoubleUtil.format2( body.getUserPrice()); + String minePrice = DoubleUtil.format2(body.getUserPrice()); if (getActivity() != null) { getActivity().runOnUiThread(new Runnable() { @SuppressLint("SetTextI18n") @@ -162,7 +161,7 @@ public class MineFragment extends BaseFragment implements View.OnClickListener { } else if (response.getCode() == 230) { FlushTokenUtil.flushToken(getActivity()); } else { - ToastUtils.Message(getActivity(),response.getMessage()); + ToastUtils.Message(getActivity(), response.getMessage()); } Log.d("TAG", "onSuccess: " + response.toString()); } @@ -172,10 +171,10 @@ public class MineFragment extends BaseFragment implements View.OnClickListener { 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); + if (message.equals("timeout") || message.equals("Read time out")) { + ToastUtils.Message(getActivity(), "请求超时"); + } else { + ToastUtils.Message(getActivity(), message); } Log.d("TAG", "onError: " + e.getMessage()); } @@ -235,7 +234,7 @@ public class MineFragment extends BaseFragment implements View.OnClickListener { Intent intentGrade = new Intent(getActivity(), FragmentManagement.class); intentGrade.putExtra("tag", 17); startActivity(intentGrade);*/ - ToastUtils.Message(getActivity(),"该功能以后上新，敬请期待"); + ToastUtils.Message(getActivity(), "该功能以后上新，敬请期待"); break; case R.id.btn_withdraw://提现页面 @@ -287,14 +286,15 @@ public class MineFragment extends BaseFragment implements View.OnClickListener { mainBuilder.append(TimestampUtil.time()).append(",").append("onStop ,"); } - @Override public void onDestroy() { if (EventBus.getDefault().isRegistered(this))//加上判断 EventBus.getDefault().unregister(this); super.onDestroy(); - mainBuilder.append(TimestampUtil.time()).append(",").append("onDestroy"); - mainBuilder.append("\r\n"); - FileUtils.writeFile(logFile.getAbsolutePath(), mainBuilder.toString(), true); + if (mainBuilder != null) { + mainBuilder.append(TimestampUtil.time()).append(",").append("onDestroy"); + mainBuilder.append("\r\n"); + FileUtils.writeFile(logFile.getAbsolutePath(), mainBuilder.toString(), true); + } } } 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 46b1c6b..a9c914c 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/OtherFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/OtherFragment.java @@ -435,8 +435,7 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis private void initShowPoi() { // 添加信息： - assert getArguments() != null; - showPoiEntity = (PoiEntity) getArguments().getSerializable("poiEntity"); + showPoiEntity = (PoiEntity) Objects.requireNonNull(getArguments()).getSerializable("poiEntity"); if (showPoiEntity != null) { String name = showPoiEntity.getName();//名称 if (name != null && !name.equals("")) { @@ -539,23 +538,23 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis } String name = editTaskName.getText().toString().trim();//名称 if (name.equals("")) { - ToastUtils.Message(getActivity(),"请输入poi 名称"); + ToastUtils.Message(getActivity(), "请输入poi 名称"); return; } if (latLng == null) { - ToastUtils.Message(getActivity(),"请确定点位"); + ToastUtils.Message(getActivity(), "请确定点位"); return; } String tagPicture = (String) tvPicture.getTag(); if (tagPicture == null) { - ToastUtils.Message(getActivity(),"请拍照"); + ToastUtils.Message(getActivity(), "请拍照"); return; } else { otherUploadList.add(new File(tagPicture)); } String tagPictures = (String) tvPictures.getTag(); if (tagPictures == null) { - ToastUtils.Message(getActivity(),"请拍照"); + ToastUtils.Message(getActivity(), "请拍照"); return; } else { otherUploadList.add(new File(tagPictures)); @@ -602,13 +601,11 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis } }); } - } - } }).start(); } else { - ToastUtils.Message(getActivity(),"该任务正在提交中"); + ToastUtils.Message(getActivity(), "该任务正在提交中"); } break; } @@ -626,7 +623,7 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis PoiEntity poiEntity = initPoiEntityByUI(showPoiEntity); PoiCheckResult poiCheckResult = checkPoiEntity(poiEntity); if (poiCheckResult.getCode() == 1) { - ToastUtils.Message(getActivity(),poiCheckResult.getMsg()); + ToastUtils.Message(getActivity(), poiCheckResult.getMsg()); return; } poiEntity.setTaskStatus(2); @@ -648,14 +645,14 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis } }).start(); } else { - ToastUtils.Message(getActivity(),"没有申请权限，请手动申请"); + ToastUtils.Message(getActivity(), "没有申请权限，请手动申请"); } } @Override public void onDenied(List permissions, boolean never) { if (never) { - ToastUtils.Message(getActivity(),"被永久拒绝授权，请手动授予权限"); + ToastUtils.Message(getActivity(), "被永久拒绝授权，请手动授予权限"); // 如果是被永久拒绝就跳转到应用权限系统设置页面 XXPermissions.startPermissionActivity(Objects.requireNonNull(getActivity()), permissions); } @@ -688,7 +685,7 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis private void otherUploadByNet(int body, List otherUploadList) { if (body == 0) { - ToastUtils.Message(getActivity(),"没有保存本地"); + ToastUtils.Message(getActivity(), "没有保存本地"); Log.e("TAG", "poiUploadByNetWork: " + body + otherUploadList); return; } @@ -752,12 +749,12 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis } }).start(); } else { - ToastUtils.Message(getActivity(),poiSaveBean.getMessage()); + ToastUtils.Message(getActivity(), poiSaveBean.getMessage()); } } else if (poiSaveBean.getCode() == 230) { FlushTokenUtil.flushToken(getActivity()); } else { - ToastUtils.Message(getActivity(),poiSaveBean.getMessage()); + ToastUtils.Message(getActivity(), poiSaveBean.getMessage()); } } @@ -767,9 +764,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")) { - ToastUtils.Message(getActivity(),"请求超时"); + ToastUtils.Message(getActivity(), "请求超时"); } else { - ToastUtils.Message(getActivity(),message); + ToastUtils.Message(getActivity(), message); } } }); @@ -876,14 +873,16 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis if (markerOther != null) { markerOther.remove(); } - otherBuilder.append(TimestampUtil.time()).append("onDestroy"); - otherBuilder.append("\r\n"); - FileUtils.writeFile(logFile.getAbsolutePath(), otherBuilder.toString(), true); + if (otherBuilder != null) { + otherBuilder.append(TimestampUtil.time()).append("onDestroy"); + otherBuilder.append("\r\n"); + FileUtils.writeFile(logFile.getAbsolutePath(), otherBuilder.toString(), true); + } } private void initEndReceiveTask(String url, PoiEntity poiEntity) { if (poiEntity.getTaskId() == 0) { - ToastUtils.Message(getActivity(),"无此任务"); + ToastUtils.Message(getActivity(), "无此任务"); return; } HttpParams httpParams = new HttpParams(); 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 09d3ca4..59ce47e 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/PhotoFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/PhotoFragment.java @@ -51,7 +51,7 @@ import java.util.Objects; public class PhotoFragment extends BaseFragment implements View.OnClickListener { private ArrayList fileBeans; private PhotoAdapter photoAdapter; - private File logFile,fileTxt; + private File logFile, fileTxt; private StringBuilder photoBuilder; public static PhotoFragment newInstance(Bundle bundle) { @@ -154,7 +154,7 @@ public class PhotoFragment extends BaseFragment implements View.OnClickListener photoAdapter = new PhotoAdapter(fileTxt, getContext()); photoAdapter.setFileBeans(fileBeans); photoRecycler.setAdapter(photoAdapter); - }catch (Exception e){ + } catch (Exception e) { e.getLocalizedMessage(); } @@ -227,9 +227,11 @@ public class PhotoFragment extends BaseFragment implements View.OnClickListener if (EventBus.getDefault().isRegistered(this))//加上判断 EventBus.getDefault().unregister(this); super.onDestroy(); - photoBuilder.append(TimestampUtil.time()).append("onDestroy"); - photoBuilder.append("\r\n"); - FileUtils.writeFile(logFile.getAbsolutePath(), photoBuilder.toString(), true); + if (photoBuilder != null) { + photoBuilder.append(TimestampUtil.time()).append("onDestroy"); + photoBuilder.append("\r\n"); + FileUtils.writeFile(logFile.getAbsolutePath(), photoBuilder.toString(), true); + } } } 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 548504e..9af388a 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/PoiFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/PoiFragment.java @@ -92,8 +92,7 @@ import java.util.List; import java.util.Objects; /** - * poi记录的Fragment - * 2021-5-25 + * 寻宝-上报- poi记录的Fragment */ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListener { private EditText editDescribe; @@ -334,6 +333,7 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe break; } } + @Override public void onNothingSelected(AdapterView parent) { @@ -452,143 +452,144 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe private void initShowPoi() { // 添加信息： - assert getArguments() != null; - showPoiEntity = (PoiEntity) getArguments().getSerializable("poiEntity"); - assert showPoiEntity != null; - if (showPoiEntity.getTaskStatus() == 1 || showPoiEntity.getTaskStatus() == 5) { - tvPoiExamine.setVisibility(View.GONE); - } else { - tvPoiExamine.setVisibility(View.VISIBLE); - } - String name = showPoiEntity.getName();//名称 - if (name != null && !name.equals("")) { - editNameContent.setText(name); - } - String address = showPoiEntity.getAddress();//地址 - if (address != null && !address.equals("")) { - editSiteContent.setText(address); - } - String geoWkt = showPoiEntity.getGeoWkt(); - if (geoWkt != null) { - String geo = Geohash.getInstance().decode(geoWkt); - Geometry geometry = GeometryTools.createGeometry(geo); - switch (geometry.getGeometryType()) { - case "Point": //点 - latLng = GeometryTools.createLatLng(geo); - break; - case "LineString": //线 - case "Polygon": //面 - List latLineString = GeometryTools.getLatLags(geo); - assert latLineString != null; - latLng = latLineString.get(0); - break; + showPoiEntity = (PoiEntity) Objects.requireNonNull(getArguments()).getSerializable("poiEntity"); + if (showPoiEntity != null) { + if (showPoiEntity.getTaskStatus() == 1 || showPoiEntity.getTaskStatus() == 5) { + tvPoiExamine.setVisibility(View.GONE); + } else { + tvPoiExamine.setVisibility(View.VISIBLE); } - BitmapDescriptor poiDescriptor = BitmapDescriptorFactory.fromResource(R.drawable.marker_poi_show); - markerPoi = tencentMap.addMarker(new MarkerOptions(latLng).icon(poiDescriptor).anchor(0.5f, 1.0f)); - markerPoi.setZIndex(4); - moveLatlng(latLng, null); - } else { - String x = showPoiEntity.getX(); - String y = showPoiEntity.getY(); - if (x != null && y != null) { - latLng = new LatLng(); - latLng.setLatitude(Double.parseDouble(y)); - latLng.setLongitude(Double.parseDouble(x)); + String name = showPoiEntity.getName();//名称 + if (name != null && !name.equals("")) { + editNameContent.setText(name); + } + String address = showPoiEntity.getAddress();//地址 + if (address != null && !address.equals("")) { + editSiteContent.setText(address); + } + String geoWkt = showPoiEntity.getGeoWkt(); + if (geoWkt != null) { + String geo = Geohash.getInstance().decode(geoWkt); + Geometry geometry = GeometryTools.createGeometry(geo); + switch (geometry.getGeometryType()) { + case "Point": //点 + latLng = GeometryTools.createLatLng(geo); + break; + case "LineString": //线 + case "Polygon": //面 + List latLineString = GeometryTools.getLatLags(geo); + assert latLineString != null; + latLng = latLineString.get(0); + break; + } BitmapDescriptor poiDescriptor = BitmapDescriptorFactory.fromResource(R.drawable.marker_poi_show); markerPoi = tencentMap.addMarker(new MarkerOptions(latLng).icon(poiDescriptor).anchor(0.5f, 1.0f)); markerPoi.setZIndex(4); moveLatlng(latLng, null); - } - } - //得到区号 - initPhone(); - String memo = showPoiEntity.getMemo();//任务描述 - if (memo != null && !memo.equals("")) { - editDescribe.setText(memo); - } - String telPhone = showPoiEntity.getTelPhone(); - if (telPhone != null && !telPhone.equals("") && !telPhone.equals("null")) { - String[] phones = telPhone.split("\\|"); - for (int i = 0; i < phones.length; i++) { - if (i == 0) { - if (!StringUtils.isEmpty(phones[i])) { - if (phones[i].contains("-")) { // 包含区号数据的电话 - String[] split = phones[i].split("-"); - if (split.length > 1) { - poiBeans.add(new PhoneBean("电话", split[1] + "", split[0] + "", R.drawable.icon_add_bg)); - } else { - poiBeans.add(new PhoneBean("电话", "", "", R.drawable.icon_add_bg)); - } - } else { - poiBeans.add(new PhoneBean("电话", phones[i] + "", "", R.drawable.icon_add_bg)); - } - } - } else { - if (!StringUtils.isEmpty(phones[i])) { - if (phones[i].contains("-")) { // 包含区号数据的电话 - String[] split = phones[i].split("-"); - if (split.length > 1) { - poiBeans.add(new PhoneBean("", split[1] + "", split[0] + "", R.drawable.icon_del_bg)); - } else { - poiBeans.add(new PhoneBean("", "", "", R.drawable.icon_del_bg)); - } - } else { - if (phones[i] != null) { - poiBeans.add(new PhoneBean("", phones[i] + "", "", R.drawable.icon_del_bg)); - } else { - poiBeans.add(new PhoneBean("", "", "", R.drawable.icon_del_bg)); - } - } - } - } - } - } else { - if (Constant.CODE == null || Constant.CODE.equals("")) { - poiBeans.add(new PhoneBean("电话", "", "", R.drawable.icon_add_bg)); } else { - poiBeans.add(new PhoneBean("电话", "", Constant.CODE, R.drawable.icon_add_bg)); - } - } - contactView = new ContactView(getActivity(), linearContact, poiBeans); - contactView.resetView(); - //poiRecycleAdapter.setList(poiBeans); - if (showPoiEntity.getName() != null) { - linearExist.setVisibility(View.VISIBLE); - spinnerExist.setSelection(showPoiEntity.getExistence(), true); - } - if (showPoiEntity.getPhotoInfo() != null) { - for (int i = 0; i < showPoiEntity.getPhotoInfo().size(); i++) { - String photo = showPoiEntity.getPhotoInfo().get(i).getPhoto(); - String[] split = photo.split("/"); - if (split[split.length - 1].startsWith("a")) { - Glide.with(Objects.requireNonNull(getActivity())).load(photo).into(ivPanorama); - tvPanorama.setTag(photo); - } else if (split[split.length - 1].startsWith("b")) { - Glide.with(Objects.requireNonNull(getActivity())).load(photo).into(ivName); - tvPoiNamePic.setTag(photo); - } else if (split[split.length - 1].startsWith("c")) { - Glide.with(Objects.requireNonNull(getActivity())).load(photo).into(ivInternal); - tvInternal.setTag(photo); - } else if (split[split.length - 1].startsWith("d")) { - Glide.with(Objects.requireNonNull(getActivity())).load(photo).into(ivCard); - tvCard.setTag(photo); - } else if (split[split.length - 1].startsWith("e")) { - Glide.with(Objects.requireNonNull(getActivity())).load(photo).into(ivElse); - tvElse.setTag(photo); + String x = showPoiEntity.getX(); + String y = showPoiEntity.getY(); + if (x != null && y != null) { + latLng = new LatLng(); + latLng.setLatitude(Double.parseDouble(y)); + latLng.setLongitude(Double.parseDouble(x)); + BitmapDescriptor poiDescriptor = BitmapDescriptorFactory.fromResource(R.drawable.marker_poi_show); + markerPoi = tencentMap.addMarker(new MarkerOptions(latLng).icon(poiDescriptor).anchor(0.5f, 1.0f)); + markerPoi.setZIndex(4); + moveLatlng(latLng, null); } } - } - if (showPoiEntity.getTaskStatus() == 3) { - disables(); - } - editNameContent.setOnFocusChangeListener(new View.OnFocusChangeListener() { - @Override - public void onFocusChange(View v, boolean hasFocus) { - if (!hasFocus) { - findingDuplicateByWork(); + //得到区号 + initPhone(); + String memo = showPoiEntity.getMemo();//任务描述 + if (memo != null && !memo.equals("")) { + editDescribe.setText(memo); + } + String telPhone = showPoiEntity.getTelPhone(); + if (telPhone != null && !telPhone.equals("") && !telPhone.equals("null")) { + String[] phones = telPhone.split("\\|"); + for (int i = 0; i < phones.length; i++) { + if (i == 0) { + if (!StringUtils.isEmpty(phones[i])) { + if (phones[i].contains("-")) { // 包含区号数据的电话 + String[] split = phones[i].split("-"); + if (split.length > 1) { + poiBeans.add(new PhoneBean("电话", split[1] + "", split[0] + "", R.drawable.icon_add_bg)); + } else { + poiBeans.add(new PhoneBean("电话", "", "", R.drawable.icon_add_bg)); + } + } else { + poiBeans.add(new PhoneBean("电话", phones[i] + "", "", R.drawable.icon_add_bg)); + } + } + } else { + if (!StringUtils.isEmpty(phones[i])) { + if (phones[i].contains("-")) { // 包含区号数据的电话 + String[] split = phones[i].split("-"); + if (split.length > 1) { + poiBeans.add(new PhoneBean("", split[1] + "", split[0] + "", R.drawable.icon_del_bg)); + } else { + poiBeans.add(new PhoneBean("", "", "", R.drawable.icon_del_bg)); + } + } else { + if (phones[i] != null) { + poiBeans.add(new PhoneBean("", phones[i] + "", "", R.drawable.icon_del_bg)); + } else { + poiBeans.add(new PhoneBean("", "", "", R.drawable.icon_del_bg)); + } + } + } + } + } + } else { + if (Constant.CODE == null || Constant.CODE.equals("")) { + poiBeans.add(new PhoneBean("电话", "", "", R.drawable.icon_add_bg)); + } else { + poiBeans.add(new PhoneBean("电话", "", Constant.CODE, R.drawable.icon_add_bg)); } } - }); + contactView = new ContactView(getActivity(), linearContact, poiBeans); + contactView.resetView(); + //poiRecycleAdapter.setList(poiBeans); + if (showPoiEntity.getName() != null) { + linearExist.setVisibility(View.VISIBLE); + spinnerExist.setSelection(showPoiEntity.getExistence(), true); + } + if (showPoiEntity.getPhotoInfo() != null) { + for (int i = 0; i < showPoiEntity.getPhotoInfo().size(); i++) { + String photo = showPoiEntity.getPhotoInfo().get(i).getPhoto(); + String[] split = photo.split("/"); + if (split[split.length - 1].startsWith("a")) { + Glide.with(Objects.requireNonNull(getActivity())).load(photo).into(ivPanorama); + tvPanorama.setTag(photo); + } else if (split[split.length - 1].startsWith("b")) { + Glide.with(Objects.requireNonNull(getActivity())).load(photo).into(ivName); + tvPoiNamePic.setTag(photo); + } else if (split[split.length - 1].startsWith("c")) { + Glide.with(Objects.requireNonNull(getActivity())).load(photo).into(ivInternal); + tvInternal.setTag(photo); + } else if (split[split.length - 1].startsWith("d")) { + Glide.with(Objects.requireNonNull(getActivity())).load(photo).into(ivCard); + tvCard.setTag(photo); + } else if (split[split.length - 1].startsWith("e")) { + Glide.with(Objects.requireNonNull(getActivity())).load(photo).into(ivElse); + tvElse.setTag(photo); + } + } + } + if (showPoiEntity.getTaskStatus() == 3) { + disables(); + } + editNameContent.setOnFocusChangeListener(new View.OnFocusChangeListener() { + @Override + public void onFocusChange(View v, boolean hasFocus) { + if (!hasFocus) { + findingDuplicateByWork(); + } + } + }); + } + } /** @@ -629,7 +630,7 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe } else if (getPhoneBean.getCode() == 230) { FlushTokenUtil.flushToken(getActivity()); } else { - ToastUtils.Message(getActivity(), getPhoneBean.getMessage()); + ToastUtils.Message(getActivity(), getPhoneBean.getMessage()); } } @@ -669,6 +670,7 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe btnSaveLocal.setEnabled(false); spinnerExist.setEnabled(false); relativePhone.setEnabled(false); + linearContact.setEnabled(false); } @Override @@ -868,7 +870,7 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe public void onSuccess(TaskNameBean taskNameBean, int id) { dismissLoadingDialog(); if (taskNameBean.getCode() == 200) { - if (getActivity()!=null){ + if (getActivity() != null) { getActivity().runOnUiThread(new Runnable() { @Override public void run() { @@ -881,7 +883,7 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe for (int i = 0; i < body.size(); i++) { stringBuilder.append(body.get(i)).append("；"); } - ToastUtils.Message(getActivity(), "存在类似名称---"+stringBuilder.toString()); + ToastUtils.Message(getActivity(), "存在类似名称---" + stringBuilder.toString()); } else { ToastUtils.Message(getActivity(), "没有类似名称,可以作业"); } @@ -988,7 +990,7 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe .cls(PoiSaveBean.class) .token(Constant.ACCESS_TOKEN) .params(httpParams); - if (getActivity()!=null){ + if (getActivity() != null) { okGoBuilder.getRequest(PreserveUtils.getInstance().getPoiPreserveCallback(getActivity(), poiEntity)); getActivity().getSupportFragmentManager().popBackStack();//回退 WaitDialog.show((AppCompatActivity) getActivity(), "任务已保存本地,请稍后"); @@ -1012,7 +1014,7 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe .token(Constant.ACCESS_TOKEN) .fileList(poiPicList) .params(httpParams); - if (getActivity()!=null){ + if (getActivity() != null) { okGoBuilder.postFileAsynchronous(UploadUtils.getInstance().getPoiUploadCallback(getActivity(), showPoiEntity, poiPicList)); getActivity().getSupportFragmentManager().popBackStack();//回退 WaitDialog.show((AppCompatActivity) getActivity(), "任务正在后台上传中，请稍候..."); @@ -1062,12 +1064,12 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe } }).start(); } else { - ToastUtils.Message(getActivity(), poiSaveBean.getMessage()); + ToastUtils.Message(getActivity(), poiSaveBean.getMessage()); } } else if (poiSaveBean.getCode() == 230) { FlushTokenUtil.flushToken(getActivity()); } else { - ToastUtils.Message(getActivity(), poiSaveBean.getMessage()); + ToastUtils.Message(getActivity(), poiSaveBean.getMessage()); } } @@ -1077,9 +1079,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")) { - ToastUtils.Message(getActivity(), "请求超时"); + ToastUtils.Message(getActivity(), "请求超时"); } else { - ToastUtils.Message(getActivity(), message); + ToastUtils.Message(getActivity(), message); } Log.d("TAG", "onError: " + e.getMessage()); } @@ -1240,14 +1242,16 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe if (markerPoi != null) { markerPoi.remove(); } - poiBuilder.append(TimestampUtil.time()).append(",").append("onDestroy"); - poiBuilder.append("\r\n"); - FileUtils.writeFile(logFile.getAbsolutePath(), poiBuilder.toString(), true); + if (poiBuilder != null) { + poiBuilder.append(TimestampUtil.time()).append(",").append("onDestroy"); + poiBuilder.append("\r\n"); + FileUtils.writeFile(logFile.getAbsolutePath(), poiBuilder.toString(), true); + } } private void initEndReceiveTask(String url, PoiEntity poiEntity) { if (poiEntity.getTaskId() == 0) { - ToastUtils.Message(getActivity(), "无此任务"); + ToastUtils.Message(getActivity(), "无此任务"); return; } showLoadingDialog(); @@ -1280,7 +1284,7 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe } else if (response.getCode() == 230) { FlushTokenUtil.flushToken(getActivity()); } else { - ToastUtils.Message(getActivity(), response.getMessage()); + ToastUtils.Message(getActivity(), response.getMessage()); } } @@ -1290,9 +1294,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")) { - ToastUtils.Message(getActivity(), "请求超时"); + ToastUtils.Message(getActivity(), "请求超时"); } else { - ToastUtils.Message(getActivity(), message); + 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 0cee954..abc20ff 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/PoiTaskFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/PoiTaskFragment.java @@ -44,8 +44,7 @@ import java.util.List; import java.util.Objects; /** - * - * 记录-已提交-poi任务列表 + * 记录-已提交-任务列表 */ public class PoiTaskFragment extends BaseFragment implements View.OnClickListener { private XRecyclerView poiTaskXrv; @@ -101,6 +100,7 @@ public class PoiTaskFragment extends BaseFragment implements View.OnClickListene page = 1; initWork(type, true); } + @Override public void onLoadMore() { initWork(type, false); @@ -170,7 +170,7 @@ public class PoiTaskFragment extends BaseFragment implements View.OnClickListene } else if (hasSubmitBean.getCode() == 230) { FlushTokenUtil.flushToken(getActivity()); } else { - ToastUtils.Message(getActivity(), hasSubmitBean.getMessage()); + ToastUtils.Message(getActivity(), hasSubmitBean.getMessage()); } } @@ -179,10 +179,10 @@ public class PoiTaskFragment extends BaseFragment implements View.OnClickListene 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); + if (message.equals("timeout") || message.equals("Read time out")) { + ToastUtils.Message(getActivity(), "请求超时"); + } else { + ToastUtils.Message(getActivity(), message); } } }); @@ -195,7 +195,7 @@ public class PoiTaskFragment extends BaseFragment implements View.OnClickListene listBeans.clear(); } if (hasSubmitBean.getBody().getList() == null) { - ToastUtils.Message(getActivity(), "没有相关数据"); + ToastUtils.Message(getActivity(), "没有相关数据"); } else { listBeans.addAll(hasSubmitBean.getBody().getList()); page++; @@ -213,7 +213,7 @@ public class PoiTaskFragment extends BaseFragment implements View.OnClickListene } } } else { - ToastUtils.Message(getActivity(), hasSubmitBean.getMessage()); + ToastUtils.Message(getActivity(), hasSubmitBean.getMessage()); Log.d("TAG", "" + hasSubmitBean.getMessage()); } } @@ -241,9 +241,11 @@ public class PoiTaskFragment extends BaseFragment implements View.OnClickListene @Override public void onDestroy() { super.onDestroy(); - poiTaskBuilder.append(TimestampUtil.time()).append(",").append("onDestroy"); - poiTaskBuilder.append("\r\n"); - FileUtils.writeFile(logFile.getAbsolutePath(), poiTaskBuilder.toString(), true); + if (poiTaskBuilder != null) { + poiTaskBuilder.append(TimestampUtil.time()).append(",").append("onDestroy"); + 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 d509460..373f849 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/PoiVideoFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/PoiVideoFragment.java @@ -79,8 +79,7 @@ import java.util.List; import java.util.Objects; /** - * - * 寻宝-点击上传弹窗-poi录像 + * 寻宝-上报弹窗-poi录像 */ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClickListener { private EditText etRoadName, etDesc; @@ -93,6 +92,7 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick private TextView tvCombo, tvShort; private StringBuilder poiVideoBuilder; private LatLng rearLatLng; + private boolean booleanExtra = true; public static PoiVideoFragment newInstance(Bundle bundle) { PoiVideoFragment fragment = new PoiVideoFragment(); @@ -159,7 +159,7 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick @Override public boolean onClick(BaseDialog baseDialog, View v) { poiVideoBuilder.append(TimestampUtil.time()).append(",").append("点击了返回当前页面的 确定 按钮,"); - if (showPoiEntity!=null){ + if (showPoiEntity != null) { if (showPoiEntity.getId() != null) { List fileListByUUID = AWMp4ParserHelper.getInstance().getFileListByUUID(showPoiEntity.getId()); for (int i = 0; i < fileListByUUID.size(); i++) { @@ -364,11 +364,9 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick } fmPoiVideoPic.setTag(fileListByUUID); } - } - //判断是否是已做完任务并保存成功 - assert showPoiEntity != null; - if (showPoiEntity.getTaskStatus() == 3) { - disables();//禁用所有可操作的控件 + if (showPoiEntity.getTaskStatus() == 3) { + disables();//禁用所有可操作的控件 + } } } @@ -425,7 +423,7 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick photoAlbumIntent.putExtra("showPoiEntity", showPoiEntity); startActivity(photoAlbumIntent); } else { - ToastUtils.Message(getActivity(),"请拍摄"); + ToastUtils.Message(getActivity(), "请拍摄"); } break; case R.id.btn_poi_video_save: @@ -441,12 +439,12 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick double rearGeometry = GeometryTools.distanceToDouble(startLatLng, rearLatLng);//終點于用戶的距離 if (geometry > rearGeometry) {//用戶在终点开始作业 if (rearGeometry > 5000) { - ToastUtils.Message(getActivity(), "用户距离作业终点五公里以内才能拍摄"); + ToastUtils.Message(getActivity(), "用户距离作业终点五公里以内才能拍摄"); return; } } else {//用户在起点开始作业 if (geometry > 5000) { - ToastUtils.Message(getActivity(), "用户距离作业终点五公里以内才能拍摄"); + ToastUtils.Message(getActivity(), "用户距离作业终点五公里以内才能拍摄"); return; } } @@ -456,6 +454,12 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick intents.putExtra(Constant.INTENT_TYPE, showPoiEntity.getType()); intents.putExtra(Constant.INTENT_GEO_WKT, showPoiEntity.getGeoWkt()); intents.putExtra(Constant.INTENT_DETAIL, showPoiEntity.getDetail()); + int gpsRssi = Constant.currentLocation.getGPSRssi(); + if (gpsRssi == 0) { + intents.putExtra(Constant.INTENT_BOOLEAN, false); + } else { + intents.putExtra(Constant.INTENT_BOOLEAN, true); + } startActivityForResult(intents, 0x101); break; case R.id.tv_combo://自动连拍: @@ -465,12 +469,12 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick double rearGeom = GeometryTools.distanceToDouble(startLng, rearLatLng); if (geom > rearGeom) {//用戶在终点开始作业 if (rearGeom > 5000) { - ToastUtils.Message(getActivity(), "用户距离作业终点五公里以内才能拍摄"); + ToastUtils.Message(getActivity(), "用户距离作业终点五公里以内才能拍摄"); return; } } else {//用户在起点开始作业 if (geom > 5000) { - ToastUtils.Message(getActivity(), "用户距离作业终点五公里以内才能拍摄"); + ToastUtils.Message(getActivity(), "用户距离作业终点五公里以内才能拍摄"); return; } } @@ -480,6 +484,12 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick intent.putExtra(Constant.INTENT_TYPE, showPoiEntity.getType()); intent.putExtra(Constant.INTENT_GEO_WKT, showPoiEntity.getGeoWkt()); intent.putExtra(Constant.INTENT_DETAIL, showPoiEntity.getDetail()); + int gpsRss = Constant.currentLocation.getGPSRssi(); + if (gpsRss == 0) { + intent.putExtra(Constant.INTENT_BOOLEAN, false); + } else { + intent.putExtra(Constant.INTENT_BOOLEAN, true); + } startActivityForResult(intent, 0x102); break; case R.id.btn_poi_video_upload: @@ -516,7 +526,7 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick @Override public void run() { fileZip.delete(); - ToastUtils.Message(getActivity(), "压缩文件失败,请重新提交"); + ToastUtils.Message(getActivity(), "压缩文件失败,请重新提交"); } }); } @@ -525,11 +535,11 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick }).start(); } else { dismissLoadingDialog(); - ToastUtils.Message(getActivity(), "请录像"); + ToastUtils.Message(getActivity(), "请录像"); return; } } else { - ToastUtils.Message(getActivity(), "该任务正在提交中"); + ToastUtils.Message(getActivity(), "该任务正在提交中"); } break; } @@ -545,7 +555,7 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick PoiEntity poiEntity = initPoiEntityByUI(showPoiEntity); PoiCheckResult poiCheckResult = checkPoiEntity(poiEntity); if (poiCheckResult.getCode() == 1) { - ToastUtils.Message(getActivity(), poiCheckResult.getMsg()); + ToastUtils.Message(getActivity(), poiCheckResult.getMsg()); return; } poiEntity.setTaskStatus(2); @@ -569,14 +579,14 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick } }).start(); } else { - ToastUtils.Message(getActivity(), "没有申请权限，请手动申请"); + ToastUtils.Message(getActivity(), "没有申请权限，请手动申请"); } } @Override public void onDenied(List permissions, boolean never) { if (never) { - ToastUtils.Message(getActivity(), "被永久拒绝授权，请手动授予权限"); + ToastUtils.Message(getActivity(), "被永久拒绝授权，请手动授予权限"); // 如果是被永久拒绝就跳转到应用权限系统设置页面 XXPermissions.startPermissionActivity(Objects.requireNonNull(getActivity()), permissions); } @@ -609,11 +619,11 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick private void poiVideoUpload(int poiVideoBody, File fileZip) { if (poiVideoBody == 0) { - ToastUtils.Message(getActivity(), "请先保存本地在上传"); + ToastUtils.Message(getActivity(), "请先保存本地在上传"); return; } if (fileZip == null) { - ToastUtils.Message(getActivity(), "未压缩完成"); + ToastUtils.Message(getActivity(), "未压缩完成"); return; } HttpParams httpParams = new HttpParams(); @@ -676,12 +686,12 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick } }).start(); } else { - ToastUtils.Message(getActivity(), poiVideoBean.getMessage()); + ToastUtils.Message(getActivity(), poiVideoBean.getMessage()); } } else if (poiVideoBean.getCode() == 230) { FlushTokenUtil.flushToken(getActivity()); } else { - ToastUtils.Message(getActivity(), poiVideoBean.getMessage()); + ToastUtils.Message(getActivity(), poiVideoBean.getMessage()); } } @@ -691,7 +701,7 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick String message = e.getMessage(); assert message != null; if (message.equals("timeout") || message.equals("Read time out")) { - ToastUtils.Message(getActivity(), "请求超时"); + ToastUtils.Message(getActivity(), "请求超时"); } else { ToastUtils.Message(getActivity(), message); } @@ -705,6 +715,7 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick if (requestCode == 0x101 && resultCode == 0x111) { if (data != null && data.hasExtra(Constant.INTENT_PICTURES_PATH)) { String videoPath = data.getStringExtra(Constant.INTENT_PICTURES_PATH); + booleanExtra = data.getBooleanExtra(Constant.INTENT_BOOLEAN, true); assert videoPath != null; File videoFile = new File(videoPath); if (videoFile.exists()) { @@ -761,13 +772,15 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick if (markerPoiVideo != null) { markerPoiVideo.remove(); } - poiVideoBuilder.append(TimestampUtil.time()).append(",").append("onDestroy "); - poiVideoBuilder.append("\r\n"); - FileUtils.writeFile(logFile.getAbsolutePath(), poiVideoBuilder.toString(), true); + if (poiVideoBuilder != null) { + poiVideoBuilder.append(TimestampUtil.time()).append(",").append("onDestroy "); + poiVideoBuilder.append("\r\n"); + FileUtils.writeFile(logFile.getAbsolutePath(), poiVideoBuilder.toString(), true); + } } private void initEndReceiveTask(String url, PoiEntity poiEntity) { - if (poiEntity==null){ + if (poiEntity == null) { ToastUtils.Message(getActivity(), "无此任务"); return; } @@ -811,7 +824,7 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick } else if (response.getCode() == 230) { FlushTokenUtil.flushToken(getActivity()); } else { - ToastUtils.Message(getActivity(), response.getMessage()); + ToastUtils.Message(getActivity(), response.getMessage()); } } @@ -821,9 +834,9 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick String message = e.getMessage(); assert message != null; if (message.equals("timeout") || message.equals("Read time out")) { - ToastUtils.Message(getActivity(), "请求超时"); + ToastUtils.Message(getActivity(), "请求超时"); } else { - ToastUtils.Message(getActivity(), message); + ToastUtils.Message(getActivity(), message); } } }); @@ -875,13 +888,26 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick List fileListByUUID = AWMp4ParserHelper.getInstance().getFileListByUUID(showPoiEntity.getId()); if (fileListByUUID != null) { fmPoiVideoPic.setTag(fileListByUUID); - List lineStringByFileList = AWMp4ParserHelper.getInstance().getLinePhotoByList(fileListByUUID); - String lineString = Geohash.getInstance().encodeList(lineStringByFileList); + if (booleanExtra) { + List lineStringByFileList = AWMp4ParserHelper.getInstance().getLinePhotoByList(fileListByUUID); + if (lineStringByFileList != null) { + String lineString = Geohash.getInstance().encodeList(lineStringByFileList); + if (lineString != null) { + poiEntity.setDetail(lineString); + } + } + } else { + List lineStringByFileList = AWMp4ParserHelper.getInstance().getGpsLineByList(fileListByUUID); + if (lineStringByFileList != null) { + String lineString = Geohash.getInstance().encodeList(lineStringByFileList); + if (lineString != null) { + poiEntity.setDetail(lineString); + } + } + } String photoStr = AWMp4ParserHelper.getInstance().getVideoFileListStr(fileListByUUID); poiEntity.setPhoto(photoStr); - if (lineString != null) { - poiEntity.setDetail(lineString); - } + } } 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 450f2c6..0e7ddb9 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/PrivilegeFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/PrivilegeFragment.java @@ -10,7 +10,7 @@ import com.navinfo.outdoor.base.BaseFragment; import java.util.Objects; /** - * 我的等级页面的fragment + * 我的-等级页面的fragment */ public class PrivilegeFragment extends BaseFragment implements View.OnClickListener { 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 638001e..9b3910a 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/RecordFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/RecordFragment.java @@ -25,7 +25,6 @@ import java.util.Objects; /** * 记录的Fragment - * 2021-5-25 */ public class RecordFragment extends BaseFragment { 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 864dea3..2a513e5 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/RegisterFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/RegisterFragment.java @@ -46,7 +46,7 @@ import java.util.Objects; /** - * 注册页面 + * 登录-注册页面 */ public class RegisterFragment extends BaseFragment implements View.OnClickListener { private EditText etRegisterPhone, etRegisterNote, etRegisterPaw, etRegisterConfirmPaw; @@ -56,7 +56,7 @@ public class RegisterFragment extends BaseFragment implements View.OnClickListen private CheckBox ivRegisterCheck; private File logFile; private StringBuilder registerBuilder; - private EditText etRegisterReferrer; + public static RegisterFragment newInstance(Bundle bundle) { RegisterFragment fragment = new RegisterFragment(); @@ -78,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); - etRegisterReferrer = findViewById(R.id.et_register_referrer); + EditText 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); @@ -134,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())) { - ToastUtils.Message(getActivity(), "手机号错误，请重新输入"); + ToastUtils.Message(getActivity(), "手机号错误，请重新输入"); return; } initGetNote(); @@ -150,7 +150,7 @@ public class RegisterFragment extends BaseFragment implements View.OnClickListen timer.cancel(); timer = null; } - ToastUtils.Message(getActivity(), "请输入手机号"); + ToastUtils.Message(getActivity(), "请输入手机号"); return; } else { httpParams.put("mobile", mobile); @@ -171,9 +171,9 @@ public class RegisterFragment extends BaseFragment implements View.OnClickListen if (response.getCode() == 200) { sessionId = response.getBody(); registerNote(); - ToastUtils.Message(getActivity(), "验证码已发送"); + ToastUtils.Message(getActivity(), "验证码已发送"); } else { - ToastUtils.Message(getActivity(), response.getMessage()); + ToastUtils.Message(getActivity(), response.getMessage()); } } @@ -183,9 +183,9 @@ public class RegisterFragment extends BaseFragment implements View.OnClickListen String message = e.getMessage(); assert message != null; if (message.equals("timeout") || message.equals("Read time out")) { - ToastUtils.Message(getActivity(), "请求超时"); + ToastUtils.Message(getActivity(), "请求超时"); } else { - ToastUtils.Message(getActivity(), message); + ToastUtils.Message(getActivity(), message); } } }); @@ -195,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)) { - ToastUtils.Message(getActivity(), "手机号错误"); + ToastUtils.Message(getActivity(), "手机号错误"); return; } else { httpParams.put("mobile", mobile); } String code = etRegisterNote.getText().toString().trim(); if (code.equals("")) { - ToastUtils.Message(getActivity(), "请获取短信验证码"); + ToastUtils.Message(getActivity(), "请获取短信验证码"); return; } else { httpParams.put("code", code); } String password = etRegisterPaw.getText().toString().trim(); if (password.equals("")) { - ToastUtils.Message(getActivity(), "请输入密码"); + ToastUtils.Message(getActivity(), "请输入密码"); return; } else { try { @@ -220,21 +220,21 @@ public class RegisterFragment extends BaseFragment implements View.OnClickListen } String conFirmPaw = etRegisterConfirmPaw.getText().toString().trim(); if (conFirmPaw.equals("")) { - ToastUtils.Message(getActivity(), "请输入确认密码"); + ToastUtils.Message(getActivity(), "请输入确认密码"); return; } if (!conFirmPaw.equals(password)) { - ToastUtils.Message(getActivity(), "密码和确认密码请保持一致"); + ToastUtils.Message(getActivity(), "密码和确认密码请保持一致"); return; } if (sessionId == null || sessionId.equals("")) { - ToastUtils.Message(getActivity(), "请短信获取验证码"); + ToastUtils.Message(getActivity(), "请短信获取验证码"); return; } else { httpParams.put("sessionId", sessionId); } if (!ivRegisterCheck.isChecked()) { - ToastUtils.Message(getActivity(), "请先同意用户协议"); + ToastUtils.Message(getActivity(), "请先同意用户协议"); return; } long time = System.currentTimeMillis(); @@ -252,7 +252,7 @@ public class RegisterFragment extends BaseFragment implements View.OnClickListen public void onSuccess(UserBean response, int id) { dismissLoadingDialog(); if (response.getCode() == 200) { - ToastUtils.Message(getActivity(), "注册成功"); + ToastUtils.Message(getActivity(), "注册成功"); Constant.USER_NAME = mobile; Constant.PASS_WORD = password; Message obtain = Message.obtain(); @@ -261,7 +261,7 @@ public class RegisterFragment extends BaseFragment implements View.OnClickListen EventBus.getDefault().post(obtain); Objects.requireNonNull(getActivity()).finish(); } else { - ToastUtils.Message(getActivity(), response.getMessage()); + ToastUtils.Message(getActivity(), response.getMessage()); } } @@ -276,9 +276,9 @@ public class RegisterFragment extends BaseFragment implements View.OnClickListen String message = e.getMessage(); assert message != null; if (message.contains("timeout") || message.contains("Read time out")) { - ToastUtils.Message(getActivity(), "请求超时"); + ToastUtils.Message(getActivity(), "请求超时"); } else { - ToastUtils.Message(getActivity(), message); + ToastUtils.Message(getActivity(), message); } } }); @@ -320,9 +320,11 @@ public class RegisterFragment extends BaseFragment implements View.OnClickListen @Override public void onDestroy() { super.onDestroy(); - registerBuilder.append(TimestampUtil.time()).append(",").append("onDestroy"); - registerBuilder.append("\r\n"); - FileUtils.writeFile(logFile.getAbsolutePath(), registerBuilder.toString(), true); + if (registerBuilder != null) { + registerBuilder.append(TimestampUtil.time()).append(",").append("onDestroy"); + registerBuilder.append("\r\n"); + FileUtils.writeFile(logFile.getAbsolutePath(), registerBuilder.toString(), true); + } } } \ No newline at end of file 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 39fab0a..78905ca 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/RoadFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/RoadFragment.java @@ -88,11 +88,12 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList private EditText etRoadName, etDesc; private ImageView ivRoadPicture; private Button btnRoadSave; - private File fileZip,logFile; + private File fileZip, logFile; private FrameLayout fmRoadPic; private Marker markerRoad; - private LatLng latLng,rearLatLng; + private LatLng latLng, rearLatLng; private StringBuilder roadBuilder; + private boolean booleanExtra = true; public static RoadFragment newInstance(Bundle bundle) { RoadFragment fragment = new RoadFragment(); @@ -444,7 +445,7 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList photoAlbumIntent.putExtra("showPoiEntity", showPoiEntity); startActivity(photoAlbumIntent); } else { - ToastUtils.Message(getActivity(), "请拍摄"); + ToastUtils.Message(getActivity(), "请拍摄"); } break; case R.id.tv_pictures: @@ -456,12 +457,12 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList double rearGeometry = GeometryTools.distanceToDouble(startLatLng, rearLatLng); if (geometry > rearGeometry) {//用戶在终点开始作业 if (rearGeometry > 5000) { - ToastUtils.Message(getActivity(), "用户距离作业终点五公里以内才能拍摄"); + ToastUtils.Message(getActivity(), "用户距离作业终点五公里以内才能拍摄"); return; } } else {//用户在起点开始作业 if (geometry > 5000) { - ToastUtils.Message(getActivity(), "用户距离作业终点五公里以内才能拍摄"); + ToastUtils.Message(getActivity(), "用户距离作业终点五公里以内才能拍摄"); return; } } @@ -471,6 +472,12 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList intent.putExtra(Constant.INTENT_TYPE, showPoiEntity.getType()); intent.putExtra(Constant.INTENT_GEO_WKT, showPoiEntity.getGeoWkt()); intent.putExtra(Constant.INTENT_DETAIL, showPoiEntity.getDetail()); + int gpsRssi = Constant.currentLocation.getGPSRssi(); + if (gpsRssi == 0) { + intent.putExtra(Constant.INTENT_BOOLEAN, false); + } else { + intent.putExtra(Constant.INTENT_BOOLEAN, true); + } startActivityForResult(intent, 0x101); break; case R.id.road_upload: @@ -507,21 +514,20 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList @Override public void run() { fileZip.delete(); - ToastUtils.Message(getActivity(),"压缩文件失败,请重新提交"); + ToastUtils.Message(getActivity(), "压缩文件失败,请重新提交"); } }); } - } } }).start(); } else { dismissLoadingDialog(); - ToastUtils.Message(getActivity(), "请录像"); + ToastUtils.Message(getActivity(), "请录像"); return; } } else { - ToastUtils.Message(getActivity(), "该任务正在提交中"); + ToastUtils.Message(getActivity(), "该任务正在提交中"); } break; } @@ -558,13 +564,14 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList } }).start(); } else { - ToastUtils.Message(getActivity(), "没有申请权限，请手动申请"); + ToastUtils.Message(getActivity(), "没有申请权限，请手动申请"); } } + @Override public void onDenied(List permissions, boolean never) { if (never) { - ToastUtils.Message(getActivity(), "被永久拒绝授权，请手动授予权限"); + ToastUtils.Message(getActivity(), "被永久拒绝授权，请手动授予权限"); // 如果是被永久拒绝就跳转到应用权限系统设置页面 XXPermissions.startPermissionActivity(Objects.requireNonNull(getActivity()), permissions); } @@ -594,14 +601,13 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList } } - private void poiVideoUpload(int body, File fileZip) { if (body == 0) { - ToastUtils.Message(getActivity(), "请先保存本地上传"); + ToastUtils.Message(getActivity(), "请先保存本地上传"); return; } if (fileZip == null) { - ToastUtils.Message(getActivity(), "未压缩完成"); + ToastUtils.Message(getActivity(), "未压缩完成"); return; } HttpParams httpParams = new HttpParams(); @@ -665,12 +671,12 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList } }).start(); } else { - ToastUtils.Message(getActivity(), roadSaveBean.getMessage()); + ToastUtils.Message(getActivity(), roadSaveBean.getMessage()); } } else if (roadSaveBean.getCode() == 230) { FlushTokenUtil.flushToken(getActivity()); } else { - ToastUtils.Message(getActivity(), roadSaveBean.getMessage()); + ToastUtils.Message(getActivity(), roadSaveBean.getMessage()); } } @@ -680,7 +686,7 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList String message = e.getMessage(); assert message != null; if (message.equals("timeout") || message.equals("Read time out")) { - ToastUtils.Message(getActivity(), "请求超时"); + ToastUtils.Message(getActivity(), "请求超时"); } else { ToastUtils.Message(getActivity(), message); } @@ -696,6 +702,7 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList if (data != null && data.hasExtra(Constant.INTENT_PICTURES_PATH)) { // 扫描照片目录中当前视频的所有视频文件 String videoPath = data.getStringExtra(Constant.INTENT_PICTURES_PATH); + booleanExtra = data.getBooleanExtra(Constant.INTENT_BOOLEAN, true); assert videoPath != null; File videoFile = new File(videoPath); if (videoFile.exists()) { @@ -755,9 +762,11 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList if (markerRoad != null) { markerRoad.remove(); } - roadBuilder.append(TimestampUtil.time()).append(",").append("onDestroy"); - roadBuilder.append("\r\n"); - FileUtils.writeFile(logFile.getAbsolutePath(), roadBuilder.toString(), true); + if (roadBuilder != null) { + roadBuilder.append(TimestampUtil.time()).append(",").append("onDestroy"); + roadBuilder.append("\r\n"); + FileUtils.writeFile(logFile.getAbsolutePath(), roadBuilder.toString(), true); + } } private void initEndReceiveTask(String url, PoiEntity poiEntity) { @@ -801,7 +810,7 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList } else if (response.getCode() == 230) { FlushTokenUtil.flushToken(getActivity()); } else { - ToastUtils.Message(getActivity(), response.getMessage()); + ToastUtils.Message(getActivity(), response.getMessage()); } } @@ -813,7 +822,7 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList if (message.equals("timeout") || message.equals("Read time out")) { ToastUtils.Message(getActivity(), "请求超时"); } else { - ToastUtils.Message(getActivity(), message); + ToastUtils.Message(getActivity(), message); } } }); @@ -866,13 +875,25 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList List fileListByUUID = AWMp4ParserHelper.getInstance().getFileListByUUID(showPoiEntity.getId()); if (fileListByUUID != null) { fmRoadPic.setTag(fileListByUUID); - List lineStringByFileList = AWMp4ParserHelper.getInstance().getLinePhotoByList(fileListByUUID); - String encodeList = Geohash.getInstance().encodeList(lineStringByFileList); + if (booleanExtra) {//true + List lineStringByFileList = AWMp4ParserHelper.getInstance().getLinePhotoByList(fileListByUUID); + if (lineStringByFileList != null) { + String encodeList = Geohash.getInstance().encodeList(lineStringByFileList); + if (encodeList != null) { + poiEntity.setDetail(encodeList); + } + } + } else { + List lineStringByFileList = AWMp4ParserHelper.getInstance().getGpsLineByList(fileListByUUID); + if (lineStringByFileList != null) { + String lineString = Geohash.getInstance().encodeList(lineStringByFileList); + if (lineString != null) { + poiEntity.setDetail(lineString); + } + } + } String photoStr = AWMp4ParserHelper.getInstance().getVideoFileListStr(fileListByUUID); poiEntity.setPhoto(photoStr); - if (encodeList != null) { - poiEntity.setDetail(encodeList); - } } } return poiEntity; diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/RoadTaskFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/RoadTaskFragment.java deleted file mode 100644 index edbf3e5..0000000 --- a/app/src/main/java/com/navinfo/outdoor/fragment/RoadTaskFragment.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.navinfo.outdoor.fragment; - -import android.os.Bundle; - -import androidx.fragment.app.Fragment; - -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; - -import com.navinfo.outdoor.R; -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; - } - - @Override - protected void initView() { - super.initView(); - } - - @Override - protected void initData() { - super.initData(); - } - - @Override - 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 7e4be8f..9fc46fa 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/SetFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/SetFragment.java @@ -18,7 +18,7 @@ import com.navinfo.outdoor.base.BaseFragment; import java.util.Objects; /** - * 设置页面的fragment + * 我的-设置页面的fragment */ public class SetFragment extends BaseFragment implements View.OnClickListener { 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 a4e2f83..4761d16 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/StaySubmitFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/StaySubmitFragment.java @@ -309,7 +309,6 @@ public class StaySubmitFragment extends BaseFragment implements View.OnClickList } else { ToastUtils.Message(getActivity(), "有正在提交的数据，等提交成功后，方可操作"); } - break; case R.id.btn_stay_submit://提交 staySubmitBuilder.append(TimestampUtil.time()).append(",").append("点击了提交的按钮 ,"); @@ -479,8 +478,10 @@ public class StaySubmitFragment extends BaseFragment implements View.OnClickList EventBus.getDefault().unregister(this); super.onDestroy(); dismissLoadingDialog(); - staySubmitBuilder.append(TimestampUtil.time()).append(",").append("onDestroy"); - staySubmitBuilder.append("\r\n"); - FileUtils.writeFile(logFile.getAbsolutePath(), staySubmitBuilder.toString(), true); + if (staySubmitBuilder!=null) { + staySubmitBuilder.append(TimestampUtil.time()).append(",").append("onDestroy"); + staySubmitBuilder.append("\r\n"); + FileUtils.writeFile(logFile.getAbsolutePath(), staySubmitBuilder.toString(), true); + } } } \ No newline at end of file diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/TaskExWebFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/TaskExWebFragment.java deleted file mode 100644 index 87ad55a..0000000 --- a/app/src/main/java/com/navinfo/outdoor/fragment/TaskExWebFragment.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.navinfo.outdoor.fragment; - -import android.os.Bundle; -import android.view.View; - -import com.navinfo.outdoor.R; -import com.navinfo.outdoor.base.BaseFragment; - -/** - * 发现-任务说明的Item点击进入Web页面 - */ -public class TaskExWebFragment extends BaseFragment implements View.OnClickListener { - - public static TaskExWebFragment newInstance(Bundle bundle) { - TaskExWebFragment fragment = new TaskExWebFragment(); - fragment.setArguments(bundle); - return fragment; - } - - @Override - protected int getLayout() { - return R.layout.fragment_task_ex_web; - } - - @Override - protected void initView() { - super.initView(); - } - - @Override - protected void initData() { - super.initData(); - } - - @Override - 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 1f220bc..06bb2bb 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/TaskExplainFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/TaskExplainFragment.java @@ -70,31 +70,26 @@ public class TaskExplainFragment extends BaseFragment implements View.OnClickLis ImageView ivFindTaskExplain = findViewById(R.id.iv_find_task_explain); taskExplainRecycle = findViewById(R.id.task_explain_recycler); ivFindTaskExplain.setOnClickListener(this); - taskExplainRecycle.setLayoutManager(new LinearLayoutManager(getActivity())); //下划线 // taskExplainRecycle.addItemDecoration(new DividerItemDecoration(getActivity(), DividerItemDecoration.VERTICAL)); - taskExplainRecycle.setRefreshProgressStyle(ProgressStyle.BallSpinFadeLoader); taskExplainRecycle.setLoadingMoreProgressStyle(ProgressStyle.BallRotate); //取消上啦加载下拉刷新 -// taskExplainRecycle.setPullRefreshEnabled(false); -// taskExplainRecycle.setLoadingMoreEnabled(false); +// taskExplainRecycle.setPullRefreshEnabled(false); +// taskExplainRecycle.setLoadingMoreEnabled(false); taskExplainAdapter = new TaskExplainAdapter(explainList, getActivity()); taskExplainRecycle.setAdapter(taskExplainAdapter); taskExplainRecycle.setLoadingListener(new XRecyclerView.LoadingListener() { - @Override public void onRefresh() { taskPage = 1; initNetWork(true); } - @Override public void onLoadMore() { initNetWork(false); } - }); taskExplainAdapter.setOnItemClick(new TaskExplainAdapter.OnItemClick() { @Override @@ -195,7 +190,6 @@ public class TaskExplainFragment extends BaseFragment implements View.OnClickLis } else { if (taskPrefectureBean.getBody().getList() == null) { taskExplainRecycle.setNoMore(true); - } else { explainList.addAll(taskPrefectureBean.getBody().getList()); taskExplainAdapter.notifyDataSetChanged(); @@ -232,9 +226,11 @@ public class TaskExplainFragment extends BaseFragment implements View.OnClickLis @Override public void onDestroy() { super.onDestroy(); - taskExplainBuilder.append(TimestampUtil.time()).append(",").append("onDestroy"); - taskExplainBuilder.append("\r\n"); - FileUtils.writeFile(logFile.getAbsolutePath(), taskExplainBuilder.toString(), true); + if (taskExplainBuilder!=null) { + taskExplainBuilder.append(TimestampUtil.time()).append(",").append("onDestroy"); + 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 8bef970..037d97e 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/TaskExplainFragment2.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/TaskExplainFragment2.java @@ -2,26 +2,21 @@ package com.navinfo.outdoor.fragment; import android.annotation.SuppressLint; import android.content.Context; -import android.content.Intent; import android.content.SharedPreferences; import android.os.Bundle; import android.util.Log; import android.view.View; import android.widget.ImageView; -import android.widget.Toast; -import androidx.recyclerview.widget.DividerItemDecoration; import androidx.recyclerview.widget.LinearLayoutManager; import com.github.lazylibrary.util.FileUtils; import com.lzy.okgo.model.HttpParams; import com.navinfo.outdoor.R; -import com.navinfo.outdoor.activity.WebActivity; import com.navinfo.outdoor.adapter.TaskExplainAdapter2; import com.navinfo.outdoor.api.Constant; import com.navinfo.outdoor.base.BaseFragment; -import com.navinfo.outdoor.bean.TaskExplainInfo; import com.navinfo.outdoor.bean.TaskPrefectureBean; import com.navinfo.outdoor.http.Callback; import com.navinfo.outdoor.http.HttpInterface; @@ -32,8 +27,6 @@ import com.navinfo.outdoor.util.FlushTokenUtil; import com.navinfo.outdoor.util.TimestampUtil; import com.navinfo.outdoor.util.ToastUtils; -import org.json.JSONObject; - import java.io.File; import java.text.DateFormat; import java.text.SimpleDateFormat; @@ -44,7 +37,7 @@ import java.util.List; import java.util.Objects; /** - * 发现页面的任务说明的点击条目跳转第二个页面 + * 发现-任务说明-操作说明 */ public class TaskExplainFragment2 extends BaseFragment implements View.OnClickListener { private XRecyclerView taskExplain2Recycler; @@ -62,7 +55,7 @@ public class TaskExplainFragment2 extends BaseFragment implements View.OnClickLi @Override protected int getLayout() { - return R.layout.fragment_task_explain2; + return R.layout.task_explains_fragment; } @Override @@ -158,7 +151,7 @@ public class TaskExplainFragment2 extends BaseFragment implements View.OnClickLi } else if (response.getCode() == 230) { FlushTokenUtil.flushToken(getActivity()); } else { - ToastUtils.Message(getActivity(), response.getMessage() ); + ToastUtils.Message(getActivity(), response.getMessage()); } Log.d("TAG", "onSuccess: " + response.getMessage() + ""); } @@ -169,9 +162,9 @@ public class TaskExplainFragment2 extends BaseFragment implements View.OnClickLi String message = e.getMessage(); assert message != null; if (message.equals("timeout") || message.equals("Read time out")) { - ToastUtils.Message(getActivity(),"请求超时"); + ToastUtils.Message(getActivity(), "请求超时"); } else { - ToastUtils.Message(getActivity(),message); + ToastUtils.Message(getActivity(), message); } } }); @@ -184,7 +177,7 @@ public class TaskExplainFragment2 extends BaseFragment implements View.OnClickLi explainList.clear(); } if (taskPrefectureBean.getBody().getList() == null) { - ToastUtils.Message(getActivity(),"没有相关数据"); + ToastUtils.Message(getActivity(), "没有相关数据"); } else { explainList.addAll(taskPrefectureBean.getBody().getList()); taskExplainPage++; @@ -202,7 +195,7 @@ public class TaskExplainFragment2 extends BaseFragment implements View.OnClickLi } } } else { - ToastUtils.Message(getActivity(),taskPrefectureBean.getMessage()); + ToastUtils.Message(getActivity(), taskPrefectureBean.getMessage()); Log.d("TAG", "" + taskPrefectureBean.getMessage()); } } @@ -230,9 +223,11 @@ public class TaskExplainFragment2 extends BaseFragment implements View.OnClickLi @Override public void onDestroy() { super.onDestroy(); - taskExplain2Builder.append(TimestampUtil.time()).append(",").append("onDestroy"); - taskExplain2Builder.append("\r\n"); - FileUtils.writeFile(logFile.getAbsolutePath(), taskExplain2Builder.toString(), true); + if (taskExplain2Builder != null) { + taskExplain2Builder.append(TimestampUtil.time()).append(",").append("onDestroy"); + 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 393d166..4d54ea4 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/TaskPrefectureFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/TaskPrefectureFragment.java @@ -147,15 +147,16 @@ 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.equals("timeout") || message.equals("Read time out")) { - ToastUtils.Message(getActivity(),"请求超时"); + ToastUtils.Message(getActivity(), "请求超时"); } else { - ToastUtils.Message(getActivity(),message); + ToastUtils.Message(getActivity(), message); } } }); @@ -168,7 +169,7 @@ public class TaskPrefectureFragment extends BaseFragment implements View.OnClick dataBeanList.clear(); } if (taskPrefectureBean.getBody().getList() == null) { - ToastUtils.Message(getActivity(),"没有相关数据"); + ToastUtils.Message(getActivity(), "没有相关数据"); } else { dataBeanList.addAll(taskPrefectureBean.getBody().getList()); taskPage++; @@ -188,7 +189,7 @@ public class TaskPrefectureFragment extends BaseFragment implements View.OnClick } else if (taskPrefectureBean.getCode() == 230) { FlushTokenUtil.flushToken(getActivity()); } else { - ToastUtils.Message(getActivity(),taskPrefectureBean.getMessage()); + ToastUtils.Message(getActivity(), taskPrefectureBean.getMessage()); Log.d("TAG", "" + taskPrefectureBean.getMessage()); } } @@ -216,8 +217,10 @@ public class TaskPrefectureFragment extends BaseFragment implements View.OnClick @Override public void onDestroy() { super.onDestroy(); - taskPrefectureBuilder.append(TimestampUtil.time()).append(",").append("onDestroy"); - taskPrefectureBuilder.append("\r\n"); - FileUtils.writeFile(logFile.getAbsolutePath(), taskPrefectureBuilder.toString(), true); + if (taskPrefectureBuilder != null) { + taskPrefectureBuilder.append(TimestampUtil.time()).append(",").append("onDestroy"); + taskPrefectureBuilder.append("\r\n"); + FileUtils.writeFile(logFile.getAbsolutePath(), taskPrefectureBuilder.toString(), true); + } } } diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/TreasureFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/TreasureFragment.java index be4010d..fe581e7 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/TreasureFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/TreasureFragment.java @@ -24,6 +24,7 @@ import android.widget.CompoundButton; import android.widget.FrameLayout; import android.widget.ImageView; import android.widget.TextView; + import androidx.annotation.NonNull; import androidx.appcompat.app.AlertDialog; import androidx.appcompat.app.AppCompatActivity; @@ -32,6 +33,7 @@ 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; @@ -293,17 +295,17 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen } private void initUM() { - if (Constant.NOTIFICATION!=null){ + if (Constant.NOTIFICATION != null) { NotificationBean notificationBean = new Gson().fromJson(Constant.NOTIFICATION, NotificationBean.class); NotificationBean.ExtraBean extra = notificationBean.getExtra(); - if (extra!=null){ + if (extra != null) { HashMap paramMap = new HashMap<>(); - paramMap.put("id", extra.getId()+ ""); + 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 { + } else { Intent messageIntent = new Intent(getActivity(), FragmentManagement.class); messageIntent.putExtra("tag", 35); startActivity(messageIntent); @@ -565,6 +567,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen /** * 网络删选接口 + * * @param tencentLocation location */ private void initList(TencentLocation tencentLocation) { @@ -842,6 +845,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen /** * geo 坐标点转成 + * * @param latLng lat */ public String initGeo(LatLng latLng) { @@ -863,6 +867,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen /** * marker 选中的状态 + * * @param poiEntity PoiEntity * @param aBoolean boolean */ @@ -1450,14 +1455,14 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen } else if (data.what == Constant.EVENT_WHAT_LOCATION_CHANGE) { // 用户位置更新 if (tencentMap != null) { TencentLocation tencentLocation = (TencentLocation) data.obj; - int gpsRssi = tencentLocation.getGPSRssi(); - if (gpsRssi == 0) { + int gasRabi = tencentLocation.getGPSRssi(); + if (gasRabi == 0) { tvTenantGaps.setText("信号强度：无信号"); - } else if (gpsRssi == 1) { + } else if (gasRabi == 1) { tvTenantGaps.setText("信号强度：弱"); - } else if (gpsRssi == 2) { + } else if (gasRabi == 2) { tvTenantGaps.setText("信号强度：中"); - } else if (gpsRssi == 3) { + } else if (gasRabi == 3) { tvTenantGaps.setText("信号强度：强"); } } @@ -1638,17 +1643,21 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen if (mapView != null) { mapView.onDestroy(); } - treasureBuilder.append(TimestampUtil.time()).append(",").append("onDestroy"); - treasureBuilder.append("\r\n"); + if (treasureBuilder != null) { + treasureBuilder.append(TimestampUtil.time()).append(",").append("onDestroy"); + treasureBuilder.append("\r\n"); + FileUtils.writeFile(logFile.getAbsolutePath(), treasureBuilder.toString(), true); + } //initLocation(); - FileUtils.writeFile(logFile.getAbsolutePath(), treasureBuilder.toString(), true); if (bigMarker != null) { bigMarker.remove(); } - for (int i = 0; i < removableScreenMarker.size(); i++) { - removableScreenMarker.get(i).remove(); + if (removableScreenMarker != null) { + for (int i = 0; i < removableScreenMarker.size(); i++) { + removableScreenMarker.get(i).remove(); + } + removableScreenMarker.clear(); } - removableScreenMarker.clear(); } @Override @@ -1671,8 +1680,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen case R.id.iv_location://定位: treasureBuilder.append(TimestampUtil.time()).append(",").append("点击了定位的按钮,"); if (Constant.currentLocation != null) { - CameraUpdate cameraSigma = - CameraUpdateFactory.newCameraPosition(new CameraPosition( + CameraUpdate cameraSigma = CameraUpdateFactory.newCameraPosition(new CameraPosition( new LatLng(Constant.currentLocation.getLatitude(), Constant.currentLocation.getLongitude()),//中心点坐标，地图目标经纬度 17,//目标缩放级别 0,//目标倾斜角[0.0 ~ 45.0] (垂直地图时为0) 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 4c915d7..70e451e 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/UserAttestationFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/UserAttestationFragment.java @@ -54,10 +54,10 @@ import java.util.regex.Pattern; import static android.app.Activity.RESULT_OK; /** - * 实名认证 + * 我的-用户资料-实名认证的fragment */ public class UserAttestationFragment extends BaseFragment implements View.OnClickListener { - private ImageView ivAttestation2, ivAttestation1,ivAttestation3, ivHera1,ivHera2,ivHera3,useCamera; + private ImageView ivAttestation2, ivAttestation1, ivAttestation3, ivHera1, ivHera2, ivHera3, useCamera; private EditText etAttestationName, etNamePhone; private TextView tvCard1, tvCard2, tvCard3; private File logFile; @@ -123,7 +123,7 @@ public class UserAttestationFragment extends BaseFragment implements View.OnClic Button btnAttestation = findViewById(R.id.btn_attestation); btnAttestation.setOnClickListener(this); LinearLayout linearHint = findViewById(R.id.linear_hint); - etAttestationName = findViewById(R.id.et_attestationName); + etAttestationName = findViewById(R.id.et_attestationName); etNamePhone = findViewById(R.id.et_namePhone); ivHera1 = findViewById(R.id.iv_hera1); tvCard1 = findViewById(R.id.tv_card1); @@ -220,15 +220,15 @@ public class UserAttestationFragment extends BaseFragment implements View.OnClic break; case R.id.btn_attestation: if (etAttestationName.getText().toString().equals("")) { - ToastUtils.Message(getActivity(),"姓名不能为空，请输入姓名"); + ToastUtils.Message(getActivity(), "姓名不能为空，请输入姓名"); return; } if (!chineseNameTest(etAttestationName.getText().toString())) { - ToastUtils.Message(getActivity(),"请输入中文名字"); + ToastUtils.Message(getActivity(), "请输入中文名字"); return; } if (checkNumber(etNamePhone.getText().toString().trim())) { - ToastUtils.Message(getActivity(),"身份证号错误，请重新输入"); + 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("")) { - ToastUtils.Message(getActivity(),"姓名不能为空，请输入姓名"); + ToastUtils.Message(getActivity(), "姓名不能为空，请输入姓名"); return; } if (checkNumber(etNamePhone.getText().toString().trim())) { - ToastUtils.Message(getActivity(),"身份证错误，请重新输入"); + ToastUtils.Message(getActivity(), "身份证错误，请重新输入"); return; } if (tvCard1.getTag() == null) { - ToastUtils.Message(getActivity(),"请拍照 身份证人像面"); + ToastUtils.Message(getActivity(), "请拍照 身份证人像面"); return; } if (tvCard2.getTag() == null) { - ToastUtils.Message(getActivity(),"请拍照 身份证国徽面"); + ToastUtils.Message(getActivity(), "请拍照 身份证国徽面"); return; } if (tvCard3.getTag() == null) { - ToastUtils.Message(getActivity(),"请拍照 手持身份证"); + 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 { - ToastUtils.Message(getActivity(),"提交失败！"); + 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")) { - ToastUtils.Message(getActivity(),"请求超时"); + ToastUtils.Message(getActivity(), "请求超时"); } else { - ToastUtils.Message(getActivity(),message); + 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("识别失败，可以重新识别或则进行手动输入 ,"); - ToastUtils.Message(getActivity(),"识别失败，可以重新识别或则进行手动输入"); + 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 { - ToastUtils.Message(getActivity(),"身份号识别失败，可以重新识别或则进行手动输入"); + ToastUtils.Message(getActivity(), "身份号识别失败，可以重新识别或则进行手动输入"); userAttestationBuilder.append(TimestampUtil.time()).append("身份号识别失败，可以重新识别或则进行手动输入 ,"); } if (idCardNumberBean.getWords_result().get姓名() != null) { @@ -438,18 +438,17 @@ public class UserAttestationFragment extends BaseFragment implements View.OnClic etAttestationName.setText(words); userAttestationBuilder.append(TimestampUtil.time()).append("姓名识别成功 ,"); } else { - ToastUtils.Message(getActivity(),"姓名识别失败，可以重新识别或则进行手动输入"); + ToastUtils.Message(getActivity(), "姓名识别失败，可以重新识别或则进行手动输入"); userAttestationBuilder.append(TimestampUtil.time()).append("姓名识别失败，可以重新识别或则进行手动输入 ,"); } } } else { userAttestationBuilder.append(TimestampUtil.time()).append("识别失败，可以重新识别或则进行手动输入 ,"); - ToastUtils.Message(getActivity(),"识别失败，可以重新识别或则进行手动输入"); + ToastUtils.Message(getActivity(), "识别失败，可以重新识别或则进行手动输入"); } - } } else { - ToastUtils.Message(getActivity(),"请先拍照"); + ToastUtils.Message(getActivity(), "请先拍照"); } } } @@ -469,9 +468,11 @@ public class UserAttestationFragment extends BaseFragment implements View.OnClic @Override public void onDestroy() { super.onDestroy(); - userAttestationBuilder.append(TimestampUtil.time()).append("onDestroy"); - userAttestationBuilder.append("\r\n"); - FileUtils.writeFile(logFile.getAbsolutePath(), userAttestationBuilder.toString(), true); + if (userAttestationBuilder != null) { + userAttestationBuilder.append(TimestampUtil.time()).append("onDestroy"); + userAttestationBuilder.append("\r\n"); + FileUtils.writeFile(logFile.getAbsolutePath(), userAttestationBuilder.toString(), true); + } } } 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 a25b6f4..316975e 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/VideoFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/VideoFragment.java @@ -133,6 +133,7 @@ public class VideoFragment extends BaseFragment implements View.OnClickListener EventBus.getDefault().post(message); Objects.requireNonNull(getActivity()).finish(); break; + case R.id.tv_video_album_delete: if (fileBeans != null) { for (int i = 0; i < fileBeans.size(); i++) { @@ -142,6 +143,7 @@ public class VideoFragment extends BaseFragment implements View.OnClickListener ToastUtils.Message(getActivity(),"请选择要删除的数据后才可以删除"); } break; + } } 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 5170c89..2267915 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/WithdrawFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/WithdrawFragment.java @@ -43,7 +43,7 @@ import java.util.Date; import java.util.Objects; /** - * 提现页面的fragment + * 我的-提现页面的fragment */ public class WithdrawFragment extends BaseFragment implements View.OnClickListener { private TextView tvUnit, tvAlready, tvTotal, poiPushMoney, poiReportMoney, poiVideoPushMoney, poiVideoReportMoney, roadPushMoney, roadReportMoney, chargingPushMoney, chargingReportMoney, otherPushMoney, otherReportMoney; @@ -110,7 +110,7 @@ public class WithdrawFragment extends BaseFragment implements View.OnClickListen public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { if (isChecked) { if (Constant.BACKGROUND == null) { - ToastUtils.Message(getActivity(),"没有绑定银行卡，请先绑定银行卡"); + ToastUtils.Message(getActivity(), "没有绑定银行卡，请先绑定银行卡"); checkBox.setChecked(false); withdrawBuilder.append(TimestampUtil.time()).append(",").append("点击了银行卡的勾选,"); } else { @@ -182,7 +182,7 @@ public class WithdrawFragment extends BaseFragment implements View.OnClickListen } else if (response.getCode() == 230) { FlushTokenUtil.flushToken(getActivity()); } else { - ToastUtils.Message(getActivity(),response.getMessage()); + ToastUtils.Message(getActivity(), response.getMessage()); } Log.d("TAG", "onSuccess: " + response.toString()); } @@ -192,10 +192,10 @@ public class WithdrawFragment extends BaseFragment implements View.OnClickListen 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); + if (message.equals("timeout") || message.equals("Read time out")) { + ToastUtils.Message(getActivity(), "请求超时"); + } else { + ToastUtils.Message(getActivity(), message); } } }); @@ -221,15 +221,15 @@ public class WithdrawFragment extends BaseFragment implements View.OnClickListen if (!price.equals("")) { double aDouble = Double.parseDouble(price); if (aDouble < 10) { - ToastUtils.Message(getActivity(),"提现金额不能低于10元"); + ToastUtils.Message(getActivity(), "提现金额不能低于10元"); return; } } else { - ToastUtils.Message(getActivity(),"提现金额不能为空"); + ToastUtils.Message(getActivity(), "提现金额不能为空"); return; } if (!checkBox.isChecked()) { - ToastUtils.Message(getActivity(),"请勾选银行卡"); + ToastUtils.Message(getActivity(), "请勾选银行卡"); return; } if (Constant.BACKGROUND != null) { @@ -243,7 +243,7 @@ public class WithdrawFragment extends BaseFragment implements View.OnClickListen } }); } else { - ToastUtils.Message(getActivity(),"请先绑定银行卡"); + ToastUtils.Message(getActivity(), "请先绑定银行卡"); return; } break; @@ -288,7 +288,7 @@ public class WithdrawFragment extends BaseFragment implements View.OnClickListen FlushTokenUtil.flushToken(getActivity()); } else { withdrawBuilder.append(TimestampUtil.time()).append(",").append("提现了失败 ，"); - ToastUtils.Message(getActivity(),response.getMessage() ); + ToastUtils.Message(getActivity(), response.getMessage()); } etAllPrice.getText().clear(); Log.d("TAG", "onSuccess: " + response.getMessage() + response.getCode()); @@ -299,10 +299,10 @@ public class WithdrawFragment extends BaseFragment implements View.OnClickListen 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); + if (message.equals("timeout") || message.equals("Read time out")) { + ToastUtils.Message(getActivity(), "请求超时"); + } else { + ToastUtils.Message(getActivity(), message); } Log.d("TAG", "onError: " + e.getMessage()); } @@ -325,8 +325,10 @@ public class WithdrawFragment extends BaseFragment implements View.OnClickListen @Override public void onDestroy() { super.onDestroy(); - withdrawBuilder.append(TimestampUtil.time()).append(",").append("onDestroy"); - withdrawBuilder.append("\r\n"); - FileUtils.writeFile(logFile.getAbsolutePath(), withdrawBuilder.toString(), true); + if (withdrawBuilder != null) { + withdrawBuilder.append(TimestampUtil.time()).append(",").append("onDestroy"); + withdrawBuilder.append("\r\n"); + FileUtils.writeFile(logFile.getAbsolutePath(), withdrawBuilder.toString(), true); + } } } 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 88cd306..5e0f032 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/WithdrawalRecordFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/WithdrawalRecordFragment.java @@ -38,7 +38,7 @@ import java.util.Date; import java.util.Objects; /** - * 提现记录： + * 我的-去提现-提现记录的fragment： */ public class WithdrawalRecordFragment extends BaseFragment implements View.OnClickListener { @@ -64,7 +64,7 @@ public class WithdrawalRecordFragment extends BaseFragment implements View.OnCli super.initView(); ImageView ivWithdraw = findViewById(R.id.iv_withdraw); ivWithdraw.setOnClickListener(this); - rxlWithdraw = (XRecyclerView) findViewById(R.id.rxl_withdraw); + rxlWithdraw = findViewById(R.id.rxl_withdraw); rxlWithdraw.setLayoutManager(new LinearLayoutManager(getActivity())); rxlWithdraw.setRefreshProgressStyle(ProgressStyle.BallSpinFadeLoader); rxlWithdraw.setLoadingMoreProgressStyle(ProgressStyle.BallRotate); @@ -140,11 +140,11 @@ public class WithdrawalRecordFragment extends BaseFragment implements View.OnCli } else if (withdrawalBean.getCode() == 230) { FlushTokenUtil.flushToken(getActivity()); } else { - ToastUtils.Message(getActivity(),withdrawalBean.getMessage() ); + ToastUtils.Message(getActivity(), withdrawalBean.getMessage()); } rxlWithdraw.loadMoreComplete(); rxlWithdraw.refreshComplete(); - Log.d("TAG", "onSuccess: " + withdrawalBean.getMessage() + ""); + Log.d("TAG", "onSuccess: " + withdrawalBean.getMessage()); } @Override @@ -154,10 +154,10 @@ public class WithdrawalRecordFragment extends BaseFragment implements View.OnCli 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); + if (message.contains("timeout") || message.contains("Read time out")) { + ToastUtils.Message(getActivity(), "请求超时"); + } else { + ToastUtils.Message(getActivity(), message); } } }); @@ -186,8 +186,10 @@ public class WithdrawalRecordFragment extends BaseFragment implements View.OnCli @Override public void onDestroy() { super.onDestroy(); - withdrawalRecordBuilder.append(TimestampUtil.time()).append("onDestroy"); - withdrawalRecordBuilder.append("\r\n"); - FileUtils.writeFile(logFile.getAbsolutePath(), withdrawalRecordBuilder.toString(), true); + if (withdrawalRecordBuilder != null) { + withdrawalRecordBuilder.append(TimestampUtil.time()).append("onDestroy"); + withdrawalRecordBuilder.append("\r\n"); + FileUtils.writeFile(logFile.getAbsolutePath(), withdrawalRecordBuilder.toString(), true); + } } } 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 320b61b..aa3af86 100644 --- a/app/src/main/java/com/navinfo/outdoor/http/HttpInterface.java +++ b/app/src/main/java/com/navinfo/outdoor/http/HttpInterface.java @@ -1,9 +1,8 @@ package com.navinfo.outdoor.http; public class HttpInterface { - 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 IP1 = "http://172.23.139.127:9999/m4";//测试接口 + public static final String IP = "http://dtxbmaps.navinfo.com/dtxb/m4";//正式接口 public static final String USER_PATH = "/user/";//我的 public static final String MSG_LIST_PATH = "/msgList/";//发现 public static final String USER_LOGIN_PATH = "/userlogin/";//登录 @@ -40,9 +39,11 @@ public class HttpInterface { public static String USER_DETAIL_BY_USER_ID = null; //获取用户信息 //172.21.98.90:9999/m4/user/userGuide/1/insertUserGuide public static String INSERT_USER_GUIDE = null;//引导页完成接口 + /* 发现 * Path=/m4/msgList/ */ + public static String MSG_CONTENT = null;//发现 -富文本详情页请求 public static String LIST_TASK = null;//任务专区 public static String LIST_EVENT = null;//活动专区 diff --git a/app/src/main/java/com/navinfo/outdoor/util/Gps.java b/app/src/main/java/com/navinfo/outdoor/util/Gps.java new file mode 100644 index 0000000..e9268fa --- /dev/null +++ b/app/src/main/java/com/navinfo/outdoor/util/Gps.java @@ -0,0 +1,145 @@ +package com.navinfo.outdoor.util; + +import java.math.BigDecimal; +import java.math.RoundingMode; + +/** + * gps纠偏算法，适用于google,高德体系的地图 + */ +public abstract class Gps { + + private final static double a = 6378245.0; + private final static double pi = 3.1415926535897932384626; + private final static double ee = 0.00669342162296594323; + + /** + * 计算地球上任意两点(经纬度)距离 + * + * @param lat1 + * 第一点纬度 + * @param lng1 + * 第一点经度 + * @param lat2 + * 第二点纬度 + * @param lng2 + * 第二点经度 + * @return 返回距离 单位：米 + */ + public static double distance(double lat1, double lng1, double lat2, double lng2) { + double a, b, R; + R = 6378137; // 地球半径 + lat1 = lat1 * Math.PI / 180.0; + lat2 = lat2 * Math.PI / 180.0; + a = lat1 - lat2; + b = (lng1 - lng2) * Math.PI / 180.0; + double d; + double sa2, sb2; + sa2 = Math.sin(a / 2.0); + sb2 = Math.sin(b / 2.0); + d = 2 * R * Math.asin(Math.sqrt(sa2 * sa2 + Math.cos(lat1) * Math.cos(lat2) * sb2 * sb2)); + return d; + } + + /** + * Description: WGS-84 to GCJ-02
+ * + * @author dsn + * @date 2017年10月24日 下午2:09:27 + * @param latitude + * 纬度 + * @param longitude + * 经度 + * @return [纬度，经度] + * @version 1.0 + */ + public static double[] toGCJ02Point(double latitude, double longitude) { + double[] dev = calDev(latitude, longitude); + double retLat = latitude + dev[0]; + double retLon = longitude + dev[1]; + return new double[] { retLat, retLon }; + } + + /** + * Description: WGS-84 to GCJ-02
+ * + * @author dsn + * @date 2017年10月24日 下午2:09:27 + * @param latitude + * 纬度 + * @param longitude + * 经度 + * @param scale + * 经纬度保留小数位数 + * @return [纬度，经度] + * @version 1.0 + */ + public static double[] toGCJ02Point(double latitude, double longitude, int scale) { + double[] dev = calDev(latitude, longitude); + double retLat = latitude + dev[0]; + double retLon = longitude + dev[1]; + return new double[] { new BigDecimal(retLat).setScale(scale, RoundingMode.DOWN).doubleValue(), + new BigDecimal(retLon).setScale(scale, RoundingMode.DOWN).doubleValue() }; + } + + /** + * Description:GCJ-02 to WGS-84
+ * + * @author dsn + * @date 2017年10月24日 下午2:09:54 + * @param latitude + * 纬度 + * @param longitude + * 经度 + * @return [纬度，经度] + * @version 1.0 + */ + public static double[] toWGS84Point(double latitude, double longitude) { + double[] dev = calDev(latitude, longitude); + double retLat = latitude - dev[0]; + double retLon = longitude - dev[1]; + dev = calDev(retLat, retLon); + retLat = latitude - dev[0]; + retLon = longitude - dev[1]; + return new double[] { retLat, retLon }; + } + + private static double[] calDev(double wgLat, double wgLon) { + if (isOutOfChina(wgLat, wgLon)) { + return new double[] { 0, 0 }; + } + double dLat = calLat(wgLon - 105.0, wgLat - 35.0); + double dLon = calLon(wgLon - 105.0, wgLat - 35.0); + double radLat = wgLat / 180.0 * pi; + double magic = Math.sin(radLat); + magic = 1 - ee * magic * magic; + double sqrtMagic = Math.sqrt(magic); + dLat = (dLat * 180.0) / ((a * (1 - ee)) / (magic * sqrtMagic) * pi); + dLon = (dLon * 180.0) / (a / sqrtMagic * Math.cos(radLat) * pi); + return new double[] { dLat, dLon }; + } + + private static boolean isOutOfChina(double lat, double lon) { + if (lon < 72.004 || lon > 137.8347) + return true; + if (lat < 0.8293 || lat > 55.8271) + return true; + return false; + } + + private static double calLat(double x, double y) { + double ret = -100.0 + 2.0 * x + 3.0 * y + 0.2 * y * y + 0.1 * x * y + 0.2 * Math.sqrt(Math.abs(x)); + ret += (20.0 * Math.sin(6.0 * x * pi) + 20.0 * Math.sin(2.0 * x * pi)) * 2.0 / 3.0; + ret += (20.0 * Math.sin(y * pi) + 40.0 * Math.sin(y / 3.0 * pi)) * 2.0 / 3.0; + ret += (160.0 * Math.sin(y / 12.0 * pi) + 320 * Math.sin(y * pi / 30.0)) * 2.0 / 3.0; + return ret; + } + + private static double calLon(double x, double y) { + double ret = 300.0 + x + 2.0 * y + 0.1 * x * x + 0.1 * x * y + 0.1 * Math.sqrt(Math.abs(x)); + ret += (20.0 * Math.sin(6.0 * x * pi) + 20.0 * Math.sin(2.0 * x * pi)) * 2.0 / 3.0; + ret += (20.0 * Math.sin(x * pi) + 40.0 * Math.sin(x / 3.0 * pi)) * 2.0 / 3.0; + ret += (150.0 * Math.sin(x / 12.0 * pi) + 300.0 * Math.sin(x / 30.0 * pi)) * 2.0 / 3.0; + return ret; + } + +} diff --git a/app/src/main/res/layout/activity_link.xml b/app/src/main/res/layout/activity_link.xml deleted file mode 100644 index 241d128..0000000 --- a/app/src/main/res/layout/activity_link.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_capacity_evaluation2.xml b/app/src/main/res/layout/fragment_capacity_evaluation2.xml deleted file mode 100644 index 066e076..0000000 --- a/app/src/main/res/layout/fragment_capacity_evaluation2.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_road_task.xml b/app/src/main/res/layout/fragment_road_task.xml deleted file mode 100644 index 091f889..0000000 --- a/app/src/main/res/layout/fragment_road_task.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_task_ex_web.xml b/app/src/main/res/layout/fragment_task_ex_web.xml deleted file mode 100644 index 8e46e31..0000000 --- a/app/src/main/res/layout/fragment_task_ex_web.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_task_explain2.xml b/app/src/main/res/layout/task_explains_fragment.xml similarity index 78% rename from app/src/main/res/layout/fragment_task_explain2.xml rename to app/src/main/res/layout/task_explains_fragment.xml index 8a8a517..90e8157 100644 --- a/app/src/main/res/layout/fragment_task_explain2.xml +++ b/app/src/main/res/layout/task_explains_fragment.xml @@ -24,6 +24,18 @@ android:layout_marginLeft="15dp" android:src="@drawable/ic_baseline_arrow" /> + +