订阅功能断网情况bug

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/fragment/SubscriptionAllFragment.java

@@ -30,7 +30,6 @@ import com.xzjmyk.pm.activity.ui.erp.view.EmptyLayout;
 import com.xzjmyk.pm.activity.util.DisplayUtil;
 import com.xzjmyk.pm.activity.util.SharedUtil;
 import com.xzjmyk.pm.activity.view.crouton.Crouton;
-import com.xzjmyk.pm.activity.view.crouton.Style;
 
 import org.json.JSONArray;
 import org.json.JSONException;
@@ -111,8 +110,15 @@ public class SubscriptionAllFragment extends BaseFragment {
         mPullToRefreshListView.setOnRefreshListener(new PullToRefreshBase.OnRefreshListener2<ListView>() {
             @Override
             public void onPullDownToRefresh(PullToRefreshBase<ListView> refreshView) {
-                mAllSubscriptonKindMessages.clear();
-                sendAllSubscriptionRequest();
+                if (CommonUtil.isNetWorkConnected(getActivity().getApplicationContext())){
+                    mAllSubscriptonKindMessages.clear();
+                    sendAllSubscriptionRequest();
+                }else {
+                    if (mPullToRefreshListView.isRefreshing()){
+                        mPullToRefreshListView.onRefreshComplete(500);
+                    }
+                    Crouton.makeText(getActivity(), "网络未连接", 0xffff4444, 1500).show();
+                }
             }
 
             @Override
@@ -146,7 +152,7 @@ public class SubscriptionAllFragment extends BaseFragment {
             public boolean onItemLongClick(AdapterView<?> parent, View view, final int position, long id) {
                 View popView = View.inflate(getActivity(), R.layout.pop_subs_delete, null);
                 TextView deleteTv = (TextView) popView.findViewById(R.id.pop_subs_delete_tv);
-                deleteTv.setText("删除该订阅号");
+                deleteTv.setText("隐藏该订阅号");
                 deleteTv.setOnClickListener(new View.OnClickListener() {
                     @Override
                     public void onClick(View v) {
@@ -218,7 +224,7 @@ public class SubscriptionAllFragment extends BaseFragment {
             public boolean onItemLongClick(AdapterView<?> parent, View view, final int position, long id) {
                 View popView = View.inflate(getActivity(), R.layout.pop_subs_delete, null);
                 TextView deleteTv = (TextView) popView.findViewById(R.id.pop_subs_delete_tv);
-                deleteTv.setText("删除该订阅类");
+                deleteTv.setText("隐藏该订阅类");
                 deleteTv.setOnClickListener(new View.OnClickListener() {
                     @Override
                     public void onClick(View v) {
@@ -492,7 +498,7 @@ public class SubscriptionAllFragment extends BaseFragment {
                     break;
                 case Constants.APP_SOCKETIMEOUTEXCEPTION:
                     progressDialog.dismiss();
-                    Crouton.makeText(getActivity(), msg.getData().getString("result"), Style.ALERT).show();
+                    Crouton.makeText(getActivity(), msg.getData().getString("result"), 0xffff4444, 1500).show();
                     if (mPullToRefreshListView.isRefreshing()){
                         mPullToRefreshListView.onRefreshComplete();
                     }

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/fragment/SubscriptionMyFragment.java

@@ -22,6 +22,7 @@ import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.Constants;
 import com.xzjmyk.pm.activity.ui.erp.view.EmptyLayout;
 import com.xzjmyk.pm.activity.view.crouton.Crouton;
+import com.xzjmyk.pm.activity.view.crouton.Style;
 
 import org.json.JSONArray;
 import org.json.JSONException;
@@ -78,8 +79,15 @@ public class SubscriptionMyFragment extends BaseFragment {
         mPullListView.setOnRefreshListener(new PullToRefreshBase.OnRefreshListener2<ListView>() {
             @Override
             public void onPullDownToRefresh(PullToRefreshBase<ListView> refreshView) {
-                mPersonalSubscriptionBeans.clear();
-                sendSubscriptionRequest();
+                if (CommonUtil.isNetWorkConnected(getActivity().getApplicationContext())) {
+                    mPersonalSubscriptionBeans.clear();
+                    sendSubscriptionRequest();
+                } else {
+                    if (mPullListView.isRefreshing()) {
+                        mPullListView.onRefreshComplete(500);
+                    }
+                    Crouton.makeText(getActivity(), "网络未连接", Style.holoRedLight, 1500).show();
+                }
             }
 
             @Override
@@ -198,7 +206,7 @@ public class SubscriptionMyFragment extends BaseFragment {
                     break;
                 case Constants.APP_SOCKETIMEOUTEXCEPTION:
                     progressDialog.dismiss();
-                    Crouton.makeText(getActivity(), msg.getData().getString("result"), 0xff99cc00, 1500).show();
+                    Crouton.makeText(getActivity(), msg.getData().getString("result"), 0xffff4444, 1500).show();
                     if (mPullListView.isRefreshing()){
                         mPullListView.onRefreshComplete();
                     }