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

WeiChat/build.gradle

@@ -1,6 +1,5 @@
 apply plugin: 'com.android.application'
 apply plugin: 'com.getkeepsafe.dexcount'
-
 android {
 
     lintOptions {
@@ -13,7 +12,7 @@ android {
     }
     signingConfigs {
         config {
-            storeFile file('E:/CompanyProject/applicationsignname[20150409]')
+            storeFile file('C:/Users/FANGlh/Desktop/UU5.5.1/applicationsignname[20150409]')
             storePassword '13237658359'
             keyAlias 'jie-20150409'
             keyPassword '13237658359'

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

@@ -17,7 +17,7 @@ public class AppConfig {
 	public static final String CONFIG_URL = "http://113.105.74.140:8092/config";
 	//public static final String CONFIG_ URL = "http://192.168.253.155:8092/config";
 	/* 分页的Size */
-	public static final int PAGE_SIZE = 50;
+	public static final int PAGE_SIZE = 500;
 
 	/* 基本地址 */
 	public String apiUrl;// Api 的服务器地址

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

@@ -82,12 +82,6 @@ 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);

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

@@ -18,7 +18,7 @@ import android.widget.CheckBox;
 import android.widget.ImageView;
 import android.widget.ListView;
 import android.widget.TextView;
-import android.widget.Toast;
+
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
@@ -28,6 +28,7 @@ import com.handmark.pulltorefresh.library.PullToRefreshListView;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.xzjmyk.pm.activity.R;
+import com.xzjmyk.pm.activity.helper.AvatarHelper;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.model.Employee;
 import com.xzjmyk.pm.activity.ui.erp.model.Employees;
@@ -295,7 +296,7 @@ public class DbfindList2Activity extends BaseActivity{
             ViewHolder holder = null;
             if (view == null) {
                 holder = new ViewHolder();
-                view = LayoutInflater.from(ct).inflate(R.layout.meet_select_item, null);
+                view = LayoutInflater.from(ct).inflate(R.layout.business_distribution_item, null);
                 holder.select_scb = (CheckBox) view.findViewById(R.id.select_scb);
                 holder.id_tv = (TextView) view.findViewById(R.id.id_tv);
                 holder.name_tv = (TextView) view.findViewById(R.id.name_tv);
@@ -309,7 +310,12 @@ public class DbfindList2Activity extends BaseActivity{
             holder.select_scb.setClickable(false);
             String str = (StringUtils.isEmpty(users.get(i).getEm_position()) ? "" : (" | " + users.get(i).getEm_position()));
             holder.id_tv.setText(users.get(i).getEm_depart() + str);
-            holder.name_tv.setText( users.get(i).getEm_name());
+            holder.name_tv.setText(users.get(i).getEm_name());
+            if (users.get(i).getEm_id() == 0){
+                holder.head_img.setImageResource(com.xzjmyk.pm.activity.R.drawable.avatar_normal);
+            }else {
+                AvatarHelper.getInstance().display(users.get(i).getEm_id() + "", holder.head_img, true, true);
+            }
             return view;
         }
 
@@ -352,7 +358,7 @@ public class DbfindList2Activity extends BaseActivity{
             DbfindList2Activity.this.finish();
             finish();
         }else {
-            ToastMessage("请选择分配对象");
+            ToastMessage("请选择分配人员");
         }
 
     }

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

@@ -29,6 +29,7 @@ import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.Friend;
 import com.xzjmyk.pm.activity.db.dao.FriendDao;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+import com.xzjmyk.pm.activity.ui.erp.model.NewsData;
 import com.xzjmyk.pm.activity.ui.erp.model.NewsEntity;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
@@ -36,6 +37,12 @@ import com.xzjmyk.pm.activity.ui.erp.util.Constants;
 import com.xzjmyk.pm.activity.ui.erp.util.ObjectUtils;
 import com.xzjmyk.pm.activity.ui.erp.view.EmptyLayout;
 
+
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -54,7 +61,8 @@ public class NewsTwoActivity extends BaseActivity {
     public EmptyLayout mEmptyLayout;
     private Context ct;
     private int num = 0;
-    private int mCurrentPage = 0;
+    private int currentpage = 1;
+    private List<NewsData> mNewsDataList;
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -68,6 +76,11 @@ public class NewsTwoActivity extends BaseActivity {
         ct = this;
         ViewUtils.inject(this);
         TAG = "NewsTwoActivity";
+
+        mNewsDataList = new ArrayList<>();
+        adapter = new CardItemAdapter(ct, mNewsDataList);
+        mlist.getRefreshableView().setAdapter(adapter);
+
         String mLoginUserId = MyApplication.getInstance().mLoginUser.getUserId();
         // 表示已读
         FriendDao.getInstance().markUserMessageRead(mLoginUserId, Friend.ID_ERP_NEWS);
@@ -92,22 +105,22 @@ public class NewsTwoActivity extends BaseActivity {
                 }
             }
         });
+
         mlist.setOnRefreshListener(new PullToRefreshBase.OnRefreshListener2<ListView>() {
             @Override
             public void onPullDownToRefresh(PullToRefreshBase<ListView> refreshView) {
-//                mCurrentPage = 0;
-//                initData();
+                currentpage = 1;
+                initData();
+
             }
 
             @Override
             public void onPullUpToRefresh(PullToRefreshBase<ListView> refreshView) {
-//                mCurrentPage++;
-//                initData();
+                currentpage++;
+                initData();
             }
         });
     }
-
-
     @Override
     public void onBackPressed() {
         sendResult();
@@ -135,9 +148,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("page", mCurrentPage);
-//        param.put("pageSize",10);
-        param.put("count",1000);
+        param.put("page", currentpage);
+        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"));
@@ -147,20 +160,34 @@ public class NewsTwoActivity extends BaseActivity {
         public void handleMessage(android.os.Message msg) {
             switch (msg.what) {
                 case Constants.LOAD_SUCCESS:
-                    String result = msg.getData().getString("result");
-                    NewsEntity newsEntity = JSON.parseObject(result, NewsEntity.class);
-                    if (adapter == null) {
-                        adapter = new CardItemAdapter(ct, newsEntity);
-                        mlist.getRefreshableView().setAdapter(adapter);
-                        mlist.setVisibility(View.VISIBLE);
-                        progress_bar.setVisibility(View.GONE);
-                    } else {
-                        adapter.notifyDataSetChanged();
+                    if (currentpage == 1){
+                        mNewsDataList.clear();
+                        ToastMessage("刷新成功");
+                    }else{
+                        ToastMessage("加载完毕");
                     }
-                    if(adapter.getCount()==0){
-                        mEmptyLayout.showEmpty();
+                    String result = msg.getData().getString("result");
+                   // Log.i("handleMessage: ",result);
+                    progress_bar.setVisibility(View.GONE);
+                    mlist.setVisibility(View.VISIBLE);
+                    mlist.onRefreshComplete();
+                    try {
+                        JSONObject resultJsonObject = new JSONObject(result);
+                        JSONArray dataArray = resultJsonObject.getJSONArray("data");
+                        if (currentpage == 1 && dataArray == null && mNewsDataList.isEmpty()){
+                            mEmptyLayout.showEmpty();
+                        }else {
+                            for (int i = 0; i < dataArray.length(); i++) {
+                                JSONObject currentObject = dataArray.getJSONObject(i);
+                                NewsData newsData = JSON.parseObject(currentObject.toString(), NewsData.class);
+                                mNewsDataList.add(newsData);
+                            }
+                            adapter.notifyDataSetChanged();
+                        }
+                    } catch (JSONException e) {
+                        e.printStackTrace();
                     }
-                    Log.i(TAG, result);
+
                     break;
                 case Constants.APP_SOCKETIMEOUTEXCEPTION:
                     result = msg.getData().getString("result");
@@ -175,30 +202,31 @@ public class NewsTwoActivity extends BaseActivity {
             }
         }
 
-        ;
+
     };
 
 
     public class CardItemAdapter extends BaseAdapter {
-        private NewsEntity newsEntities;
+       // private NewsEntity newsEntities;
+        private List<NewsData> newsDataList;
         private Context ct;
         private LayoutInflater inflater;
 
-        public CardItemAdapter(Context ct, NewsEntity list) {
+        public CardItemAdapter(Context ct, List<NewsData> newsDataList) {
             this.ct = ct;
-            this.newsEntities = list;
+            this.newsDataList = newsDataList;
             this.inflater = LayoutInflater.from(ct);
         }
 
         @Override
         public int getCount() {
-            return newsEntities == null ? 0 : newsEntities.getData().size();
+            return newsDataList == null ? 0 : newsDataList.size();
 
         }
 
         @Override
         public Object getItem(int position) {
-            return newsEntities.getData().get(position);
+            return newsDataList.get(position);
         }
 
         @Override
@@ -232,21 +260,21 @@ public class NewsTwoActivity extends BaseActivity {
                 convertView.setBackgroundColor(getResources().getColor(R.color.item_color2));
 
             }
-            List<NewsEntity.Data> datas = newsEntities.getData();
 //			model.tv_title.setText(datas.get(position).getNE_THEME());
-            model.tv_time.setText(CommonUtil.transferLongToDate("yyyy-MM-dd HH:mm:ss", datas.get(position).getNE_RELEASEDATE()));
+            model.tv_time.setText(CommonUtil.transferLongToDate("yyyy-MM-dd HH:mm:ss",
+                    newsDataList.get(position).getNE_RELEASEDATE()));
 
 //			model.tv_count.setText(datas.get(position).getNE_BROWSENUMBER()+"");
-            model.tv_theme.setText(datas.get(position).getNE_THEME());
-            model.tv_author.setText("作者:" + datas.get(position).getNE_RELEASER());
-            model.id = datas.get(position).getNE_ID();
-            if (!ObjectUtils.isEquals(datas.get(position).getSTATUS(), null)) {
-                if (((int) datas.get(position).getSTATUS()) != -1) {
+            model.tv_theme.setText(newsDataList.get(position).getNE_THEME());
+            model.tv_author.setText("作者:" + newsDataList.get(position).getNE_RELEASER());
+            model.id = newsDataList.get(position).getNE_ID();
+            if (!ObjectUtils.isEquals(newsDataList.get(position).getSTATUS(), null)) {
+                if (((int) newsDataList.get(position).getSTATUS()) != -1) {
                     model.img.setImageResource(R.drawable.notice_img_1);
                     model.hasRead = -1;
 
                 } else {
-                    if (((int) datas.get(position).getSTATUS()) == -1) {
+                    if (((int) newsDataList.get(position).getSTATUS()) == -1) {
                         model.img.setImageResource(R.drawable.notice_img_2);
                         model.hasRead = 1;
 

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

@@ -106,7 +106,7 @@ public class NoticeMenuActivity extends BaseActivity {
                     if (bean.unReNun > 0) {
                         bean.subTitle = "您有" + bean.unReNun + "条新闻未阅读";
                     } else {
-                        bean.subTitle = "您有暂无未阅读新闻消息";
+                        bean.subTitle = "您暂无未阅读新闻消息";
                     }
                     bean.time = "刚刚";
                     bean.title = "新闻";
@@ -121,7 +121,7 @@ public class NoticeMenuActivity extends BaseActivity {
                     if (bean.unReNun > 0) {
                         bean.subTitle = "您有" + bean.unReNun + "条通知未阅读";
                     } else {
-                        bean.subTitle = "您有暂无未阅读通知内容";
+                        bean.subTitle = "您无未阅读通知内容";
                     }
                     bean.time = "刚刚";
                     bean.title = "通知";
@@ -135,7 +135,7 @@ public class NoticeMenuActivity extends BaseActivity {
                     if (bean.unReNun > 0) {
                         bean.subTitle = "您有" + bean.unReNun + "条公告未阅读";
                     } else {
-                        bean.subTitle = "您有暂无未阅读公告消息";
+                        bean.subTitle = "您暂无未阅读公告消息";
                     }
                     bean.time = "刚刚";
                     bean.title = "公告";

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

@@ -13,16 +13,19 @@ 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.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.Friend;
 import com.xzjmyk.pm.activity.db.dao.FriendDao;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+import com.xzjmyk.pm.activity.ui.erp.model.NoticeData;
 import com.xzjmyk.pm.activity.ui.erp.model.NoticeEntity;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
@@ -30,6 +33,11 @@ import com.xzjmyk.pm.activity.ui.erp.util.Constants;
 import com.xzjmyk.pm.activity.ui.erp.util.ObjectUtils;
 import com.xzjmyk.pm.activity.ui.erp.view.EmptyLayout;
 
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -37,7 +45,7 @@ import java.util.Map;
 
 /**
  * @author Administrator
- * @功能:通知
+ * @功能:通知公告
  */
 public class NoticesActivity extends BaseActivity {
 
@@ -48,6 +56,8 @@ public class NoticesActivity extends BaseActivity {
     private int type;
     private Context ct;
     private int gnum = 0, nnum = 0;
+    private int currentpage = 1;
+    private List<NoticeData> mNoticeData;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -62,13 +72,18 @@ public class NoticesActivity extends BaseActivity {
     public void initView() {
         TAG = "NoticesActivity";
         ct = this;
-
         getSupportActionBar().setTitle("通知");
+
+        mNoticeData = new ArrayList<>();
+        adapter = new CardItemAdapter(this,mNoticeData);
+        mlist.getRefreshableView().setAdapter(adapter);
+
         mEmptyLayout = new EmptyLayout(this, mlist.getRefreshableView());
         mEmptyLayout.setShowEmptyButton(false);
         mEmptyLayout.setShowErrorButton(false);
         mEmptyLayout.setShowLoadingButton(false);
         type = getIntent().getIntExtra("type", 0);
+        mlist.setMode(PullToRefreshBase.Mode.BOTH);
         mlist.getRefreshableView().setOnItemClickListener(new OnItemClickListener() {
             @Override
             public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
@@ -88,6 +103,20 @@ public class NoticesActivity extends BaseActivity {
 
             }
         });
+
+        mlist.setOnRefreshListener(new PullToRefreshBase.OnRefreshListener2<ListView>() {
+            @Override
+            public void onPullDownToRefresh(PullToRefreshBase refreshView) {
+                currentpage = 1;
+                initData();
+            }
+
+            @Override
+            public void onPullUpToRefresh(PullToRefreshBase refreshView) {
+                currentpage++;
+                initData();
+            }
+        });
     }
 
 
@@ -111,7 +140,7 @@ public class NoticesActivity extends BaseActivity {
         Intent intent = new Intent();
         if (type == 1) {//通知
             intent.putExtra(NoticeMenuActivity.NOTICE, nnum);
-        } else {
+        } else { //公告
             intent.putExtra(NoticeMenuActivity.GONGGAO, gnum);
 
         }
@@ -124,7 +153,9 @@ public class NoticesActivity extends BaseActivity {
         progress_bar.setVisibility(View.VISIBLE);
         String url =null;
         final Map<String, Object> param = new HashMap<>();
-        param.put("count", "1000");
+       // param.put("count", "1000");
+        param.put("page",currentpage);
+        param.put("pageSize",10);
         param.put("sessionId", CommonUtil.getSharedPreferences(ct, "sessionId"));
         if (getIntent().getIntExtra("type", 0) == 1) {
             url = Constants.getAppBaseUrl(ct) + "common/desktop/note/inform.action";
@@ -148,35 +179,33 @@ public class NoticesActivity extends BaseActivity {
         public void handleMessage(android.os.Message msg) {
             switch (msg.what) {
                 case Constants.LOAD_SUCCESS:
-                    String result = msg.getData().getString("result");
-                    NoticeEntity newsEntity = JSON.parseObject(result, NoticeEntity.class);
-                    if (adapter == null) {
-//                        String em_id = CommonUtil.getSharedPreferences(ct, "erp_emid");
-//                        List<NoticeEntity.Data> fiterdata = new ArrayList<NoticeEntity.Data>();
-//                        for (int i = 0; i < newsEntity.getData().size(); i++) {
-//                            if (newsEntity.getData().get(i).getNO_ISPUBLIC() == 0) {
-//                                if ((!StringUtils.isEmpty(em_id) && newsEntity.getData().get(i).getNO_RECIPIENTID() != null)) {
-//                                    if (newsEntity.getData().get(i).getNO_RECIPIENTID().toString().contains(em_id)) {
-//                                        fiterdata.add(newsEntity.getData().get(i));
-//                                    }
-//                               }
-//                            } else {
-//                                fiterdata.add(newsEntity.getData().get(i));
-//                            }
-//                        }
-//                        newsEntity.setData(fiterdata);
-                        adapter = new CardItemAdapter(ct, newsEntity);
-                        mlist.getRefreshableView().setAdapter(adapter);
-                        mlist.setVisibility(View.VISIBLE);
-                        progress_bar.setVisibility(View.GONE);
-
-                    } else {
-                        adapter.notifyDataSetChanged();
+                    if (currentpage == 1){
+                        mNoticeData.clear();
+                        ToastMessage("刷新成功");
+                    }else {
+                        ToastMessage("加载完毕");
                     }
-                    if(adapter.getCount()==0){
-                        mEmptyLayout.showEmpty();
+                    String result = msg.getData().getString("result");
+                    Log.i("handleMessage: ",result);
+                    progress_bar.setVisibility(View.GONE);
+                    mlist.setVisibility(View.VISIBLE);
+                    mlist.onRefreshComplete();
+                    try {
+                        JSONObject resultJsonObject = new JSONObject(result);
+                        JSONArray dataArray = resultJsonObject.getJSONArray("data");
+                        if (currentpage == 1 && dataArray.length() == 0){
+                            mEmptyLayout.showEmpty();
+                        }else {
+                            for (int i = 0; i < dataArray.length(); i++) {
+                                JSONObject currentObject = dataArray.getJSONObject(i);
+                                NoticeData noticeData  = JSON.parseObject(currentObject.toString(), NoticeData.class);
+                                mNoticeData.add(noticeData);
+                            }
+                            adapter.notifyDataSetChanged();
+                        }
+                    } catch (JSONException e) {
+                        e.printStackTrace();
                     }
-                    Log.i(TAG, result);
                     break;
                 case Constants.APP_SOCKETIMEOUTEXCEPTION:
                     result = msg.getData().getString("result");
@@ -195,23 +224,24 @@ public class NoticesActivity extends BaseActivity {
 
     public class CardItemAdapter extends BaseAdapter {
 
-        private NoticeEntity newsEntities;
+       // private NoticeEntity newsEntities;
+        private List<NoticeData> noticeDataList;
         private LayoutInflater inflater;
 
-        public CardItemAdapter(Context ct, NoticeEntity list) {
-            this.newsEntities = list;
+        public CardItemAdapter(Context ct, List<NoticeData> noticeDataList) {
+            this.noticeDataList = noticeDataList;
             this.inflater = LayoutInflater.from(ct);
         }
 
         @Override
         public int getCount() {
-            return newsEntities == null ? 0 : newsEntities.getData().size();
+            return noticeDataList == null ? 0 : noticeDataList.size();
 
         }
 
         @Override
         public Object getItem(int position) {
-            return newsEntities.getData().get(position);
+            return noticeDataList.get(position);
         }
 
         @Override
@@ -243,26 +273,26 @@ public class NoticesActivity extends BaseActivity {
                 convertView.setBackgroundColor(getResources().getColor(R.color.item_color2));
             }
 
-            List<NoticeEntity.Data> datas = newsEntities.getData();
+           // List<NoticeData> noticeDataList = noticeDataList;
 //			model.tv_title.setText(datas.get(position).getNO_TITLE());
             model.tv_time.setText(CommonUtil.transferLongToDate("yyyy-MM-dd HH:mm:ss",
-                    datas.get(position).getNO_APPTIME()));
-            model.tv_theme.setText(datas.get(position).getNO_TITLE().replace("&nbsp;",""));
-            model.tv_author.setText(datas.get(position).getNO_APPROVER());
-            model.id = datas.get(position).getNO_ID();
-            model.hasRead = datas.get(position).getSTATUS() == null ? -1 : (int) datas.get(position).getSTATUS();
-            if (!ObjectUtils.isEquals(datas.get(position).getSTATUS(), null)) {
-                if (((int) datas.get(position).getSTATUS()) != -1) {
+                    noticeDataList.get(position).getNO_APPTIME()));
+            model.tv_theme.setText(noticeDataList.get(position).getNO_TITLE().replace("&nbsp;",""));
+            model.tv_author.setText(noticeDataList.get(position).getNO_APPROVER());
+            model.id = noticeDataList.get(position).getNO_ID();
+            model.hasRead = noticeDataList.get(position).getSTATUS() == null ? -1 : (int) noticeDataList.get(position).getSTATUS();
+            if (!ObjectUtils.isEquals(noticeDataList.get(position).getSTATUS(), null)) {
+                if (((int) noticeDataList.get(position).getSTATUS()) != -1) {
                     model.img.setImageResource(R.drawable.notice_img_1);
                 } else {
-                    if (((int) datas.get(position).getSTATUS()) == -1) {
+                    if (((int) noticeDataList.get(position).getSTATUS()) == -1) {
                         model.img.setImageResource(R.drawable.notice_img_2);
                     }
                 }
             } else {
                 model.img.setImageResource(R.drawable.notice_img_1);
             }
-            
+
 //			model.tv_count.setVisibility(View.GONE);
             return convertView;
         }

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

@@ -79,6 +79,7 @@ public class TaskActivity extends BaseActivity {
                 } else {
                     adapter = new SchedultAdapter(TaskActivity.this, allList);
                     listview_main.setAdapter(adapter);
+                    ToastMessage("想要查看具体任务情况，请点击进入");
                 }
                 listview_main.onRefreshComplete();
             } else if (msg.what == 0) {
@@ -161,7 +162,7 @@ public class TaskActivity extends BaseActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.task_listview);
-        ToastMessage("想要查看具体任务情况，请点击进入");
+
         context = TaskActivity.this;
         ViewUtils.inject(this);
         getSupportActionBar().setTitle("我的任务");
@@ -304,6 +305,7 @@ public class TaskActivity extends BaseActivity {
         if (reString != null && !reString.equals("500")) {
             Map<String, Object> results = FlexJsonUtil.fromJson(reString);
             if (results.get("allProcess") != null) {
+
                 String count = results.get("count").toString();
                 Intent intent_update = new Intent("com.activity.update.data");
                 getSharedPreferences("setting", MODE_PRIVATE).edit().putString("count", count).commit();
@@ -321,7 +323,7 @@ public class TaskActivity extends BaseActivity {
                     if (allProcesses.get(i).getTypecode().contains("task")) {
                         taskProcess.add(allProcesses.get(i));
                     }
-                    ;
+
                 }
                 if (!taskProcess.isEmpty()) {
                     intent_update.putExtra("count", String.valueOf(taskProcess.size()));

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

@@ -47,7 +47,7 @@ public class AlarmaActivity extends BaseActivity implements View.OnClickListener
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_oa__alarma);
+        setContentView(R.layout.activity_oa_alarma);
         ViewUtils.inject(this);
         initView();
     }

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

@@ -0,0 +1,19 @@
+package com.xzjmyk.pm.activity.ui.erp.activity.oa;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+
+import com.xzjmyk.pm.activity.util.TimeUtils;
+
+/**
+ * Created by FANGlh on 2016/10/27.
+ */
+public class AutoSignReceiver extends BroadcastReceiver {
+
+    private String c_time = TimeUtils.long2str(System.currentTimeMillis(), "HH:mm");//获取当前时间的时分
+    @Override
+    public void onReceive(Context context, Intent intent) {
+
+    }
+}

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

@@ -265,6 +265,7 @@ public class SigninFragment extends EasyFragment implements View.OnClickListener
                         Crouton.makeText(ct, "当前网络不可用，请检查网络连接");
                         return;
                     }
+                    validatorMac();
                     if (isMacInNet) {
                         validatorMac();
                     } else {

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

@@ -0,0 +1,134 @@
+package com.xzjmyk.pm.activity.ui.erp.model;
+
+/**
+ * Created by FANGlh on 2016/10/28.
+ */
+public class NewsData {
+
+    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 Object getSTATUS() {
+        return STATUS;
+    }
+
+    public void setSTATUS(Object STATUS) {
+        this.STATUS = STATUS;
+    }
+}

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

@@ -0,0 +1,145 @@
+package com.xzjmyk.pm.activity.ui.erp.model;
+
+/**
+ * Created by FANGlh on 2016/10/28.
+ */
+public class NoticeData {
+    private int NO_ID;
+
+    private String NO_TITLE;
+
+    private String NO_APPROVER;
+
+    private Long NO_APPTIME;
+
+    private String NO_INFOTYPE;
+
+    private String NO_EMERGENCY;
+
+    private Object NO_KEYWORD;//公告
+
+    private String NO_CONTENT;
+
+    private int NO_ISTOP;
+
+    private int NO_ISREAD;//
+
+    private int NO_ISPUBLIC;
+
+    private int RN;
+    private Object NO_RECIPIENTID;
+
+    private Object STATUS;
+
+    public Object getNO_RECIPIENTID() {
+        return NO_RECIPIENTID;
+    }
+
+    public void setNO_RECIPIENTID(Object NO_RECIPIENTID) {
+        this.NO_RECIPIENTID = NO_RECIPIENTID;
+    }
+
+    public int getNO_ID() {
+        return NO_ID;
+    }
+
+    public void setNO_ID(int NO_ID) {
+        this.NO_ID = NO_ID;
+    }
+
+    public String getNO_TITLE() {
+        return NO_TITLE;
+    }
+
+    public void setNO_TITLE(String NO_TITLE) {
+        this.NO_TITLE = NO_TITLE;
+    }
+
+    public String getNO_APPROVER() {
+        return NO_APPROVER;
+    }
+
+    public void setNO_APPROVER(String NO_APPROVER) {
+        this.NO_APPROVER = NO_APPROVER;
+    }
+
+    public Long getNO_APPTIME() {
+        return NO_APPTIME;
+    }
+
+    public void setNO_APPTIME(Long NO_APPTIME) {
+        this.NO_APPTIME = NO_APPTIME;
+    }
+
+    public String getNO_INFOTYPE() {
+        return NO_INFOTYPE;
+    }
+
+    public void setNO_INFOTYPE(String NO_INFOTYPE) {
+        this.NO_INFOTYPE = NO_INFOTYPE;
+    }
+
+    public String getNO_EMERGENCY() {
+        return NO_EMERGENCY;
+    }
+
+    public void setNO_EMERGENCY(String NO_EMERGENCY) {
+        this.NO_EMERGENCY = NO_EMERGENCY;
+    }
+
+    public Object getNO_KEYWORD() {
+        return NO_KEYWORD;
+    }
+
+    public void setNO_KEYWORD(Object NO_KEYWORD) {
+        this.NO_KEYWORD = NO_KEYWORD;
+    }
+
+    public String getNO_CONTENT() {
+        return NO_CONTENT;
+    }
+
+    public void setNO_CONTENT(String NO_CONTENT) {
+        this.NO_CONTENT = NO_CONTENT;
+    }
+
+    public int getNO_ISTOP() {
+        return NO_ISTOP;
+    }
+
+    public void setNO_ISTOP(int NO_ISTOP) {
+        this.NO_ISTOP = NO_ISTOP;
+    }
+
+    public int getNO_ISREAD() {
+        return NO_ISREAD;
+    }
+
+    public void setNO_ISREAD(int NO_ISREAD) {
+        this.NO_ISREAD = NO_ISREAD;
+    }
+
+    public int getNO_ISPUBLIC() {
+        return NO_ISPUBLIC;
+    }
+
+    public void setNO_ISPUBLIC(int NO_ISPUBLIC) {
+        this.NO_ISPUBLIC = NO_ISPUBLIC;
+    }
+
+    public int getRN() {
+        return RN;
+    }
+
+    public void setRN(int RN) {
+        this.RN = RN;
+    }
+
+    public Object getSTATUS() {
+        return STATUS;
+    }
+
+    public void setSTATUS(Object STATUS) {
+        this.STATUS = STATUS;
+    }
+}

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

@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="@dimen/item_height"
+    android:background="@color/bg_main"
+    android:padding="8dp">
+
+    <CheckBox
+        android:id="@+id/select_scb"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:button="@null"
+        android:checked="false"
+        android:drawableLeft="@drawable/oa_rb_button_bg"
+        android:padding="10dp" />
+
+    <ImageView
+        android:id="@+id/head_img"
+        android:layout_width="38dp"
+        android:layout_height="38dp"
+        android:layout_centerVertical="true"
+        android:layout_toRightOf="@id/select_scb"
+        android:src="@drawable/friend_u"
+        android:visibility="visible" />
+
+    <TextView
+        android:id="@+id/name_tv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="10dp"
+        android:layout_toRightOf="@+id/head_img"
+        android:textColor="@color/text_main"
+        android:textSize="@dimen/text_main" />
+
+    <TextView
+        android:id="@+id/id_tv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignLeft="@+id/name_tv"
+        android:layout_below="@+id/name_tv"
+        android:layout_marginTop="8dp"
+        android:textColor="@color/text_hine"
+        android:textSize="@dimen/text_hine" />
+</RelativeLayout>

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

@@ -90,7 +90,7 @@
         <View
             android:layout_width="match_parent"
             android:layout_height="2px"
-            android:layout_marginTop="30dp"
+            android:layout_marginTop="5dp"
             android:background="@color/item_line" />
 
         <RelativeLayout
@@ -153,7 +153,7 @@
                 android:layout_alignLeft="@id/date_tv"
                 android:layout_below="@+id/location_tv"
                 android:layout_marginTop="5dp"
-                android:maxLines="2"
+                android:maxLines="3"
                 android:textColor="@color/text_hine"
                 android:textSize="@dimen/text_hine" />
 

WeiChat/src/main/res/values/styles.xml

@@ -760,7 +760,7 @@
         <item name="android:layout_height">match_parent</item>
         <item name="android:layout_marginTop">10dp</item>
         <item name="android:divider">#00000000</item>
-        <item name="android:dividerHeight">10dp</item>
+        <item name="android:dividerHeight">5dp</item>
         <item name="android:scrollingCache">false</item>
         <item name="android:headerDividersEnabled">false</item>
         <item name="android:footerDividersEnabled">true</item>
@@ -768,6 +768,16 @@
         <item name="android:listSelector">@android:color/transparent</item>
     </style>
 
+    <!--通用PullToRefreshListView列表显示间隙style-->
+    <style name="general_Line_clearance">
+        <item name="android:divider">@drawable/bg_bar</item>
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">match_parent</item>
+        <item name="android:layout_marginTop">10dp</item>
+        <item name="android:dividerHeight">5dp</item>
+        <item name="android:scrollingCache">false</item>
+    </style>
+
     <style name="GridViewBasic">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">match_parent</item>