pull之前备份

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

@@ -663,7 +663,7 @@ public class ProcessMsgActivity extends BaseActivity implements View.OnClickList
                         String codename = jsonArray.getJSONObject(position).getString("JP_NODENAME");
                         if (!StringUtils.isEmpty(status)) {
                             if (status.equals("待审批")) {
-                                model.status.setTextColor(getResources().getColor(R.color.new_waitting_approvel));
+                                model.status.setTextColor(getResources().getColor(R.color.approvaling));
                                 nodename = nodename == null ? "" : nodename;
                                 status = "等待" + nodename + "(" + codename + ")" + getString(R.string.approvel);
                             } else if (status.equals("未通过")) {

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

@@ -107,7 +107,7 @@ public class SelectCollisionActivity extends OABaseActivity implements ISelectAc
         sidebar.setOnTouchingLetterChangedListener(new SideBar.OnTouchingLetterChangedListener() {
             @Override
             public void onTouchingLetterChanged(String s) {
-                if (adapter == null || ListUtils.isEmpty(adapter.getListData())) return;
+                if (adapter == null || ListUtils.isEmpty(adapter.getListData()) || StringUtils.isEmpty(s)) return;
                 // 该字母首次出现的位置
                 if ("↑".equals(s)) {
                     listView.setSelection(0);

WeiChat/src/main/java/com/xzjmyk/pm/activity/util/QSearchPpwindowUtils.java

@@ -75,7 +75,6 @@ public class QSearchPpwindowUtils{
         contentView.findViewById(R.id.no_tv).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                PreferenceUtils.putInt(MainActivity.UU_STEP, 1);
                 PreferenceUtils.putInt(MainActivity.Q_SEARCH, 1);
                 popupWindow.dismiss();  //不再提示
                 isqSearch[0] = false;