新闻通知添加进度体！还有内容显示文本2!

WeiChat/src/main/AndroidManifest.xml

@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="com.xzjmyk.pm.activity"
-    android:versionCode="45"
-    android:versionName="4.5">
+    android:versionCode="46"
+    android:versionName="4.6">
 
     <uses-sdk
         android:minSdkVersion="11"

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

@@ -115,6 +115,8 @@ public class NewsTwoActivity extends BaseActivity {
     }
 
     public void initData() {
+        mlist.setVisibility(View.GONE);
+        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);
@@ -132,11 +134,14 @@ public class NewsTwoActivity extends BaseActivity {
                     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(adapter.getCount()==0){
+                        mEmptyLayout.showEmpty();
+                    }
                     Log.i(TAG, result);
                     break;
                 case Constants.APP_SOCKETIMEOUTEXCEPTION:

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

@@ -62,6 +62,7 @@ public class NoticesActivity extends BaseActivity {
     public void initView() {
         TAG = "NoticesActivity";
         ct = this;
+
         getSupportActionBar().setTitle("通知");
         mEmptyLayout = new EmptyLayout(this, mlist.getRefreshableView());
         mEmptyLayout.setShowEmptyButton(false);
@@ -119,7 +120,9 @@ public class NoticesActivity extends BaseActivity {
 
 
     public void initData() {
-        String url = Constants.getAppBaseUrl(ct) + "common/desktop/note/notice.action";
+        mlist.setVisibility(View.GONE);
+        progress_bar.setVisibility(View.VISIBLE);
+        String url =null;
         final Map<String, Object> param = new HashMap<>();
         param.put("count", "1000");
         param.put("sessionId", CommonUtil.getSharedPreferences(ct, "sessionId"));
@@ -164,12 +167,15 @@ public class NoticesActivity extends BaseActivity {
 //                        newsEntity.setData(fiterdata);
                         adapter = new CardItemAdapter(ct, newsEntity);
                         mlist.getRefreshableView().setAdapter(adapter);
+                        mlist.setVisibility(View.VISIBLE);
                         progress_bar.setVisibility(View.GONE);
 
-                        TextView text;
                     } else {
                         adapter.notifyDataSetChanged();
                     }
+                    if(adapter.getCount()==0){
+                        mEmptyLayout.showEmpty();
+                    }
                     Log.i(TAG, result);
                     break;
                 case Constants.APP_SOCKETIMEOUTEXCEPTION:

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

@@ -250,7 +250,10 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
         public void handleMessage(Message msg) {
             switch (msg.what){
                 case Constants.HTTP_SUCCESS_INIT:
-
+                    progressDialog.dismiss();
+                    break;
+                case Constants.APP_SOCKETIMEOUTEXCEPTION:
+                    progressDialog.dismiss();
                     break;
             }
         }

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

@@ -17,6 +17,7 @@ import com.xzjmyk.pm.activity.ui.MainActivity;
 import com.xzjmyk.pm.activity.ui.base.XutilsFragment;
 import com.xzjmyk.pm.activity.ui.circle.BusinessCircleActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.ErpMenActivity;
+import com.xzjmyk.pm.activity.ui.erp.activity.crm.ClientActivity;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.util.PreferenceUtils;
@@ -97,8 +98,8 @@ public class WorksFragment extends XutilsFragment implements View.OnClickListene
 //                        ct.startActivity(new Intent(ct, OAActivity.class));
                 break;
             case R.id.my_client_rl:
-                // ct.startActivity(new Intent(ct, ClientActivity.class));
-                ToastUtil.showToast(getActivity(), "抱歉，该功能尚未完善");
+                 ct.startActivity(new Intent(ct, ClientActivity.class));
+                //ToastUtil.showToast(getActivity(), "抱歉，该功能尚未完善");
                 break;
             case R.id.my_friend_rl:
                 iv_remain.setVisibility(View.GONE);

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

@@ -18,5 +18,6 @@
         android:divider="@null"
         android:fadingEdge="none"
         android:listSelector="#00000000"
-        android:scrollbars="none"></com.handmark.pulltorefresh.library.PullToRefreshListView>
+        android:scrollbars="none">
+    </com.handmark.pulltorefresh.library.PullToRefreshListView>
 </RelativeLayout>