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

WeiChat/src/main/java/com/xzjmyk/pm/activity/adapter/UUFriendSortAdapter.java

@@ -81,7 +81,7 @@ public class UUFriendSortAdapter extends BaseAdapter implements SectionIndexer {
             convertView = LayoutInflater.from(mContext).inflate(R.layout.contact_item, parent, false);
             holder.header_img = (ImageView) convertView.findViewById(R.id.header_img);
             holder.phone_img = (ImageView) convertView.findViewById(R.id.phone_img);
-            holder.tag_tv = (TextView) convertView.findViewById(R.id.tag_tv);
+//            holder.tag_tv = (TextView) convertView.findViewById(R.id.tag_tv);
             holder.name_tv = (TextView) convertView.findViewById(R.id.name_tv);
             holder.sub_tv = (TextView) convertView.findViewById(R.id.sub_tv);
             holder.time_tv = (TextView) convertView.findViewById(R.id.time_tv);
@@ -91,11 +91,11 @@ public class UUFriendSortAdapter extends BaseAdapter implements SectionIndexer {
         }
         // 如果当前位置等于该分类首字母的Char的位置 ，则认为是第一次出现
         if (position == getPositionForSection(section)) {
-            holder.tag_tv.setVisibility(View.VISIBLE);
-            holder.tag_tv.setVisibility(View.GONE);
-            holder.tag_tv.setText(mSortFriends.get(position).getFirstLetter());
+//            holder.tag_tv.setVisibility(View.VISIBLE);
+//            holder.tag_tv.setVisibility(View.GONE);
+//            holder.tag_tv.setText(mSortFriends.get(position).getFirstLetter());
         } else {
-            holder.tag_tv.setVisibility(View.GONE);
+//            holder.tag_tv.setVisibility(View.GONE);
         }
         Friend friend = mSortFriends.get(position).getBean();
         final String phone = friend.getPhone();
@@ -204,7 +204,7 @@ public class UUFriendSortAdapter extends BaseAdapter implements SectionIndexer {
     }
 
     class ViewHolder {
-        TextView tag_tv;
+//        TextView tag_tv;
         ImageView header_img;
         TextView name_tv;
         TextView sub_tv;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/contact/MyFriendActivity.java

@@ -101,9 +101,9 @@ public class MyFriendActivity extends BaseActivity {
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         if (requestCode == 0x20 && resultCode == 0x20) {
-            mAdapter.setisRefeshed(true);
-            upDataFriend();
-            loadData();
+//            mAdapter.setisRefeshed(true);
+//            upDataFriend();
+//            loadData();
         }
     }
 
@@ -138,6 +138,7 @@ public class MyFriendActivity extends BaseActivity {
 
 
     private void initView() {
+        progressDialog.show();
         mPullToRefreshListView = (PullToRefreshListView) findViewById(R.id.pull_refresh_list);
         mTextDialog = (TextView) findViewById(R.id.text_dialog);
         mSideBar = (SideBar) findViewById(R.id.sidebar);
@@ -163,22 +164,36 @@ public class MyFriendActivity extends BaseActivity {
             }
         });
         setHeaderView();
+        loadData();
         mAdapter = new UUFriendSortAdapter(MyFriendActivity.this, mSortFriends);
-        mPullToRefreshListView.setMode(PullToRefreshBase.Mode.PULL_FROM_START);
+        mPullToRefreshListView.setMode(PullToRefreshBase.Mode.DISABLED);
         mPullToRefreshListView.getRefreshableView().setAdapter(mAdapter);
         mPullToRefreshListView.setAdapter(mAdapter);
-        mPullToRefreshListView.setOnRefreshListener(new PullToRefreshBase.OnRefreshListener<ListView>() {
+       /* mPullToRefreshListView.setOnRefreshListener(new PullToRefreshBase.OnRefreshListener<ListView>() {
             @Override
             public void onRefresh(PullToRefreshBase<ListView> refreshView) {
                 mAdapter.setisRefeshed(true);
                 upDataFriend();
                 loadData();
             }
-        });
+        });*/
+       mPullToRefreshListView.setOnRefreshListener(new PullToRefreshBase.OnRefreshListener2<ListView>() {
+           @Override
+           public void onPullDownToRefresh(PullToRefreshBase<ListView> refreshView) {
+               progressDialog.show();
+               mAdapter.setisRefeshed(true);
+               upDataFriend();
+               loadData();
+           }
+
+           @Override
+           public void onPullUpToRefresh(PullToRefreshBase<ListView> refreshView) {
+
+           }
+       });
 
         mPullToRefreshListView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
             private Friend friend;   //l临时对象
-
             @Override
             public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
                 try {
@@ -226,7 +241,6 @@ public class MyFriendActivity extends BaseActivity {
             public void afterTextChanged(Editable editable) {
                 String str = editable == null ? "" : editable.toString();
                 upDataBySearch(str);
-                mAdapter.setData(mSortFriends);
             }
         });
 
@@ -246,15 +260,18 @@ public class MyFriendActivity extends BaseActivity {
                 mSortFriends.add(e);
             }
         }
+        LogUtil.prinlnLongMsg("mSortFriends",JSON.toJSONString(mSortFriends));
+        mAdapter.setData(mSortFriends);
     }
 
     @Override
     public void onResume() {
         super.onResume();
         if (mNeedUpdate) {
-            loadData();
+//            loadData();
             mNeedUpdate = false;
         }
+        mAdapter.notifyDataSetChanged();
     }
 
     List<Friend> friends;//临时变量
@@ -394,6 +411,7 @@ public class MyFriendActivity extends BaseActivity {
         this.friends = friends;
         mAdapter.notifyDataSetInvalidated();
         mPullToRefreshListView.onRefreshComplete();
+        progressDialog.dismiss();
     }
 
     private void getFriendByErp(List<Friend> friends) {

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

@@ -285,6 +285,7 @@ public class ProcessMsgActivity extends BaseActivity implements View.OnClickList
             @Override
             public void onPullDownToRefresh(PullToRefreshBase<ListView> refreshView) {
                 page = 1;
+                voiceSearchView.setText("");
                 switch (tab_type) {
                     case 1:
                         loadProcessToDo(page);
@@ -301,6 +302,7 @@ public class ProcessMsgActivity extends BaseActivity implements View.OnClickList
             @Override
             public void onPullUpToRefresh(PullToRefreshBase<ListView> refreshView) {
                 page++;
+                voiceSearchView.setText("");
                 switch (tab_type) {
                     case 1:
                         loadProcessToDo(page);
@@ -418,7 +420,7 @@ public class ProcessMsgActivity extends BaseActivity implements View.OnClickList
                 tv_process_me_rl.setSelected(false);
                 mList.setMode(PullToRefreshBase.Mode.PULL_FROM_START);
                 loadProcessToDo(page);
-
+                voiceSearchView.setText("");
                 break;
             case R.id.tv_process_already_rl:
                 progressDialog.show();
@@ -430,7 +432,7 @@ public class ProcessMsgActivity extends BaseActivity implements View.OnClickList
                 tv_process_already_rl.setSelected(true);
                 tv_process_me_rl.setSelected(false);
                 loadProcesstoAlreadyDo(page);
-
+                voiceSearchView.setText("");
                 break;
             case R.id.tv_process_me_rl:
                 progressDialog.show();
@@ -442,7 +444,7 @@ public class ProcessMsgActivity extends BaseActivity implements View.OnClickList
                 tv_process_already_rl.setSelected(false);
                 tv_process_me_rl.setSelected(true);
                 loadProcessAlreadyLaunch(page);
-
+                voiceSearchView.setText("");
                 break;
             case R.id.back:
                 onBackPressed();
@@ -582,7 +584,7 @@ public class ProcessMsgActivity extends BaseActivity implements View.OnClickList
                     }
                     ;
 //                    model.status.setText(jp_status);
-                    model.status.setTextColor(getResources().getColor(R.color.vpi__bright_foreground_inverse_holo_light));
+                    model.status.setTextColor(getResources().getColor(R.color.new_waitting_approvel));
                     model.status.setText("等待我审批");
                     model.JP_NODEID = JP_NODEID;
                     model.typecode = jp_typecode;
@@ -664,7 +666,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.vpi__bright_foreground_inverse_holo_light));
+                                model.status.setTextColor(getResources().getColor(R.color.new_waitting_approvel));
                                 nodename = nodename == null ? "" : nodename;
                                 status = "等待" + nodename + "(" + codename + ")" + getString(R.string.approvel);
                             } else if (status.equals("未通过")) {

WeiChat/src/main/res/values/colors.xml

@@ -324,4 +324,5 @@
     <color name="normal_day">#ff999999</color>
     <color name="selected_day_background">#E75F49</color>
     <color name="selected_day_text">#fff2f2f2</color>
+    <color name="new_waitting_approvel">#F4A460</color>
 </resources>