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

WeiChat/build.gradle

@@ -4,7 +4,7 @@ apply plugin: 'com.getkeepsafe.dexcount'
 android {
     signingConfigs {
         config {
-            storeFile file('C:/Users/Arison/Desktop/applicationsignname[20150409]')
+            storeFile file('D:/config/applicationsignname[20150409]')
             storePassword '13237658359'
             keyAlias 'jie-20150409'
             keyPassword '13237658359'

WeiChat/src/main/AndroidManifest.xml

@@ -4,11 +4,13 @@
     package="com.xzjmyk.pm.activity"
     android:versionCode="52"
     android:versionName="5.2">
+
     <uses-sdk
         android:minSdkVersion="11"
         android:targetSdkVersion="23" />
     <!-- 拨打电话 -->
     <uses-permission android:name="android.permission.CALL_PHONE" />
+
     <uses-feature android:name="android.hardware.camera" />
     <uses-feature android:name="android.hardware.camera.autofocus" />
     <uses-feature android:name="android.hardware.microphone" />
@@ -60,7 +62,8 @@
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.GET_TASKS" />
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
-    <!--全局样式不要随意改动  @style/AppTheme-->
+
+    <!-- 全局样式不要随意改动  @style/AppTheme -->
     <application
         android:name=".MyApplication"
         android:allowBackup="true"
@@ -550,7 +553,7 @@
         <activity
             android:name=".ui.erp.activity.oa.OAListActivity"
             android:label="外勤签到列表" />
-
+        <activity android:name=".ui.erp.activity.oa.OptionActivity"></activity>
     </application>
 
 </manifest>

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

@@ -31,12 +31,12 @@ 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.crm.Business;
-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.activity.oa.UserSelectActivity;
 import com.xzjmyk.pm.activity.ui.erp.db.DBManager;
 import com.xzjmyk.pm.activity.ui.erp.entity.EmployeesEntity;
+import com.xzjmyk.pm.activity.ui.erp.model.Employees;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.Constants;
@@ -58,10 +58,10 @@ import java.util.Map;
  */
 public class CustomerListActivity extends BaseActivity implements View.OnClickListener {
     private BussinessDetailAdapter mAdapter;
-    
+
     @ViewInject(R.id.iv_head)
     private ImageView iv_head;
-    
+
     @ViewInject(R.id.tv_change)
     private TextView tv_change;
     @ViewInject(R.id.tv_count_unend)
@@ -162,7 +162,7 @@ public class CustomerListActivity extends BaseActivity implements View.OnClickLi
                 Log.i(TAG, "initData:" + model.getEM_POSITION());
                 Log.i(TAG, "initData:" + model.getCOMPANY());
                 Log.i(TAG, "initData:" +model.getEm_IMID()  );
-                        
+
             }
             tv_position.setText(db.get(0).getEM_POSITION());
             tv_department.setText(db.get(0).getEM_DEFAULTORNAME() + "->");
@@ -407,9 +407,9 @@ public class CustomerListActivity extends BaseActivity implements View.OnClickLi
                             if (json1.size()>0){
                                 endSize = json1.getJSONObject(0).getIntValue("count");
                             }
-                          
-                          
-                           
+
+
+
 
                             CommonUtil.textSpanForStyle(tv_count_unend, unEndSize + "\n未成交", String.valueOf(unEndSize),
                                     ct.getResources().getColor(R.color.yellow_home));
@@ -478,15 +478,15 @@ public class CustomerListActivity extends BaseActivity implements View.OnClickLi
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         if (data == null) return;
         if (requestCode == 0x11 && 0x11 == resultCode) {
-            MeetUserEntity entity = data.getParcelableExtra("data");
-            if (entity == null || entity.getEmCode() == null) return;
+            Employees entity = data.getParcelableExtra("data");
+            if (entity == null || entity.getEm_code() == null) return;
             isSelected = 1;
             page = 1;
             kind = 0;
-            em_code = entity.getEmCode();
-            tv_name.setText(entity.getName());
-            tv_department.setText(entity.getImId());
-            tv_position.setText("");
+            em_code = entity.getEm_code();
+            tv_name.setText(entity.getEm_name());
+            tv_department.setText(entity.getEm_depart());
+            tv_position.setText(entity.getEm_position());
             sendHttpResquest(Constants.HTTP_SUCCESS_INIT, kind, page, isSelected, em_code);
         }
     }

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

@@ -16,9 +16,9 @@ import com.andreabaccega.widget.FormEditText;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.bean.oa.MeetUserEntity;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.UserSelectActivity;
+import com.xzjmyk.pm.activity.ui.erp.model.Employees;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.Constants;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
@@ -203,9 +203,9 @@ public class TaskAddActivity extends BaseActivity implements View.OnClickListene
                                 setCodeByNet(code);
                             else
                                 endActivity();
-                          
+
                         }
-                    },3000);
+                    }, 3000);
                     break;
                 case Constants.APP_SOCKETIMEOUTEXCEPTION:
                     progressDialog.dismiss();
@@ -272,9 +272,9 @@ public class TaskAddActivity extends BaseActivity implements View.OnClickListene
                     + "\",\n" +
                     "\"custname\":\"" +
                     tv_customer.getText().toString() +//联系人
-                     "\",\n" +
+                    "\",\n" +
                     "\"SOURCECODE\":\"" +
-                      code +//联系人
+                    code +//联系人
                     "\",\n" +
                     "\"timealert\":\"" +
                     tv_notice.getText().toString() +//提醒
@@ -425,9 +425,9 @@ public class TaskAddActivity extends BaseActivity implements View.OnClickListene
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         if (data == null) return;
         if (requestCode == 0x11 && resultCode == 0x11) {
-            MeetUserEntity entity = data.getParcelableExtra("data");
-            if (entity == null || entity.getName() == null) return;
-            tv_executive.setText(entity.getName());
+            Employees entity = data.getParcelableExtra("data");
+            if (entity == null || entity.getEm_name() == null) return;
+            tv_executive.setText(entity.getEm_name());
         }
     }
 }

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

@@ -140,4 +140,17 @@ public class AddLogActivity extends BaseActivity {
         }
         ViewUtil.httpSendRequest(this, mConfig.MSG_ADD_URL, params, handler, null, ADD_WHAT, null, null, "get");
     }
+
+
+    /** 添加一条评论的操作 */
+    /**
+     * 新一条回复
+     */
+    private void  addWorkLog(String text) {
+
+
+
+
+    }
+
 }

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

@@ -1,6 +1,5 @@
 package com.xzjmyk.pm.activity.ui.erp.activity.oa;
 
-import android.app.AlertDialog;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
@@ -18,13 +17,12 @@ 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.ui.base.BaseActivity;
+import com.xzjmyk.pm.activity.ui.erp.model.Employees;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.CodeUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.Constants;
-import com.xzjmyk.pm.activity.ui.erp.view.DateTimePickerDialog;
 import com.xzjmyk.pm.activity.ui.erp.view.SwitchView;
 import com.xzjmyk.pm.activity.util.StringUtils;
 import com.xzjmyk.pm.activity.util.TimeUtils;
@@ -61,7 +59,7 @@ public class AddMeetingActivity extends BaseActivity implements View.OnClickList
     private final int whatAdd = 0x11;
     private String baseUrl;
     private int request = 0x13;
-    ArrayList<MeetUserEntity> entities = null;//成员
+    ArrayList<Employees> entities = null;//成员
     private Handler handler = new Handler() {
         @Override
         public void handleMessage(Message msg) {
@@ -253,41 +251,61 @@ public class AddMeetingActivity extends BaseActivity implements View.OnClickList
             Crouton.makeText(this, "开始时间不能大于结束时间");
             return;
         }
+        if (start_tv.getText().toString().toString().compareTo(end_tv.getText().toString().trim()) >= 0) {
+            Crouton.makeText(ct, "结束时间不能小于开始时间");
+            return;
+        }
         StringBuilder builder = new StringBuilder();
         StringBuilder builderId = new StringBuilder();
         for (int i = 0; i < entities.size(); i++) {
             if (i == 0) {
-                builder.append(entities.get(i).getName());
-                builderId.append("employee#" + entities.get(i).getEmId());
+                builder.append(entities.get(i).getEm_name());
+                builderId.append("employee#" + entities.get(i).getEm_id());
             } else {
-                builder.append(";" + entities.get(i).getName());
-                builderId.append(";employee#" + entities.get(i).getEmId());
+                builder.append(";" + entities.get(i).getEm_name());
+                builderId.append(";employee#" + entities.get(i).getEm_id());
             }
         }
         doSignin(builder.toString(), builderId.toString(), id);
     }
 
-    private void showDateDialog(final TextView tv) {
-        DateTimePicker picker = new DateTimePicker(this, DateTimePicker.HOUR_OF_DAY);
-        picker.setRange(2000, 2030);
-        picker.setSelectedItem(Calendar.getInstance().get(Calendar.YEAR),
+    private void showDateDialog(TextView tv) {
+        showDateDialog(tv, Calendar.getInstance().get(Calendar.YEAR),
                 Calendar.getInstance().get(Calendar.MONTH) + 1,
                 Calendar.getInstance().get(Calendar.DAY_OF_MONTH),
                 Calendar.getInstance().get(Calendar.HOUR_OF_DAY),
                 Calendar.getInstance().get(Calendar.MINUTE));
+    }
+
+    private void showDateDialog(final TextView tv, int yeas, int month, int day, int hh, int mm) {
+        DateTimePicker picker = new DateTimePicker(this, DateTimePicker.HOUR_OF_DAY);
+        picker.setRange(2010, 2030);
+        picker.setSelectedItem(yeas, month, day, hh, mm);
         picker.setOnDateTimePickListener(new DateTimePicker.OnYearMonthDayTimePickListener() {
             @Override
             public void onDateTimePicked(String year, String month, String day, String hour, String minute) {
                 String time = year + "-" + month + "-" + day + " " + hour + ":" + minute + ":00";
                 switch (tv.getId()) {
                     case R.id.start_tv:
-                        start_tv.setText(time);
+                        if (!StringUtils.isEmpty(end_tv.getText().toString())) {
+                            if (end_tv.getText().toString().compareTo(time) < 0) {
+                                Crouton.makeText(ct, "结束时间不能小于开始时间");
+                            } else {
+                                start_tv.setText(time);
+                            }
+                        } else {
+                            start_tv.setText(time);
+                        }
                         break;
                     case R.id.end_tv:
-                        if (time.compareTo(start_tv.getText().toString()) < 0) {
-                            Crouton.makeText(ct, "结束时间不能小于开始时间");
+                        if (!StringUtils.isEmpty(start_tv.getText().toString())) {
+                            if (time.compareTo(start_tv.getText().toString()) <= 0) {
+                                Crouton.makeText(ct, "结束时间不能小于开始时间");
+                            } else {
+                                end_tv.setText(time);
+                            }
                         } else {
-                            end_tv.setText(time);
+                            Crouton.makeText(ct, "请先填写开始时间");
                         }
                         break;
                 }
@@ -296,16 +314,6 @@ public class AddMeetingActivity extends BaseActivity implements View.OnClickList
         picker.show();
     }
 
-    public void showDialog(final TextView tv) {
-        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);
-            }
-        });
-        dialog.show();
-    }
 
     private void getIdByNet() {
         String url = CommonUtil.getSharedPreferences(ct, "erp_baseurl") + "common/getId.action";
@@ -314,7 +322,6 @@ public class AddMeetingActivity extends BaseActivity implements View.OnClickList
         LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
         headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
         ViewUtil.httpSendRequest(ct, url, param, handler, headers, 0x16, null, null, "post");
-
     }
 
     //提交表单
@@ -357,8 +364,8 @@ public class AddMeetingActivity extends BaseActivity implements View.OnClickList
         progressDialog.show();
         StringBuilder resourcename = new StringBuilder();
         if (entities != null && entities.size() > 0) {
-            for (MeetUserEntity e : entities) {
-                resourcename.append("," + e.getName());
+            for (Employees e : entities) {
+                resourcename.append("," + e.getEm_name());
             }
             resourcename.delete(0, 1);
         }

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

@@ -24,7 +24,6 @@ import com.xzjmyk.pm.activity.bean.oa.MeetingDocBean;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
-import com.xzjmyk.pm.activity.util.BaiduMapUtil;
 import com.xzjmyk.pm.activity.util.StringUtils;
 import com.xzjmyk.pm.activity.util.TimeUtils;
 import com.xzjmyk.pm.activity.util.ToastUtil;
@@ -87,7 +86,7 @@ public class MeetDetailsActivity extends BaseActivity implements View.OnClickLis
                 case SIGNNIN:
                     ToastUtil.showToast(ct, "会议签到成功");
                     isPlay = false;
-                    click_btn.setPressed(true);
+                    setSigninAble(false);
                     loadNumData();
                     break;
                 case 0x14:
@@ -101,7 +100,7 @@ public class MeetDetailsActivity extends BaseActivity implements View.OnClickLis
                             for (int i = 0; i < confirmed; i++)
                                 if (array.getJSONObject(i).containsKey("EM_CODE") && code.equals(array.getJSONObject(i).getString("EM_CODE"))) {
                                     isPlay = false;
-                                    click_btn.setPressed(true);
+                                    setSigninAble(false);
                                     break;
                                 }
                         }
@@ -136,18 +135,13 @@ public class MeetDetailsActivity extends BaseActivity implements View.OnClickLis
         initView();
     }
 
-    private void getPoinfo() {
-        BaiduMapUtil.getInstence().getPoiInfo(ct, new BaiduMapUtil.OnLocationListener() {
-            @Override
-            public void result(Map<String, Object> map) {
-                if (map == null || map.isEmpty()) return;
-                if (map.get("poi") != null) {
-                    location_tv.setText(map.get("poi") + "");
-                } else if (map.get("name") != null) {
-                    location_tv.setText(map.get("name") + "");
-                }
-            }
-        });
+    private void setSigninAble(boolean b) {
+        if (b) {
+            click_btn.setBackgroundResource(R.drawable.bg_orange_btn);
+        } else {
+            click_btn.setBackgroundResource(R.drawable.bg_orange_btn_pass);
+            click_btn.setText("已签到");
+        }
     }
 
     private void showExitDialog() {
@@ -356,7 +350,6 @@ public class MeetDetailsActivity extends BaseActivity implements View.OnClickLis
                     }
                 } else {
                     ToastUtil.showToast(ct, "您已经签到过了");
-                    click_btn.setPressed(true);
                 }
                 break;
             case R.id.location_tag://点击重新定位

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/MeetingActivity.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;
@@ -30,6 +29,7 @@ import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.Constants;
 import com.xzjmyk.pm.activity.ui.erp.view.EmptyLayout;
+import com.xzjmyk.pm.activity.util.StringUtils;
 import com.xzjmyk.pm.activity.util.TimeUtils;
 import com.xzjmyk.pm.activity.view.ClearEditText;
 
@@ -297,7 +297,7 @@ public class MeetingActivity extends BaseActivity {
             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());
+            viewholder.oa_meeting_tag_tv.setText(StringUtils.isEmpty(entity.getMa_type()) ? "未填写" : entity.getMa_type());
         }
 
         class ViewHolder {
@@ -316,7 +316,6 @@ public class MeetingActivity extends BaseActivity {
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         if (data == null) return;
-        Log.i("gongpengming", "onActivityResult");
         if (requestCode == this.requestCode) {
             if (resultCode == 0x14) {
                 if ("data".equals(data.getStringExtra("data"))) {
@@ -324,13 +323,17 @@ public class MeetingActivity extends BaseActivity {
                     loadNetData(1);
                 }
             } else if (resultCode == 0x15) {
-                Log.i("gongpengming", "resultCode == 0x15");
-                int i = data.getIntExtra("item", -1);
-                if (i >= 0 && data.getBooleanExtra("data", false)) {//是否结束会议
-                    entities = adapter.getData();
-                    entities.get(i).setStatus("已结束");
-                }
-                adapter.setData(entities);
+                loadNetData(1);
+//                Log.i("gongpengming", "resultCode == 0x15");
+//                int i = data.getIntExtra("item", -1);
+//                Log.i("gongpengming", "i == " + i);
+//                if (i >= 0 && data.getBooleanExtra("data", false)) {//是否结束会议
+//                    Log.i("gongpengming", "进来了" + i);
+//                    entities = adapter.getData();
+//                    entities.get(i).setStatus("已结束");
+//                    Log.i("gongpengming", "进来了222" + entities.get(i).getStatus());
+//                }
+//                adapter.setData(entities);
             }
         }
     }

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

@@ -28,7 +28,6 @@ import com.alibaba.fastjson.JSONObject;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.bean.oa.MeetUserEntity;
 import com.xzjmyk.pm.activity.bean.oa.OABean;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.DetailTaskActivity;
@@ -36,6 +35,7 @@ import com.xzjmyk.pm.activity.ui.erp.activity.ErpMenActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.crm.TaskAddActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.crm.VisitReportAddActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.crm.VisitReportPlanActivity;
+import com.xzjmyk.pm.activity.ui.erp.model.Employees;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.ListUtils;
@@ -231,17 +231,16 @@ public class OAActivity extends BaseActivity implements View.OnClickListener {
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         if (data == null) return;
         if (requestCode == 0x11 && 0x11 == resultCode) {
-            MeetUserEntity entity = data.getParcelableExtra("data");
-            if (entity == null || entity.getName() == null) return;
-            my_client_log.setText(entity.getName());
+            Employees entity = data.getParcelableExtra("data");
+            if (entity == null || entity.getEm_name() == null) return;
+            my_client_log.setText(entity.getEm_name());
             //下属选项
             if (otherBeans == null) {
                 adapter.setBeans(new ArrayList<OABean>());
                 return;
             }
             List<OABean> chche = new ArrayList<>();
-            String name = "," + entity.getName().trim() + ",";
-            Log.i("gongpengming", name);
+            String name = "," + entity.getEm_name().trim() + ",";
             if (name == null) return;
             String nameStr;
             for (OABean e : otherBeans) {
@@ -254,9 +253,7 @@ public class OAActivity extends BaseActivity implements View.OnClickListener {
                 } else if (e.getRecordman() != null) {//拜访
                     if (e.getRecordman() == null || e.getRecordman().length() <= 0) continue;
                     nameStr = "," + e.getRecordman().trim() + ",";
-                    Log.i("gongpengming", nameStr);
                     if (getResult(nameStr, name)) {//是该下属任务日程
-                        Log.i("gongpengming", "是的");
                         chche.add(e);
                     }
                 }
@@ -380,6 +377,7 @@ public class OAActivity extends BaseActivity implements View.OnClickListener {
                 @Override
                 public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
                     Intent intent = null;
+                    popupWindow.dismiss();
                     switch (position) {
                         case 0:
                             if (!(getIntent() == null || getIntent().getIntExtra("type", 0) != 1)) {

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

@@ -15,13 +15,10 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.nostra13.universalimageloader.core.ImageLoader;
-import com.nostra13.universalimageloader.core.imageaware.ImageAware;
-import com.nostra13.universalimageloader.core.imageaware.ImageViewAware;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.Constants;
-import com.xzjmyk.pm.activity.util.ImageUtil;
 import com.xzjmyk.pm.activity.util.TimeUtils;
 
 import java.util.HashMap;
@@ -121,6 +118,8 @@ public class OAListActivity extends BaseActivity {
             holder.company.setText(object.getString("mo_company") == null ? "" : object.getString("mo_company"));
             if (object.containsKey("mo_attachid") && object.getInteger("mo_attachid") > 1000) {
                 ImageLoader.getInstance().displayImage(getImageUrl(object.getInteger("mo_attachid")), holder.image);
+            } else {
+                holder.image.setVisibility(View.GONE);
             }
             return view;
         }
@@ -134,7 +133,6 @@ public class OAListActivity extends BaseActivity {
                     name,//签到人
                     addr, //地址
                     company;//签到公司
-
             ImageView image;
         }
     }

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

@@ -0,0 +1,15 @@
+package com.xzjmyk.pm.activity.ui.erp.activity.oa;
+
+import android.os.Bundle;
+
+import com.xzjmyk.pm.activity.R;
+import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+
+public class OptionActivity extends BaseActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_option);
+    }
+}

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

@@ -40,6 +40,7 @@ import com.xzjmyk.pm.activity.ui.erp.util.FlexJsonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.JsonValidator;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 import com.xzjmyk.pm.activity.util.CameraUtil;
+import com.xzjmyk.pm.activity.util.ImageUtil;
 import com.xzjmyk.pm.activity.util.TimeUtils;
 import com.xzjmyk.pm.activity.util.ToastUtil;
 import com.xzjmyk.pm.activity.view.crouton.Crouton;
@@ -83,18 +84,16 @@ public class OutSigninOKActivity extends BaseActivity {
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         if (item.getItemId() == R.id.push) {
-            CodeUtil.getInstance().getCode(ct, "mobile_outsign", new CodeUtil.OnCodeLinstener() {
-                @Override
-                public void callBack(String code) {
-                    doSignin(code, 0);
-                }
-            });
+            if (!StringUtils.isEmpty(path) && new File(path).isFile())
+                uploadFile(path);
+            else
+                CodeUtil.getInstance().getCode(ct, "mobile_outsign", new CodeUtil.OnCodeLinstener() {
+                    @Override
+                    public void callBack(String code) {
+                        doSignin(code, 0);
+                    }
+                });
         }
-//            if (!StringUtils.isEmpty(path) && new File(path).isFile())
-//                uploadFile(path);
-//            else
-//
-//        }
         return super.onOptionsItemSelected(item);
     }
 
@@ -138,12 +137,14 @@ public class OutSigninOKActivity extends BaseActivity {
             public void onClick(DialogInterface dialogInterface, int i) {
                 if (i == 0) {
                     //调用拍照
+                    isTask = true;
                     mNewPhotoUri = CameraUtil.getOutputMediaFileUri(OutSigninOKActivity.this, CameraUtil.MEDIA_TYPE_IMAGE);
                     CameraUtil.captureImage(OutSigninOKActivity.this, mNewPhotoUri, REQUEST_CODE_CAPTURE_PHOTO);
                 } else if (i == 1) {
-                    if (!CommonUtil.setSharedPreferences(ct, "isImage", false)) {
+                    if (!getIntent().getBooleanExtra("isImage", false)) {
                         Crouton.makeText(ct, "您没有被允许使用系统相册，请使用拍照");
                     } else {
+                        isTask = false;
                         //调用系统相册
                         CameraUtil.pickImageSimple(OutSigninOKActivity.this, REQUEST_CODE_PICK_PHOTO);
                     }
@@ -163,7 +164,8 @@ public class OutSigninOKActivity extends BaseActivity {
         return -1;
     }
 
-    int id = 0;
+    private int id = 0;
+    private boolean isTask = false;
 
     private void uploadFile(String path) {
         if (StringUtils.isEmpty(path)) return;
@@ -174,7 +176,10 @@ public class OutSigninOKActivity extends BaseActivity {
         params.addHeader("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
         params.addBodyParameter("em_code", CommonUtil.getSharedPreferences(ct, "erp_username"));
         params.addBodyParameter("type", "common");
-        params.addBodyParameter("img", finalFile);
+        if (isTask)
+            params.addBodyParameter("img", ImageUtil.compressBitmapToFile(path, 100, 300, 300));
+        else
+            params.addBodyParameter("img", finalFile);
         String url = Constants.getAppBaseUrl(ct) + "mobile/uploadEmployeeAttach.action";
         final HttpUtils http = new HttpUtils();
         http.send(HttpRequest.HttpMethod.POST, url, params, new RequestCallBack<String>() {
@@ -222,7 +227,7 @@ public class OutSigninOKActivity extends BaseActivity {
             if (resultCode == Activity.RESULT_OK) {
                 if (mNewPhotoUri != null) {
                     path = mNewPhotoUri.getPath();
-                    path = CameraUtil.getImagePathFromUri(ct, mNewPhotoUri);
+//                    path = CameraUtil.getImagePathFromUri(ct, mNewPhotoUri);
                     if (StringUtils.isEmpty(path)) return;
                     ImageLoader.getInstance().displayImage(Uri.fromFile(new File(path)).toString(), image);
                 } else {

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

@@ -1,23 +1,35 @@
 package com.xzjmyk.pm.activity.ui.erp.activity.oa;
 
 import android.content.DialogInterface;
+import android.content.Intent;
 import android.os.Bundle;
+import android.os.Handler;
+import android.os.Message;
 import android.support.v7.app.AlertDialog;
+import android.view.MenuItem;
 import android.view.View;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
+import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 import com.xzjmyk.pm.activity.ui.erp.view.SwitchView;
+import com.xzjmyk.pm.activity.view.crouton.Crouton;
 
-public class OutofficeSetActivity extends BaseActivity {
-    public static final String OA_LOCATION_DISTANCE = "OA_LOCATION_DISTANCE";
-    public static final String OA_LOCATION_IS = "OA_LOCATION_IS";
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
+public class OutofficeSetActivity extends BaseActivity {
     @ViewInject(R.id.location_tv)
     private TextView location_tv;
     @ViewInject(R.id.location_tag)
@@ -28,6 +40,32 @@ public class OutofficeSetActivity extends BaseActivity {
     private SwitchView allow_chance_location;
     @ViewInject(R.id.isImage)
     private SwitchView isImage;
+    private Handler handler = new Handler() {
+        @Override
+        public void handleMessage(Message msg) {
+            String message = msg.getData().getString("result");
+            if (progressDialog.isShowing())
+                progressDialog.dismiss();
+            JSONObject object = null;
+            switch (msg.what) {
+                case 0x11:
+                    object = JSON.parseObject(message);
+                    if (object.containsKey("success") && object.getBoolean("success"))
+                        Crouton.makeText(ct, "保存成功");
+                    else
+                        Crouton.makeText(ct, "保存失败");
+                    break;
+            }
+        }
+    };
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId() == android.R.id.home) {
+            endActivity();
+        }
+        return true;
+    }
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -37,20 +75,67 @@ public class OutofficeSetActivity extends BaseActivity {
         initview();
     }
 
+
+    @Override
+    public void onBackPressed() {
+        endActivity();
+    }
+
+    private void endActivity() {
+        Intent intent = new Intent();
+        intent.putExtra("isImage", isImage.isChecked());
+        intent.putExtra("isAddress", allow_chance_location.isChecked());
+        intent.putExtra("distance", getMin(location_tv.getText().toString().trim()));
+        setResult(0x21, intent);
+        finish();
+    }
+
+    private void updataSet(String key, String value) {
+        String formStore = "{\"code\":\"" + key + "\",\"data\":\"" + value + "\"}";
+        Map<String, Object> param = new HashMap<>();
+        param.put("formStore", formStore);
+        net("mobile/updateconfigs.action", param, 0x11);
+    }
+
+    String baseUrl;
+    String emcode;
+
+    private void net(String action, Map<String, Object> param, int what) {
+        progressDialog.show();
+        if (baseUrl == null)
+            baseUrl = CommonUtil.getSharedPreferences(ct, "erp_baseurl");
+        if (emcode == null)
+            emcode = CommonUtil.getSharedPreferences(ct, "erp_username");
+        String url = baseUrl + action;
+        param.put("caller", "AppConfigs");
+        param.put("emcode", emcode);
+        param.put("sessionId", CommonUtil.getSharedPreferences(ct, "sessionId"));
+        LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
+        headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
+        ViewUtil.httpSendRequest(ct, url, param, handler, headers, what, null, null, "get");
+    }
+
+
     private void initview() {
-        isImage.setChecked(CommonUtil.setSharedPreferences(ct, "isImage", false));
+        Intent intent = getIntent();
+        if (intent != null) {
+            isImage.setChecked(intent.getBooleanExtra("isImage", false));
+            allow_chance_location.setChecked(intent.getBooleanExtra("isAddress", false));
+            setClickAble(intent.getBooleanExtra("isAddress", false));
+            location_tv.setText(intent.getIntExtra("distance", 0) + "米");
+        }
         isImage.setOnCheckedChangeListener(new SwitchView.OnCheckedChangeListener() {
             @Override
             public void onCheckedChanged(View view, boolean isChecked) {
                 CommonUtil.setSharedPreferences(ct, "isImage", isChecked);
+                updataSet("isImage", "" + (isChecked ? 1 : 0));
             }
         });
         allow_chance_location.setOnCheckedChangeListener(new SwitchView.OnCheckedChangeListener() {
             @Override
             public void onCheckedChanged(View view, boolean isChecked) {
                 setClickAble(isChecked);
-                CommonUtil.setSharedPreferences(ct, OA_LOCATION_DISTANCE, location_tv.getText().toString().trim());
-                CommonUtil.setSharedPreferences(ct, OA_LOCATION_IS, isChecked);
+                updataSet("isAddress", "" + (isChecked ? 1 : 0));
             }
         });
         location_rl.setOnClickListener(new View.OnClickListener() {
@@ -59,12 +144,6 @@ public class OutofficeSetActivity extends BaseActivity {
                 ShowDalogs();
             }
         });
-        //获取保存信息
-        String location = CommonUtil.getSharedPreferences(ct, OA_LOCATION_DISTANCE);
-        if (location == null || location.length() <= 0)
-            location = "100米";
-        location_tv.setText(location);
-        allow_chance_location.setChecked(CommonUtil.getSharedPreferencesBoolean(ct, OA_LOCATION_IS, false));
     }
 
     private void ShowDalogs() {
@@ -77,12 +156,21 @@ public class OutofficeSetActivity extends BaseActivity {
             @Override
             public void onClick(DialogInterface dialog, int which) {
                 location_tv.setText(cities[which]);
-                CommonUtil.setSharedPreferences(ct, OA_LOCATION_DISTANCE, cities[which]);
+                updataSet("distance", "" + getMin(cities[which]));
             }
         });
         builder.show();
     }
 
+    private int getMin(String chche) {
+        if (StringUtils.isEmpty(chche)) return 0;
+        Pattern p = Pattern.compile("(\\d+)");
+        Matcher m = p.matcher(chche);
+        if (m.find()) {
+            return Integer.parseInt(m.group(0));
+        }
+        return 0;
+    }
 
     public void setClickAble(boolean clickAble) {
         location_rl.setClickable(clickAble);

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

@@ -26,13 +26,13 @@ import com.handmark.pulltorefresh.library.PullToRefreshListView;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
 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;
+import com.xzjmyk.pm.activity.ui.erp.model.Employees;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
+import com.xzjmyk.pm.activity.ui.erp.util.Constants;
+import com.xzjmyk.pm.activity.ui.erp.util.FlexJsonUtil;
+import com.xzjmyk.pm.activity.ui.erp.util.ListUtils;
 import com.xzjmyk.pm.activity.util.StringUtils;
 import com.xzjmyk.pm.activity.view.ClearEditText;
 
@@ -53,49 +53,62 @@ public class UserSelectActivity extends BaseActivity {
     private ClearEditText search_edit;
     private boolean isSingle = false;
     private boolean isNet = false;
-    private DBManager manager;
     private MeetSelectAdapter adapter;
-    private ArrayList<MeetUserEntity> entities = new ArrayList<>();
+    private List<Employees> list = new ArrayList<>();
     private Handler handler = new Handler() {
         @Override
         public void handleMessage(Message msg) {
             String message = msg.getData().getString("result");
-            progressDialog.dismiss();
+            if (progressDialog.isShowing())
+                progressDialog.dismiss();
             switch (msg.what) {
                 case WHAT_LOAD:
                     JSONArray array = JSON.parseObject(message).getJSONArray("datas");//获取到数据
                     if (array == null || array.size() <= 0) return;
-                    MeetUserEntity entity = null;
+                    Employees entity = null;
                     String code = null;//em_code
                     String name = null;//em_name
                     String company = null;//em_name
+                    String position = 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 = new Employees();
                         entity.setClick(false);
                         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);
-                        entity.setName(name);
-                        entity.setImId(imId);
-                        entity.setCompany(company);
-                        entities.add(entity);
+                        company = array.getJSONObject(i).getString("em_department") == null ? "" : array.getJSONObject(i).getString("em_department");
+                        position = (array.getJSONObject(i).getString("em_post") == null ? "" : array.getJSONObject(i).getString("em_post"));
+                        entity.setEm_code(code);
+                        entity.setEm_name(name);
+                        entity.setEm_id(Integer.parseInt(imId));
+                        entity.setEm_depart(company);
+                        entity.setEm_position(position);
+                        list.add(entity);
                     }
-                    if (entities.size() > 0) {
+                    if (list.size() > 0) {
                         if (adapter == null) {
-                            adapter = new MeetSelectAdapter(entities);
+                            adapter = new MeetSelectAdapter(list);
                             listview.setAdapter(adapter);
                         } else
-                            adapter.setUsers(entities);
+                            adapter.setUsers(list);
+                    }
+                    break;
+                case 0x12:
+                    Map<Object, Object> kMap = FlexJsonUtil.fromJson(msg.getData().getString("result"));
+                    list = FlexJsonUtil.fromJsonArray(kMap.get("data").toString(), Employees.class);
+                    if (ListUtils.isEmpty(list)) return;
+                    if (list.size() > 0) {
+                        if (adapter == null) {
+                            adapter = new MeetSelectAdapter(list);
+                            listview.setAdapter(adapter);
+                        } else
+                            adapter.setUsers(list);
                     }
                     break;
             }
-
         }
     };
 
@@ -113,10 +126,6 @@ public class UserSelectActivity extends BaseActivity {
 
     private void initView() {
         View view = LayoutInflater.from(this).inflate(R.layout.view_empty, null);
-        TextView tvMessage = (TextView) view.findViewById(R.id.textViewMessage);
-        if (!isNet) {
-            tvMessage.setText("当前数据库没有找到数据，请点击通讯录页面的企业架构刷新数据");
-        }
         listview.setEmptyView(view);
         adapter = new MeetSelectAdapter();
         listview.setAdapter(adapter);
@@ -125,7 +134,6 @@ public class UserSelectActivity extends BaseActivity {
             @Override
             public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) {
             }
-
             @Override
             public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) {
             }
@@ -133,10 +141,10 @@ public class UserSelectActivity extends BaseActivity {
             @Override
             public void afterTextChanged(Editable editable) {
                 String strChche = editable.toString();
-                if (entities == null || entities.size() <= 0) return;
-                ArrayList<MeetUserEntity> chche = new ArrayList<>();
-                for (MeetUserEntity e : entities) {
-                    if (getResult(e.getName() + e.getImId(), strChche)) {
+                if (list == null || list.size() <= 0) return;
+                ArrayList<Employees> chche = new ArrayList<>();
+                for (Employees e : list) {
+                    if (getResult(e.getEm_name() + e.getEm_depart() + e.getEm_position(), strChche)) {
                         chche.add(e);
                     }
                 }
@@ -152,10 +160,10 @@ public class UserSelectActivity extends BaseActivity {
         listview.setOnItemClickListener(new AdapterView.OnItemClickListener() {
             @Override
             public void onItemClick(AdapterView<?> adapterView, View view, int i, long l) {
-                MeetUserEntity select = adapter.getUsers().get(i - 1 < 0 ? 0 : (i - 1));
+                Employees select = adapter.getUsers().get(i - 1 < 0 ? 0 : (i - 1));
                 if (isSingle) {//单选
                     if (adapter.getUsers() == null) return;
-                    MeetUserEntity entity = select;
+                    Employees entity = select;
                     Intent intent = new Intent();
                     intent.putExtra("data", entity);
                     setResult(0x11, intent);
@@ -178,14 +186,14 @@ public class UserSelectActivity extends BaseActivity {
 
     private void selectOK() {
         //选择人员成功操作
-        ArrayList<MeetUserEntity> list = new ArrayList<>();
+        ArrayList<Employees> list = new ArrayList<>();
         if (adapter == null || adapter.getUsers() == null || adapter.getUsers().size() <= 0) {
             finish();
             return;
         }
         String name = CommonUtil.getSharedPreferences(ct, "erp_username");
         for (int i = 0; i < adapter.getUsers().size(); i++) {
-            if (!StringUtils.isEmpty(name) && name.equals(adapter.getUsers().get(i).getEmCode())) {
+            if (!StringUtils.isEmpty(name) && name.equals(adapter.getUsers().get(i).getEm_code())) {
                 list.add(adapter.getUsers().get(i));
                 continue;
             }
@@ -218,26 +226,25 @@ public class UserSelectActivity extends BaseActivity {
         if (isNet) {
             getDataByNet();
         } else {
-            getDataByDB();
+            getEmployeeByNet();
         }
     }
 
-    private void getDataByDB() {  //企业通讯录好友
-        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++) {//企业通讯人员
-
-            entities.add(EnterChatAction(emList.get(i)));
-        }
+    private void getEmployeeByNet() {
+        progressDialog.show();
+        String url = Constants.getAppBaseUrl(ct) + "common/dbfind.action";
+        Map<String, Object> params = new HashMap<>();
+        params.put("caller", "Ask4leave");
+        params.put("which", "form");
+        params.put("field", "va_emcode");
+        params.put("condition", "1=1");
+        params.put("page", "1");
+        params.put("pageSize", "100");
+        params.put("sessionId", CommonUtil.getSharedPreferences(ct, "sessionId"));
+        LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
+        headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
+        ViewUtil.httpSendRequest(ct, url, params, handler, headers, 0x12, null, null, "get");
 
-        //获取完数据以后
-        if (adapter != null)
-            adapter.setUsers(entities);
     }
 
     private void getDataByNet() {
@@ -252,29 +259,20 @@ public class UserSelectActivity extends BaseActivity {
         ViewUtil.httpSendRequest(ct, url, param, handler, headers, WHAT_LOAD, null, null, "get");
     }
 
-    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());
-        entity.setEmId(employee.getEM_ID());
-        return entity;
-    }
 
     class MeetSelectAdapter extends BaseAdapter {
-        private ArrayList<MeetUserEntity> users;
+        private List<Employees> users;
 
-        public ArrayList<MeetUserEntity> getUsers() {
+        public List<Employees> getUsers() {
             return users;
         }
 
-        public void setUsers(ArrayList<MeetUserEntity> users) {
+        public void setUsers(List<Employees> users) {
             this.users = users;
             notifyDataSetChanged();
         }
 
-        public MeetSelectAdapter(ArrayList<MeetUserEntity> users) {
+        public MeetSelectAdapter(List<Employees> users) {
             this.users = users;
         }
 
@@ -313,13 +311,9 @@ 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).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());
+            String str = (StringUtils.isEmpty(users.get(i).getEm_position()) ? "" : (" | " + users.get(i).getEm_position()));
+            holder.id_tv.setText(users.get(i).getEm_depart() + str);
+            holder.name_tv.setText("姓名:" + users.get(i).getEm_name());
             return view;
         }
 

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

@@ -4,6 +4,7 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.text.Editable;
 import android.text.TextWatcher;
+import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
@@ -81,6 +82,7 @@ public class WorkLogsActivity extends BaseActivity {
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         if (requestCode == this.requestCode) {
             if (resultCode == this.resultCode) {
+                Log.i("gongpengming", "进来了");
                 requestMyBusiness(true);
             }
         }
@@ -197,7 +199,7 @@ public class WorkLogsActivity extends BaseActivity {
             params.put("messageId", messageId);
         }
         params.put("access_token", MyApplication.getInstance().mAccessToken);
-        params.put("pageSize", "" + 10);
+        params.put("pageSize", "10");
         params.put("type", "0");
         params.put("flag", "1");
         StringJsonArrayRequest<PublicMessage> request = new StringJsonArrayRequest<PublicMessage>(
@@ -224,6 +226,8 @@ public class WorkLogsActivity extends BaseActivity {
                     if (context_rv.isRefreshing()) {
                         context_rv.onRefreshComplete();
                     }
+                    Log.i("gongpengming","mMessages="+mMessages.size());
+                    Log.i("gongpengming","messages="+messages.size());
                     mMessages.addAll(result.getData());
                     messages.addAll(result.getData());
                     upDataUi();

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

@@ -5,6 +5,7 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
 import android.text.Html;
+import android.util.Log;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
@@ -15,6 +16,7 @@ import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.baidu.mapapi.map.MapView;
 import com.baidu.mapapi.model.LatLng;
 import com.baidu.mapapi.search.core.PoiInfo;
@@ -29,24 +31,26 @@ import com.xzjmyk.pm.activity.ui.erp.activity.oa.OAListActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.OutSigninOKActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.OutofficeActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.OutofficeSetActivity;
+import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
-import com.xzjmyk.pm.activity.ui.erp.util.ViewUtil;
 import com.xzjmyk.pm.activity.util.BaiduMapUtil;
 import com.xzjmyk.pm.activity.util.StringUtils;
 import com.xzjmyk.pm.activity.util.TimeUtils;
-import com.xzjmyk.pm.activity.util.ToastUtil;
+import com.xzjmyk.pm.activity.view.crouton.Crouton;
 
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
 /**
+ * 1.0x11 获取打卡记录列表
+ * 2.0x12 获取判断用户是否是管理员接口
+ * 3.0x13 获取考勤设置接口
+ * 4.0x21 requestCode
  * Created by gongpm on 2016/7/14.
  */
 public class OutofficeFragment extends EasyFragment implements View.OnClickListener {
-    private static final int WHAT_LOAD = 0x11;
     private LatLng point;//位置
-    private static int requestCode = 0x11;
     private int sigNum;//签到次数
     @ViewInject(R.id.name_img)
     private ImageView name_img;//头像
@@ -70,19 +74,45 @@ public class OutofficeFragment extends EasyFragment implements View.OnClickListe
     private TextView do_trim;
     private OutofficeActivity ct;
     private JSONArray json = null;
+    private String baseAddr;
+    private boolean isAdmin = false;
+    private boolean isAddress = false;
+    private boolean isImage = false;
+    private int distance = 0;
     private Handler handler = new Handler() {
         @Override
         public void handleMessage(Message msg) {
             ct.progressDialog.dismiss();
             String message = msg.getData().getString("result");
-            if (msg.what == WHAT_LOAD) {
-                if (JSON.parseObject(message).containsKey("listdata")) {
-                    json = JSON.parseObject(message).getJSONArray("listdata");
-                    sigNum = json.size();
-                    num_tv.setText(Html.fromHtml("<u>" + sigNum + "</u>"));
-                }
+            JSONObject object = null;
+            switch (msg.what) {
+                case 0x11:
+                    object = JSON.parseObject(message);
+                    if (object.containsKey("listdata")) {
+                        json = object.getJSONArray("listdata");
+                        sigNum = json.size();
+                        num_tv.setText(Html.fromHtml("<u>" + sigNum + "</u>"));
+                    }
+                    break;
+                case 0x12:
+                    object = JSON.parseObject(message);
+                    if (object.containsKey("success") && object.getBoolean("success")) {
+                        isAdmin = object.containsKey("isAdmin") ? ("1".equals(object.getString("isAdmin")) ? true : false) : false;
+                    }
+                    break;
+                case 0x13:
+                    object = JSON.parseObject(message);
+                    if (object.containsKey("success") && object.getBoolean("success")) {
+                        isAddress = object.containsKey("isAddress") ? ("1".equals(object.getString("isAddress")) ? true : false) : false;
+                        isImage = object.containsKey("isImage") ? ("1".equals(object.getString("isImage")) ? true : false) : false;
+                        distance = object.containsKey("distance") ? Integer.parseInt(object.getString("distance")) : 0;
+                        if (isAddress)
+                            do_trim.setVisibility(View.VISIBLE);
+                        else
+                            do_trim.setVisibility(View.GONE);
+                    }
+                    break;
             }
-
         }
     };
 
@@ -91,79 +121,6 @@ public class OutofficeFragment extends EasyFragment implements View.OnClickListe
         return R.layout.fragment_outoffice;
     }
 
-    @Override
-    protected void onCreateView(Bundle savedInstanceState, boolean createView) {
-        setHasOptionsMenu(true);
-        ViewUtils.inject(getmRootView());
-        ct = (OutofficeActivity) getActivity();
-        initview();
-    }
-
-    private void signinAble(boolean b) {
-        click_btn.setFocusable(b);
-        click_btn.setClickable(b);
-        if (b) {
-            click_btn.setBackgroundResource(R.drawable.button_round_shape);
-        } else {
-            click_btn.setBackgroundResource(R.drawable.button_signin);
-        }
-    }
-
-    private void initview() {
-        loadLog();
-        num_tv.setOnClickListener(this);
-        date_tv.setText(TimeUtils.day_long_2_str(System.currentTimeMillis()) + " " + TimeUtils.getWeek(System.currentTimeMillis()) + " " + TimeUtils.long2str(System.currentTimeMillis(), "HH:mm"));
-        num_tv.setText("" + sigNum);
-        String loginUserId = MyApplication.getInstance().mLoginUser.getUserId();
-        AvatarHelper.getInstance().displayAvatar(loginUserId, name_img, true);
-        name_tv.setText(MyApplication.getInstance().mLoginUser.getNickName());
-        com_tv.setText(CommonUtil.getSharedPreferences(ct, "erp_commpany"));
-        String name = MyApplication.getInstance().getBdLocationHelper().getName();
-        String addr = MyApplication.getInstance().getBdLocationHelper().getAddress();
-        out_add_name_tv.setText(name);
-        out_add_t_tv.setText(addr);
-        double latitude = MyApplication.getInstance().getBdLocationHelper().getLatitude();
-        double longitude = MyApplication.getInstance().getBdLocationHelper().getLongitude();
-        point = new LatLng(latitude, longitude);
-        baseAddr = StringUtils.isEmail(name) ? addr : name;
-        BaiduMapUtil.getInstence().setMapViewPoint(mapView, point);
-//        BaiduMapUtil.getInstence().getPoiInfo(ct, new BaiduMapUtil.OnLocationListener() {
-//            @Override
-//            public void result(Map<String, Object> map) {
-//                out_add_name_tv.setText(map.get("poi") + "");
-////                out_add_t_tv.setText(map.get("name") + "");
-//                out_add_t_tv.setText(MyApplication.getInstance().getBdLocationHelper().getAddress());
-//                double latitude = (double) map.get("latitude");
-//                double longitude = (double) map.get("lontitude");
-//                point = new LatLng(latitude, longitude);
-//                baseAddr = map.get("poi") + "";
-//                BaiduMapUtil.getInstence().setMapViewPoint(mapView, point);
-//            }
-//        });
-        do_trim.setOnClickListener(this);
-        click_btn.setOnClickListener(this);
-    }
-
-    //获取打卡记录 date:yyyy-MM-dd
-    private void loadLog() {
-        ct.progressDialog.show();
-        //获取网络数据
-        String url = CommonUtil.getSharedPreferences(ct, "erp_baseurl") + "mobile/common/list.action";
-        String emcode = CommonUtil.getSharedPreferences(ct, "erp_username");
-        final Map<String, Object> param = new HashMap<>();
-        param.put("currentMaster", CommonUtil.getSharedPreferences(ct, "erp_master"));
-        param.put("page", 1);
-        param.put("pageSize", 1000);
-        param.put("emcode", emcode);
-        param.put("condition", "mo_mancode='" + emcode + "' and to_char(mo_signtime,'yyyy-MM-dd')='" + TimeUtils.s_long_2_str(System.currentTimeMillis()) + "'");
-        param.put("caller", "Mobile_outsign");
-        param.put("sessionId", CommonUtil.getSharedPreferences(ct, "sessionId"));
-        LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
-        headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
-        ViewUtil.httpSendRequest(ct, url, param, handler, headers, WHAT_LOAD, null, null, "get");
-    }
-
-    String baseAddr;
 
     @Override
     public void onDestroy() {
@@ -179,31 +136,19 @@ public class OutofficeFragment extends EasyFragment implements View.OnClickListe
                 startActivity(list);
                 break;
             case R.id.do_trim:
-                boolean isClick = CommonUtil.getSharedPreferencesBoolean(ct, OutofficeSetActivity.OA_LOCATION_IS);
-                if (isClick) {
-                    Intent i = new Intent(getActivity(), LocationMapActivity.class);
-                    i.putExtra("addr", baseAddr == null ? "" : baseAddr);
-                    String location = CommonUtil.getSharedPreferences(ct, OutofficeSetActivity.OA_LOCATION_DISTANCE);
-                    if (location == null) location = "600米";
-                    StringBuilder builder = new StringBuilder(location);
-                    location = builder.deleteCharAt(builder.length() - 1).toString();
-                    try {
-                        i.putExtra("data", Integer.parseInt(location));
-                    } catch (NumberFormatException e) {
-                        e.printStackTrace();
-                    }
-                    startActivityForResult(i, requestCode);
-                } else {
-                    ToastUtil.showToast(ct, "您已关闭地点微调功能，请在设置里面修改设置");
-                }
+                Intent i = new Intent(getActivity(), LocationMapActivity.class);
+                i.putExtra("addr", baseAddr == null ? "" : baseAddr);
+                i.putExtra("data", distance);
+                startActivityForResult(i, 0x21);
                 break;
             case R.id.click_btn:
                 Intent intent = new Intent(getActivity(), OutSigninOKActivity.class);
                 intent.putExtra("addr", out_add_t_tv.getText().toString());
                 intent.putExtra("com", out_add_name_tv.getText().toString());
+                intent.putExtra("isImage", isImage);
                 if (json != null)
                     intent.putExtra("list", json);
-                startActivityForResult(intent, requestCode);
+                startActivityForResult(intent, 0x21);
                 break;
         }
     }
@@ -211,7 +156,15 @@ public class OutofficeFragment extends EasyFragment implements View.OnClickListe
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         if (item.getItemId() == R.id.title) {
-            startActivity(new Intent(getActivity(), OutofficeSetActivity.class));
+            if (isAdmin) {
+                Intent intent = new Intent(ct, OutofficeSetActivity.class);
+                intent.putExtra("isAddress", isAddress);
+                intent.putExtra("isImage", isImage);
+                intent.putExtra("distance", distance);
+                startActivityForResult(intent, 0x21);
+            } else {
+                Crouton.makeText(ct, "当前账号无权限进行设置");
+            }
         }
         return super.onOptionsItemSelected(item);
     }
@@ -219,14 +172,14 @@ public class OutofficeFragment extends EasyFragment implements View.OnClickListe
     @Override
     public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
         inflater.inflate(R.menu.menu_outoffice, menu);
-        menu.getItem(0).setTitle("设置");
         super.onCreateOptionsMenu(menu, inflater);
     }
 
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
         if (data == null) return;
-        if (this.requestCode == requestCode) {
+        Log.i("gongpengming", "data != null");
+        if (0x21 == requestCode) {
             if (resultCode == LocationMapActivity.REQUCODE) {
                 PoiInfo info = data.getParcelableExtra(LocationMapActivity.REQUESTNAME);
                 if (info != null) {
@@ -241,7 +194,104 @@ public class OutofficeFragment extends EasyFragment implements View.OnClickListe
                     sigNum++;
                     num_tv.setText(Html.fromHtml("<u>" + sigNum + "</u>"));
                 }
+            } else if (resultCode == 0x21) {
+                Log.i("gongpengming", "requestCode == 0x21");
+                isImage = data.getBooleanExtra("isImage", false);
+                isAddress = data.getBooleanExtra("isAddress", false);
+                distance = data.getIntExtra("distance", 100);
+                Log.i("gongpengming", "isImage=" + isImage);
+                Log.i("gongpengming", "isAddress=" + isAddress);
+                Log.i("gongpengming", "distance=" + distance);
+                if (isAddress)
+                    do_trim.setVisibility(View.VISIBLE);
+                else
+                    do_trim.setVisibility(View.GONE);
             }
         }
     }
+
+    @Override
+    protected void onCreateView(Bundle savedInstanceState, boolean createView) {
+        setHasOptionsMenu(true);
+        ViewUtils.inject(getmRootView());
+        ct = (OutofficeActivity) getActivity();
+        initview();
+        initData();
+    }
+
+    private void initview() {
+        num_tv.setOnClickListener(this);
+        date_tv.setText(TimeUtils.day_long_2_str(System.currentTimeMillis()) + " " + TimeUtils.getWeek(System.currentTimeMillis()) + " " + TimeUtils.long2str(System.currentTimeMillis(), "HH:mm"));
+        num_tv.setText("" + sigNum);
+        String loginUserId = MyApplication.getInstance().mLoginUser.getUserId();
+        AvatarHelper.getInstance().displayAvatar(loginUserId, name_img, true);
+        name_tv.setText(MyApplication.getInstance().mLoginUser.getNickName());
+        com_tv.setText(CommonUtil.getSharedPreferences(ct, "erp_commpany"));
+        String name = MyApplication.getInstance().getBdLocationHelper().getName();
+        String addr = MyApplication.getInstance().getBdLocationHelper().getAddress();
+        out_add_name_tv.setText(name);
+        out_add_t_tv.setText(addr);
+        double latitude = MyApplication.getInstance().getBdLocationHelper().getLatitude();
+        double longitude = MyApplication.getInstance().getBdLocationHelper().getLongitude();
+        point = new LatLng(latitude, longitude);
+        baseAddr = StringUtils.isEmail(name) ? addr : name;
+        BaiduMapUtil.getInstence().setMapViewPoint(mapView, point);
+        do_trim.setOnClickListener(this);
+        click_btn.setOnClickListener(this);
+        if (isAddress)
+            do_trim.setVisibility(View.VISIBLE);
+        else
+            do_trim.setVisibility(View.GONE);
+    }
+
+    private void initData() {
+        loadLog();
+        judgeManager();
+        getSet();
+    }
+
+    private void getSet() {
+        Map<String, Object> param = new HashMap<>();
+        param.put("code", "isImage,isAddress,distance");
+        net("mobile/getconfigs.action", param, 0x13);
+    }
+
+    //判断是否管理员
+    private void judgeManager() {
+        Map<String, Object> param = new HashMap<>();
+        net("mobile/ifadmin.action", param, 0x12);
+    }
+
+    //获取打卡记录 date:yyyy-MM-dd
+    private void loadLog() {
+        if (emcode == null)
+            emcode = CommonUtil.getSharedPreferences(ct, "erp_username");
+        final Map<String, Object> param = new HashMap<>();
+        param.put("currentMaster", CommonUtil.getSharedPreferences(ct, "erp_master"));
+        param.put("page", 1);
+        param.put("pageSize", 1000);
+        param.put("condition", "mo_mancode='" + emcode + "' and to_char(mo_signtime,'yyyy-MM-dd')='" + TimeUtils.s_long_2_str(System.currentTimeMillis()) + "'");
+        param.put("caller", "Mobile_outsign");
+        net("mobile/common/list.action", param, 0x11);
+    }
+
+    String baseUrl = null;
+    String emcode = null;
+
+    private void net(String action, Map<String, Object> param, int what) {
+        ct.progressDialog.show();
+        if (baseUrl == null)
+            baseUrl = CommonUtil.getSharedPreferences(ct, "erp_baseurl");
+        if (emcode == null)
+            emcode = CommonUtil.getSharedPreferences(ct, "erp_username");
+        String url = baseUrl + action;
+
+        param.put("emcode", emcode);
+        param.put("sessionId", CommonUtil.getSharedPreferences(ct, "sessionId"));
+        LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
+        headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
+        ViewUtil.httpSendRequest(ct, url, param, handler, headers, what, null, null, "get");
+    }
+
+
 }

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

@@ -5,7 +5,6 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
-import android.support.v7.app.AlertDialog;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.support.v7.widget.Toolbar;
@@ -29,11 +28,11 @@ import com.xzjmyk.pm.activity.ui.base.EasyFragment;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.AlarmaActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.LocationMapActivity;
 import com.xzjmyk.pm.activity.ui.erp.adapter.SigninAdapter;
+import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.CodeUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.FlexJsonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
-import com.xzjmyk.pm.activity.ui.erp.util.ViewUtil;
 import com.xzjmyk.pm.activity.util.BaiduMapUtil;
 import com.xzjmyk.pm.activity.util.CalendarUtils;
 import com.xzjmyk.pm.activity.util.TimeUtils;
@@ -80,7 +79,6 @@ public class SigninFragment extends EasyFragment implements View.OnClickListener
     @ViewInject(R.id.unoffice_mm)
     private TextView unoffice_mm;//地点微调
 
-
     //变量
     private BaseActivity ct;
     private double companyX;//当前公司位置经度
@@ -94,11 +92,8 @@ public class SigninFragment extends EasyFragment implements View.OnClickListener
     private SigninAdapter adapter;
     private long selectTime;//当前选择的日期的时间
     private String code;//账号员工编号
-    private AlertDialog.Builder builder;
-    private String[] timeList = new String[5];
     private boolean isToday = true;
     private long time = System.currentTimeMillis();
-
     private Handler handler = new Handler() {
         @Override
         public void handleMessage(Message msg) {
@@ -110,9 +105,9 @@ public class SigninFragment extends EasyFragment implements View.OnClickListener
                     JSONObject jsonObject = JSON.parseObject(message);//返回对象
                     if (jsonObject.containsKey("success") && jsonObject.getBoolean("success")) {//返回正常
                         if (jsonObject.containsKey("comaddressset") ? jsonObject.getBoolean("comaddressset") : false) {//如果有分配公司
-                            companyDistance = Integer.parseInt(jsonObject.containsKey("distance") ?(StringUtils.isEmpty(jsonObject.getString("distance") )?"0":jsonObject.getString("distance")) : "0");
-                            companyX = Double.parseDouble(jsonObject.containsKey("longitude") ? (StringUtils.isEmpty(jsonObject.getString("longitude") )?"0":jsonObject.getString("longitude")) : "0");
-                            companyY = Double.parseDouble(jsonObject.containsKey("latitude") ? (StringUtils.isEmpty(jsonObject.getString("latitude") )?"0":jsonObject.getString("latitude")) : "0");
+                            companyDistance = Integer.parseInt(jsonObject.containsKey("distance") ? (StringUtils.isEmpty(jsonObject.getString("distance")) ? "0" : jsonObject.getString("distance")) : "0");
+                            companyX = Double.parseDouble(jsonObject.containsKey("longitude") ? (StringUtils.isEmpty(jsonObject.getString("longitude")) ? "0" : jsonObject.getString("longitude")) : "0");
+                            companyY = Double.parseDouble(jsonObject.containsKey("latitude") ? (StringUtils.isEmpty(jsonObject.getString("latitude")) ? "0" : jsonObject.getString("latitude")) : "0");
                             unoffice_mm.setText(setDistance());
                         } else {
                             Crouton.makeText(ct, "当前账号没有分配公司地址，请联系管理员!!");
@@ -154,7 +149,10 @@ public class SigninFragment extends EasyFragment implements View.OnClickListener
                     });
                     break;
                 default:
-                    Crouton.makeText(ct, "系统出现错误，请联系管理员!!");
+                    if ("网络未连接!".equals(message))
+                        Crouton.makeText(ct, message);
+                    else
+                        Crouton.makeText(ct, message);
                     break;
             }
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/model/Employees.java

@@ -1,15 +1,17 @@
 package com.xzjmyk.pm.activity.ui.erp.model;
 
+import android.os.Parcel;
 import android.os.Parcelable;
 
-public class Employees {
+public class Employees implements Parcelable {
     private int em_id;
     private String em_code;
     private String em_name;
     private String em_depart;
     private String em_position;
-    //private int em_defaultorid;
     private String em_defaultorname;
+    private boolean isClick=false;
+    public Employees(){}
 
     public int getEm_id() {
         return em_id;
@@ -51,12 +53,6 @@ public class Employees {
         this.em_position = em_position;
     }
 
-    //	public int getEm_defaultorid() {
-//		return em_defaultorid;
-//	}
-//	public void setEm_defaultorid(int em_defaultorid) {
-//		this.em_defaultorid = em_defaultorid;
-//	}
     public String getEm_defaultorname() {
         return em_defaultorname;
     }
@@ -65,5 +61,49 @@ public class Employees {
         this.em_defaultorname = em_defaultorname;
     }
 
+    public boolean isClick() {
+        return isClick;
+    }
+
+    public void setClick(boolean click) {
+        isClick = click;
+    }
+
+    protected Employees(Parcel in) {
+        em_id = in.readInt();
+        em_code = in.readString();
+        em_name = in.readString();
+        em_depart = in.readString();
+        em_position = in.readString();
+        em_defaultorname = in.readString();
+        isClick = in.readByte() != 0;
+    }
+
+    public static final Creator<Employees> CREATOR = new Creator<Employees>() {
+        @Override
+        public Employees createFromParcel(Parcel in) {
+            return new Employees(in);
+        }
+
+        @Override
+        public Employees[] newArray(int size) {
+            return new Employees[size];
+        }
+    };
+
+    @Override
+    public int describeContents() {
+        return 0;
+    }
 
+    @Override
+    public void writeToParcel(Parcel parcel, int i) {
+        parcel.writeInt(em_id);
+        parcel.writeString(em_code);
+        parcel.writeString(em_name);
+        parcel.writeString(em_depart);
+        parcel.writeString(em_position);
+        parcel.writeString(em_defaultorname);
+        parcel.writeByte((byte) (isClick ? 1 : 0));
+    }
 }

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/net/ViewUtil.java

@@ -642,7 +642,7 @@ public class ViewUtil {
                     }*/
                     Bundle bundle = new Bundle();
                     Message message = new Message();
-                    bundle.putString("result", "网络未连接！");
+                    bundle.putString("result", "网络未连接!");
                     message.setData(bundle);
                     message.what = Constants.APP_SOCKETIMEOUTEXCEPTION;
                     handler.sendMessage(message);

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

@@ -28,8 +28,6 @@ public class ImageUtil {
      * 所以要解决这个问题，可以在onActivityResult方法中，
      * 获取到照片数据后，读取它的旋转信息，如果不是0，
      * 说明这个照片已经被旋转过了，那么再使用android.graphics.Matrix将照片旋转回去即可。*/
-
-
     public static Bitmap roateBitmapAndScale(Bitmap bitmap, int degree, int newWidth ,int newHeight ) {
         if (degree == 0) {
             return bitmap;

WeiChat/src/main/res/drawable/bg_orange_btn.xml

@@ -4,7 +4,8 @@
         <shape>
             <solid android:color="@color/btn_orange_press" />
             <corners android:radius="8dp" />
-            <padding android:bottom="0.5dp" android:left="0.5dp" android:right="0.5dp" android:top="0.5dp" />
+            <padding android:bottom="0.5dp" android:left="0.5dp"
+                android:right="0.5dp" android:top="0.5dp" />
         </shape>
     </item>
     <item>

WeiChat/src/main/res/drawable/bg_orange_btn_pass.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+        <shape>
+            <solid android:color="@color/btn_orange_press" />
+            <corners android:radius="8dp" />
+            <padding android:bottom="0.5dp" android:left="0.5dp" android:right="0.5dp" android:top="0.5dp" />
+        </shape>
+</selector>

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

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@drawable/bg_main"

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

@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
     tools:context="com.xzjmyk.pm.activity.ui.erp.activity.oa.AddLogActivity">
-
+<LinearLayout
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="50dp"
@@ -140,5 +143,5 @@
             android:layout_weight="1"
             android:src="@drawable/actionbar_add_icon" />
     </LinearLayout>
-
 </LinearLayout>
+</ScrollView>

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

@@ -132,7 +132,8 @@
                 style="@style/add_meet_tv"
                 android:layout_marginLeft="20dp"
                 android:layout_toRightOf="@id/location_tag"
-                android:hint="请输入" />
+                android:hint="请输入"
+                android:lines="1" />
         </RelativeLayout>
 
         <RelativeLayout

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

@@ -11,8 +11,8 @@
         android:id="@+id/top"
         android:layout_width="match_parent"
         android:layout_height="70dp"
-        android:gravity="center_vertical"
         android:background="@color/oa_background_orange"
+        android:gravity="center_vertical"
         android:orientation="horizontal">
 
         <LinearLayout
@@ -32,9 +32,9 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:textColor="@color/white"
                 android:layout_marginTop="2dp"
-                android:text="会议纪要" />
+                android:text="会议纪要"
+                android:textColor="@color/white" />
         </LinearLayout>
 
         <LinearLayout
@@ -56,8 +56,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="2dp"
-                android:textColor="@color/white"
-                android:text="分配任务" />
+                android:text="发起任务"
+                android:textColor="@color/white" />
         </LinearLayout>
     </LinearLayout>
 
@@ -228,32 +228,29 @@
         android:textSize="@dimen/text_main" />
 
 
-    <LinearLayout
+    <RelativeLayout
         android:id="@+id/baidu_ll"
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_below="@+id/click_btn"
-        android:layout_centerHorizontal="true"
-        android:layout_marginTop="10dp"
-        android:orientation="horizontal">
+        android:layout_marginTop="10dp">
 
         <TextView
             android:id="@+id/location_tv"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content" />
-
-        <View
-            android:layout_width="6dp"
-            android:layout_height="1dp" />
+            android:layout_height="wrap_content"
+            android:layout_centerHorizontal="true" />
 
         <TextView
             android:id="@+id/location_tag"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:layout_toRightOf="@id/location_tv"
             android:clickable="true"
             android:text="@string/agare"
             android:textColor="@color/blue" />
-    </LinearLayout>
+    </RelativeLayout>
 
     <LinearLayout
         android:id="@+id/click_ll"
@@ -287,18 +284,18 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
-        android:background="@drawable/endmeeting"/>
+        android:background="@drawable/endmeeting" />
 
     <!--<TextView-->
-        <!--android:id="@+id/end_meet_tv"-->
-        <!--android:layout_width="match_parent"-->
-        <!--android:layout_height="wrap_content"-->
-        <!--android:layout_alignParentBottom="true"-->
-        <!--android:layout_below="@+id/meet_about"-->
-        <!--android:background="@color/white"-->
-        <!--android:clickable="true"-->
-        <!--android:gravity="center"-->
-        <!--android:padding="20dp"-->
-        <!--android:text="结束会议"-->
-        <!--android:textColor="@color/text_main" />-->
+    <!--android:id="@+id/end_meet_tv"-->
+    <!--android:layout_width="match_parent"-->
+    <!--android:layout_height="wrap_content"-->
+    <!--android:layout_alignParentBottom="true"-->
+    <!--android:layout_below="@+id/meet_about"-->
+    <!--android:background="@color/white"-->
+    <!--android:clickable="true"-->
+    <!--android:gravity="center"-->
+    <!--android:padding="20dp"-->
+    <!--android:text="结束会议"-->
+    <!--android:textColor="@color/text_main" />-->
 </RelativeLayout>

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

@@ -35,8 +35,6 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_below="@+id/meet_select_rl"
-        android:layout_marginTop="10dp"
         android:divider="@color/item_line"
-        android:padding="10dp"
         android:scrollbars="none" />
 </RelativeLayout>

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

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context="com.xzjmyk.pm.activity.ui.erp.activity.oa.OptionActivity">
+
+    <android.support.v7.widget.RecyclerView
+        android:id="@+id/listview"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+</RelativeLayout>

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

@@ -113,7 +113,7 @@
             <RelativeLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:visibility="gone">
+            >
 
                 <ImageView
                     android:id="@+id/image"

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

@@ -6,9 +6,9 @@
 
     <TextView
         android:id="@+id/name_tv"
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="英唐大厦"
+        android:layout_toLeftOf="@+id/select_rb"
         android:textColor="@color/text_main"
         android:textSize="@dimen/text_main" />
 
@@ -19,7 +19,6 @@
         android:layout_below="@+id/name_tv"
         android:layout_marginTop="2dp"
         android:layout_toLeftOf="@+id/select_rb"
-        android:text="英唐大厦"
         android:textColor="@color/text_hine"
         android:textSize="@dimen/text_hine" />
 
@@ -29,7 +28,7 @@
         android:layout_height="wrap_content"
         android:layout_alignParentRight="true"
         android:button="@null"
-        android:focusable="false"
         android:drawableLeft="@drawable/oa_rb_button_bg"
+        android:focusable="false"
         android:padding="10dp" />
 </RelativeLayout>

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

@@ -20,7 +20,8 @@
         android:layout_height="38dp"
         android:layout_centerVertical="true"
         android:layout_toRightOf="@id/select_scb"
-        android:src="@drawable/friend_u" />
+        android:src="@drawable/friend_u"
+        android:visibility="gone" />
 
     <TextView
         android:id="@+id/name_tv"

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

@@ -23,7 +23,7 @@
     <string name="crm_customer_visit">客户拜访</string>
     <string name="crm_waller">荣誉墙</string>
     <!--View empty-->
-    <string name="empty_message">暂时没有数据！</string>
+    <string name="empty_message">暂时没有数据</string>
     <string name="loading_message">请等待！</string>
     <string name="error_message">很抱歉! 系统发现未知错误</string>
     <string name="empty_button">再次尝试</string>