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

WeiChat/src/main/java/com/sk/weichat/ui/erp/fragment/LinksManFragment.java

@@ -735,7 +735,7 @@ public class LinksManFragment extends XutilsFragment implements View.OnClickList
 
     @Override
     public void onDestroy() {
-        Log.i("gongpengming","onDestroy");
+
         getActivity().unregisterReceiver(receiver);
 
         super.onDestroy();

WeiChat/src/main/java/com/sk/weichat/ui/erp/net/ViewUtil.java

@@ -363,7 +363,6 @@ public class ViewUtil {
                         Intent intent = new Intent("com.app.home.update");
                         intent.putExtra("falg", "home");
                         ct.sendBroadcast(intent);
-                        Log.i("gongpengming","发送成功修改公司");
                         ChangeStatusERP(msg.getData().getString("result"));
                     } else {
                         String reason = JSON.parseObject(result).getString("reason");
@@ -371,7 +370,6 @@ public class ViewUtil {
                     }
                     break;
                 case Constants.SUCCESS_B2B:
-                    Log.i("logingongpengming","修改成功SUCCESS_B2B");
                     ChangeStatusB2B(msg.getData().getString("result"));
                     break;
                 case Constants.SocketTimeoutException:

WeiChat/src/main/java/com/sk/weichat/ui/me/MeFragment.java

@@ -51,33 +51,33 @@ public class MeFragment extends EasyFragment implements View.OnClickListener {
     private TextView master_tv;
 
     @ViewInject(R.id.tv_uas_login)
-    private TextView tv_uas_login ;
+    private TextView tv_uas_login;
     @ViewInject(R.id.tv_b2b_login)
-    private TextView  tv_b2b_login;
+    private TextView tv_b2b_login;
 
     @ViewInject(R.id.rl_company_change)
-    private RelativeLayout  rl_company_change;
+    private RelativeLayout rl_company_change;
     @ViewInject(R.id.rl_master_change)
     private RelativeLayout rl_master_change;
 
     private Context ct;
     public MasterDialog mDialog;
 
-    private Handler mhandler=new Handler(){
+    private Handler mhandler = new Handler() {
         @Override
         public void handleMessage(Message msg) {
-            switch (msg.what){
+            switch (msg.what) {
                 case 1://获取中文账套
-                    String  result=msg.getData().getString("result"); //解析账套信息
-                    boolean isJsonStr=new JsonValidator().validate(result);
-                    if(isJsonStr){
+                    String result = msg.getData().getString("result"); //解析账套信息
+                    boolean isJsonStr = new JsonValidator().validate(result);
+                    if (isJsonStr) {
                         Map<Object, Object> resultsMap = FlexJsonUtil.fromJson(result);
                         List<Master> mList = FlexJsonUtil.fromJsonArray(
                                 FlexJsonUtil.toJson(resultsMap.get("masters")),
                                 Master.class);
                         getChMaster(mList);
-                    }else{
-                        ViewUtil.ShowMessageFDialogAutoDismiss(ct,"获取账套信息失败!",2000);
+                    } else {
+                        ViewUtil.ShowMessageFDialogAutoDismiss(ct, "获取账套信息失败!", 2000);
                     }
                     break;
                 case 2://切换账套
@@ -90,11 +90,9 @@ public class MeFragment extends EasyFragment implements View.OnClickListener {
                     mDialog = new MasterDialog(ct, "切换账套",
                             new MasterDialog.PickDialogListener() {
                                 @Override
-                                public void onListItemClick(int position,
-                                                            final Master master) {
+                                public void onListItemClick(int position, final Master master) {
                                     Login(master);
                                 }
-
                             });
                     mDialog.show();
                     mDialog.initViewData(mList);
@@ -104,7 +102,7 @@ public class MeFragment extends EasyFragment implements View.OnClickListener {
                     Map<String, Object> results = FlexJsonUtil.fromJson(msg
                             .getData().getString("result"));
                     if ((Boolean) results.get("success")) {
-                        com.sk.weichat.ui.erp.net.ViewUtil.ToastMessage(ct,"账套切换成功！");
+                        com.sk.weichat.ui.erp.net.ViewUtil.ToastMessage(ct, "账套切换成功！");
                         String sessionId = results.get("sessionId").toString();
                         String master = msg.getData().getString("master");
                         String master_ch = msg.getData().getString("master_ch");
@@ -112,13 +110,11 @@ public class MeFragment extends EasyFragment implements View.OnClickListener {
                         CommonUtil.setSharedPreferences(ct, "erp_master", master);
                         CommonUtil.setSharedPreferences(ct, "Master_ch", master_ch);
                         master_tv.setText(master_ch);
-
                         // 发送给主页刷新的广播
                         Intent intent = new Intent("com.app.home.update");
                         intent.putExtra("falg", "home");
 
                         ct.sendBroadcast(intent);
-                        Log.i("gongpengming","发送成功修改套件");
                     } else {
                         com.sk.weichat.ui.erp.net.ViewUtil.ToastMessage(ct, "账套切换失败！");
                     }
@@ -134,7 +130,6 @@ public class MeFragment extends EasyFragment implements View.OnClickListener {
     public void onResume() {
         super.onResume();
         if (mNickNameTv != null) {
-
             mNickNameTv.setText(MyApplication.getInstance().mLoginUser.getNickName());
         }
     }
@@ -152,7 +147,7 @@ public class MeFragment extends EasyFragment implements View.OnClickListener {
     }
 
     private void initView() {
-        ct=getActivity();
+        ct = getActivity();
         findViewById(R.id.my_data_rl).setOnClickListener(this);
         findViewById(R.id.my_friend_rl).setOnClickListener(this);
         findViewById(R.id.my_space_rl).setOnClickListener(this);
@@ -167,7 +162,7 @@ public class MeFragment extends EasyFragment implements View.OnClickListener {
         mPhoneNumTv = (TextView) findViewById(R.id.phone_number_tv);
 
         //init data
-        company_tv.setText(CommonUtil.getSharedPreferences(ct,"erp_commpany"));
+        company_tv.setText(CommonUtil.getSharedPreferences(ct, "erp_commpany"));
         master_tv.setText(CommonUtil.getSharedPreferences(ct, "erp_master"));
 
         IntentFilter loginFilter = new IntentFilter();
@@ -211,15 +206,15 @@ public class MeFragment extends EasyFragment implements View.OnClickListener {
 //                    Log.i("LoginApp","手机号："+MyApplication.getInstance().mLoginUser.getTelephone() );
 //                    Log.i("LoginApp","密码："+ CommonUtil.getSharedPreferences(ct,"user_password"));
 
-                String commpany=CommonUtil.getSharedPreferences(ct,"erp_commpany");
+                String commpany = CommonUtil.getSharedPreferences(ct, "erp_commpany");
 
                 com.sk.weichat.ui.erp.net.ViewUtil.LoginTask(MyApplication.getInstance().mLoginUser.getTelephone()
-                        , CommonUtil.getSharedPreferences(ct,"user_password"), ct);
+                        , CommonUtil.getSharedPreferences(ct, "user_password"), ct);
 
 
                 break;
             case R.id.rl_master_change:
-                 changeMaster();
+                changeMaster();
                 break;
             case R.id.my_data_rl:// 我的资料
                 startActivityForResult(new Intent(getActivity(), BasicInfoEditActivity.class), 1);
@@ -251,10 +246,11 @@ public class MeFragment extends EasyFragment implements View.OnClickListener {
             mNickNameTv.setText(MyApplication.getInstance().mLoginUser.getNickName());
         }
     }
+
     //获取中文账套
     public void getChinaMaster() {
-        String url=Constants.getAppBaseUrl(ct)+"mobile/getAllMasters.action";
-        Map<String, Object> params =new HashMap<>();
+        String url = Constants.getAppBaseUrl(ct) + "mobile/getAllMasters.action";
+        Map<String, Object> params = new HashMap<>();
         params.put("sessionId", CommonUtil.getSharedPreferences(ct, "sessionId"));
         LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
         headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
@@ -271,14 +267,15 @@ public class MeFragment extends EasyFragment implements View.OnClickListener {
                     CommonUtil.setSharedPreferences(ct, "Master_ch", master.getMa_function());
                 }
             }
-        }else{
-           master_tv.setText(CommonUtil.getSharedPreferences(ct, "erp_master"));
+        } else {
+            master_tv.setText(CommonUtil.getSharedPreferences(ct, "erp_master"));
         }
     }
-   //切换账套
+
+    //切换账套
     public void changeMaster() {
-        String url = Constants.getAppBaseUrl(ct)+"mobile/getAllMasters.action";
-        Map<String, Object> params =new HashMap<>();
+        String url = Constants.getAppBaseUrl(ct) + "mobile/getAllMasters.action";
+        Map<String, Object> params = new HashMap<>();
         params.put("sessionId", CommonUtil.getSharedPreferences(ct, "sessionId"));
         LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
         headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
@@ -288,7 +285,7 @@ public class MeFragment extends EasyFragment implements View.OnClickListener {
     //切换登录
     public void Login(Master master) {
         String url = Constants.getAppBaseUrl(ct) + "mobile/login.action";
-        Map<String,Object> params = new HashMap<String,Object>();
+        Map<String, Object> params = new HashMap<String, Object>();
         String username = CommonUtil.getSharedPreferences(ct, "erp_username");
         String password = CommonUtil.getSharedPreferences(ct, "user_password");
         params.put("username", username);
@@ -306,13 +303,12 @@ public class MeFragment extends EasyFragment implements View.OnClickListener {
     }
 
 
-
     public void updateStatus() {
         if (!StringUtils.isEmpty(CommonUtil.getSharedPreferences(ct,
                 "user_phone"))) {
             if (CommonUtil.getSharedPreferencesBoolean(ct, "erp_login")) {
                 company_tv.setText(CommonUtil.getSharedPreferences(ct, "erp_commpany"));
-               // master_tv.setText(CommonUtil.getSharedPreferences(ct,"master"));
+                // master_tv.setText(CommonUtil.getSharedPreferences(ct,"master"));
                 tv_uas_login.setText("已登录");
             } else {
                 tv_uas_login.setText("未登录");
@@ -346,7 +342,9 @@ public class MeFragment extends EasyFragment implements View.OnClickListener {
                     getChinaMaster();
                 }
             }
-        };
+        }
+
+        ;
     };
 
 

WeiChat/src/main/java/com/sk/weichat/ui/message/MessageFragment.java

@@ -108,21 +108,22 @@ public class MessageFragment extends EasyFragment {
             }
         }
     };
-//    //接收修改公司广播
-//    private IntentFilter inputFilter;
-//    private BroadcastReceiver receiver=new BroadcastReceiver() {
-//        @Override
-//        public void onReceive(Context context, Intent intent) {
-//            if ("home".equals(intent.getStringExtra("falg"))){
-//                upDataFriend();
-//                loadData();
-//
-//            }
-//        }
-//    };
+    //接收修改公司广播
+    private IntentFilter inputFilter;
+    private BroadcastReceiver receiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            if ("home".equals(intent.getStringExtra("falg"))) {
+                Log.i("gongpengming", "更新ui界面广播开始...........................");
+                refreshUI();
+
+            }
+        }
+    };
     private BaseActivity mActivity;
 
     public MessageFragment() {
+//        getActivity().registerReceiver(receiver,inputFilter);
         mOriginalFriendList = new ArrayList<BaseSortModel<Friend>>();
         mFriendList = new ArrayList<BaseSortModel<Friend>>();
     }
@@ -138,20 +139,23 @@ public class MessageFragment extends EasyFragment {
             initView();
         }
 //        inputFilter=new IntentFilter("com.app.home.update");
-//        getActivity().registerReceiver(receiver,inputFilter);
+
     }
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        inputFilter = new IntentFilter();
+        inputFilter.addAction("com.app.home.update");
         getActivity().registerReceiver(mUpdateReceiver, new IntentFilter(MsgBroadcast.ACTION_MSG_UI_UPDATE));
+        getActivity().registerReceiver(receiver, inputFilter);
     }
 
     @Override
     public void onDestroy() {
         super.onDestroy();
         getActivity().unregisterReceiver(mUpdateReceiver);
-//        getActivity().unregisterReceiver(receiver);
+        getActivity().unregisterReceiver(receiver);
     }
 
     @Override
@@ -212,15 +216,9 @@ public class MessageFragment extends EasyFragment {
         mPullToRefreshListView.setOnRefreshListener(new OnRefreshListener<SlideListView>() {
             @Override
             public void onRefresh(PullToRefreshBase<SlideListView> refreshView) {
-                upDataFriend();
-                loadData();
-                FriendDao.getInstance().markUserMessageRead(
-                        MyApplication.getInstance().mLoginUser.getUserId(),
-                        Friend.ID_ERP_ZHIHUI);
-                loadERPMsgNum(getActivity());
-                loadGongGaoCount(getActivity());
-                loadNoticeCount(getActivity());
-                loadERPNewsNum(getActivity());
+
+                //TODO 刷新信息
+                refreshUI();
             }
         });
 
@@ -266,6 +264,20 @@ public class MessageFragment extends EasyFragment {
         });
     }
 
+    private void refreshUI() {
+        Log.i("gongpengming", "进入下拉刷新页面");
+        upDataFriend();
+        loadData();
+        FriendDao.getInstance().markUserMessageRead(
+                MyApplication.getInstance().mLoginUser.getUserId(),
+                Friend.ID_ERP_ZHIHUI);
+        loadERPMsgNum(getActivity());
+        loadGongGaoCount(getActivity());
+        loadNoticeCount(getActivity());
+        loadERPNewsNum(getActivity());
+    }
+
+
     /**
      * 更新朋友信息
      */
@@ -762,7 +774,7 @@ public class MessageFragment extends EasyFragment {
                     }
                     if (count != 0) {
                         //标注红点
-                        Log.i("MessageFragment", " 通知 标注红点"+count);
+                        Log.i("MessageFragment", " 通知 标注红点" + count);
                         String owerId = MyApplication.getInstance().mLoginUser.getUserId();
 
                         FriendDao.getInstance().markUserMessageRead(owerId, Friend.ID_ERP_NOTICE);
@@ -790,7 +802,7 @@ public class MessageFragment extends EasyFragment {
                     }
                     if (count != 0) {
                         //标注红点
-                        Log.i("MessageFragment", "新闻 标注红点"+count);
+                        Log.i("MessageFragment", "新闻 标注红点" + count);
                         String owerId = MyApplication.getInstance().mLoginUser.getUserId();
 
                         FriendDao.getInstance().markUserMessageRead(owerId, Friend.ID_ERP_NEWS);