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

WeiChat/src/main/AndroidManifest.xml

@@ -431,10 +431,10 @@
             android:label="外勤签到" />
         <activity
             android:name=".ui.erp.activity.oa.MeetDetailsActivity"
-            android:label="会议签到" />
+            android:label="会议详情" />
         <activity
             android:name=".ui.erp.activity.oa.OARegisterActivity"
-            android:label="查看签到情况" />
+            android:label="会议签到" />
         <activity
             android:name=".ui.erp.activity.crm.CustomerAddActivity"
             android:configChanges="orientation|keyboardHidden"

WeiChat/src/main/java/com/xzjmyk/pm/activity/bean/oa/MeetUserEntity.java

@@ -10,12 +10,21 @@ public class MeetUserEntity implements Parcelable {
     private String imId;
     private String name;
     private String emCode;
+    private String company;
     private int emId;
     private boolean isClick = false;
 
     public MeetUserEntity() {
     }
 
+    public String getCompany() {
+        return company;
+    }
+
+    public void setCompany(String company) {
+        this.company = company;
+    }
+
     public String getImId() {
         return imId;
     }
@@ -60,6 +69,7 @@ public class MeetUserEntity implements Parcelable {
         imId = in.readString();
         name = in.readString();
         emCode = in.readString();
+        company = in.readString();
         emId = in.readInt();
         isClick = in.readByte() != 0;
     }
@@ -86,6 +96,7 @@ public class MeetUserEntity implements Parcelable {
         parcel.writeString(imId);
         parcel.writeString(name);
         parcel.writeString(emCode);
+        parcel.writeString(company);
         parcel.writeInt(emId);
         parcel.writeByte((byte) (isClick ? 1 : 0));
     }

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/TaskAddActivity.java

@@ -10,7 +10,6 @@ import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.EditText;
-import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
 import com.andreabaccega.widget.FormEditText;
@@ -27,10 +26,8 @@ import com.xzjmyk.pm.activity.ui.erp.util.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.view.DateTimePickerDialog;
 import com.xzjmyk.pm.activity.util.TimeUtils;
 import com.xzjmyk.pm.activity.util.ToastUtil;
-import com.xzjmyk.pm.activity.view.wheel.DatePicker;
 import com.xzjmyk.pm.activity.view.wheel.OptionPicker;
 
-import java.util.Calendar;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.Map;
@@ -88,7 +85,7 @@ public class TaskAddActivity extends BaseActivity implements View.OnClickListene
         tv_priority.setOnClickListener(this);
         tv_date.setOnClickListener(this);
         tv_date_start.setOnClickListener(this);
-        findViewById(R.id.sex_erp_rl).setOnClickListener(this);
+        findViewById(R.id.tv_executive).setOnClickListener(this);
         tv_date.setKeyListener(null);
         tv_date.setFocusable(false);
         tv_date_start.setKeyListener(null);
@@ -128,12 +125,27 @@ public class TaskAddActivity extends BaseActivity implements View.OnClickListene
         return true;
     }
 
-    public void showDialog(final TextView tv) {
-        DateTimePickerDialog dialog = new DateTimePickerDialog(this, System.currentTimeMillis());
+    public void showDialog(final FormEditText tv, final boolean b) {
+        final DateTimePickerDialog dialog = new DateTimePickerDialog(this, System.currentTimeMillis());
         dialog.setOnDateTimeSetListener(new DateTimePickerDialog.OnDateTimeSetListener() {
             public void OnDateTimeSet(AlertDialog dia, long date) {
                 String str = TimeUtils.f_long_2_str(date);
-                tv.setText(str);
+                String start = null;
+                if (!b) {
+                    start = tv_date_start.getText().toString();
+                    if (str.compareTo(start) < 0) {
+                        ToastUtil.showToast(ct, "结束时间不能小于开始时间");
+                    } else {
+                        tv.setText(str);
+                    }
+                } else {
+                    start = TimeUtils.f_long_2_str(System.currentTimeMillis());
+                    if (str.compareTo(start) < 0) {
+                        ToastUtil.showToast(ct, "开始时间不能小于当前时间");
+                    } else {
+                        tv.setText(str);
+                    }
+                }
             }
         });
         dialog.show();
@@ -270,41 +282,17 @@ public class TaskAddActivity extends BaseActivity implements View.OnClickListene
         sex_option.show();
     }
 
-    private void showDateDialog(final FormEditText view) {
-        DatePicker picker = new DatePicker(this);
-        picker.setRange(1950, 2030);
-        picker.setSelectedItem(
-                Calendar.getInstance().get(Calendar.YEAR),
-                Calendar.getInstance().get(Calendar.MONTH) + 1,
-                Calendar.getInstance().get(Calendar.DAY_OF_MONTH));
-        picker.setOnDatePickListener(new DatePicker.OnYearMonthDayPickListener() {
-            @Override
-            public void onDatePicked(String year, String month, String day) {
-                switch (view.getId()) {
-                    case R.id.tv_date:
-                        view.setText(year + "-" + month + "-" + day);
-                        break;
-                    case R.id.tv_date_start:
-                        view.setText(year + "-" + month + "-" + day);
-                        break;
-                }
-
-
-            }
-        });
-        picker.show();
-    }
 
     @Override
     public void onClick(View v) {
         switch (v.getId()) {
             case R.id.tv_date_start:
-                showDialog(tv_date_start);
+                showDialog(tv_date_start, true);
 //                showDateDialog((FormEditText) v.findViewById(R.id.tv_date_start));
                 break;
             case R.id.tv_date:
                 if (tv_date_start.getText() != null && tv_date_start.getText().toString().length() > 0) {
-                    showDialog(tv_date);
+                    showDialog(tv_date, false);
                 } else {
                     ToastUtil.showToast(ct, "请先填写开始日期");
                 }
@@ -316,7 +304,7 @@ public class TaskAddActivity extends BaseActivity implements View.OnClickListene
             case R.id.tv_priority:
                 showPriorityDialog(tv_priority, 0x11);
                 break;
-            case R.id.sex_erp_rl:
+            case R.id.tv_executive:
                 Intent intent = new Intent(ct, UserSelectActivity.class);
                 intent.putExtra("single", true);
                 startActivityForResult(intent, 0x11);

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/VisitReportAddActivity.java

@@ -51,7 +51,6 @@ public class VisitReportAddActivity extends BaseActivity implements View.OnClick
     private FormEditText tv_customer_login;
     @ViewInject(R.id.tv_linksman_login)
     private FormEditText tv_linksman_login;
-
     @ViewInject(R.id.tv_date_start)
     private FormEditText tv_date_start;
     @ViewInject(R.id.tv_date_end)

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

@@ -4,7 +4,6 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -75,8 +74,9 @@ public class AddMeetTaskActivity extends BaseActivity {
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         if (data == null) return;
-        if (requestCode == 0x11 && resultCode == 0x11) {
-            data.getStringExtra("name");
+        if (requestCode == 0x11 && resultCode == 0x20) {
+//            data.getStringExtra("name");
+            loadNetData();
         }
     }
 
@@ -110,7 +110,6 @@ public class AddMeetTaskActivity extends BaseActivity {
     }
 
     private void loadNetData() {
-        Log.i("gongpengming", meetName);
         String url = CommonUtil.getSharedPreferences(this, "erp_baseurl") + "common/datalist/data.action";
         String emcode = CommonUtil.getSharedPreferences(ct, "erp_username");
         String caller = "ResourceAssignment";

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

@@ -285,7 +285,7 @@ public class AddMeetingActivity extends BaseActivity implements View.OnClickList
                 "\"ma_groupid\":" + "\"" + ids + "\",\n" +
                 "\"ma_id\":" + "\"" + id + "\",\n" +
                 "\"ma_isturndoc\":" + "\"" + "否" + "\",\n" +
-                "\"ma_mrname\":" + "\"" + name_et.getText().toString() + "\",\n" +
+                "\"ma_mrname\":" + "\"" + location_et.getText().toString() + "\",\n" +
                 "\"ma_recorddate\":" + "\"" + TimeUtils.s_long_2_str(System.currentTimeMillis()) + "\",\n" +
                 "\"ma_recorder\":" + "\"" + MyApplication.getInstance().mLoginUser.getNickName() + "\",\n" +
                 "\"ma_remark\":" + "\"" + about_et.getText().toString() + "\",\n" +

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

@@ -190,6 +190,7 @@ public class AlarmaActivity extends BaseActivity implements View.OnClickListener
          下班时间设置，弹出款：延迟1分钟，延迟2分钟，延迟5分钟，延迟10分钟，延迟20分钟，延迟30分钟
          */
         final String[] str = new String[6];
+
         if (isU) {
             str[0] = "提前1分钟";
             str[1] = "提前2分钟";

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

@@ -51,6 +51,8 @@ public class MeetDetailsActivity extends BaseActivity implements View.OnClickLis
     private Button click_btn;
     @ViewInject(R.id.oa_meeting_start_date)
     private TextView oa_meeting_start_date;
+    @ViewInject(R.id.end_meet_tv)
+    private TextView end_meet_tv;
     @ViewInject(R.id.status_tv)
     private TextView status_tv;
     @ViewInject(R.id.location_tv)
@@ -70,7 +72,7 @@ public class MeetDetailsActivity extends BaseActivity implements View.OnClickLis
             switch (msg.what) {
                 case whatLoad:
                     object = JSON.parseObject(message).getJSONObject("panelData");
-                    updataUI();
+//                    updataUI();
                     break;
                 case ENDMEET:
                     ToastUtil.showToast(ct, "会议结束成功");
@@ -84,6 +86,7 @@ public class MeetDetailsActivity extends BaseActivity implements View.OnClickLis
                     ToastUtil.showToast(ct, "会议签到成功");
                     isPlay = false;
                     click_btn.setPressed(true);
+                    loadNumData();
                     break;
                 case 0x14:
                     JSONObject numlist = JSON.parseObject(message).getJSONObject("participants");
@@ -127,7 +130,6 @@ public class MeetDetailsActivity extends BaseActivity implements View.OnClickLis
             ma_id = entity.getMa_id();
             ma_code = entity.getMa_code();
         }
-        loadDetailsData();
         loadNumData();
         initView();
     }
@@ -157,8 +159,6 @@ public class MeetDetailsActivity extends BaseActivity implements View.OnClickLis
     }
 
     private void initView() {
-        sub_tv.setText(entity.getMa_remark() == null ? "" : entity.getMa_remark());
-        tag_tv.setText(entity.getMa_tag() == null ? "" : entity.getMa_tag());
         getPoinfo();
         findViewById(R.id.meet_save).setOnClickListener(this);
         findViewById(R.id.num_tag).setOnClickListener(this);
@@ -166,32 +166,42 @@ public class MeetDetailsActivity extends BaseActivity implements View.OnClickLis
         findViewById(R.id.click_btn).setOnClickListener(this);
         findViewById(R.id.location_tag).setOnClickListener(this);
         findViewById(R.id.add_task_ll).setOnClickListener(this);
-    }
-
-    String baseUrl;
-
-    private void updataUI() {
-        if (object == null) return;
-        name_tv.setText(object.getString("ma_theme"));
-        addr_tv.setText(object.getString("mr_site"));
-        user_tv.setText(object.getString("ma_recorder"));
-        long startLongTime = TimeUtils.f_str_2_long(entity.getMa_starttime());
-        oa_meeting_start.setText(TimeUtils.long2str(startLongTime, "MM月dd"));
-        oa_meeting_start_date.setText(TimeUtils.long2str(startLongTime, "HH:mm"));
-        long endLongTime = TimeUtils.f_str_2_long(entity.getMa_endtime());
-        oa_meeting_end.setText(TimeUtils.long2str(startLongTime, "MM月dd"));
-        oa_meeting_end_date.setText(TimeUtils.long2str(endLongTime, "HH:mm"));
+        if (entity == null) return;
+        if (entity.getMa_recorder() != null && !MyApplication.getInstance().mLoginUser.getNickName().equals(entity.getMa_recorder())) {
+            end_meet_tv.setVisibility(View.GONE);
+        } else {
+            end_meet_tv.setVisibility(View.VISIBLE);
+        }
+        //设置会议 地点、介绍、发起人、标签
+        addr_tv.setText(entity.getMa_mrname() == null ? "未填写" : entity.getMa_mrname());
+        sub_tv.setText(entity.getMa_remark() == null ? "" : entity.getMa_remark());
+        user_tv.setText(entity.getMa_recorder() == null ? "" : entity.getMa_recorder());
+        tag_tv.setText(entity.getMa_tag() == null ? "" : entity.getMa_tag());
+        //设置会议状态
         String str = entity.getMa_stage();
         if (str == null) {
             if (TimeUtils.f_str_2_long(entity.getMa_starttime()) > System.currentTimeMillis())
                 str = "未开始";
             else
                 str = "进行中";
+        } else {
+            if ("已结束".equals(str)) {
+
+            }
         }
         status_tv.setText(str);
+        //设置开始和结束时间的显示
+        long startLongTime = TimeUtils.f_str_2_long(entity.getMa_starttime());
+        oa_meeting_start.setText(TimeUtils.long2str(startLongTime, "MM月dd"));
+        oa_meeting_start_date.setText(TimeUtils.long2str(startLongTime, "HH:mm"));
+        long endLongTime = TimeUtils.f_str_2_long(entity.getMa_endtime());
+        oa_meeting_end.setText(TimeUtils.long2str(startLongTime, "MM月dd"));
+        oa_meeting_end_date.setText(TimeUtils.long2str(endLongTime, "HH:mm"));
     }
 
-    //下拉页面数据
+    String baseUrl;
+
+    //获取会议详情接口（获取到的数据太少，先不用）
     private void loadDetailsData() {
         progressDialog.show();
         //获取网络数据
@@ -258,15 +268,20 @@ public class MeetDetailsActivity extends BaseActivity implements View.OnClickLis
                 urlSub = "mobile/crm/updateMeeting.action";//结束会议
                 break;
         }
+//        emcode改成em_code ，ma_id改成ma_code
         String url = baseUrl + urlSub;
         String em_code = CommonUtil.getSharedPreferences(ct, "erp_username");
         String sessionId = CommonUtil.getSharedPreferences(ct, "sessionId");
         final Map<String, Object> param = new HashMap<>();
         String caller = "Meetingroomapply";
-        param.put("emcode", em_code);
-        if (type != ENDMEET)
+        if (type == ENDMEET) {
+            param.put("emcode", em_code);
+            param.put("ma_id", ma_id);
+        } else {
             param.put("caller", caller);
-        param.put("ma_id", ma_id);
+            param.put("em_code", em_code);
+            param.put("ma_code", ma_id);
+        }
         param.put("sessionId", sessionId);
         LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
         headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
@@ -328,9 +343,13 @@ public class MeetDetailsActivity extends BaseActivity implements View.OnClickLis
                 showExitDialog();
                 break;
             case R.id.click_btn:
-                if (isPlay)
-                    doNetSubmit(SIGNNIN);
-                else {
+                if (isPlay) {
+                    if ("已结束".equals(status_tv.getText().toString().trim())) {
+                        ToastUtil.showToast(ct, "会议已经结束，不能在签到");
+                    } else {
+                        doNetSubmit(SIGNNIN);
+                    }
+                } else {
                     ToastUtil.showToast(ct, "您已经签到过了");
                     click_btn.setPressed(true);
                 }

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

@@ -157,7 +157,6 @@ public class MeetingActivity extends BaseActivity {
                 MeetEntity entity = adapter.getData().get((i - 1 < 0 ? 0 : (i - 1)));
                 intent.putExtra("data", entity);
                 intent.putExtra("item", (i - 1 < 0 ? 0 : (i - 1)));
-
                 startActivityForResult(intent, requestCode);
             }
         });
@@ -289,7 +288,7 @@ public class MeetingActivity extends BaseActivity {
             viewholder.oa_meeting_start_date.setText(TimeUtils.long2str(startLong, "HH:mm"));
             viewholder.oa_meeting_end_date.setText(TimeUtils.long2str(endLong, "HH:mm"));
             viewholder.oa_meeting_name_tv.setText(entity.getMa_theme());
-            viewholder.oa_meeting_addr_tv.setText(entity.getMa_remark());
+            viewholder.oa_meeting_addr_tv.setText(entity.getMa_mrname());
             viewholder.oa_meeting_user_tv.setText(entity.getMa_recorder());
             if (entity.getMa_tag() == null || entity.getMa_tag().length() <= 0) return;
             viewholder.oa_meeting_tag_tv.setText(entity.getMa_type() == null ? "" : entity.getMa_type());
@@ -314,17 +313,17 @@ public class MeetingActivity extends BaseActivity {
         if (requestCode == this.requestCode) {
             if (resultCode == 0x14) {
                 if ("data".equals(data.getStringExtra("data"))) {
-                    //TODO 刷新
                     list_business.setRefreshing(true);
                     loadNetData(1);
                 }
             } else if (resultCode == 0x15) {
+                Log.i("gongpengming", "resultCode == 0x15");
                 int i = data.getIntExtra("item", -1);
+                Log.i("gongpengming", "item=" + i);
                 if (i >= 0 && data.getBooleanExtra("data", false)) {//是否结束会议
+                    Log.i("gongpengming", "item=已结束");
                     entities = adapter.getData();
                     entities.get(i).setStatus("已结束");
-                } else {
-                    entities.get(i).setStatus("正在进行");
                 }
                 adapter.setData(entities);
             }

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

@@ -466,6 +466,7 @@ public class OAActivity extends BaseActivity implements View.OnClickListener {
 
     /**
      * 点击我和我的下属的工作日志中的标识变化
+     *
      * @param isMy 是否是 我的工作日志
      */
     private void chaneTAG(boolean isMy) {
@@ -616,6 +617,11 @@ public class OAActivity extends BaseActivity implements View.OnClickListener {
             }
             if (chche.getStatus() != null) {//状态
                 viewholder.item_status_tv.setText(chche.getStatus());
+                if ("已拜访".equals(chche.getStatus())) {
+                    viewholder.item_doit_tv.setVisibility(View.GONE);
+                } else {
+                    viewholder.item_doit_tv.setVisibility(View.VISIBLE);
+                }
             } else {
                 viewholder.item_status_tv.setText("");
             }

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

@@ -48,13 +48,15 @@ public class SaveMeetActivity extends BaseActivity {
                     ToastUtil.showToast(SaveMeetActivity.this, "保存会议纪要失败");
                 }
             } else if (msg.what == 0x12) {
-                JSONObject json = JSON.parseObject(message);
-                if (json.containsKey("success") && json.getBoolean("success")) {
-                    ToastUtil.showToast(SaveMeetActivity.this, "保存会议纪要成功");
-                    finish();
-                } else {
-                    ToastUtil.showToast(SaveMeetActivity.this, "更新会议纪要失败");
-                }
+                ToastUtil.showToast(SaveMeetActivity.this, "保存会议纪要成功");
+                finish();
+//                JSONObject json = JSON.parseObject(message);
+//                if (json.containsKey("success") && json.getBoolean("success")) {
+//                    ToastUtil.showToast(SaveMeetActivity.this, "保存会议纪要成功");
+//                    finish();
+//                } else {
+//                    ToastUtil.showToast(SaveMeetActivity.this, "更新会议纪要失败");
+//                }
             }
         }
     };
@@ -67,11 +69,13 @@ public class SaveMeetActivity extends BaseActivity {
         }
         return super.onOptionsItemSelected(item);
     }
+
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         getMenuInflater().inflate(R.menu.menu_visit_save, menu);
         return super.onCreateOptionsMenu(menu);
     }
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -113,6 +117,7 @@ public class SaveMeetActivity extends BaseActivity {
         }
         doSave(builder.toString());
     }
+
     private void updataCode() {
         //获取网络数据
         if (bean == null) {

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

@@ -6,7 +6,6 @@ import android.os.Handler;
 import android.os.Message;
 import android.text.Editable;
 import android.text.TextWatcher;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -15,17 +14,21 @@ import android.view.ViewGroup;
 import android.widget.AdapterView;
 import android.widget.BaseAdapter;
 import android.widget.CheckBox;
+import android.widget.ImageView;
 import android.widget.ListView;
 import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
+import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.oa.MeetUserEntity;
+import com.xzjmyk.pm.activity.helper.AvatarHelper;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.db.DBManager;
 import com.xzjmyk.pm.activity.ui.erp.entity.EmployeesEntity;
@@ -66,20 +69,24 @@ public class UserSelectActivity extends BaseActivity {
                     MeetUserEntity entity = null;
                     String code = null;//em_code
                     String name = null;//em_name
+                    String company = null;//em_name
                     String imId = null;//em_department->em_post
+                    JSONObject object = null;
                     for (int i = 0; i < array.size(); i++) {
+                        object = array.getJSONObject(i);
                         entity = new MeetUserEntity();
                         entity.setClick(false);
-                        code = array.getJSONObject(i).getString("em_code");
-                        name = array.getJSONObject(i).getString("em_name");
-                        imId = (array.getJSONObject(i).getString("em_department") == null ? "" : (array.getJSONObject(i).getString("em_department") + "->")) +
+                        code = object.containsKey("em_code") ? object.getString("em_code") : "";
+                        name = object.containsKey("em_name") ? object.getString("em_name") : "";
+                        imId = object.containsKey("em_imid") ? object.getString("em_imid") : "";
+                        company = (array.getJSONObject(i).getString("em_department") == null ? "" : (array.getJSONObject(i).getString("em_department") + "->")) +
                                 (array.getJSONObject(i).getString("em_post") == null ? "" : array.getJSONObject(i).getString("em_post"));
-                        entity.setEmCode(code == null ? "" : code);
-                        entity.setName(name == null ? "" : name);
-                        entity.setImId(imId == null ? "" : imId);
+                        entity.setEmCode(code);
+                        entity.setName(name);
+                        entity.setImId(imId);
+                        entity.setCompany(company);
                         entities.add(entity);
                     }
-
                     if (entities.size() > 0) {
                         if (adapter == null) {
                             adapter = new MeetSelectAdapter(entities);
@@ -107,7 +114,7 @@ public class UserSelectActivity extends BaseActivity {
         listview.setEmptyView(view);
         adapter = new MeetSelectAdapter();
         listview.setAdapter(adapter);
-        listview.setMode(PullToRefreshBase.Mode.PULL_FROM_START);
+        listview.setMode(PullToRefreshBase.Mode.DISABLED);
         search_edit.addTextChangedListener(new TextWatcher() {
             @Override
             public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) {
@@ -120,26 +127,11 @@ public class UserSelectActivity extends BaseActivity {
             @Override
             public void afterTextChanged(Editable editable) {
                 String strChche = editable.toString();
-                //TODO 正则
-                Log.i("gongpengming", strChche);
-                if (entities == null) {
-                    Log.i("gongpengming", "beans==null");
-                } else {
-                    Log.i("gongpengming", "beans!=null");
-                }
-                if (entities.size() <= 0) {
-                    Log.i("gongpengming", "beans.size() <= 0");
-                } else {
-                    Log.i("gongpengming", "beans.size() > 0");
-                }
                 if (entities == null || entities.size() <= 0) return;
                 ArrayList<MeetUserEntity> chche = new ArrayList<>();
                 for (MeetUserEntity e : entities) {
                     if (getResult(e.getName() + e.getImId(), strChche)) {
-                        Log.i("gongpengming", "一样的 " + e.getName() + e.getImId());
                         chche.add(e);
-                    } else {
-                        Log.i("gongpengming", "这个是不一样的 " + e.getName() + e.getImId());
                     }
                 }
                 adapter.setUsers(chche);
@@ -186,7 +178,7 @@ public class UserSelectActivity extends BaseActivity {
             return;
         }
         for (int i = 0; i < adapter.getUsers().size(); i++) {
-            if (CommonUtil.getSharedPreferences(ct, "username").trim().equals(adapter.getUsers().get(i).getEmCode().trim())) {
+            if (MyApplication.getInstance().mLoginUser.getUserId().equals(adapter.getUsers().get(i).getImId())) {
                 list.add(adapter.getUsers().get(i));
                 continue;
             }
@@ -225,23 +217,22 @@ public class UserSelectActivity extends BaseActivity {
     }
 
     private void getDataByDB() {  //企业通讯录好友
-        if (manager == null)
-            manager = new DBManager(ct);
+        manager = new DBManager(ct);
         String master = CommonUtil.getSharedPreferences(ct, "erp_master"); //待优化   每次都 读取文件耗性能
         if (StringUtils.isEmpty(master)) return;
         List<EmployeesEntity> emList = manager.select_getEmployee(
                 new String[]{master},
                 "whichsys=?");
+        manager.closeDB();
         for (int i = 0; i < emList.size(); i++) {//企业通讯人员
-            if (emList.get(i).getEm_IMID() == 0) continue;
-
+//            if (emList.get(i).getEm_IMID() == 0) continue;
             entities.add(EnterChatAction(emList.get(i)));
         }
+
         //获取完数据以后
         if (adapter != null)
             adapter.setUsers(entities);
     }
-
     private void getDataByNet() {
         progressDialog.show();
         //获取网络数据
@@ -256,6 +247,7 @@ public class UserSelectActivity extends BaseActivity {
 
     private MeetUserEntity EnterChatAction(EmployeesEntity employee) {
         MeetUserEntity entity = new MeetUserEntity();
+        entity.setCompany(employee.getCOMPANY() == null ? "" : employee.getCOMPANY());
         entity.setImId(String.valueOf(employee.getEm_IMID()));
         entity.setName(employee.getEM_NAME());
         entity.setEmCode(employee.getEM_CODE());
@@ -306,6 +298,7 @@ public class UserSelectActivity extends BaseActivity {
                 holder.select_scb = (CheckBox) view.findViewById(R.id.select_scb);
                 holder.id_tv = (TextView) view.findViewById(R.id.id_tv);
                 holder.name_tv = (TextView) view.findViewById(R.id.name_tv);
+                holder.head_img = (ImageView) view.findViewById(R.id.head_img);
                 view.setTag(holder);
             } else {
                 holder = (ViewHolder) view.getTag();
@@ -313,11 +306,12 @@ public class UserSelectActivity extends BaseActivity {
             holder.select_scb.setChecked(users.get(i).isClick());
             holder.select_scb.setFocusable(false);
             holder.select_scb.setClickable(false);
-            if (isNet)
-                holder.id_tv.setText(users.get(i).getImId());
-            else
-                holder.id_tv.setText("imId:" + users.get(i).getImId());
-
+            if (isNet) {
+                holder.id_tv.setText(users.get(i).getCompany());
+            } else {
+                holder.id_tv.setText(users.get(i).getCompany().length() <= 0 ? "" : "公司:" + users.get(i).getCompany());
+            }
+            AvatarHelper.getInstance().displayAvatar(users.get(i).getImId(), holder.head_img, true);//不会删除缓存
             holder.name_tv.setText("姓名:" + users.get(i).getName());
             return view;
         }
@@ -325,6 +319,7 @@ public class UserSelectActivity extends BaseActivity {
         class ViewHolder {
             CheckBox select_scb;
             TextView name_tv, id_tv;
+            ImageView head_img;
         }
     }
 }

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/fragment/SigninClickFragment.java

@@ -102,7 +102,8 @@ public class SigninClickFragment extends EasyFragment implements View.OnClickLis
                         }
                     } else {
                         //如果返回失败
-                        ToastUtil.showToast(ct, "网络连接失败，请稍后再试");
+                        ct.finish();
+                        ToastUtil.showToast(ct, "系统尚未找到您的班次，请联系管理员设置班次");
                     }
                     break;
                 case WHATLOG://获取打卡

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

@@ -957,10 +957,10 @@ public class MessageFragment extends EasyFragment {
                 }
                 TASK_count = task_num;
                 handler.sendEmptyMessage(TASK_MSG);
-//                DAIBAN_count = daiban_num;
-//                handler.sendEmptyMessage(DAIBAN_MSG);
-                SUBRICE_count = pagin_num;
-                handler.sendEmptyMessage(SUBRICE_MSG);
+                DAIBAN_count = daiban_num;
+                handler.sendEmptyMessage(DAIBAN_MSG);
+//                SUBRICE_count = pagin_num;
+//                handler.sendEmptyMessage(SUBRICE_MSG);
             }
         }
     }

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

@@ -32,6 +32,7 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:textColor="@color/white"
                 android:layout_marginTop="2dp"
                 android:text="会议纪要" />
         </LinearLayout>
@@ -55,6 +56,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="2dp"
+                android:textColor="@color/white"
                 android:text="分配任务" />
         </LinearLayout>
     </LinearLayout>

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

@@ -10,7 +10,8 @@
         android:layout_width="match_parent"
         android:layout_height="44dp"
         android:layout_alignParentBottom="true"
-        android:orientation="horizontal">
+        android:orientation="horizontal"
+        android:visibility="gone">
 
         <RadioButton
             android:id="@+id/sin_rb"
@@ -31,17 +32,14 @@
             android:button="@null"
             android:drawableTop="@drawable/outoffice_play"
             android:gravity="center"
-            android:text="足迹"
-            android:visibility="gone" />
+            android:text="足迹" />
 
     </RadioGroup>
-
     <View
         android:layout_width="match_parent"
         android:layout_height="2px"
         android:layout_above="@+id/top"
         android:background="@color/item_line" />
-
     <FrameLayout
         android:id="@+id/content_fl"
         android:layout_width="match_parent"

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

@@ -69,7 +69,7 @@
             <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
                 android:id="@+id/tv_executive"
                 style="@style/form_relative_right_text"
-             
+                android:drawableRight="@drawable/nav_icon_search_default"
                 android:hint="请选择"
                 editTextFormExample:testType="nocheck" />
         </RelativeLayout>
@@ -275,9 +275,9 @@
                 android:id="@+id/tv_content"
                 style="@style/form_relative_right_text"
                 android:gravity="top|left"
+                android:hint="最多输入十五个字符"
                 android:minLines="4"
                 android:padding="5dp"
-                android:hint="最多输入十五个字符"
                 editTextFormExample:testType="nocheck" />
         </RelativeLayout>
 

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

@@ -1,12 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-    <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="@dimen/item_height"
     android:background="@color/bg_main"
-    android:paddingBottom="8dp"
-    android:paddingLeft="10dp"
-    android:paddingRight="10dp"
-    android:paddingTop="8dp">
+    android:padding="8dp">
 
     <CheckBox
         android:id="@+id/select_scb"
@@ -17,13 +14,20 @@
         android:drawableLeft="@drawable/oa_rb_button_bg"
         android:padding="10dp" />
 
+    <ImageView
+        android:id="@+id/head_img"
+        android:layout_width="38dp"
+        android:layout_height="38dp"
+        android:layout_centerVertical="true"
+        android:layout_toRightOf="@id/select_scb"
+        android:src="@drawable/friend_u" />
+
     <TextView
         android:id="@+id/name_tv"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginLeft="10dp"
-        android:layout_toRightOf="@+id/select_scb"
-        android:text="名字"
+        android:layout_toRightOf="@+id/head_img"
         android:textColor="@color/text_main"
         android:textSize="@dimen/text_main" />
 
@@ -34,7 +38,6 @@
         android:layout_alignLeft="@+id/name_tv"
         android:layout_below="@+id/name_tv"
         android:layout_marginTop="8dp"
-        android:text="id:id"
         android:textColor="@color/text_hine"
         android:textSize="@dimen/text_hine" />
 </RelativeLayout>

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

@@ -21,21 +21,32 @@
         android:textColor="@color/hintColor"
         android:textSize="@dimen/text_hine" />
 
+    <ImageView
+        android:id="@+id/oa_meeting_start_tag"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/oa_meeting_name_tv"
+        android:layout_marginTop="20dp"
+        android:drawablePadding="5dp"
+        android:src="@drawable/ic_meeting_time" />
+
     <TextView
         android:id="@+id/oa_meeting_start"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_below="@id/oa_meeting_name_tv"
+        android:layout_marginLeft="5dp"
         android:layout_marginTop="20dp"
-        android:drawableLeft="@drawable/ic_meeting_time"
+        android:layout_toRightOf="@id/oa_meeting_start_tag"
         android:drawablePadding="5dp"
         android:gravity="center_vertical"
-        android:textSize="@dimen/text_hine" />
+        android:textSize="@dimen/text_main" />
 
     <TextView
         android:id="@+id/oa_meeting_start_date"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_alignLeft="@id/oa_meeting_start"
         android:layout_below="@id/oa_meeting_start"
         android:layout_marginTop="5dp"
         android:gravity="center_vertical"
@@ -58,8 +69,8 @@
         android:layout_height="wrap_content"
         android:layout_alignTop="@+id/oa_meeting_start_date"
         android:layout_toRightOf="@+id/oa_meeting_line"
-        android:gravity="center_vertical"
         android:drawableLeft="@null"
+        android:gravity="center_vertical"
         android:textSize="30sp" />
 
     <TextView
@@ -68,10 +79,10 @@
         android:layout_height="wrap_content"
         android:layout_above="@id/oa_meeting_end_date"
         android:layout_alignLeft="@+id/oa_meeting_end_date"
+        android:layout_alignTop="@id/oa_meeting_start"
         android:layout_marginBottom="5dp"
         android:gravity="center_vertical"
-        android:layout_alignTop="@id/oa_meeting_start"
-        android:textSize="@dimen/text_hine" />
+        android:textSize="@dimen/text_main" />
 
     <TextView
         android:id="@+id/oa_meeting_addr"
@@ -79,10 +90,10 @@
         android:layout_height="wrap_content"
         android:layout_below="@+id/oa_meeting_start_date"
         android:layout_marginTop="10dp"
-        android:text="会议地点"
         android:drawableLeft="@drawable/ic_meeting_address"
-        android:gravity="center_vertical"
         android:drawablePadding="5dp"
+        android:gravity="center_vertical"
+        android:text="会议地点"
         android:textColor="@color/hintColor" />
 
     <TextView
@@ -91,8 +102,7 @@
         android:layout_height="wrap_content"
         android:layout_alignTop="@+id/oa_meeting_addr"
         android:layout_marginLeft="10dp"
-        android:layout_toRightOf="@+id/oa_meeting_addr"
-        android:text="三楼会议室" />
+        android:layout_toRightOf="@+id/oa_meeting_addr" />
 
     <TextView
         android:id="@+id/oa_meeting_user"
@@ -100,10 +110,10 @@
         android:layout_height="wrap_content"
         android:layout_below="@+id/oa_meeting_addr"
         android:layout_marginTop="10dp"
-        android:text="发  起  人"
         android:drawableLeft="@drawable/ic_metting_people"
-        android:gravity="center_vertical"
         android:drawablePadding="5dp"
+        android:gravity="center_vertical"
+        android:text="发  起  人"
         android:textColor="@color/hintColor" />
 
     <TextView
@@ -112,8 +122,7 @@
         android:layout_height="wrap_content"
         android:layout_alignTop="@+id/oa_meeting_user"
         android:layout_marginLeft="10dp"
-        android:layout_toRightOf="@+id/oa_meeting_user"
-        android:text="张建国" />
+        android:layout_toRightOf="@+id/oa_meeting_user" />
 
     <TextView
         android:id="@+id/oa_meeting_tag"
@@ -121,10 +130,10 @@
         android:layout_height="wrap_content"
         android:layout_below="@+id/oa_meeting_user"
         android:layout_marginTop="10dp"
-        android:text="会议纪要"
         android:drawableLeft="@drawable/ic_metting_label"
-        android:gravity="center_vertical"
         android:drawablePadding="5dp"
+        android:gravity="center_vertical"
+        android:text="会议纪要"
         android:textColor="@color/hintColor" />
 
     <TextView