Forráskód Böngészése

订阅管理备份

RaoMeng 9 éve
szülő
commit
e3ac54b150

+ 1 - 0
WeiChat/src/main/AndroidManifest.xml

@@ -213,6 +213,7 @@
         <activity
             android:name=".ui.erp.activity.SubcribeManageActivity"
             android:theme="@style/StyledIndicators" />
+        <activity android:name=".ui.erp.activity.ManageAllSubscriptionActivity"/>
         <!-- 群聊 -->
         <activity android:name=".ui.groupchat.SelectContactsActivity" />
 

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

@@ -46,11 +46,11 @@ public class AllSubscriptionAdapter extends BaseAdapter{
         mImageIds = new ArrayList<>();
         mDbManager = new DBManager(mContext);
         progressDialog = CustomProgressDialog.createDialog(mContext);
-        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);
+//        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);
     }
 
 
@@ -84,7 +84,7 @@ public class AllSubscriptionAdapter extends BaseAdapter{
             viewHolder = (ViewHolder) convertView.getTag();
         }
 
-        viewHolder.subImageView.setImageResource(mImageIds.get(position % 5));
+//        viewHolder.subImageView.setImageResource(mImageIds.get(position % 5));
         viewHolder.subNameTextView.setText(mSubscriptionNumbers.get(position).getTitle());
         if (mSubscriptionNumbers.get(position).getStatus()== 1){
             viewHolder.applyTextView.setText("已订阅");

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

@@ -48,11 +48,11 @@ public class MySubscriptionAdapter extends BaseAdapter {
         mDbManager = new DBManager(mContext);
         progressDialog = CustomProgressDialog.createDialog(mContext);
         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);
+//        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
@@ -84,7 +84,7 @@ public class MySubscriptionAdapter extends BaseAdapter {
         }else {
             viewHolder = (ViewHolder) view.getTag();
         }
-        viewHolder.subscribeIv.setImageResource(mImageIds.get(i % 5));
+//        viewHolder.subscribeIv.setImageResource(mImageIds.get(i % 5));
         viewHolder.titleTv.setText(mPersonalSubscriptionBeans.get(i).getTITLE());
         if (mPersonalSubscriptionBeans.get(i).getISAPPLED() == -1){
             viewHolder.applyTv.setText("-退订");

+ 33 - 0
WeiChat/src/main/java/com/xzjmyk/pm/activity/commoninterface/ChangeDataSetInterface.java

@@ -0,0 +1,33 @@
+package com.xzjmyk.pm.activity.commoninterface;
+
+import java.util.LinkedList;
+import java.util.List;
+
+/**
+ * listview数据源操作接口
+ * Created by RaoMeng on 2016/10/28.
+ */
+
+public interface ChangeDataSetInterface<T> {
+    void setDatas(List<T> datas);
+
+    List<T> getDatas();
+
+    boolean AddItem(T data);
+  
+    boolean AddItem(int position , T data);
+  
+    /** 
+     * deprecate 
+     * 遍历检索效率低,且实际意义不大。 
+     * */  
+    boolean DeleteItem(T data);
+  
+    boolean DeleteItem(int position);  
+  
+    void Clear(); 
+    
+    void AddAll(LinkedList<T> datas);
+    
+    void ReplaceAll(LinkedList<T> datas);
+} 

+ 24 - 0
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/ManageAllSubscriptionActivity.java

@@ -0,0 +1,24 @@
+package com.xzjmyk.pm.activity.ui.erp.activity;
+
+import android.content.Intent;
+import android.os.Bundle;
+
+import com.xzjmyk.pm.activity.R;
+import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+import com.xzjmyk.pm.activity.util.Constants;
+
+/**
+ * Created by RaoMeng on 2016/10/28.
+ */
+public class ManageAllSubscriptionActivity extends BaseActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        getSupportActionBar().setTitle("未订阅管理");
+        setContentView(R.layout.activity_manage_all_subs);
+
+        Intent intent = new Intent();
+        setResult(Constants.RESULT_MANAGE_ALL_SUBSCRIPTION,intent);
+    }
+}

+ 37 - 0
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/SubcribeManageActivity.java

@@ -1,7 +1,11 @@
 package com.xzjmyk.pm.activity.ui.erp.activity;
 
+import android.content.Intent;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.widget.Toast;
 
 import com.viewpagerindicator.TabPageIndicator;
 import com.viewpagerindicator.UnderlinePageIndicator;
@@ -11,6 +15,7 @@ import com.xzjmyk.pm.activity.ui.erp.adapter.SubscribeManegeVpAdapter;
 import com.xzjmyk.pm.activity.ui.erp.fragment.BaseFragment;
 import com.xzjmyk.pm.activity.ui.erp.fragment.SubscriptionAllFragment;
 import com.xzjmyk.pm.activity.ui.erp.fragment.SubscriptionMyFragment;
+import com.xzjmyk.pm.activity.util.Constants;
 import com.xzjmyk.pm.activity.view.NoSlideViewpager;
 
 import java.util.ArrayList;
@@ -28,6 +33,7 @@ public class SubcribeManageActivity extends BaseActivity{
     private SubscribeManegeVpAdapter mSubscribeManegeVpAdapter;
     private NoSlideViewpager mViewPager;
     private List<String> mTitleStrings;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -56,4 +62,35 @@ public class SubcribeManageActivity extends BaseActivity{
         mUnderlinePageIndicator.setViewPager(mViewPager);
         mTabPageIndicator.setOnPageChangeListener(mUnderlinePageIndicator);
     }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.menu_apply_subscribe,menu);
+        MenuItem item = menu.getItem(0);
+        item.setTitle("整理");
+        return super.onCreateOptionsMenu(menu);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId() == R.id.subscribe_apply){
+            Toast.makeText(SubcribeManageActivity.this, "订阅整理", Toast.LENGTH_SHORT).show();
+            Intent intent = new Intent();
+            intent.setClass(this,ManageAllSubscriptionActivity.class);
+            startActivityForResult(intent, Constants.REQUEST_MANAGE_ALL_SUBSCRIPTON);
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        if (requestCode == Constants.REQUEST_MANAGE_ALL_SUBSCRIPTON
+                && resultCode == Constants.RESULT_MANAGE_ALL_SUBSCRIPTION
+                && data != null){
+            mTabPageIndicator.setCurrentItem(0);
+            mUnderlinePageIndicator.setCurrentItem(0);
+            SubscriptionAllFragment item = (SubscriptionAllFragment) mSubscribeManegeVpAdapter.getItem(0);
+            item.getDbSubsData();
+        }
+    }
 }

+ 73 - 66
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/fragment/SubscriptionAllFragment.java

@@ -46,6 +46,7 @@ import java.util.Map;
  * 所有订阅
  * Created by RaoMeng on 2016/9/5.
  */
+
 public class SubscriptionAllFragment extends BaseFragment {
     private PullToRefreshListView mPullToRefreshListView;
     private AllSubscriptionAdapter mAllSubscriptionAdapter;
@@ -84,8 +85,8 @@ public class SubscriptionAllFragment extends BaseFragment {
         currentUser = CommonUtil.getSharedPreferences(getActivity(), "erp_username");
         mPullToRefreshListView = (PullToRefreshListView) root.findViewById(R.id.subscription_all_ptlv);
         mSubscriptionNumbers = new ArrayList<>();
-        mAllSubscriptionAdapter = new AllSubscriptionAdapter(getActivity(), mSubscriptionNumbers);
         mAllSubscriptonKindMessages = new ArrayList<>();
+        mAllSubscriptionAdapter = new AllSubscriptionAdapter(getActivity(), mSubscriptionNumbers);
 
         mDbAllSubscriptonKindMessages = new ArrayList<>();
         mDbSubscriptionNumbers = new ArrayList<>();
@@ -132,9 +133,9 @@ public class SubscriptionAllFragment extends BaseFragment {
                 Intent intent = new Intent();
                 intent.setClass(getActivity(), SubscribeDetailActivity.class);
                 intent.putExtra("flag", "all");
-                intent.putExtra("subId", mSubscriptionNumbers.get(position - 1).getId());
-                intent.putExtra("subTitle", mSubscriptionNumbers.get(position - 1).getTitle());
-                intent.putExtra("subStatus", mSubscriptionNumbers.get(position - 1).getStatus());
+                intent.putExtra("subId", mAllSubscriptionAdapter.getmSubscriptionNumbers().get(position - 1).getId());
+                intent.putExtra("subTitle", mAllSubscriptionAdapter.getmSubscriptionNumbers().get(position - 1).getTitle());
+                intent.putExtra("subStatus", mAllSubscriptionAdapter.getmSubscriptionNumbers().get(position - 1).getStatus());
                 startActivityForResult(intent, SUBSCRIBE_DETAIL_REQUEST);
             }
         });
@@ -151,10 +152,9 @@ public class SubscriptionAllFragment extends BaseFragment {
                         mAllSubscriptionAdapter.getmSubscriptionNumbers().get(position - 1).setRemoved(1);
                         mDbManager.updateAllSubs(mAllSubscriptionAdapter.getmSubscriptionNumbers().get(position - 1));
                         mAllSubscriptionAdapter.getmSubscriptionNumbers().remove(position - 1);
-                        
-                        
+
                         mAllSubscriptionAdapter.notifyDataSetChanged();
-                        mAllSubscriptonKindMessages.get(rbPos).setSubscriptionNumbers( mAllSubscriptionAdapter.getmSubscriptionNumbers());
+                        mAllSubscriptonKindMessages.get(rbPos).setSubscriptionNumbers(mAllSubscriptionAdapter.getmSubscriptionNumbers());
 
                         if (mAllSubscriptionAdapter.getmSubscriptionNumbers().size() == 0) {
                             mAllSubscriptonKindMessages.remove(rbPos);
@@ -171,9 +171,11 @@ public class SubscriptionAllFragment extends BaseFragment {
                                 mTypeListView.setVisibility(View.VISIBLE);
                                 mSubsTypeAdapter.notifyDataSetChanged();
                                 initKeyStrings();
-                                mAllSubscriptionAdapter.getmSubscriptionNumbers().clear();
-                                mAllSubscriptionAdapter.getmSubscriptionNumbers().addAll(mAllSubscriptonKindMessages.get(rbPos).getSubscriptionNumbers());
-                                mAllSubscriptionAdapter.notifyDataSetChanged();
+//                                mAllSubscriptionAdapter.getmSubscriptionNumbers().clear();
+//                                mAllSubscriptionAdapter.getmSubscriptionNumbers().addAll(mAllSubscriptonKindMessages.get(rbPos).getSubscriptionNumbers());
+//                                mAllSubscriptionAdapter.notifyDataSetChanged();
+                                mAllSubscriptionAdapter = new AllSubscriptionAdapter(getActivity(), mAllSubscriptonKindMessages.get(rbPos).getSubscriptionNumbers());
+                                mPullToRefreshListView.getRefreshableView().setAdapter(mAllSubscriptionAdapter);
 
                             }
                         }
@@ -205,10 +207,7 @@ public class SubscriptionAllFragment extends BaseFragment {
                 mSubsTypeAdapter.notifyDataSetChanged();
                 rbPos = position;
                 if (mAllSubscriptonKindMessages.get(rbPos).getSubscriptionNumbers().size() != 0) {
-//                    mSubscriptionNumbers.clear();
-//                    mSubscriptionNumbers.addAll(mAllSubscriptonKindMessages.get(rbPos).getSubscriptionNumbers());
-//                    mAllSubscriptionAdapter.notifyDataSetChanged();
-                    mAllSubscriptionAdapter =new AllSubscriptionAdapter(getActivity(),mAllSubscriptonKindMessages.get(rbPos).getSubscriptionNumbers());
+                    mAllSubscriptionAdapter = new AllSubscriptionAdapter(getActivity(), mAllSubscriptonKindMessages.get(rbPos).getSubscriptionNumbers());
                     mPullToRefreshListView.getRefreshableView().setAdapter(mAllSubscriptionAdapter);
                 }
             }
@@ -304,68 +303,72 @@ public class SubscriptionAllFragment extends BaseFragment {
 
     @Override
     protected void initDatas() {
-        //每次初始化页面都需要访问网络数据用来更新本地缓存
-        sendAllSubscriptionRequest();
+        if (CommonUtil.isNetWorkConnected(getActivity().getApplicationContext())){
+            //每次初始化页面都需要访问网络数据用来更新本地缓存
+            sendAllSubscriptionRequest();
+        }else {
+            //没有网络时,取本地数据库数据
+            getDbSubsData();
+        }
 
-        /*Log.d("currentMaster: ", currentMaster);
+    }
+
+    /**
+     * 获取本地数据库全部订阅
+     */
+    public void getDbSubsData() {
         String cacheKeys = SharedUtil.getString(currentMaster + currentUser + "subs");
         if (cacheKeys != null) {
             String[] cacheKeysArray = cacheKeys.split(",");
+            keyStrings.clear();
             for (int i = 0; i < cacheKeysArray.length; i++) {
                 keyStrings.add(cacheKeysArray[i]);
             }
         }
-        try {
-            List<SubscriptionNumber> dbSubscriptionNumbers
-                    = mDbManager.queryFromAllSubs(new String[]{currentMaster, currentUser}, "subs_master=? and subs_username=? ");
-            if (dbSubscriptionNumbers == null || dbSubscriptionNumbers.size() == 0) {
-//            if (true) {
-                sendAllSubscriptionRequest();
-//                Toast.makeText(getActivity(), "网络加载", Toast.LENGTH_SHORT).show();
+
+        List<SubscriptionNumber> dbSubscriptionNumbers
+                = mDbManager.queryFromAllSubs(new String[]{currentMaster,currentUser}, "subs_master=? and subs_username=? ");
+        if (dbSubscriptionNumbers == null || dbSubscriptionNumbers.size() == 0) {
+            mEmptyLayout.showEmpty();
+        } else {
+            if (keyStrings.size() == 0) {
+                mSubsTypeAdapter.notifyDataSetChanged();
+                initKeyStrings();
+                mTypeListView.setVisibility(View.GONE);
+                mEmptyLayout.showEmpty();
+                mAllSubscriptonKindMessages.get(rbPos).getSubscriptionNumbers().clear();
+                mAllSubscriptionAdapter.notifyDataSetChanged();
             } else {
-//                Toast.makeText(getActivity(), "本地加载", Toast.LENGTH_SHORT).show();
-                if (keyStrings.size() == 0) {
-                    mSubsTypeAdapter.notifyDataSetChanged();
-                    initKeyStrings();
-                    mTypeListView.setVisibility(View.GONE);
-                    mEmptyLayout.showEmpty();
-                    mSubscriptionNumbers.clear();
-                    mAllSubscriptionAdapter.notifyDataSetChanged();
-                } else {
-                    mTypeListView.setVisibility(View.VISIBLE);
-                    mSubsTypeAdapter.notifyDataSetChanged();
-                    initKeyStrings();
-                    for (int i = 0; i < keyStrings.size(); i++) {
-                        AllSubscriptonKindMessage tempSubscriptonKindMessage = new AllSubscriptonKindMessage();
-                        List<SubscriptionNumber> tempSubscriptionNumbers = new ArrayList<>();
-                        String currentKey = keyStrings.get(i);
-                        for (int j = 0; j < dbSubscriptionNumbers.size(); j++) {
-                            SubscriptionNumber currentSubscriptionNumber = dbSubscriptionNumbers.get(j);
-                            if (currentSubscriptionNumber.getType().equals(currentKey)) {
-                                tempSubscriptionNumbers.add(currentSubscriptionNumber);
-                            }
+                mTypeListView.setVisibility(View.VISIBLE);
+                mSubsTypeAdapter.notifyDataSetChanged();
+                initKeyStrings();
+                for (int i = 0; i < keyStrings.size(); i++) {
+                    AllSubscriptonKindMessage tempSubscriptonKindMessage = new AllSubscriptonKindMessage();
+                    List<SubscriptionNumber> tempSubscriptionNumbers = new ArrayList<>();
+                    String currentKey = keyStrings.get(i);
+                    for (int j = 0; j < dbSubscriptionNumbers.size(); j++) {
+                        SubscriptionNumber currentSubscriptionNumber = dbSubscriptionNumbers.get(j);
+                        if (currentSubscriptionNumber.getType().equals(currentKey)) {
+                            tempSubscriptionNumbers.add(currentSubscriptionNumber);
                         }
-                        tempSubscriptonKindMessage.setSubscriptionKind(currentKey);
-                        tempSubscriptonKindMessage.setSubscriptionNumbers(tempSubscriptionNumbers);
-
-                        mAllSubscriptonKindMessages.add(tempSubscriptonKindMessage);
                     }
-                    mSubscriptionNumbers.clear();
-                    mSubscriptionNumbers.addAll(mAllSubscriptonKindMessages.get(rbPos).getSubscriptionNumbers());
-                    Log.d("allsubscription:", mSubscriptionNumbers.toString());
-                    mAllSubscriptionAdapter.notifyDataSetChanged();
+                    tempSubscriptonKindMessage.setSubscriptionKind(currentKey);
+                    tempSubscriptonKindMessage.setSubscriptionNumbers(tempSubscriptionNumbers);
+                    mAllSubscriptonKindMessages.add(tempSubscriptonKindMessage);
                 }
-
+//                mAllSubscriptionAdapter.getmSubscriptionNumbers().clear();
+//                mAllSubscriptionAdapter.getmSubscriptionNumbers().addAll(mAllSubscriptonKindMessages.get(rbPos).getSubscriptionNumbers());
+//                Log.d("allsubscription:", mSubscriptionNumbers.toString());
+                mAllSubscriptionAdapter.notifyDataSetChanged();
             }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }*/
+        }
     }
 
+
     /**
-     * 获取全部订阅
+     * 获取网络数据全部订阅
      */
-    private void sendAllSubscriptionRequest() {
+    public void sendAllSubscriptionRequest() {
         //取出本地缓存数据
         mDbSubscriptionNumbers = mDbManager.queryFromAllSubs(new String[]{currentMaster, currentUser}, "subs_master=? and subs_username=? ");
         progressDialog.show();
@@ -384,7 +387,6 @@ public class SubscriptionAllFragment extends BaseFragment {
         public void handleMessage(Message msg) {
             switch (msg.what) {
                 case GET_ALL_SUBSCRIPTION:
-                    progressDialog.dismiss();
                     mDbManager.deleteMasterAllSubs(currentMaster, currentUser);
                     String resultJson = msg.getData().getString("result");
                     Log.d("allsubscriptionResult: ", resultJson);
@@ -465,17 +467,19 @@ public class SubscriptionAllFragment extends BaseFragment {
                     if (keyStrings.size() == 0) {
                         mTypeListView.setVisibility(View.GONE);
                         initKeyStrings();
-                        mSubscriptionNumbers.clear();
+                        mEmptyLayout.showEmpty();
+                        mAllSubscriptionAdapter.getmSubscriptionNumbers().clear();
                         mAllSubscriptionAdapter.notifyDataSetChanged();
                     } else {
                         mTypeListView.setVisibility(View.VISIBLE);
                         mSubsTypeAdapter.notifyDataSetChanged();
                         initKeyStrings();
-                        mSubscriptionNumbers.clear();
-                        mSubscriptionNumbers.addAll(mAllSubscriptonKindMessages.get(rbPos).getSubscriptionNumbers());
-                        Log.d("allsubscription:", mSubscriptionNumbers.toString());
+                        mAllSubscriptionAdapter.getmSubscriptionNumbers().clear();
+                        mAllSubscriptionAdapter.getmSubscriptionNumbers().addAll(mAllSubscriptonKindMessages.get(rbPos).getSubscriptionNumbers());
+                        Log.d("allsubscription:", mAllSubscriptionAdapter.getmSubscriptionNumbers().toString());
                         mAllSubscriptionAdapter.notifyDataSetChanged();
                     }
+                    progressDialog.dismiss();
 
                     if (mPullToRefreshListView.isRefreshing()) {
                         mPullToRefreshListView.onRefreshComplete();
@@ -485,6 +489,9 @@ public class SubscriptionAllFragment extends BaseFragment {
                 case Constants.APP_SOCKETIMEOUTEXCEPTION:
                     progressDialog.dismiss();
                     Crouton.makeText(getActivity(), msg.getData().getString("result"), Style.ALERT).show();
+                    if (mPullToRefreshListView.isRefreshing()){
+                        mPullToRefreshListView.onRefreshComplete();
+                    }
                     break;
             }
         }
@@ -495,8 +502,8 @@ public class SubscriptionAllFragment extends BaseFragment {
         if (requestCode == SUBSCRIBE_DETAIL_REQUEST && resultCode == 9 && data != null) {
             int statu = data.getIntExtra("status", 0);
             if (mClickedPos != -1) {
-                mSubscriptionNumbers.get(mClickedPos - 1).setStatus(statu);
-                mDbManager.updateAllSubs(mSubscriptionNumbers.get(mClickedPos - 1));
+                mAllSubscriptionAdapter.getmSubscriptionNumbers().get(mClickedPos - 1).setStatus(statu);
+                mDbManager.updateAllSubs(mAllSubscriptionAdapter.getmSubscriptionNumbers().get(mClickedPos - 1));
                 mAllSubscriptionAdapter.notifyDataSetChanged();
             }
         }

+ 3 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/util/Constants.java

@@ -25,5 +25,7 @@ public class Constants {
 
     public  static String IS_NOTIFICATION="is_notification";//是是否进行通知
 
-    
+    public final static int REQUEST_MANAGE_ALL_SUBSCRIPTON = 101;
+    public final static int RESULT_MANAGE_ALL_SUBSCRIPTION = 102;
+
 }

+ 1 - 0
WeiChat/src/main/java/com/xzjmyk/pm/activity/view/NoSlideViewpager.java

@@ -9,6 +9,7 @@ import android.view.MotionEvent;
  * Created by RaoMeng on 2016/9/5.
  */
 public class NoSlideViewpager extends ViewPager {
+    //true时不可滑动,false时可滑动
     private boolean noSlide = false;
 
     public NoSlideViewpager(Context context) {

BIN
WeiChat/src/main/res/drawable-hdpi/ic_subscription_number.png


BIN
WeiChat/src/main/res/drawable-xhdpi/ic_subscription_number.png


BIN
WeiChat/src/main/res/drawable-xxhdpi/ic_subscription_number.png


+ 12 - 0
WeiChat/src/main/res/layout/activity_manage_all_subs.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:gravity="center"
+        android:text="未订阅整理页面"/>
+</LinearLayout>

+ 6 - 3
WeiChat/src/main/res/layout/fragment_all_subscription.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="horizontal">
@@ -9,15 +10,17 @@
         android:layout_width="80dp"
         android:layout_height="match_parent"
         android:background="#FFE2E0E0"
-        android:visibility="gone"/>
+        android:visibility="gone" />
+
     <View
         android:layout_width="1dp"
         android:layout_height="match_parent"
-        android:background="@color/item_line"/>
+        android:background="@color/item_line" />
+
     <com.handmark.pulltorefresh.library.PullToRefreshListView
         android:id="@+id/subscription_all_ptlv"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:divider="@color/item_line"
-        android:dividerPadding="1dp"/>
+        android:dividerPadding="1dp" />
 </LinearLayout>

+ 1 - 0
WeiChat/src/main/res/layout/layout_all_subscription_list.xml

@@ -10,6 +10,7 @@
         android:layout_width="40dp"
         android:layout_height="40dp"
         android:scaleType="fitXY"
+        android:src="@drawable/ic_subscription_number"
         />
     <LinearLayout
         android:layout_width="match_parent"

+ 1 - 0
WeiChat/src/main/res/layout/layout_my_subscribe_list.xml

@@ -10,6 +10,7 @@
         android:layout_width="40dp"
         android:layout_height="40dp"
         android:scaleType="fitXY"
+        android:src="@drawable/ic_subscription_number"
         />
 
     <TextView