Merge branch 'master' of bj.gitlab.cnlive.com:cnlive-team/ModulePedometer

韩亚云
2 parents b161f974 3cceb336
Showing 2 changed files with 27 additions and 1 deletions
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/frame/view/RaceNameListView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/utils/NetUtil.java
@@ -41,6 +41,7 @@ import com.cnlive.moudle.pedometer.net.bean.BaseInfo;
 import com.cnlive.moudle.pedometer.net.bean.RunRaceDetailInfo;
 import com.cnlive.moudle.pedometer.ui.widget.SelectDialog;
 import com.cnlive.moudle.pedometer.utils.GsonUtil;
+import com.cnlive.moudle.pedometer.utils.NetUtil;
 import com.cnlive.moudle.pedometer.utils.QMUITipDialogUtil;
 import com.example.moudle_pedometer.R;
 import com.hannesdorfmann.mosby3.mvp.MvpView;
@@ -137,6 +138,10 @@ public class RaceNameListView implements MvpView, OnFenceListener {
                         if (list.get(position).getIsEnable() == 0) {
                             return;
                         }
+                        if (!NetUtil.isNetworkConnected(fragment.getActivity())) {
+                            AlertUtil.showDeftToast(fragment.getActivity(), "无法连接网络");
+                            return;
+                        }
                         importPoints = null;
                         currentSelBean = eventShoeLinesBean;
                         currentSelPos = position;
@@ -363,7 +368,6 @@ public class RaceNameListView implements MvpView, OnFenceListener {
         if (null == fenceListResponse) {
             return;
         }
-        Log.e(TAG, "onFenceListCallback:围栏数量 " + fenceListResponse.getFenceInfos().size() + ",fenceListResponse:" + fenceListResponse.getTotalSize());
         List<Long> fenceIdList = null;
         if (null != fenceListResponse.getFenceInfos()) {
             fenceIdList = new ArrayList<>();
+package com.cnlive.moudle.pedometer.utils;
+
+import android.content.Context;
+import android.net.ConnectivityManager;
+import android.net.NetworkInfo;
+
+/**
+ * 网络相关
+ */
+public class NetUtil {
+    public static boolean isNetworkConnected(Context context) {
+        if (context != null) {
+            ConnectivityManager mConnectivityManager = (ConnectivityManager) context
+                    .getSystemService(Context.CONNECTIVITY_SERVICE);
+            NetworkInfo mNetworkInfo = mConnectivityManager.getActiveNetworkInfo();
+            if (mNetworkInfo != null) {
+                return mNetworkInfo.isAvailable();
+            }
+        }
+        return false;
+    }
+}