From 8d0bd199e7d2f572552eb7e1a77ffee7b19f46e4 Mon Sep 17 00:00:00 2001 From: wds Date: Thu, 5 Aug 2021 13:54:18 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../navinfo/outdoor/base/BaseActivity.java | 75 +++++++++++++++---- .../navinfo/outdoor/base/BaseFragment.java | 28 +++++-- .../fragment/ChargingStationFragment.java | 2 +- .../outdoor/fragment/GatherGetFragment.java | 4 +- .../outdoor/fragment/OtherFragment.java | 2 +- .../navinfo/outdoor/fragment/PoiFragment.java | 2 +- .../outdoor/fragment/PoiVideoFragment.java | 2 +- .../outdoor/fragment/RoadFragment.java | 1 + 8 files changed, 89 insertions(+), 27 deletions(-) diff --git a/app/src/main/java/com/navinfo/outdoor/base/BaseActivity.java b/app/src/main/java/com/navinfo/outdoor/base/BaseActivity.java index bf21c03..3a052ba 100644 --- a/app/src/main/java/com/navinfo/outdoor/base/BaseActivity.java +++ b/app/src/main/java/com/navinfo/outdoor/base/BaseActivity.java @@ -21,6 +21,10 @@ import androidx.appcompat.app.AppCompatActivity; import com.navinfo.outdoor.R; import com.navinfo.outdoor.api.UserApplication; import com.gyf.immersionbar.ImmersionBar; +import com.navinfo.outdoor.util.NetWorkUtils; + +import java.util.Timer; +import java.util.TimerTask; public abstract class BaseActivity extends AppCompatActivity { @@ -64,19 +68,64 @@ public abstract class BaseActivity extends AppCompatActivity { protected void initMVP() { } public void showLoadingDialog() { - alertDialog = new AlertDialog.Builder(this).create(); - alertDialog.getWindow().setBackgroundDrawable(new ColorDrawable()); - alertDialog.setCancelable(false); - alertDialog.setOnKeyListener((dialog, keyCode, event) -> { - if (keyCode == KeyEvent.KEYCODE_SEARCH || keyCode == KeyEvent.KEYCODE_BACK) - return true; - return false; - }); - //loading样式 - View view = LayoutInflater.from(this).inflate(R.layout.loading, null); - alertDialog.setView(view); - alertDialog.setCanceledOnTouchOutside(false); - alertDialog.show(); + if (NetWorkUtils.iConnected(this)) { // 当前网络可用 + alertDialog = new AlertDialog.Builder(this).create(); + alertDialog.getWindow().setBackgroundDrawable(new ColorDrawable()); + alertDialog.setCancelable(false); + alertDialog.setOnKeyListener((dialog, keyCode, event) -> { + if (keyCode == KeyEvent.KEYCODE_SEARCH || keyCode == KeyEvent.KEYCODE_BACK) + return true; + return false; + + }); + //loading样式 + View view = LayoutInflater.from(this).inflate(R.layout.loading, null); + alertDialog.setView(view); + alertDialog.setCanceledOnTouchOutside(false); + alertDialog.show(); + initTimer(); + } else { + Toast.makeText(this, "网络不可用", Toast.LENGTH_SHORT).show(); + } + } + public void showFileLoadingDialog() { + if (NetWorkUtils.iConnected(this)) { // 当前网络可用 + alertDialog = new AlertDialog.Builder(this).create(); + alertDialog.getWindow().setBackgroundDrawable(new ColorDrawable()); + alertDialog.setCancelable(false); + alertDialog.setOnKeyListener((dialog, keyCode, event) -> { + if (keyCode == KeyEvent.KEYCODE_SEARCH || keyCode == KeyEvent.KEYCODE_BACK) + return true; + return false; + + }); + //loading样式 + View view = LayoutInflater.from(this).inflate(R.layout.loading, null); + alertDialog.setView(view); + alertDialog.setCanceledOnTouchOutside(false); + alertDialog.show(); + } else { + Toast.makeText(this, "网络不可用", Toast.LENGTH_SHORT).show(); + } + } + + private void initTimer() { + Timer timer = new Timer(true); + TimerTask timerTask = new TimerTask() { + int countTime = 20; + + @Override + public void run() { + if (countTime > 0) { + countTime--; + } + if (countTime == 1) { + dismissLoadingDialog(); + } + + } + }; + timer.schedule(timerTask, 1000, 1000); } public void setLoadingDialogText(String s) { diff --git a/app/src/main/java/com/navinfo/outdoor/base/BaseFragment.java b/app/src/main/java/com/navinfo/outdoor/base/BaseFragment.java index 0586038..34142d6 100644 --- a/app/src/main/java/com/navinfo/outdoor/base/BaseFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/base/BaseFragment.java @@ -87,19 +87,31 @@ public abstract class BaseFragment extends Fragment implements FragmentBackHandl alertDialog.setView(view); alertDialog.setCanceledOnTouchOutside(false); alertDialog.show(); - /* final Timer timer = new Timer(); - timer.schedule(new TimerTask() { - @Override - public void run() { - alertDialog.dismiss(); - timer.cancel(); - } - },10000);*/ initTimer(); } else { Toast.makeText(getActivity(), "网络不可用", Toast.LENGTH_SHORT).show(); } } + public void showFileLoadingDialog() { + if (NetWorkUtils.iConnected(getContext())) { // 当前网络可用 + alertDialog = new AlertDialog.Builder(getActivity()).create(); + alertDialog.getWindow().setBackgroundDrawable(new ColorDrawable()); + alertDialog.setCancelable(false); + alertDialog.setOnKeyListener((dialog, keyCode, event) -> { + if (keyCode == KeyEvent.KEYCODE_SEARCH || keyCode == KeyEvent.KEYCODE_BACK) + return true; + return false; + + }); + //loading样式 + View view = LayoutInflater.from(getContext()).inflate(R.layout.loading, null); + alertDialog.setView(view); + alertDialog.setCanceledOnTouchOutside(false); + alertDialog.show(); + } else { + Toast.makeText(getActivity(), "网络不可用", Toast.LENGTH_SHORT).show(); + } + } private void initTimer() { Timer timer = new Timer(true); 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 e244e1a..327ad32 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/ChargingStationFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/ChargingStationFragment.java @@ -993,7 +993,7 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View. } private void stationUploadByNetWork(PoiEntity poiEntity, ArrayList chargingStationList) { - showLoadingDialog(); + showFileLoadingDialog(); if (poiEntity == null || poiEntity.getBodyId() == 0) { Toast.makeText(getActivity(), "没有保存本地", Toast.LENGTH_SHORT).show(); Log.e("TAG", "poiUploadByNetWork: " + poiEntity.getBodyId() + chargingStationList); 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 5d916fa..ce65ec6 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/GatherGetFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/GatherGetFragment.java @@ -178,7 +178,7 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe } break; case R.id.btn_get_task://领取任务 - if (poiEntity.getTaskStatus() < 2) { + /* if (poiEntity.getTaskStatus() < 2) { double latitude = Constant.currentLocation.getLatitude(); double longitude = Constant.currentLocation.getLongitude(); LatLng startLatLng = new LatLng(latitude, longitude); //用户当前位置 @@ -188,7 +188,7 @@ public class GatherGetFragment extends BaseFragment implements View.OnClickListe Toast.makeText(getActivity(), "作业不在领取范围内,无法领取", Toast.LENGTH_SHORT).show(); return; } - } + }*/ if (poiEntity != null) { int type = poiEntity.getType(); 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 dcbbb54..d0bacd0 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/OtherFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/OtherFragment.java @@ -468,7 +468,7 @@ public class OtherFragment extends BaseDrawerFragment implements View.OnClickLis Log.e("TAG", "poiUploadByNetWork: " + body + otherUploadList); return; } - showLoadingDialog(); + showFileLoadingDialog(); OkGo // 请求方式和请求url .post(HttpInterface.OTHER_TASK_UPLOAD_PIC) 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 c3beeaf..13aac96 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/PoiFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/PoiFragment.java @@ -739,7 +739,7 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe Log.e("TAG", "poiUploadByNetWork: " + body + poiPicList); return; } - showLoadingDialog(); + showFileLoadingDialog(); OkGo // 请求方式和请求url .post(HttpInterface.POI_TASK_UPLOAD_PIC) 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 653ae37..99eae9e 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/PoiVideoFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/PoiVideoFragment.java @@ -486,7 +486,7 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick Toast.makeText(getActivity(), "未压缩完成", Toast.LENGTH_SHORT).show(); return; } - showLoadingDialog(); + showFileLoadingDialog(); OkGo // 请求方式和请求url .post(HttpInterface.POI_VIDEO_UPLOAD_PIC) 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 484fa60..839e07a 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/RoadFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/RoadFragment.java @@ -498,6 +498,7 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList Toast.makeText(getContext(), "未压缩完成", Toast.LENGTH_SHORT).show(); return; } + showFileLoadingDialog(); OkGo // 请求方式和请求url .post(HttpInterface.ROAD_TASK_UPLOAD_PIC)