Browse Source

b2b 登录问题!4-29

LiuJie 9 years ago
parent
commit
8c2ff2e586

+ 12 - 2
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/circle/BasicInfoActivity.java

@@ -87,6 +87,7 @@ public class BasicInfoActivity extends BaseActivity implements NewFriendListener
 	private DataLoadView mDataLoadView;
 
 	private String mUserId;
+	private String mUserReName;
 	private User mUser;
 	private Friend mFriend;// 如果这个用户是当前登陆者的好友或者关注着,那么该值有意义
 	private ProgressDialog mProgressDialog;
@@ -116,6 +117,7 @@ public class BasicInfoActivity extends BaseActivity implements NewFriendListener
 		this.getWindow().invalidatePanelMenu(Window.FEATURE_OPTIONS_PANEL);
 		if (getIntent() != null) {
 			mUserId = getIntent().getStringExtra(AppConstant.EXTRA_USER_ID);
+			mUserReName= getIntent().getStringExtra(AppConstant.EXTRA_NICK_NAME);
 		}
 		mLoginUserId = MyApplication.getInstance().mLoginUser.getUserId();
 		Log.i("LoginInfo", "点击用户的id:" + mUserId);
@@ -175,7 +177,6 @@ public class BasicInfoActivity extends BaseActivity implements NewFriendListener
 
 	@Override
 	public void onBackPressed() {
-		// TODO Auto-generated method stub
 		super.onBackPressed();
 		finish();
 	}
@@ -297,16 +298,24 @@ public class BasicInfoActivity extends BaseActivity implements NewFriendListener
 		AvatarHelper.getInstance().displayAvatar(mUser.getUserId(), mAvatarImg, false);
 		// 判断是否有备注名,有就显示
 		if(mFriend!=null){
+			if (StringUtils.isEmpty(mUserReName)){
 			if(mFriend.getRemarkName()!=null){
 				mNameTv.setText(mFriend.getRemarkName());
 			}else{
 				mNameTv.setText(mUser.getNickName());
 
+			}}else{
+				mNameTv.setText(mUserReName);
 			}
+         mFriend.setRemarkName(mUserReName);
 		}else {
 			Log.i("LoginInfo", "设置当前用户的名字");
 			//mNameTv.setText(MyApplication.getInstance().mLoginUser.getNickName());
-			mNameTv.setText(mUser.getNickName());//陌生人也显示正确名字
+			if (StringUtils.isEmpty(mUserReName)){
+			     mNameTv.setText(mUser.getNickName());//陌生人也显示正确名字
+			 }else{
+				mNameTv.setText(mUserReName);
+			}
 		}
 
 		mSexTv.setText(mUser.getSex() == 0 ? R.string.sex_woman : R.string.sex_man);
@@ -904,6 +913,7 @@ public class BasicInfoActivity extends BaseActivity implements NewFriendListener
 			MsgBroadcast.broadcastMsgUiUpdate(BasicInfoActivity.this);
 			MsgBroadcast.broadcastMsgNumReset(BasicInfoActivity.this);
 			Intent intent = new Intent(mContext, ChatActivity.class);
+			mFriend.setRemarkName(mUserReName);
 			intent.putExtra(ChatActivity.FRIEND, mFriend);
 			startActivity(intent);
 		}

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/CommonFragmentActivity.java

@@ -22,7 +22,7 @@ public class CommonFragmentActivity extends BaseActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_common_fragment);
-        getSupportActionBar().setTitle("我的群组");
+        getSupportActionBar().setTitle("商务群");
         ViewUtils.inject(this);
         initView();
     }

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/CompanyContactsActivity.java

@@ -378,7 +378,7 @@ public class CompanyContactsActivity extends BaseActivity {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.act_staff_query_list);
         ViewUtils.inject(this);
-        getSupportActionBar().setTitle("企业通讯录");
+        getSupportActionBar().setTitle("企业架构");
         ct = this;
         manager = new DBManager(ct);
         mInflater = (LayoutInflater) this.getSystemService(Context.LAYOUT_INFLATER_SERVICE);

+ 27 - 33
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/WebViewCommActivity.java

@@ -1,8 +1,10 @@
 package com.xzjmyk.pm.activity.ui.erp.activity;
 
+import com.alibaba.fastjson.JSON;
 import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.ui.MainActivity;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 import com.xzjmyk.pm.activity.R;
 
@@ -57,8 +59,7 @@ public class WebViewCommActivity extends BaseActivity {
         String p = "";//动态改变文字显示
         try {
             p = intent.getStringExtra("p");
-        } catch (Exception e) {
-        }
+        } catch (Exception e) {}
         if (p != null) {
             getSupportActionBar().setTitle(p);
         }
@@ -72,48 +73,42 @@ public class WebViewCommActivity extends BaseActivity {
         webView.getRefreshableView().getSettings().setDatabaseEnabled(true);
         webView.getRefreshableView().getSettings().setAppCacheEnabled(true);
         if (MyApplication.cookie != null) {
-            synCookies(this, url);
+            //synCookies(this, url);
         }else{
-            clearCookie();
-            webView.getRefreshableView().clearHistory();
-            webView.getRefreshableView().clearCache(true);
+              clearCookie();
         }
-
         webView.getRefreshableView().loadUrl(url);
         webView.getRefreshableView().setWebViewClient(new WebViewClient() {
             public boolean shouldOverrideUrlLoading(WebView view, String url) {
-                if (MyApplication.cookie != null) {
-                    synCookies(WebViewCommActivity.this, url);
+                System.out.println("link url=" + url);
+                if (!url.equals("http://www.ubtob.com/signin#")){
+                    if (MyApplication.cookie != null) {
+                       // synCookies(WebViewCommActivity.this, url);
+                        view.loadUrl(url);
+                    }else{
+//                        ViewUtil.ShowMessageTitleAutoDismiss(WebViewCommActivity.this,
+//                                "您的登录会话过期!请重新登录!",1000);
+                        view.loadUrl(url);
+                    }
+                }else{
+                    if (MyApplication.cookie != null) {
+                       // synCookies(WebViewCommActivity.this, "http://www.ubtob.com/#");
+                        view.loadUrl("http://www.ubtob.com/#");
+                    }else{
+                        view.loadUrl(url);
+                    }
                 }
-                view.loadUrl(url);
                 return true;
             }
 
         });
         webView.getRefreshableView().setWebChromeClient(new WebChromeClient());
-
     }
 
 
     @Override
     protected void onResume() {
         super.onResume();
-//        XGPushClickedResult result=XGPushManager.onActivityStarted(this);
-//        if (result!=null) {
-//            isStartApp=true;
-//            String customParam=result.getCustomContent();
-//            Map<String,Object> pMap=FlexJsonUtil.fromJson(customParam);
-//            title.setText(pMap.get("title").toString());
-//            url=Constants.basicURL+
-//                    "?b_username="+CommonUtil.getSharedPreferences(this, "user_phone")+"&b_password="+
-//                    CommonUtil.getSharedPreferences(this, "user_password")+
-//                    pMap.get("url").toString();
-//            if (MyActivityManager.cookie!=null) {
-//                synCookies(this, url);
-//            }
-//            Log.i("xinge", "onResue url="+url);
-//            webView.getRefreshableView().loadUrl(url);
-//        }
     }
 
 
@@ -143,12 +138,9 @@ public class WebViewCommActivity extends BaseActivity {
         String cookieStr = sessionCookie.getName() + "="
                 + sessionCookie.getValue() + "; domain="
                 + sessionCookie.getDomain();
-        System.out.println("webview cookie:" + cookieStr);
-//        if (!StringUtils.isEmpty(CommonUtil.getSharedPreferences(context, "b2b_cookie"))) {
-//            cookieManager.setCookie(url, CommonUtil.getSharedPreferences(context, "b2b_cookie"));//cookies是在HttpClient中获得的cookie
-//        } else {
-            cookieManager.setCookie(url, cookieStr);//cookies是在HttpClient中获得的cookie
-//        }
+        //System.out.println("app cookie:"+ JSON.toJSONString(sessionCookie));
+        System.out.println("cookie:" + cookieStr);
+        cookieManager.setCookie(url, cookieStr);//cookies是在HttpClient中获得的cookie
         CookieSyncManager.getInstance().sync();
     }
 
@@ -156,6 +148,8 @@ public class WebViewCommActivity extends BaseActivity {
         CookieManager cookieManager = CookieManager.getInstance();
         cookieManager.removeSessionCookie();//移除
         cookieManager.removeAllCookie();
+        webView.getRefreshableView().clearHistory();
+        webView.getRefreshableView().clearCache(true);
     }
 
 

+ 14 - 11
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/fragment/LinksManFragment.java

@@ -60,6 +60,7 @@ import com.xzjmyk.pm.activity.ui.erp.activity.MyFriendActivity;
 import com.xzjmyk.pm.activity.ui.erp.db.DBManager;
 import com.xzjmyk.pm.activity.ui.erp.entity.EmployeesEntity;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
+import com.xzjmyk.pm.activity.ui.erp.util.ListUtils;
 import com.xzjmyk.pm.activity.ui.message.ChatActivity;
 import com.xzjmyk.pm.activity.ui.message.NewFriendActivity;
 import com.xzjmyk.pm.activity.ui.nearby.UserSearchActivity;
@@ -190,21 +191,22 @@ public class LinksManFragment extends XutilsFragment implements View.OnClickList
                 "whichsys=?");
         Log.i("gongpengming", "emList.size()=" + emList.size());
         List<Friend> friends = new ArrayList<>();
-
-
         for (int i = 0; i < emList.size(); i++) {//企业通讯人员
             // friends.add(EnterChatAction(emList.get(i)));
             String fId = String.valueOf(emList.get(i).getEm_IMID());
-
-            for (int j = 0; j < friend.size(); j++) {//IM好友
-                if (fId.equals(friend.get(j).getUserId())) {  //当有重复
-                    //改昵称
-                    friend.get(j).setNickName(emList.get(i).getEM_NAME());
-                    friend.get(j).setRemarkName(emList.get(i).getEM_NAME());//备注
-                    break;
-                } else if ((j == (friend.size() - 1)) && !(fId.equals(friend.get(j).getUserId()))) {
-                    friends.add(EnterChatAction(emList.get(i)));
+            if (!ListUtils.isEmpty(friend)) {
+                for (int j = 0; j < friend.size(); j++) {//IM好友
+                    if (fId.equals(friend.get(j).getUserId())) {  //当有重复
+                        //改昵称
+                        friend.get(j).setNickName(emList.get(i).getEM_NAME());
+                        friend.get(j).setRemarkName(emList.get(i).getEM_NAME());//备注
+                        break;
+                    } else if ((j == (friend.size() - 1)) && !(fId.equals(friend.get(j).getUserId()))) {
+                        friends.add(EnterChatAction(emList.get(i)));
+                    }
                 }
+            }else{
+                friends.add(EnterChatAction(emList.get(i)));
             }
         }
         friend.addAll(friends);
@@ -378,6 +380,7 @@ public class LinksManFragment extends XutilsFragment implements View.OnClickList
                 } else {
                     intent = new Intent(getActivity(), BasicInfoActivity.class);
                     intent.putExtra(AppConstant.EXTRA_USER_ID, friend.getUserId());
+                    intent.putExtra(AppConstant.EXTRA_NICK_NAME, friend.getRemarkName());
                 }
                 startActivity(intent);
             }

+ 5 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/fragment/WorksFragment.java

@@ -18,6 +18,7 @@ import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.MainActivity;
 import com.xzjmyk.pm.activity.ui.base.XutilsFragment;
 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;
 import com.xzjmyk.pm.activity.volley.FastVolley;
 
@@ -78,7 +79,10 @@ public class WorksFragment extends XutilsFragment implements View.OnClickListene
     public void onClick(View v) {
         switch (v.getId()) {
             case R.id.setting_rl:
-                ViewUtil.WebLinks(ct,"http://www.ubtob.com/#","优软商务");
+                String phone= CommonUtil.getSharedPreferences(getActivity(),"user_phone");
+                String password=CommonUtil.getSharedPreferences(getActivity(), "user_password");
+                String url="http://www.ubtob.com/signin#/redirect/"+phone+"/"+password;
+                ViewUtil.WebLinks(ct,url,"优软商务");
                 break;
             case R.id.rl_uas_sys:
                 ct.startActivity(new Intent(ct, ErpMenActivity.class));

+ 2 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/model/NoticeEntity.java

@@ -1,5 +1,6 @@
 package com.xzjmyk.pm.activity.ui.erp.model;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -8,7 +9,7 @@ import java.util.List;
   */
 public class NoticeEntity {
 	
-	private List<Data> data ;
+	private List<Data> data =new ArrayList<Data>();
 
 	public void setData(List<Data> data){
 	this.data = data;

+ 27 - 10
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/net/HttpUtil.java

@@ -1,5 +1,8 @@
 package com.xzjmyk.pm.activity.ui.erp.net;
 
+import android.util.Log;
+
+import com.lidroid.xutils.util.LogUtils;
 import com.xzjmyk.pm.activity.ui.erp.hmac.HmacUtils;
 
 import org.apache.http.HttpResponse;
@@ -191,16 +194,23 @@ public class HttpUtil {
 
         public Response(HttpResponse response) throws IllegalStateException,
                 IOException, Exception {
-
             this.statusCode = response.getStatusLine().getStatusCode();
             this.responseText = HttpUtil.read2String(response.getEntity()
                     .getContent());
         }
 
+        private static Response sResponse;
+
         public static Response getResponse(HttpResponse response)
                 throws IllegalStateException, IOException, Exception {
-            if (response != null)
-                return new Response(response);
+//            if (sResponse == null) {
+//                synchronized (Response.class) {// 1
+                    if (response != null) {// 2
+                        return  new Response(response);// 3
+                    }
+//                }
+//            }
+//            return sResponse;
             return null;
         }
     }
@@ -211,18 +221,25 @@ public class HttpUtil {
      * @author Administrator
      * @功能:待封装
      */
-    public static String read2String(InputStream inStream) throws Exception {
+    public static  String read2String(InputStream inStream) throws Exception {
         ByteArrayOutputStream outSteam = new ByteArrayOutputStream();
-        byte[] buffer = new byte[1024];
+        byte[] buffer = new byte[1024*1024];
         int len = 0;
-        while ((len = inStream.read(buffer)) != -1) {
-            outSteam.write(buffer, 0, len);
-        }
         try {
+            while ((len = inStream.read(buffer)) != -1) {
+                outSteam.write(buffer, 0, len);
+            }
+        } catch(OutOfMemoryError e){
+            Log.i("result","内存溢出异常");
+            e.printStackTrace();
+            return  null;
+        }catch (Exception e) {
+            Log.i("result","其它异常");
+            e.printStackTrace();
+            return  null;
+        }finally {
             outSteam.close();
             inStream.close();
-        } catch (Exception e) {
-
         }
         return new String(outSteam.toByteArray(), "UTF-8");
     }

+ 2 - 3
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/net/ViewUtil.java

@@ -143,7 +143,7 @@ public class ViewUtil {
                 .show();
     }
 
-	/*public static void ShowBasicNoTitle(Context ct) {
+/*	public static void ShowBasicNoTitle(Context ct) {
         new MaterialDialog.Builder(ct).title(""
 				+ "信息提示").content("您还未登录,请登录!")
 				.positiveText("确定").negativeText("取消").autoDismiss(false)
@@ -170,8 +170,6 @@ public class ViewUtil {
                         dialog.dismiss();
                     }
                 }).show();
-
-
     }
 
 
@@ -619,6 +617,7 @@ public class ViewUtil {
             public void run() {
                 boolean isNetHas = CommonUtil.isNetWorkConnected(ct);
                 if (isNetHas) {
+                    Log.i("result", "url="+url);
                     HttpUtil.Response result = httpSendTask(url, params, headers, request);
                     if (result != null) {
                         Log.i("result", "http 请求-----------------------------------------");

+ 0 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/util/Constants.java

@@ -19,7 +19,6 @@ public class Constants {
      * @注释:B2B平台
      */
     public static final String basicURL = "http://www.ubtob.com/";
-    //登录URL
     public static final String serviceURL =
             "http://www.ubtob.com/j_spring_security_check";
 

+ 1 - 0
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/util/ViewUtil.java

@@ -56,6 +56,7 @@ public class ViewUtil {
             public void run() {
                 boolean isNetHas = Constants.isNetworkConnected(ct);
                 if (isNetHas) {
+                    Log.i("result:","url="+url);
                     HttpUtil.Response result = httpSendTask(url, params, headers, request);
                     if (result != null) {
                         prinltResponseInfo(result, url, params);

+ 12 - 6
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/me/BasicInfoEditActivity.java

@@ -30,6 +30,7 @@ import com.nostra13.universalimageloader.core.ImageLoader;
 import com.xzjmyk.pm.activity.ui.erp.db.DBManager;
 import com.xzjmyk.pm.activity.ui.erp.entity.EmployeesEntity;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
+import com.xzjmyk.pm.activity.ui.erp.util.ListUtils;
 import com.xzjmyk.pm.activity.ui.tool.SelectAreaActivity;
 import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
@@ -136,9 +137,14 @@ public class BasicInfoEditActivity extends BaseActivity implements View.OnClickL
         String userId= mUser.getUserId();
         String whichsys= CommonUtil.getSharedPreferences(this, "erp_master");
         List<EmployeesEntity> entities= dbManager.select_getEmployee(new String[]{userId, whichsys}, "em_imid=? and whichsys=?");
+        if (ListUtils.isEmpty(entities)){
+            mNameEdit.setText(mTempData.getNickName());
 
+        }else{
+            mNameEdit.setText(entities.get(0).getEM_NAME());
+        }
        // mNameEdit.setText(mTempData.getNickName());
-        mNameEdit.setText(entities.get(0).getEM_NAME());
+
         mCityTv.setText(Area.getProvinceCityString(mTempData.getProvinceId(), mTempData.getCityId()));
         AvatarHelper.getInstance().displayAvatar(mTempData.getUserId(), mAvatarImg, true);
     }
@@ -318,11 +324,11 @@ public class BasicInfoEditActivity extends BaseActivity implements View.OnClickL
             mNameEdit.setError(StringUtils.editTextHtmlErrorTip(this, R.string.name_empty_error));
             return;
         }
-        if (!StringUtils.isNickName(mTempData.getNickName())) {
-            mNameEdit.requestFocus();
-            mNameEdit.setError(StringUtils.editTextHtmlErrorTip(this, R.string.nick_name_format_error));
-            return;
-        }
+//        if (!StringUtils.isNickName(mTempData.getNickName())) {
+//            mNameEdit.requestFocus();
+//            mNameEdit.setError(StringUtils.editTextHtmlErrorTip(this, R.string.nick_name_format_error));
+//            return;
+//        }
 
         if (mTempData.getCityId() <= 0) {
             ToastUtil.showToast(mContext, R.string.live_address_empty_error);

+ 5 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/me/MeFragment.java

@@ -32,6 +32,7 @@ import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 import com.xzjmyk.pm.activity.ui.erp.util.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.view.MasterDialog;
 import com.xzjmyk.pm.activity.ui.tool.SingleImagePreviewActivity;
+import com.xzjmyk.pm.activity.util.ToastUtil;
 
 import java.util.HashMap;
 import java.util.LinkedHashMap;
@@ -64,7 +65,10 @@ public class MeFragment extends EasyFragment implements View.OnClickListener {
     private Handler mhandler = new Handler() {
         @Override
         public void handleMessage(Message msg) {
-            switch (msg.what) {
+            switch (msg.what){
+                case Constants.APP_SOCKETIMEOUTEXCEPTION:
+                    ToastUtil.showToast(getActivity(),"服务器繁忙!");
+                break;
                 case 1://获取中文账套
                     String result = msg.getData().getString("result"); //解析账套信息
                     boolean isJsonStr = new JsonValidator().validate(result);

+ 1 - 6
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/message/ChatActivity.java

@@ -122,7 +122,6 @@ public class ChatActivity extends ActionBackActivity
     private FastVolley mFastVolley;
 
 
-
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.chat);
@@ -212,13 +211,11 @@ public class ChatActivity extends ActionBackActivity
 
     private void initView() {
         String remarkName = mFriend.getRemarkName();
-        //TODO 修改顶栏
         if (remarkName == null) {
             getSupportActionBar().setTitle(mFriend.getNickName());
         } else {
-            getSupportActionBar().setTitle(remarkName);
+            getSupportActionBar().setTitle(mFriend.getRemarkName());
         }
-
         findViewById(R.id.root_view);
         mAuthStateTipTv = (TextView) findViewById(R.id.auth_state_tip);
         mChatContentView = (ChatContentView) findViewById(R.id.chat_content_view);
@@ -252,7 +249,6 @@ public class ChatActivity extends ActionBackActivity
         tv_delete.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                //TODO 确定删除选择聊天记录
                 if (botton_ll != null) {
                     botton_ll.setVisibility(View.GONE);
                 }
@@ -301,7 +297,6 @@ public class ChatActivity extends ActionBackActivity
 
     @Override
     protected void onStop() {
-        // TODO Auto-generated method stub
         super.onStop();
 
     }

+ 14 - 4
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/message/MessageFragment.java

@@ -740,8 +740,12 @@ public class MessageFragment extends EasyFragment {
             switch (msg.what) {
                 case Constants.SUCCESS_LOGIN://公告
                     String result = msg.getData().getString("result");
-                    NoticeEntity newsEntity = JSON.parseObject(result, NoticeEntity.class);
-                    int size = newsEntity.getData().size();
+                    NoticeEntity newsEntity =
+                    newsEntity  = JSON.parseObject(result, NoticeEntity.class);
+                    int size = 0;
+                    if (newsEntity!=null) {
+                        size = newsEntity.getData().size();
+                    }
                     String em_id = CommonUtil.getSharedPreferences(getActivity(), "erp_emid");
                     int count = 0;
                     for (int i = 0; i < size; i++) {
@@ -787,7 +791,10 @@ public class MessageFragment extends EasyFragment {
                 case Constants.LOAD_SUCCESS://通知
                     result = msg.getData().getString("result");
                     newsEntity = JSON.parseObject(result, NoticeEntity.class);
-                    size = newsEntity.getData().size();
+                    size=0;
+                    if (newsEntity!=null) {
+                        size = newsEntity.getData().size();
+                    }
                     count = 0;
                     em_id = CommonUtil.getSharedPreferences(getActivity(), "erp_emid");
                     for (int i = 0; i < size; i++) {
@@ -829,7 +836,10 @@ public class MessageFragment extends EasyFragment {
                 case Constants.SUCCESS_INITDATA://新闻
                     result = msg.getData().getString("result");
                     NewsEntity news = JSON.parseObject(result, NewsEntity.class);
-                    size = news.getData().size();
+                    size=0;
+                    if (news!=null) {
+                        size = news.getData().size();
+                    }
                     count = 0;
                     for (int i = 0; i < size; i++) {
                         if (!ObjectUtils.isEquals(news.getData().get(i).getSTATUS(), null)) {

+ 1 - 1
build.gradle

@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.0.0'
+        classpath 'com.android.tools.build:gradle:1.3.0'
     }
 }