Merge branch 'draft' of https://gitlab.com/Arisono/SkWeiChat-Baidu into csdn

WeiChat/build.gradle

@@ -13,7 +13,7 @@ android {
     }
     signingConfigs {
         config {
-            storeFile file('C:/Users/Arison/Desktop/applicationsignname[20150409]')
+            storeFile file('E:/CompanyProject/applicationsignname[20150409]')
             storePassword '13237658359'
             keyAlias 'jie-20150409'
             keyPassword '13237658359'
@@ -123,9 +123,7 @@ dependencies {
     compile('com.facebook.stetho:stetho:1.4.1') {
         force = true
     }
-
     releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5'
     debugCompile 'com.squareup.leakcanary:leakcanary-android:1.5'
     androidTestCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5'
-  
 }

WeiChat/src/main/java/com/xzjmyk/pm/activity/MyApplication.java

@@ -69,14 +69,6 @@ public class MyApplication extends Application {
     @Override
     public void onCreate() {
         super.onCreate();
-//        //
-//        if (LeakCanary.isInAnalyzerProcess(this)) {
-//            // This process is dedicated to LeakCanary for heap analysis.
-//            // You should not init your app in this process.
-//            return;
-//        }
-//        LeakCanary.install(this);
-        // Normal app init code...
         //Stetho调试工具初始化
         Stetho.initializeWithDefaults(this);
         //自定义闪退页面初始化
@@ -90,6 +82,13 @@ public class MyApplication extends Application {
         //设置重新启动的activity
         CustomActivityOnCrash.setRestartActivityClass(SplashActivity.class);
 
+        /*if (LeakCanary.isInAnalyzerProcess(this)) {
+            // This process is dedicated to LeakCanary for heap analysis.
+            // You should not init your app in this process.
+            return;
+        }
+        LeakCanary.install(this);*/
+
         INSTANCE = this;
         ZXingLibrary.initDisplayOpinion(this);
         mRequestQueue = Volley.newRequestQueue(this);

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

@@ -15,10 +15,12 @@ import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemClickListener;
 import android.widget.BaseAdapter;
 import android.widget.ImageView;
+import android.widget.ListView;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
+import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
@@ -52,7 +54,7 @@ public class NewsTwoActivity extends BaseActivity {
     public EmptyLayout mEmptyLayout;
     private Context ct;
     private int num = 0;
-
+    private int mCurrentPage = 0;
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -75,6 +77,7 @@ public class NewsTwoActivity extends BaseActivity {
         mEmptyLayout.setShowErrorButton(false);
         mEmptyLayout.setShowLoadingButton(false);
         getSupportActionBar().setTitle("新闻");
+        mlist.setMode(PullToRefreshBase.Mode.BOTH);
         mlist.getRefreshableView().setOnItemClickListener(new OnItemClickListener() {
 
             @Override
@@ -89,6 +92,19 @@ public class NewsTwoActivity extends BaseActivity {
                 }
             }
         });
+        mlist.setOnRefreshListener(new PullToRefreshBase.OnRefreshListener2<ListView>() {
+            @Override
+            public void onPullDownToRefresh(PullToRefreshBase<ListView> refreshView) {
+//                mCurrentPage = 0;
+//                initData();
+            }
+
+            @Override
+            public void onPullUpToRefresh(PullToRefreshBase<ListView> refreshView) {
+//                mCurrentPage++;
+//                initData();
+            }
+        });
     }
 
 
@@ -119,7 +135,9 @@ public class NewsTwoActivity extends BaseActivity {
         progress_bar.setVisibility(View.VISIBLE);
         String url = Constants.getAppBaseUrl(ct) + "common/desktop/news/getNews.action";
         final Map<String, Object> param = new HashMap<>();
-        param.put("count", 1000);
+//        param.put("page", mCurrentPage);
+//        param.put("pageSize",10);
+        param.put("count",1000);
         param.put("sessionId", CommonUtil.getSharedPreferences(ct, "sessionId"));
         LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
         headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));

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

@@ -3,16 +3,17 @@ package com.xzjmyk.pm.activity.ui.erp.model;
 import java.util.List;
 
 public class NewsEntity {
-	private List<Data> data ;
-
-	public void setData(List<Data> data){
-	this.data = data;
-	}
-	public List<Data> getData(){
-	return this.data;
-	}
-	
-	public class Data {
+    private List<Data> data;
+
+    public void setData(List<Data> data) {
+        this.data = data;
+    }
+
+    public List<Data> getData() {
+        return this.data;
+    }
+
+    public class Data {
 //		private int RN;
 //
 //		private String ne_code;
@@ -29,131 +30,131 @@ public class NewsEntity {
 //
 //		private int ne_id;
 
-		private int   NE_ID;
-		private Object	NE_NKID;
-		private String  NE_RELEASER;//作者
-		private String	NE_THEME;//
-		private Long NE_RELEASEDATE;//时间
-		private int	NE_BROWSENUMBER;//浏览量
-		private String	NE_TYPE;//新闻类型
-		private String	NE_CODE;
-		private String	NE_CONTENT;//响应正文
-		private Object	NE_FEEL;
-		private Object	NE_ATTACHS;
-		private int		NE_ISTOP;//是否公开
-		private int		RN;//编号
-		private Object	STATUS;//状态
-
-		public int getNE_ID() {
-			return NE_ID;
-		}
-
-		public void setNE_ID(int NE_ID) {
-			this.NE_ID = NE_ID;
-		}
-
-		public Object getNE_NKID() {
-			return NE_NKID;
-		}
-
-		public void setNE_NKID(Object NE_NKID) {
-			this.NE_NKID = NE_NKID;
-		}
-
-		public String getNE_RELEASER() {
-			return NE_RELEASER;
-		}
-
-		public void setNE_RELEASER(String NE_RELEASER) {
-			this.NE_RELEASER = NE_RELEASER;
-		}
-
-		public String getNE_THEME() {
-			return NE_THEME;
-		}
-
-		public void setNE_THEME(String NE_THEME) {
-			this.NE_THEME = NE_THEME;
-		}
-
-		public Long getNE_RELEASEDATE() {
-			return NE_RELEASEDATE;
-		}
-
-		public void setNE_RELEASEDATE(Long NE_RELEASEDATE) {
-			this.NE_RELEASEDATE = NE_RELEASEDATE;
-		}
-
-		public int getNE_BROWSENUMBER() {
-			return NE_BROWSENUMBER;
-		}
-
-		public void setNE_BROWSENUMBER(int NE_BROWSENUMBER) {
-			this.NE_BROWSENUMBER = NE_BROWSENUMBER;
-		}
-
-		public String getNE_TYPE() {
-			return NE_TYPE;
-		}
-
-		public void setNE_TYPE(String NE_TYPE) {
-			this.NE_TYPE = NE_TYPE;
-		}
-
-		public String getNE_CODE() {
-			return NE_CODE;
-		}
-
-		public void setNE_CODE(String NE_CODE) {
-			this.NE_CODE = NE_CODE;
-		}
-
-		public String getNE_CONTENT() {
-			return NE_CONTENT;
-		}
-
-		public void setNE_CONTENT(String NE_CONTENT) {
-			this.NE_CONTENT = NE_CONTENT;
-		}
-
-		public Object getNE_FEEL() {
-			return NE_FEEL;
-		}
-
-		public void setNE_FEEL(Object NE_FEEL) {
-			this.NE_FEEL = NE_FEEL;
-		}
-
-		public Object getNE_ATTACHS() {
-			return NE_ATTACHS;
-		}
-
-		public void setNE_ATTACHS(Object NE_ATTACHS) {
-			this.NE_ATTACHS = NE_ATTACHS;
-		}
-
-		public int getNE_ISTOP() {
-			return NE_ISTOP;
-		}
-
-		public void setNE_ISTOP(int NE_ISTOP) {
-			this.NE_ISTOP = NE_ISTOP;
-		}
-
-		public int getRN() {
-			return RN;
-		}
+        private int NE_ID;
+        private Object NE_NKID;
+        private String NE_RELEASER;//作者
+        private String NE_THEME;//
+        private Long NE_RELEASEDATE;//时间
+        private int NE_BROWSENUMBER;//浏览量
+        private String NE_TYPE;//新闻类型
+        private String NE_CODE;
+        private String NE_CONTENT;//响应正文
+        private Object NE_FEEL;
+        private Object NE_ATTACHS;
+        private int NE_ISTOP;//是否公开
+        private int RN;//编号
+        private Object STATUS;//状态
+
+        public int getNE_ID() {
+            return NE_ID;
+        }
+
+        public void setNE_ID(int NE_ID) {
+            this.NE_ID = NE_ID;
+        }
+
+        public Object getNE_NKID() {
+            return NE_NKID;
+        }
+
+        public void setNE_NKID(Object NE_NKID) {
+            this.NE_NKID = NE_NKID;
+        }
+
+        public String getNE_RELEASER() {
+            return NE_RELEASER;
+        }
+
+        public void setNE_RELEASER(String NE_RELEASER) {
+            this.NE_RELEASER = NE_RELEASER;
+        }
+
+        public String getNE_THEME() {
+            return NE_THEME;
+        }
+
+        public void setNE_THEME(String NE_THEME) {
+            this.NE_THEME = NE_THEME;
+        }
+
+        public Long getNE_RELEASEDATE() {
+            return NE_RELEASEDATE;
+        }
+
+        public void setNE_RELEASEDATE(Long NE_RELEASEDATE) {
+            this.NE_RELEASEDATE = NE_RELEASEDATE;
+        }
+
+        public int getNE_BROWSENUMBER() {
+            return NE_BROWSENUMBER;
+        }
+
+        public void setNE_BROWSENUMBER(int NE_BROWSENUMBER) {
+            this.NE_BROWSENUMBER = NE_BROWSENUMBER;
+        }
+
+        public String getNE_TYPE() {
+            return NE_TYPE;
+        }
+
+        public void setNE_TYPE(String NE_TYPE) {
+            this.NE_TYPE = NE_TYPE;
+        }
+
+        public String getNE_CODE() {
+            return NE_CODE;
+        }
+
+        public void setNE_CODE(String NE_CODE) {
+            this.NE_CODE = NE_CODE;
+        }
+
+        public String getNE_CONTENT() {
+            return NE_CONTENT;
+        }
+
+        public void setNE_CONTENT(String NE_CONTENT) {
+            this.NE_CONTENT = NE_CONTENT;
+        }
+
+        public Object getNE_FEEL() {
+            return NE_FEEL;
+        }
+
+        public void setNE_FEEL(Object NE_FEEL) {
+            this.NE_FEEL = NE_FEEL;
+        }
+
+        public Object getNE_ATTACHS() {
+            return NE_ATTACHS;
+        }
+
+        public void setNE_ATTACHS(Object NE_ATTACHS) {
+            this.NE_ATTACHS = NE_ATTACHS;
+        }
+
+        public int getNE_ISTOP() {
+            return NE_ISTOP;
+        }
+
+        public void setNE_ISTOP(int NE_ISTOP) {
+            this.NE_ISTOP = NE_ISTOP;
+        }
+
+        public int getRN() {
+            return RN;
+        }
 
-		public void setRN(int RN) {
-			this.RN = RN;
-		}
+        public void setRN(int RN) {
+            this.RN = RN;
+        }
 
-		public Object getSTATUS() {
-			return STATUS;
-		}
+        public Object getSTATUS() {
+            return STATUS;
+        }
 
-		public void setSTATUS(Object STATUS) {
-			this.STATUS = STATUS;
-		}
-	}
+        public void setSTATUS(Object STATUS) {
+            this.STATUS = STATUS;
+        }
+    }
 }

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

@@ -15,6 +15,8 @@
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:paddingTop="8dp"
+        android:paddingBottom="5dp"
         android:paddingLeft="27dp"
         android:paddingRight="27dp">