订阅管理ui

WeiChat/src/main/java/com/xzjmyk/pm/activity/adapter/AllSubscriptionAdapter.java

@@ -9,8 +9,6 @@ import android.widget.TextView;
 
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.SubscriptionNumber;
-import com.xzjmyk.pm.activity.bean.message.AllSubscriptonKindMessage;
-import com.xzjmyk.pm.activity.view.MyListView;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -20,25 +18,28 @@ import java.util.List;
  */
 public class AllSubscriptionAdapter extends BaseAdapter{
     private Context mContext;
-    private List<AllSubscriptonKindMessage> mAllSubscriptonKindMessages;
-    private AllSubscriptionNumbersAdapter mAllSubscriptionNumbersAdapter;
-    private List<SubscriptionNumber> subscriptionNumbers;
-
-    public AllSubscriptionAdapter(Context mContext, List<AllSubscriptonKindMessage> mAllSubscriptonKindMessages) {
+    private List<SubscriptionNumber> mSubscriptionNumbers;
+    private List<Integer> mImageIds;
+    public AllSubscriptionAdapter(Context mContext, List<SubscriptionNumber> mSubscriptionNumbers) {
         this.mContext = mContext;
-        this.mAllSubscriptonKindMessages = mAllSubscriptonKindMessages;
-        subscriptionNumbers = new ArrayList<>();
+        this.mSubscriptionNumbers = mSubscriptionNumbers;
+        mImageIds = new ArrayList<>();
+        mImageIds.add(R.drawable.ic_subscription_icon1);
+        mImageIds.add(R.drawable.ic_subscription_icon2);
+        mImageIds.add(R.drawable.ic_subscription_icon3);
+        mImageIds.add(R.drawable.ic_subscription_icon4);
+        mImageIds.add(R.drawable.ic_subscription_icon5);
     }
 
 
     @Override
     public int getCount() {
-        return mAllSubscriptonKindMessages.size();
+        return mSubscriptionNumbers.size();
     }
 
     @Override
     public Object getItem(int position) {
-        return mAllSubscriptonKindMessages.get(position);
+        return mSubscriptionNumbers.get(position);
     }
 
     @Override
@@ -53,46 +54,33 @@ public class AllSubscriptionAdapter extends BaseAdapter{
             convertView = View.inflate(mContext, R.layout.layout_all_subscription_list,null);
             viewHolder = new ViewHolder();
 
-            viewHolder.kindImageView = (ImageView) convertView.findViewById(R.id.all_subscription_kind_iv);
-            viewHolder.kindNameTextView = (TextView) convertView.findViewById(R.id.all_subscription_name_tv);
-            viewHolder.numbersListView = (MyListView) convertView.findViewById(R.id.all_subscription_number_lv);
-
+            viewHolder.subImageView = (ImageView) convertView.findViewById(R.id.all_subscribe_iv);
+            viewHolder.subNameTextView = (TextView) convertView.findViewById(R.id.all_subscribe_title_tv);
+            viewHolder.applyTextView = (TextView) convertView.findViewById(R.id.all_subscribe_apply_tv);
             convertView.setTag(viewHolder);
         }else {
             viewHolder = (ViewHolder) convertView.getTag();
         }
-        String subscriptionKind = mAllSubscriptonKindMessages.get(position).getSubscriptionKind();
-        viewHolder.kindNameTextView.setText(subscriptionKind);
-        switch (subscriptionKind){
-            case "财务管理":
-                viewHolder.kindImageView.setImageResource(R.drawable.ic_financial_statement);
-                break;
-            case "销售管理":
-                viewHolder.kindImageView.setImageResource(R.drawable.ic_sales);
-                break;
-            case "库存管理":
-                viewHolder.kindImageView.setImageResource(R.drawable.ic_reserve);
-                break;
-            case "采购管理":
-                viewHolder.kindImageView.setImageResource(R.drawable.ic_purchase);
-                break;
-            case "品质管理":
-                viewHolder.kindImageView.setImageResource(R.drawable.ic_quality);
-                break;
-            case "生产制造管理":
-                viewHolder.kindImageView.setImageResource(R.drawable.ic_production_plan);
-                break;
-        }
-        subscriptionNumbers = mAllSubscriptonKindMessages.get(position).getSubscriptionNumbers();
-        mAllSubscriptionNumbersAdapter = new AllSubscriptionNumbersAdapter(mContext,subscriptionNumbers);
-        viewHolder.numbersListView.setAdapter(mAllSubscriptionNumbersAdapter);
 
+        viewHolder.subImageView.setImageResource(mImageIds.get(position % 5));
+        viewHolder.subNameTextView.setText(mSubscriptionNumbers.get(position).getTitle());
+        if (mSubscriptionNumbers.get(position).getStatus()== 1){
+            viewHolder.applyTextView.setText("已订阅");
+            viewHolder.applyTextView.setEnabled(false);
+        }else if (mSubscriptionNumbers.get(position).getStatus() == 3){
+//            CommonUtil.textUnderlineForStyle(viewHolder.applyTextView,"申请","申请");
+            viewHolder.applyTextView.setText("订阅");
+            viewHolder.applyTextView.setEnabled(true);
+        }else if (mSubscriptionNumbers.get(position).getStatus() == 2){
+            viewHolder.applyTextView.setText("已申请");
+            viewHolder.applyTextView.setEnabled(false);
+        }
         return convertView;
     }
 
     class ViewHolder{
-        ImageView kindImageView;
-        TextView kindNameTextView;
-        MyListView numbersListView;
+        ImageView subImageView;
+        TextView subNameTextView;
+        TextView applyTextView;
     }
 }

WeiChat/src/main/java/com/xzjmyk/pm/activity/adapter/MySubscriptionAdapter.java

@@ -1,17 +1,31 @@
 package com.xzjmyk.pm.activity.adapter;
 
 import android.content.Context;
+import android.os.Handler;
+import android.os.Message;
+import android.view.Gravity;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.BaseAdapter;
 import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.PopupWindow;
 import android.widget.TextView;
 
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.PersonalSubscriptionBean;
+import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
+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.CustomProgressDialog;
+import com.xzjmyk.pm.activity.util.DisplayUtil;
+import com.xzjmyk.pm.activity.view.crouton.Crouton;
 
 import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Created by RaoMeng on 2016/9/1.
@@ -20,11 +34,15 @@ public class MySubscriptionAdapter extends BaseAdapter {
     private Context mContext;
     private List<PersonalSubscriptionBean> mPersonalSubscriptionBeans;
     private List<Integer> mImageIds;
+    protected CustomProgressDialog progressDialog;
+    private final static int REMOVE_MY_SUBSCRIPTION = 13;
+    private int mCanclePosition;
+    private PopupWindow mCancleWindow;
 
     public MySubscriptionAdapter(Context mContext, List<PersonalSubscriptionBean> mPersonalSubscriptionBeans) {
         this.mContext = mContext;
         this.mPersonalSubscriptionBeans = mPersonalSubscriptionBeans;
-
+        progressDialog = CustomProgressDialog.createDialog(mContext);
         mImageIds = new ArrayList<>();
         mImageIds.add(R.drawable.ic_subscription_icon1);
         mImageIds.add(R.drawable.ic_subscription_icon2);
@@ -49,52 +67,104 @@ public class MySubscriptionAdapter extends BaseAdapter {
     }
 
     @Override
-    public int getViewTypeCount() {
-        return 2;
-    }
-
-    @Override
-    public int getItemViewType(int position) {
-        return mPersonalSubscriptionBeans.get(position).getISAPPLED();
-    }
-
-    @Override
-    public View getView(int i, View view, ViewGroup viewGroup) {
+    public View getView(final int i, View view, final ViewGroup viewGroup) {
         ViewHolder viewHolder = null;
         if (view == null){
             view = View.inflate(mContext, R.layout.layout_my_subscribe_list, null);
             viewHolder = new ViewHolder();
             viewHolder.subscribeIv = (ImageView) view.findViewById(R.id.my_subscribe_iv);
             viewHolder.titleTv = (TextView) view.findViewById(R.id.my_subscribe_title_tv);
-            viewHolder.contentTv = (TextView) view.findViewById(R.id.my_subscribe_content_tv);
-            viewHolder.lockIv = (ImageView) view.findViewById(R.id.my_subscribe_lock_iv);
+            viewHolder.applyTv = (TextView) view.findViewById(R.id.my_subscribe_apply_tv);
             view.setTag(viewHolder);
 
         }else {
             viewHolder = (ViewHolder) view.getTag();
         }
-        int itemViewType = getItemViewType(i);
-        if (itemViewType == 0){
-            viewHolder.lockIv.setVisibility(View.VISIBLE);
-            viewHolder.contentTv.setText("该订阅号不可取消订阅");
-        }else if (itemViewType == -1){
-            viewHolder.lockIv.setVisibility(View.GONE);
-            viewHolder.contentTv.setText("侧滑可取消订阅");
-        }
         viewHolder.subscribeIv.setImageResource(mImageIds.get(i % 5));
-//        if ("private".equals(mPersonalSubscriptionBeans.get(i).getKIND())){
-//            viewHolder.titleTv.setText(mPersonalSubscriptionBeans.get(i).getTITLE()+"(私)");
-//        }else {
-//            viewHolder.titleTv.setText(mPersonalSubscriptionBeans.get(i).getTITLE()+"(公)");
-//        }
         viewHolder.titleTv.setText(mPersonalSubscriptionBeans.get(i).getTITLE());
+        viewHolder.applyTv.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                View cancleView = View.inflate(mContext, R.layout.pop_cancle_my_subscribe, null);
+                TextView cancleTextView = (TextView) cancleView.findViewById(R.id.cancel_subscribe_cancle_tv);
+                TextView contineTextView = (TextView) cancleView.findViewById(R.id.cancel_subscribe_contine_tv);
+
+                cancleTextView.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        mCanclePosition = i;
+                        sendRemoveRequest(mCanclePosition);
+                        closeWarningPopupWindow();
+                    }
+                });
+
+                contineTextView.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        closeWarningPopupWindow();
+                    }
+                });
+
+                mCancleWindow = new PopupWindow(cancleView, LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT, true);
+                mCancleWindow.setAnimationStyle(R.style.MenuAnimationFade);
+                mCancleWindow.showAtLocation(viewGroup, Gravity.BOTTOM, 0, 0);
+                DisplayUtil.backgroundAlpha(mContext, 0.5f);
+
+                mCancleWindow.setOnDismissListener(new PopupWindow.OnDismissListener() {
+                    @Override
+                    public void onDismiss() {
+                        closeWarningPopupWindow();
+                    }
+                });
+            }
+        });
         return view;
     }
 
+
+    /**
+     * 取消订阅
+     */
+    private void sendRemoveRequest(int position) {
+        progressDialog.show();
+        String subsUrl = Constants.getAppBaseUrl(mContext) + "common/charts/removeSubsMans.action";
+        Map<String, Object> params = new HashMap<>();
+        params.put("emcode", CommonUtil.getSharedPreferences(mContext, "erp_username"));
+        params.put("numIds", mPersonalSubscriptionBeans.get(position).getNUM_ID());
+
+        LinkedHashMap headers = new LinkedHashMap();
+        headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(mContext, "sessionId"));
+        ViewUtil.httpSendRequest(mContext, subsUrl, params, mHandler, headers, REMOVE_MY_SUBSCRIPTION, null, null, "post");
+
+    }
+
+    private void closeWarningPopupWindow() {
+        if (mCancleWindow != null) {
+            mCancleWindow.dismiss();
+            mCancleWindow = null;
+            DisplayUtil.backgroundAlpha(mContext, 1f);
+
+        }
+
+    }
+    private Handler mHandler = new Handler(){
+        @Override
+        public void handleMessage(Message msg) {
+            switch (msg.what){
+                case REMOVE_MY_SUBSCRIPTION:
+                    progressDialog.dismiss();
+                    Crouton.makeText(mContext, "取消订阅成功");
+                    mPersonalSubscriptionBeans.remove(mCanclePosition);
+                    notifyDataSetChanged();
+                    break;
+
+            }
+        }
+    };
+
     class ViewHolder{
         ImageView subscribeIv;
         TextView titleTv;
-        TextView contentTv;
-        ImageView lockIv;
+        TextView applyTv;
     }
 }

WeiChat/src/main/java/com/xzjmyk/pm/activity/bean/SubscriptionNumber.java

@@ -41,4 +41,14 @@ public class SubscriptionNumber {
     public void setKind(String kind) {
         this.kind = kind;
     }
+
+    @Override
+    public String toString() {
+        return "SubscriptionNumber{" +
+                "id=" + id +
+                ", title='" + title + '\'' +
+                ", kind='" + kind + '\'' +
+                ", status=" + status +
+                '}';
+    }
 }

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

@@ -445,6 +445,7 @@ public class BaseInfoActivity extends BaseActivity implements View.OnClickListen
             public void onErrorResponse(VolleyError arg0) {
                 ProgressDialogUtil.dismiss(mProgressDialog);
                 ToastUtil.showErrorNet(BaseInfoActivity.this);
+                finish();
             }
         }, new StringJsonObjectRequest.Listener<Void>() {
 

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

@@ -3,7 +3,13 @@ package com.xzjmyk.pm.activity.ui.erp.fragment;
 import android.os.Handler;
 import android.os.Message;
 import android.util.Log;
+import android.util.TypedValue;
+import android.view.Gravity;
+import android.view.View;
+import android.widget.LinearLayout;
 import android.widget.ListView;
+import android.widget.RadioButton;
+import android.widget.RadioGroup;
 
 import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
@@ -33,11 +39,16 @@ import java.util.Map;
  * 所有订阅
  * Created by RaoMeng on 2016/9/5.
  */
-public class SubscriptionAllFragment extends BaseFragment {
+public class SubscriptionAllFragment extends BaseFragment implements RadioGroup.OnCheckedChangeListener {
     private PullToRefreshListView mPullToRefreshListView;
     private AllSubscriptionAdapter mAllSubscriptionAdapter;
     private List<AllSubscriptonKindMessage> mAllSubscriptonKindMessages;
+    private List<SubscriptionNumber> mSubscriptionNumbers;
     private EmptyLayout mEmptyLayout;
+    private RadioGroup mRadioGroup;
+    private int rbPos = 0;
+    private List<String> keyStrings = new ArrayList<>();
+
     @Override
     protected int getLayout() {
         return R.layout.fragment_all_subscription;
@@ -45,9 +56,12 @@ public class SubscriptionAllFragment extends BaseFragment {
 
     @Override
     protected void initViews() {
+        mRadioGroup = (RadioGroup) root.findViewById(R.id.subscription_all_rg);
+
         mPullToRefreshListView = (PullToRefreshListView) root.findViewById(R.id.subscription_all_ptlv);
         mAllSubscriptonKindMessages = new ArrayList<>();
-        mAllSubscriptionAdapter = new AllSubscriptionAdapter(getActivity(),mAllSubscriptonKindMessages);
+        mSubscriptionNumbers = new ArrayList<>();
+        mAllSubscriptionAdapter = new AllSubscriptionAdapter(getActivity(),mSubscriptionNumbers);
 
         mEmptyLayout = new EmptyLayout(getActivity(),mPullToRefreshListView.getRefreshableView());
         mEmptyLayout.setShowLoadingButton(false);
@@ -79,6 +93,8 @@ public class SubscriptionAllFragment extends BaseFragment {
                 }, 1000);
             }
         });
+
+        mRadioGroup.setOnCheckedChangeListener(this);
     }
 
     @Override
@@ -122,8 +138,14 @@ public class SubscriptionAllFragment extends BaseFragment {
                             }
                             return;
                         }
+
+                        keyStrings.clear();
+                        mRadioGroup.removeAllViews();
                         while (iterator.hasNext()){
                             String key = iterator.next().toString();
+
+                            keyStrings.add(key);
+
                             Log.d("allsubskeys: ",key);
                             AllSubscriptonKindMessage subscriptonKindMessage = new AllSubscriptonKindMessage();
                             subscriptonKindMessage.setSubscriptionKind(key);
@@ -148,10 +170,39 @@ public class SubscriptionAllFragment extends BaseFragment {
                             }
 
                         }
-                        mAllSubscriptionAdapter.notifyDataSetChanged();
                     } catch (JSONException e) {
                         e.printStackTrace();
                     }
+
+                    if (keyStrings.size() == 0){
+                        mRadioGroup.setVisibility(View.GONE);
+                    }else {
+                        mRadioGroup.setVisibility(View.VISIBLE);
+                        for (int i = 0; i < keyStrings.size(); i++) {
+                            RadioButton radioButton = new RadioButton(getActivity());
+                            radioButton.setButtonDrawable(null);
+                            radioButton.setGravity(Gravity.CENTER);
+                            radioButton.setTextSize(TypedValue.COMPLEX_UNIT_SP, 16);
+                            radioButton.setBackground(getResources().getDrawable(R.drawable.selector_subscribe_bg));
+                            radioButton.setText(keyStrings.get(i));
+                            radioButton.setPadding(0, 30, 0, 30);
+                            radioButton.setId(i);
+
+                            if (i == rbPos){
+//                                radioButton.setTextColor(getResources().getColor(R.color.red));
+                                radioButton.setChecked(true);
+                            }else {
+//                                radioButton.setTextColor(getResources().getColor(R.color.black));
+                                radioButton.setChecked(false);
+                            }
+
+                            mRadioGroup.addView(radioButton, LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT);
+                        }
+                    }
+                    mSubscriptionNumbers.clear();
+                    mSubscriptionNumbers.addAll(mAllSubscriptonKindMessages.get(rbPos).getSubscriptionNumbers());
+                    Log.d("allsubscription:",mSubscriptionNumbers.toString());
+                    mAllSubscriptionAdapter.notifyDataSetChanged();
                     if (mPullToRefreshListView.isRefreshing()){
                         mPullToRefreshListView.onRefreshComplete();
                         Crouton.makeText(getActivity(),"刷新成功", 0xff99cc00,1500).show();
@@ -165,4 +216,20 @@ public class SubscriptionAllFragment extends BaseFragment {
         }
     };
 
+    @Override
+    public void onCheckedChanged(RadioGroup group, int checkedId) {
+        rbPos = checkedId;
+/*
+        for (int i = 0; i < keyStrings.size(); i++) {
+            RadioButton currentButton = (RadioButton) group.findViewById(i);
+            if (i == checkedId){
+                currentButton.setTextColor(getResources().getColor(R.color.red));
+            }else {
+                currentButton.setTextColor(getResources().getColor(R.color.black));
+            }
+        }*/
+        mSubscriptionNumbers.clear();
+        mSubscriptionNumbers.addAll(mAllSubscriptonKindMessages.get(rbPos).getSubscriptionNumbers());
+        mAllSubscriptionAdapter.notifyDataSetChanged();
+    }
 }

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

@@ -3,20 +3,11 @@ package com.xzjmyk.pm.activity.ui.erp.fragment;
 import android.os.Handler;
 import android.os.Message;
 import android.util.Log;
-import android.view.Gravity;
-import android.view.View;
-import android.widget.LinearLayout;
-import android.widget.PopupWindow;
 import android.widget.ScrollView;
-import android.widget.TextView;
 import android.widget.Toast;
 
-import com.baoyz.swipemenulistview.MySwipeMenuListView;
-import com.baoyz.swipemenulistview.SwipeMenu;
-import com.baoyz.swipemenulistview.SwipeMenuListView;
 import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshScrollView;
-import com.xzjmyk.pm.activity.MySwipeMenuCreator;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.adapter.MySubscriptionAdapter;
 import com.xzjmyk.pm.activity.bean.PersonalSubscriptionBean;
@@ -24,7 +15,7 @@ import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 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.util.DisplayUtil;
+import com.xzjmyk.pm.activity.view.MyListView;
 import com.xzjmyk.pm.activity.view.crouton.Crouton;
 
 import org.json.JSONArray;
@@ -43,18 +34,12 @@ import java.util.Map;
  */
 public class SubscriptionMyFragment extends BaseFragment {
     private PullToRefreshScrollView mPullToRefreshScrollView;
-    private MySwipeMenuListView mSwipeMenuListView;
+    private MyListView mMyListView;
     private List<PersonalSubscriptionBean> mPersonalSubscriptionBeans;
-    private MySwipeMenuCreator mMySwipeMenuCreator;
     private MySubscriptionAdapter mMySubscriptionAdapter;
-    private PopupWindow mCancleWindow;
-    private int mStartSwipe;
-    private int mEndSwipe;
 
     private final static int GET_MY_SUBSCRIPTION = 12;
-    private final static int REMOVE_MY_SUBSCRIPTION = 13;
 
-    private int mCanclePosition;
     private EmptyLayout mEmptyLayout;
     @Override
     protected int getLayout() {
@@ -65,12 +50,9 @@ public class SubscriptionMyFragment extends BaseFragment {
     protected void initViews() {
         mPersonalSubscriptionBeans = new ArrayList<>();
         mPullToRefreshScrollView = (PullToRefreshScrollView) root.findViewById(R.id.my_subscription_ptrsv);
-        mSwipeMenuListView = (MySwipeMenuListView) root.findViewById(R.id.my_subscripton_smlv);
+        mMyListView = (MyListView) root.findViewById(R.id.my_subscripton_smlv);
         mMySubscriptionAdapter = new MySubscriptionAdapter(getActivity(),mPersonalSubscriptionBeans);
-        mMySwipeMenuCreator = new MySwipeMenuCreator(getActivity());
-
-
-        mEmptyLayout = new EmptyLayout(getActivity(),mSwipeMenuListView);
+        mEmptyLayout = new EmptyLayout(getActivity(),mMyListView);
         mEmptyLayout.setShowLoadingButton(false);
         mEmptyLayout.setShowEmptyButton(false);
         mEmptyLayout.setShowErrorButton(false);
@@ -79,63 +61,7 @@ public class SubscriptionMyFragment extends BaseFragment {
 
     @Override
     protected void initEvents() {
-        mSwipeMenuListView.setAdapter(mMySubscriptionAdapter);
-        mSwipeMenuListView.setMenuCreator(mMySwipeMenuCreator);
-        mSwipeMenuListView.setSwipeDirection(SwipeMenuListView.DIRECTION_LEFT);
-
-        mSwipeMenuListView.setOnSwipeListener(new SwipeMenuListView.OnSwipeListener() {
-            @Override
-            public void onSwipeStart(int position) {
-                mStartSwipe = position;
-            }
-
-            @Override
-            public void onSwipeEnd(int position) {
-                mEndSwipe = position;
-                if (mPersonalSubscriptionBeans.get(mStartSwipe).getISAPPLED() == 0) {
-                    mSwipeMenuListView.smoothCloseMenu();
-                }
-
-            }
-        });
-        mSwipeMenuListView.setOnMenuItemClickListener(new SwipeMenuListView.OnMenuItemClickListener() {
-            @Override
-            public boolean onMenuItemClick(final int position, SwipeMenu menu, int index) {
-                View cancleView = View.inflate(getActivity(), R.layout.pop_cancle_my_subscribe, null);
-                TextView cancleTextView = (TextView) cancleView.findViewById(R.id.cancel_subscribe_cancle_tv);
-                TextView contineTextView = (TextView) cancleView.findViewById(R.id.cancel_subscribe_contine_tv);
-
-                cancleTextView.setOnClickListener(new View.OnClickListener() {
-                    @Override
-                    public void onClick(View v) {
-//                        Crouton.makeText(getActivity(), "取消成功", 0xff99cc00, 1500).show();
-                        mCanclePosition = position;
-                        sendRemoveRequest(mCanclePosition);
-                        closeWarningPopupWindow();
-                    }
-                });
-
-                contineTextView.setOnClickListener(new View.OnClickListener() {
-                    @Override
-                    public void onClick(View v) {
-                        closeWarningPopupWindow();
-                    }
-                });
-
-                mCancleWindow = new PopupWindow(cancleView, LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT, true);
-                mCancleWindow.setAnimationStyle(R.style.MenuAnimationFade);
-                mCancleWindow.showAtLocation(mSwipeMenuListView, Gravity.BOTTOM, 0, 0);
-                DisplayUtil.backgroundAlpha(getActivity(), 0.5f);
-
-                mCancleWindow.setOnDismissListener(new PopupWindow.OnDismissListener() {
-                    @Override
-                    public void onDismiss() {
-                        closeWarningPopupWindow();
-                    }
-                });
-                return false;
-            }
-        });
+        mMyListView.setAdapter(mMySubscriptionAdapter);
 
         mPullToRefreshScrollView.setMode(PullToRefreshBase.Mode.PULL_FROM_START);
         mPullToRefreshScrollView.setOnRefreshListener(new PullToRefreshBase.OnRefreshListener2<ScrollView>() {
@@ -172,23 +98,6 @@ public class SubscriptionMyFragment extends BaseFragment {
         ViewUtil.httpSendRequest(getActivity(), subsUrl, params, mHandler, headers, GET_MY_SUBSCRIPTION, null, null, "post");
     }
 
-    /**
-     * 取消订阅
-     */
-    private void sendRemoveRequest(int position) {
-        progressDialog.show();
-        String subsUrl = Constants.getAppBaseUrl(getActivity()) + "common/charts/removeSubsMans.action";
-        Map<String, Object> params = new HashMap<>();
-        params.put("emcode", CommonUtil.getSharedPreferences(getActivity(),"erp_username"));
-        params.put("numIds", mPersonalSubscriptionBeans.get(position).getNUM_ID());
-
-        LinkedHashMap headers = new LinkedHashMap();
-        headers.put("Cookie","JSESSIONID=" + CommonUtil.getSharedPreferences(getActivity(),"sessionId"));
-        ViewUtil.httpSendRequest(getActivity(), subsUrl, params, mHandler, headers, REMOVE_MY_SUBSCRIPTION, null, null, "post");
-
-    }
-
-
     private Handler mHandler = new Handler(){
         @Override
         public void handleMessage(Message msg) {
@@ -234,14 +143,6 @@ public class SubscriptionMyFragment extends BaseFragment {
                     }
 
                     break;
-
-                case REMOVE_MY_SUBSCRIPTION:
-                    progressDialog.dismiss();
-                    Crouton.makeText(getActivity(), "取消订阅成功", 0xff99cc00, 1500).show();
-                    mPersonalSubscriptionBeans.remove(mCanclePosition);
-                    mMySubscriptionAdapter.notifyDataSetChanged();
-                    break;
-
                 case Constants.APP_SOCKETIMEOUTEXCEPTION:
                     progressDialog.dismiss();
                     Crouton.makeText(getActivity(), msg.getData().getString("result"), 0xff99cc00, 1500).show();
@@ -253,14 +154,4 @@ public class SubscriptionMyFragment extends BaseFragment {
             }
         }
     };
-
-    private void closeWarningPopupWindow() {
-        if (mCancleWindow != null) {
-            mCancleWindow.dismiss();
-            mCancleWindow = null;
-            DisplayUtil.backgroundAlpha(getActivity(), 1f);
-
-        }
-
-    }
 }

WeiChat/src/main/java/com/xzjmyk/pm/activity/util/DisplayUtil.java

@@ -63,4 +63,15 @@ public class DisplayUtil {
 		lp.alpha = bgAlpha; //0.0-1.0
 		activity.getWindow().setAttributes(lp);
 	}
+	/**
+	 * 设置添加屏幕的背景透明度
+	 *
+	 * @param bgAlpha
+	 */
+	public static void backgroundAlpha(Context context, float bgAlpha) {
+		Activity activity = (Activity) context;
+		WindowManager.LayoutParams lp = activity.getWindow().getAttributes();
+		lp.alpha = bgAlpha; //0.0-1.0
+		activity.getWindow().setAttributes(lp);
+	}
 }

WeiChat/src/main/java/com/xzjmyk/pm/activity/view/crouton/Crouton.java

@@ -182,6 +182,7 @@ public final class Crouton {
         makeText((BaseActivity) ct, message, ct.getResources().getColor(R.color.light_green), 1000).show();
     }
 
+
     /**
      * 自定义设置背景色，延时时间
      *

WeiChat/src/main/res/color/selector_subscribe_tv.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="@color/red" android:state_checked="true"/>
+    <item android:color="@color/red" android:state_pressed="true"/>
+    <item android:color="@color/red" android:state_selected="true"/>
+
+    <item android:color="@color/black"/>
+</selector>

WeiChat/src/main/res/drawable/selector_subscribe_bg.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@color/white" android:state_checked="true"/>
+    <item android:drawable="@color/white" android:state_pressed="true"/>
+    <item android:drawable="@color/white" android:state_selected="true"/>
+
+    <item android:drawable="@color/umeng_socialize_ucenter_bg"/>
+</selector>

WeiChat/src/main/res/layout/fragment_all_subscription.xml

@@ -2,8 +2,19 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical">
+    android:orientation="horizontal">
 
+    <RadioGroup
+        android:id="@+id/subscription_all_rg"
+        android:layout_width="80dp"
+        android:layout_height="match_parent"
+        android:background="@color/umeng_socialize_ucenter_bg"
+        android:visibility="gone">
+    </RadioGroup>
+    <View
+        android:layout_width="1dp"
+        android:layout_height="match_parent"
+        android:background="@color/item_line"/>
     <com.handmark.pulltorefresh.library.PullToRefreshListView
         android:id="@+id/subscription_all_ptlv"
         android:layout_width="match_parent"

WeiChat/src/main/res/layout/fragment_my_subscription.xml

@@ -10,7 +10,7 @@
         android:layout_height="match_parent"
         android:orientation="vertical">
 
-        <com.baoyz.swipemenulistview.MySwipeMenuListView
+        <com.xzjmyk.pm.activity.view.MyListView
             android:id="@+id/my_subscripton_smlv"
             android:layout_width="match_parent"
             android:layout_height="match_parent"

WeiChat/src/main/res/layout/layout_all_subscription_list.xml

@@ -1,34 +1,44 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:padding="6dp">
+    android:layout_height="60dp"
+    android:padding="5dp"
+    android:gravity="center_vertical">
 
+    <ImageView
+        android:id="@+id/all_subscribe_iv"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:scaleType="fitXY"
+        />
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="40dp"
+        android:layout_height="match_parent"
         android:orientation="horizontal"
         android:gravity="center_vertical"
-        android:padding="5dp">
-        <ImageView
-            android:id="@+id/all_subscription_kind_iv"
-            android:layout_width="30dp"
-            android:layout_height="30dp"
-            android:src="@drawable/ic_sales"
-            android:layout_marginLeft="6dp"/>
+        android:layout_centerVertical="true"
+        android:layout_toRightOf="@id/all_subscribe_iv">
+
         <TextView
-            android:id="@+id/all_subscription_name_tv"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:textSize="20sp"
-            android:gravity="center_vertical"
+            android:id="@+id/all_subscribe_title_tv"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
             android:layout_marginLeft="10dp"
-            android:text="财务报表"/>
+            android:textSize="16sp"
+            android:textStyle="bold"
+            android:text="xxxx"/>
+
+        <TextView
+            android:id="@+id/all_subscribe_apply_tv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginRight="5dp"
+            android:layout_marginLeft="5dp"
+            android:text="订阅"
+            android:layout_gravity="center_vertical|right"
+            android:gravity="center_vertical|right"
+            android:textColor="@color/blue"/>
     </LinearLayout>
-    <com.xzjmyk.pm.activity.view.MyListView
-        android:id="@+id/all_subscription_number_lv"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        />
-</LinearLayout>
+
+</RelativeLayout>

WeiChat/src/main/res/layout/layout_my_subscribe_list.xml

@@ -18,27 +18,20 @@
         android:layout_height="wrap_content"
         android:layout_toRightOf="@id/my_subscribe_iv"
         android:layout_marginLeft="10dp"
-        android:textSize="16sp"
+        android:layout_centerVertical="true"
+        android:textSize="18sp"
+        android:textStyle="bold"
         android:text="xxxxxxx"/>
 
     <TextView
-        android:id="@+id/my_subscribe_content_tv"
+        android:id="@+id/my_subscribe_apply_tv"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_toRightOf="@id/my_subscribe_iv"
-        android:layout_alignParentBottom="true"
-        android:layout_marginLeft="10dp"
-        android:layout_marginBottom="5dp"
-        android:textSize="14sp"
-        android:text="yyyyyy"/>
-
-    <ImageView
-        android:id="@+id/my_subscribe_lock_iv"
-        android:layout_width="18dp"
-        android:layout_height="18dp"
         android:layout_alignParentRight="true"
-        android:src="@drawable/ic_lock"
         android:layout_marginRight="10dp"
+        android:text="退订"
+        android:gravity="center_vertical"
+        android:textColor="@color/blue"
         android:layout_centerVertical="true"/>
 
 </RelativeLayout>