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

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/circle/BasicInfoActivity.java

@@ -887,6 +887,17 @@ public class BasicInfoActivity extends BaseActivity implements NewFriendListener
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
                         deleteFriend(friend, 0);
+                        //取消好友  更新通讯录数据库
+                        ContactsModel model=new ContactsModel();
+                        model.setImid(mUser.getUserId());
+                        model.setOwnerId(MyApplication.getInstance().mLoginUser.getUserId());
+                        model.setWhichsys(CommonUtil.getSharedPreferences(MyApplication.getInstance(),"erp_master"));
+                        model.setType(2);
+                        if (StringUtils.isEmpty(model.getWhichsys())){
+                            model.setWhichsys("");
+                        }
+                        ContactsDao.getInstance().update(model);
+                        
                     }
                 }).setNegativeButton(getString(R.string.common_cancel), null);
         builder.create().show();

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

@@ -205,13 +205,13 @@ public class ContactsActivity extends OABaseActivity implements ContactsAdapter.
             @Override
             public void afterTextChanged(Editable s) {
                 searchKey = s.toString();
-                LogUtil.d("arison"," searchKey:"+searchKey);
+                LogUtil.d("arison", " searchKey:" + searchKey);
                 if (!StringUtils.isEmpty(s.toString())) {
                     mlist.setMode(PullToRefreshBase.Mode.DISABLED);
                     List<ContactsModel> cacheData = contactsDao.find(s.toString());
                     if (adapter != null) {
                         if (ListUtils.isEmpty(cacheData)) {
-                            LogUtil.d("arison","searchContactsByNet:"+searchKey);
+                            LogUtil.d("arison", "searchContactsByNet:" + searchKey);
                             searchContactsByNet(s.toString());
                             return;
                         }
@@ -219,7 +219,7 @@ public class ContactsActivity extends OABaseActivity implements ContactsAdapter.
                         models.addAll(cacheData);
                         adapter.notifyDataSetChanged();
                         //查询需要优化
-                        getStateByPhones(cacheData);
+                        //getStateByPhones(cacheData);
                         if (models.size() == 0) {
                             emptyLayout.showEmpty();
                         }
@@ -248,23 +248,25 @@ public class ContactsActivity extends OABaseActivity implements ContactsAdapter.
             PermissionUtil.requestPermission(this, PermissionUtil.DEFAULT_REQUEST, permissions);
         } else {
             getCaceData(false);
-            LogUtil.d("Test","有权限@....");
+            LogUtil.d("Test", "有权限@....");
         }
     }
-  boolean isHasPermiss=false;
+
+    boolean isHasPermiss = false;
+
     @Override
     public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
         super.onRequestPermissionsResult(requestCode, permissions, grantResults);
         if (requestCode == PermissionUtil.DEFAULT_REQUEST) {
             if (grantResults.length != 1 || grantResults[0] != PackageManager.PERMISSION_GRANTED) {
                 ToastUtil.showToast(ct, R.string.not_system_permission);
-                isHasPermiss=false;
+                isHasPermiss = false;
                 getCaceData(false);
-                LogUtil.d("Test","没有权限....");
+                LogUtil.d("Test", "没有权限....");
             } else {
-                isHasPermiss=true;
+                isHasPermiss = true;
                 getCaceData(false);
-                LogUtil.d("Test","有权限....");
+                LogUtil.d("Test", "有权限....");
             }
         }
     }
@@ -316,7 +318,7 @@ public class ContactsActivity extends OABaseActivity implements ContactsAdapter.
                         model.setEmail("");
                         model.setOwnerId(MyApplication.getInstance().mLoginUser.getUserId());
                         model.setPhone(entity.getPhone());
-                        model.setWhichsys("");
+                        model.setWhichsys(CommonUtil.getSharedPreferences(MyApplication.getInstance(),"erp_master"));
                         model.setCompany("");
                         tmodels.add(model);
                     }
@@ -336,7 +338,7 @@ public class ContactsActivity extends OABaseActivity implements ContactsAdapter.
         ThreadPool.getThreadPool().addTask(new Runnable() {
             @Override
             public void run() {
-                if ( isHasPermiss){
+                if (isHasPermiss) {
                     List<Contacts> contacts =
                             ContactsUtils.getContacts1();
                     if (contacts != null) {
@@ -348,7 +350,7 @@ public class ContactsActivity extends OABaseActivity implements ContactsAdapter.
                             model.setEmail("");
                             model.setOwnerId(MyApplication.getInstance().mLoginUser.getUserId());
                             model.setPhone(entity.getPhone());
-                            model.setWhichsys("");
+                            model.setWhichsys(CommonUtil.getSharedPreferences(MyApplication.getInstance(),"erp_master"));
                             model.setCompany("");
                             tmodels.add(model);
 
@@ -356,12 +358,12 @@ public class ContactsActivity extends OABaseActivity implements ContactsAdapter.
                         contactsDao.save(tmodels);
                         getCaceData(false);
                     }
-                }else{
+                } else {
                     //没权限
                     contactsDao.save(tmodels);
                     getCaceData(false);
                 }
-              
+
             }
         });
 
@@ -457,21 +459,19 @@ public class ContactsActivity extends OABaseActivity implements ContactsAdapter.
         params.put("token", MyApplication.getInstance().mAccessToken);
         params.put("userid", myUserId);
         params.put("telephones", builder.toString());
-        LogUtil.d("array myUserId=" + myUserId);
         LogUtil.d("array builder.toString=" + builder.toString());
         StringJsonObjectRequest<String> request = new StringJsonObjectRequest<String>(
                 MyApplication.getInstance().getConfig().APP_QUER_YUSER, new Response.ErrorListener() {
             @Override
             public void onErrorResponse(VolleyError arg0) {
-//                ToastUtil.showErrorNet(MyApplication.getInstance());
-                //   showModel(models);
+                ToastUtil.showErrorNet(MyApplication.getInstance());
             }
         }, new StringJsonObjectRequest.Listener<String>() {
             @Override
             public void onResponse(ObjectResult<String> result) {
                 String message = result.toString();
                 if (!OACheckUtil.isEmpty(message)) {
-                    LogUtil.d("Test","message:"+message);
+                    LogUtil.d("Test", "message:" + message);
                     hanlderAppQueryuserInThread(message);
                 }
             }
@@ -504,11 +504,12 @@ public class ContactsActivity extends OABaseActivity implements ContactsAdapter.
                         if (model.getPhone().equals(telephone)) {
                             if (isfriend.equals("0")) {
                                 model.setType(2);//非好友
-                                model.setImid(String.valueOf(_id));
-                                // contactsDao.update(model,String.valueOf(_id));
+                              model.setImid(String.valueOf(_id));
+                                contactsDao.update(model,"0");
                             } else if (isfriend.equals("1")) {
                                 model.setType(1);//好友
                                 model.setImid(String.valueOf(_id));
+                                contactsDao.update(model,"0");
                             }
                         }
                     }
@@ -589,7 +590,7 @@ public class ContactsActivity extends OABaseActivity implements ContactsAdapter.
         LogUtil.i("invite");
         final String name = CommonUtil.getName();
         final String phone = user.getPhone().trim().replaceAll(" ", "");
-        
+
 //        if (!com.xzjmyk.pm.activity.util.StringUtils.isMobileNumber(phone)) {
 //            showToast("选择人员电话号码为空或是格式不正确", R.color.load_submit);
 //            return;
@@ -711,7 +712,8 @@ public class ContactsActivity extends OABaseActivity implements ContactsAdapter.
                                             model.setEmail("");
                                             model.setOwnerId(MyApplication.getInstance().mLoginUser.getUserId());
                                             model.setPhone(entity.getPhone());
-                                            model.setWhichsys("");
+                                            //uu好友
+                                            model.setWhichsys(CommonUtil.getSharedPreferences(MyApplication.getInstance(),"erp_master"));
                                             model.setCompany("");
                                             tmodels.add(model);
                                         }
@@ -760,8 +762,8 @@ public class ContactsActivity extends OABaseActivity implements ContactsAdapter.
                         if (!ListUtils.isEmpty(models)) {
                             models.clear();
                             models.addAll(xmodels);
-                        }else{
-                            models.addAll(xmodels); 
+                        } else {
+                            models.addAll(xmodels);
                         }
                         if (adapter != null) {
                             adapter.notifyDataSetChanged();
@@ -770,7 +772,7 @@ public class ContactsActivity extends OABaseActivity implements ContactsAdapter.
                             emptyLayout.showEmpty();
                         }
                     } catch (Exception e) {
-                       
+
                     }
                     break;
             }

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/db/dao/ContactsDao.java

@@ -164,14 +164,13 @@ public class ContactsDao {
     public  void update(ContactsModel model){
         SQLiteDatabase db=  DatabaseManager.getInstance().openDatabase();
         String sql = "update tbl_contacts"
-                + " set tf_type=? , tf_imId=? "
+                + " set tf_type=?"
                 + " where tf_ownerId=? and tf_whichSys=? and tf_imId=?;";
         SQLiteStatement sta = db.compileStatement(sql);
         sta.bindLong(1, model.getType());
-        sta.bindString(2, model.getImid());
-        sta.bindString(3, model.getOwnerId());
-        sta.bindString(4, model.getWhichsys());
-        sta.bindString(5, model.getImid());
+        sta.bindString(2, model.getOwnerId());
+        sta.bindString(3, model.getWhichsys());
+        sta.bindString(4, model.getImid());
         long row=  sta.executeInsert();
         DatabaseManager.getInstance().closeDatabase();
     }
@@ -181,13 +180,14 @@ public class ContactsDao {
         SQLiteDatabase db=  DatabaseManager.getInstance().openDatabase();
         String sql = "update tbl_contacts"
                 + " set tf_type=? , tf_imId=? "
-                + " where tf_ownerId=? and tf_whichSys=? and tf_imId=?;";
+                + " where tf_ownerId=? and tf_whichSys=? and tf_imId=? and tf_phone=?;";
         SQLiteStatement sta = db.compileStatement(sql);
         sta.bindLong(1, model.getType());
-        sta.bindString(2, imId);
+        sta.bindString(2, model.getImid());
         sta.bindString(3, model.getOwnerId());
         sta.bindString(4, model.getWhichsys());
-        sta.bindString(5, model.getImid());
+        sta.bindString(5, imId);//0  
+        sta.bindString(6, model.getPhone());
         long row=  sta.executeInsert();
         DatabaseManager.getInstance().closeDatabase();
     }

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/message/MessageFragment.java

@@ -55,7 +55,7 @@ import java.util.List;
 /**
  * Created by Bitliker on 2017/3/1.
  */
-public class MessageFragment extends EasyFragment implements IMessageView,   View.OnClickListener {
+public class MessageFragment extends EasyFragment implements IMessageView, View.OnClickListener {
 
     @ViewInject(R.id.voiceSearchView)
     private VoiceSearchView voiceSearchView;
@@ -88,7 +88,7 @@ public class MessageFragment extends EasyFragment implements IMessageView,   Vie
     private TextView waitting_work_content_tv;//待办工作
     private TextView subscribe_content_tv;//我的订阅
     private TextView book_content_tv;
-    
+
     private TextView schedule_time_tv;//审批流
     private TextView waitting_work_time_tv;//待办工作
     private TextView subscribe_time_tv;//我的订阅
@@ -174,7 +174,6 @@ public class MessageFragment extends EasyFragment implements IMessageView,   Vie
     }
 
 
-
     private void initView() {
 
         listView.getRefreshableView().addHeaderView(initHeaderView());
@@ -194,17 +193,17 @@ public class MessageFragment extends EasyFragment implements IMessageView,   Vie
         booking_num_tv = (TextView) view.findViewById(R.id.booking_num_tv);//小秘书
 
         tv_book_num = (TextView) view.findViewById(R.id.tv_book_num);//小秘书
-        
+
         schedule_content_tv = (TextView) view.findViewById(R.id.schedule_content_tv);//审批流
         waitting_work_content_tv = (TextView) view.findViewById(R.id.waitting_work_content_tv);//待办工作
         subscribe_content_tv = (TextView) view.findViewById(R.id.subscribe_content_tv);//我的订阅
-        book_content_tv= (TextView) view.findViewById(R.id.book_content_tv);//预约内容
+        book_content_tv = (TextView) view.findViewById(R.id.book_content_tv);//预约内容
 
         schedule_time_tv = (TextView) view.findViewById(R.id.schedule_time_tv);//审批流
         waitting_work_time_tv = (TextView) view.findViewById(R.id.waitting_work_time_tv);//待办工作
         subscribe_time_tv = (TextView) view.findViewById(R.id.subscribe_time_tv);//我的订阅
-        book_time_tv=(TextView) view.findViewById(R.id.book_time_tv);
-    
+        book_time_tv = (TextView) view.findViewById(R.id.book_time_tv);
+
 
         dingyue_num = (TextView) view.findViewById(R.id.tv_dingYue_num);//订阅红点
         tv_dingyue_desc = (TextView) view.findViewById(R.id.tv_dingyue_desc);//订阅红点
@@ -230,11 +229,10 @@ public class MessageFragment extends EasyFragment implements IMessageView,   Vie
             subscribe_rl.setVisibility(View.VISIBLE);
 //            news_notice_rl.setVisibility(View.GONE);
         }
-        UserRoleUtils.checkUserRole(this,view);
+        UserRoleUtils.checkUserRole(this, view);
         return view;
     }
 
-  
 
     private void showPopupWindow() {
         if (setWindow == null) initPopupWindow();
@@ -279,13 +277,12 @@ public class MessageFragment extends EasyFragment implements IMessageView,   Vie
     }
 
 
-
     //点击时间回调
     @Override
     public void onClick(View v) {
         switch (v.getId()) {
             case R.id.booking_rl:
-                startActivity(new Intent(mContext,BookingListActivity.class));
+                startActivity(new Intent(mContext, BookingListActivity.class));
                 tv_book_num.setVisibility(View.GONE);
                 CommonUtil.setSharedPreferences(MyApplication.getInstance(), Constants.SET_BOOKING, true);
                 break;
@@ -362,23 +359,21 @@ public class MessageFragment extends EasyFragment implements IMessageView,   Vie
     }
 
 
- 
-
     @Override
-    public void updateHeaderView(int postion, int num, String subTitle,String time) {
+    public void updateHeaderView(int postion, int num, String subTitle, String time) {
         switch (postion) {
             case 0:
-                updateHeaderView(schedule_num_tv, schedule_content_tv, schedule_time_tv, num, subTitle,time);
+                updateHeaderView(schedule_num_tv, schedule_content_tv, schedule_time_tv, num, subTitle, time);
                 break;
             case 1:
-                updateHeaderView(waitting_work_num_tv, waitting_work_content_tv, waitting_work_time_tv, num, subTitle,time);
+                updateHeaderView(waitting_work_num_tv, waitting_work_content_tv, waitting_work_time_tv, num, subTitle, time);
                 break;
             case 2:
-                updateHeaderView(subscribe_num_tv, subscribe_content_tv, subscribe_time_tv, num, subTitle,time);
+                updateHeaderView(subscribe_num_tv, subscribe_content_tv, subscribe_time_tv, num, subTitle, time);
                 break;
             case 4:
-                LogUtil.d("Test","updateHeaderView:"+num);
-                updateHeaderView(booking_num_tv, book_content_tv, book_time_tv, num, subTitle,time);
+                LogUtil.d("Test", "updateHeaderView:" + num);
+                updateHeaderView(booking_num_tv, book_content_tv, book_time_tv, num, subTitle, time);
                 break;
         }
         listView.onRefreshComplete();

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

@@ -322,6 +322,7 @@
                 android:layout_gravity="top|right"
                 android:background="@drawable/tab_unread_bg"
                 android:gravity="center"
+                android:visibility="gone"
                 android:textColor="@android:color/white"
                 android:textSize="10.0dp"
                  />