消息->通知公告 里面的各个界面的分页显示设置，已完成

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

@@ -61,7 +61,7 @@ public class NewsTwoActivity extends BaseActivity {
     public EmptyLayout mEmptyLayout;
     private Context ct;
     private int num = 0;
-    private int currentpage = 0;
+    private int currentpage = 1;
     private List<NewsData> mNewsDataList;
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -76,6 +76,7 @@ public class NewsTwoActivity extends BaseActivity {
         ct = this;
         ViewUtils.inject(this);
         TAG = "NewsTwoActivity";
+
         mNewsDataList = new ArrayList<>();
         adapter = new CardItemAdapter(ct, mNewsDataList);
         mlist.getRefreshableView().setAdapter(adapter);
@@ -108,7 +109,7 @@ public class NewsTwoActivity extends BaseActivity {
         mlist.setOnRefreshListener(new PullToRefreshBase.OnRefreshListener2<ListView>() {
             @Override
             public void onPullDownToRefresh(PullToRefreshBase<ListView> refreshView) {
-                currentpage = 0;
+                currentpage = 1;
                 initData();
 
             }
@@ -147,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", currentpage);
-      //  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"));
@@ -159,17 +160,21 @@ public class NewsTwoActivity extends BaseActivity {
         public void handleMessage(android.os.Message msg) {
             switch (msg.what) {
                 case Constants.LOAD_SUCCESS:
-                    if (currentpage == 0){
+                    if (currentpage == 1){
                         mNewsDataList.clear();
+                        ToastMessage("刷新成功");
+                    }else{
+                        ToastMessage("加载完毕");
                     }
                     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 (dataArray.length() == 0){
+                        if (currentpage == 1 && dataArray == null && mNewsDataList.isEmpty()){
                             mEmptyLayout.showEmpty();
                         }else {
                             for (int i = 0; i < dataArray.length(); i++) {

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

@@ -56,7 +56,7 @@ public class NoticesActivity extends BaseActivity {
     private int type;
     private Context ct;
     private int gnum = 0, nnum = 0;
-    private int currentpage=0;
+    private int currentpage = 1;
     private List<NoticeData> mNoticeData;
 
     @Override
@@ -72,13 +72,18 @@ public class NoticesActivity extends BaseActivity {
     public void initView() {
         TAG = "NoticesActivity";
         ct = this;
-        mNoticeData = new ArrayList<>();
         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) {
@@ -102,7 +107,7 @@ public class NoticesActivity extends BaseActivity {
         mlist.setOnRefreshListener(new PullToRefreshBase.OnRefreshListener2<ListView>() {
             @Override
             public void onPullDownToRefresh(PullToRefreshBase refreshView) {
-                currentpage = 0;
+                currentpage = 1;
                 initData();
             }
 
@@ -148,9 +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("page",currentpage);
-       // param.put("pageSize",10);
+       // 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";
@@ -174,17 +179,21 @@ public class NoticesActivity extends BaseActivity {
         public void handleMessage(android.os.Message msg) {
             switch (msg.what) {
                 case Constants.LOAD_SUCCESS:
-                    if (currentpage == 0){
+                    if (currentpage == 1){
                         mNoticeData.clear();
+                        ToastMessage("刷新成功");
+                    }else {
+                        ToastMessage("加载完毕");
                     }
                     String result = msg.getData().getString("result");
-                    // Log.i("handleMessage: ",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 (dataArray.length() == 0){
+                        if (currentpage == 1 && dataArray.length() == 0){
                             mEmptyLayout.showEmpty();
                         }else {
                             for (int i = 0; i < dataArray.length(); i++) {
@@ -283,7 +292,7 @@ public class NoticesActivity extends BaseActivity {
             } 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/res/layout/activity_oa_alarma.xml

@@ -14,15 +14,17 @@
         android:layout_height="@dimen/item_height"
         android:layout_margin="2dp"
         android:background="@drawable/oa_signin_tv_bg"
-        android:visibility="visible"
-        android:padding="8dp">
+        android:visibility="gone"
+        android:padding="8dp"
+        >
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
             android:text="自动打卡"
-            android:textSize="@dimen/text_main" />
+            android:textSize="@dimen/text_main"
+            />
 
         <com.xzjmyk.pm.activity.ui.erp.view.SwitchView
             android:id="@+id/autosign_sw"