2016/9/14 发布版本

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/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/TaskAddActivity.java

@@ -21,6 +21,7 @@ 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.ListUtils;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 import com.xzjmyk.pm.activity.ui.erp.util.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.view.DateTimePickerDialog;
@@ -30,6 +31,7 @@ import com.xzjmyk.pm.activity.view.crouton.Crouton;
 import com.xzjmyk.pm.activity.view.wheel.DateTimePicker;
 import com.xzjmyk.pm.activity.view.wheel.OptionPicker;
 
+import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
@@ -146,7 +148,6 @@ public class TaskAddActivity extends BaseActivity implements View.OnClickListene
             @Override
             public void onDateTimePicked(String year, String month, String day, String hour, String minute) {
                 String time = year + "-" + month + "-" + day + " " + hour + ":" + minute + ":00";
-                Log.i("gongpengming", time);
                 if (b) {
                     tv_date_start.setText(time);
                 } else {
@@ -389,7 +390,7 @@ public class TaskAddActivity extends BaseActivity implements View.OnClickListene
                 break;
             case R.id.tv_executive:
                 Intent intent = new Intent(ct, UserSelectActivity.class);
-                intent.putExtra("single", true);
+                intent.putExtra("single", false);
                 startActivityForResult(intent, 0x11);
                 break;
         }
@@ -425,9 +426,14 @@ 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) {
-            Employees entity = data.getParcelableExtra("data");
-            if (entity == null || entity.getEm_name() == null) return;
-            tv_executive.setText(entity.getEm_name());
+            ArrayList<Employees> list = data.getParcelableExtra("data");
+            if (ListUtils.isEmpty(list)) return;
+            StringBuilder str = new StringBuilder();
+            for (Employees e : list) {
+                str.append("," + e.getEm_name());
+            }
+            str.delete(0, 1);
+            tv_executive.setText(str.toString());
         }
     }
 }

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

@@ -167,7 +167,6 @@ public class AlarmaActivity extends BaseActivity implements View.OnClickListener
 
     private void setArmmanager(long time) {
         if (time <= 0) return;
-        Log.i("gongpengming", TimeUtils.f_long_2_str(time));
         //操作：发送一个广播，广播接收后Toast提示定时操作完成
         Intent intent = new Intent(AlarmaActivity.this, AlarmReceiver.class);
         intent.setAction("ALARMA_ACTION");

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

@@ -7,6 +7,7 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
 import android.util.Log;
+import android.view.MenuItem;
 import android.view.View;
 import android.widget.Button;
 import android.widget.TextView;
@@ -77,11 +78,8 @@ public class MeetDetailsActivity extends BaseActivity implements View.OnClickLis
                     break;
                 case ENDMEET:
                     ToastUtil.showToast(ct, "会议结束成功");
-                    Intent data = new Intent();
-                    data.putExtra("item", item);
-                    data.putExtra("data", true);
-                    setResult(0x15, data);
-                    finish();
+                    status_tv.setText("已结束");
+
                     break;
                 case SIGNNIN:
                     ToastUtil.showToast(ct, "会议签到成功");
@@ -120,6 +118,28 @@ public class MeetDetailsActivity extends BaseActivity implements View.OnClickLis
     private int item;
     private JSONArray array;
 
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId() == android.R.id.home) {
+            endActivity();
+        }
+        return true;
+    }
+
+    @Override
+    public void onBackPressed() {
+        endActivity();
+    }
+
+    private void endActivity() {
+        Intent data = new Intent();
+        data.putExtra("item", item);
+        data.putExtra("data", true);
+        setResult(0x15, data);
+        finish();
+    }
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -141,6 +161,9 @@ public class MeetDetailsActivity extends BaseActivity implements View.OnClickLis
         } else {
             click_btn.setBackgroundResource(R.drawable.bg_orange_btn_pass);
             click_btn.setText("已签到");
+            click_btn.setClickable(false);
+            click_btn.setFocusable(false);
+            click_btn.setPadding(20, 20, 20, 20);
         }
     }
 
@@ -169,7 +192,6 @@ public class MeetDetailsActivity extends BaseActivity implements View.OnClickLis
         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());
-        Log.i("gongpengming", (StringUtils.isEmpty(entity.getMa_tag()) ? "未填写" : entity.getMa_tag()));
         tag_tv.setText(StringUtils.isEmpty(entity.getMa_tag()) ? "未填写" : entity.getMa_tag());
         //设置会议状态
         String str = entity.getMa_stage();

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

@@ -208,7 +208,7 @@ public class OAActivity extends BaseActivity implements View.OnClickListener {
         Log.i(TAG, "onCreate:");
         setContentView(R.layout.activity_oa);
         ViewUtils.inject(this);
-        getSupportActionBar().setTitle("自动化办公");
+        getSupportActionBar().setTitle("办公自动化");
         initView();
     }
 

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

@@ -23,8 +23,10 @@ import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.helper.AvatarHelper;
 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.Constants;
+import com.xzjmyk.pm.activity.ui.erp.view.EmptyLayout;
 import com.xzjmyk.pm.activity.util.BaiduMapUtil;
 import com.xzjmyk.pm.activity.util.CalendarUtils;
 import com.xzjmyk.pm.activity.util.StringUtils;
@@ -51,6 +53,7 @@ public class OAListActivity extends BaseActivity {
     @ViewInject(R.id.listview)
     private ListView listview;
 
+    private EmptyLayout mEmptyLayout;
     private Handler handler = new Handler() {
         @Override
         public void handleMessage(Message msg) {
@@ -77,17 +80,20 @@ public class OAListActivity extends BaseActivity {
 
     private void init() {
         date = TimeUtils.s_long_2_str(System.currentTimeMillis());
-
     }
 
     private void initView() {
+        mEmptyLayout = new EmptyLayout(ct, listview);
+        mEmptyLayout.setShowLoadingButton(false);
+        mEmptyLayout.setShowEmptyButton(false);
+        mEmptyLayout.setShowErrorButton(false);
         rili_tv.setText(StringUtils.isEmpty(date) ? "" : date);
         String name = MyApplication.getInstance().mLoginUser.getNickName();
         name_tv.setText(StringUtils.isEmpty(name) ? "" : name);
         prot_tv.setText("");
         double latitude = MyApplication.getInstance().getBdLocationHelper().getLatitude();
         double longitude = MyApplication.getInstance().getBdLocationHelper().getLongitude();
-        BaiduMapUtil.getInstence().setMapViewPoint(mapView, new LatLng(longitude, latitude), true);
+        BaiduMapUtil.getInstence().setMapViewPoint(mapView, new LatLng(latitude, longitude), true);
         AvatarHelper.getInstance().displayAvatar(MyApplication.getInstance().mLoginUser.getUserId(), head_img, true);
         JSONArray array = getIntent().getParcelableExtra("data");
         adapter = new SigninAdapter();
@@ -141,7 +147,7 @@ public class OAListActivity extends BaseActivity {
         param.put("sessionId", CommonUtil.getSharedPreferences(ct, "sessionId"));
         LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
         headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
-        com.xzjmyk.pm.activity.ui.erp.util.ViewUtil.httpSendRequest(ct, url, param, handler, headers, 0x13, null, null, "get");
+        ViewUtil.httpSendRequest(ct, url, param, handler, headers, 0x13, null, null, "get");
     }
 
 
@@ -158,6 +164,7 @@ public class OAListActivity extends BaseActivity {
         public void setJson(JSONArray json) {
             prot_tv.setText("本日签到 " + json.size() + " 次");
             this.json = json;
+            if (json == null || json.size() <= 0) mEmptyLayout.showEmpty();
             notifyDataSetChanged();
         }
 

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

@@ -91,7 +91,8 @@ public class OutofficeSetActivity extends BaseActivity {
     }
 
     private void updataSet(String key, String value) {
-        String formStore = "{\"code\":\"" + key + "\",\"data\":\"" + value + "\"}";
+
+        String formStore = "{\"" + key + "\":\"" + value + "\"}";
         Map<String, Object> param = new HashMap<>();
         param.put("formStore", formStore);
         net("mobile/updateconfigs.action", param, 0x11);

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

@@ -87,11 +87,7 @@ public class SaveMeetActivity extends BaseActivity {
     private void saveAble() {
         StringBuilder builder = new StringBuilder();
         String chche = "";
-        if (summary_et == null)
-            Log.i("gongpengming", "summary_et为空");
-        if (summary_et.getText().toString() == null) {
-            Log.i("gongpengming", "summary_et.getText().toString()为空");
-        }
+
         chche = summary_et.getText().toString();
         if (StringUtils.isEmpty(chche)) {
             ToastUtil.showToast(ct, "会议纪要未按要求填写");

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

@@ -4,7 +4,6 @@ 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;
@@ -21,6 +20,7 @@ import com.xzjmyk.pm.activity.adapter.WorkLogAdapter;
 import com.xzjmyk.pm.activity.bean.circle.Comment;
 import com.xzjmyk.pm.activity.bean.circle.PublicMessage;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+import com.xzjmyk.pm.activity.util.StringUtils;
 import com.xzjmyk.pm.activity.util.ToastUtil;
 import com.xzjmyk.pm.activity.view.ClearEditText;
 import com.xzjmyk.pm.activity.view.PMsgBottomView;
@@ -82,7 +82,6 @@ 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);
             }
         }
@@ -189,9 +188,10 @@ public class WorkLogsActivity extends BaseActivity {
         requestMyBusiness(true);
     }
 
-    private boolean isRefersh = false;
-
     private void requestMyBusiness(final boolean isPullDwonToRefersh) {
+        if (!StringUtils.isEmpty(search_edit.getText().toString())) {
+            search_edit.setText("");
+        }
         HashMap<String, String> params = new HashMap<>();
         String messageId = null;
         if (!isPullDwonToRefersh && mMessages.size() > 0) {
@@ -219,15 +219,13 @@ public class WorkLogsActivity extends BaseActivity {
                     if (messages == null) {
                         messages = new ArrayList<>();
                     }
-                    if (isRefersh) {
+                    if (isPullDwonToRefersh) {
                         mMessages.clear();
                         messages.clear();
                     }
                     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();
@@ -237,26 +235,6 @@ public class WorkLogsActivity extends BaseActivity {
         addDefaultRequest(request);
     }
 
-
-    /**
-     * 添加一条评论的操作
-     * 新一条回复
-     */
-//    private void addComment() {
-//        //参数
-//        HashMap<String, Object> params = new HashMap<>();
-//        params.put("access_token", MyApplication.getInstance().mAccessToken);
-//        if (itemChche == null) return;
-//        params.put("messageId", itemChche.messageId);
-////        if (!TextUtils.isEmpty(itemChche.toUserId)) {
-////            params.put("toUserIdtoUserId", itemChche.toUserId);
-////        }
-////        if (!TextUtils.isEmpty(itemChche.toName)) {
-////            params.put("toNickname", itemChche.toName);
-////        }
-//        params.put("body", itemChche.body);
-//        ViewUtil.httpSendRequest(this, mConfig.MSG_COMMENT_ADD, params, handler, null, ADD_WHAT, null, null, "get");
-//    }
     private void addComment() {
         if (itemChche == null) return;
         Map<String, String> params = new HashMap<String, String>();

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

@@ -178,7 +178,6 @@ public class OutofficeFragment extends EasyFragment implements View.OnClickListe
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
         if (data == null) return;
-        Log.i("gongpengming", "data != null");
         if (0x21 == requestCode) {
             if (resultCode == LocationMapActivity.REQUCODE) {
                 PoiInfo info = data.getParcelableExtra(LocationMapActivity.REQUESTNAME);
@@ -195,13 +194,9 @@ public class OutofficeFragment extends EasyFragment implements View.OnClickListe
                     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

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

@@ -197,10 +197,6 @@ public class ViewUtil {
             public void run() {
                 boolean isNetHas = CommonUtil.isNetWorkConnected(ct);
                 if (isNetHas) {
-                    Log.i("gongpengming", "url=" + url);
-                    for (String s : params.keySet()) {
-                        Log.i("gongpengming", "key=" + s + "  @@ values=" + params.get(s));
-                    }
                     String result = getDataFromServer(url, params, request);
                     Log.i("result", "http:" + result);
                     if (result != null) {

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

@@ -169,7 +169,6 @@ public class MessageFragment extends EasyFragment {
     }
 
     public void setListener(int num) {
-        Log.i("gongpengming", num + "num=");
         if (refreshRedUIListener == null) return;
         refreshRedUIListener.updata(num);
     }
@@ -722,7 +721,6 @@ public class MessageFragment extends EasyFragment {
             b2b_num_tv.setVisibility(View.VISIBLE);
             b2b_content_tv.setText("您有" + bMsgs.size() + "条商务消息未读");
             rl_b2b.setVisibility(View.VISIBLE);
-            Log.i("gongpengming", "bMsgs.size=" + bMsgs.size());
             setListener(bMsgs.size() + GONGGAO_count + NOTICE_count + NES_count + TASK_count + DAIBAN_count + SUBRICE_count);
         } else {
             rl_b2b.setVisibility(View.GONE);
@@ -746,7 +744,6 @@ public class MessageFragment extends EasyFragment {
                                 num += 1;
                         }
                     }
-                    Log.i("gongpengming", "num.size=" + num);
                     setListener(GONGGAO_count + NOTICE_count + NES_count + TASK_count + DAIBAN_count + num);
                     if (num > 0) {
                         num_tv.setText(num + "");
@@ -823,7 +820,6 @@ public class MessageFragment extends EasyFragment {
 
 
     private void setNOTICE_count(int count) {
-        Log.i("gongpengming","setNOTICE_count="+count);
         setListener(GONGGAO_count + NOTICE_count + NES_count + TASK_count + DAIBAN_count + SUBRICE_count);
         if (count > 0) {
             notice_num_tv.setText(count + "");

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/tool/SingleImagePreviewActivity.java

@@ -93,7 +93,6 @@ public class SingleImagePreviewActivity extends ActionBackActivity {
 		mImageView.setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View v) {
-//				Log.i("gongpengmingIMAGE","setOnClickListener");
 				finish();
 				overridePendingTransition(0, R.anim.alpha_scale_out);
 			}

WeiChat/src/main/java/com/xzjmyk/pm/activity/view/wheel/DateTimePicker.java

@@ -390,12 +390,16 @@ public class DateTimePicker extends WheelPicker {
         selectedYearIndex = findItemIndex(years, year);
         selectedMonthIndex = findItemIndex(months, month);
         selectedDayIndex = findItemIndex(days, day);
-        if (hour<10){
-            selectedHour = "0"+String.valueOf(hour);  
-        }else{
+        if (hour < 10) {
+            selectedHour = "0" + String.valueOf(hour);
+        } else {
             selectedHour = String.valueOf(hour);
         }
-        selectedMinute = String.valueOf(minute);
+        if (minute < 10) {
+            selectedMinute = "0" + String.valueOf(hour);
+        } else {
+            selectedMinute = String.valueOf(hour);
+        }
     }
 
     /**

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

@@ -4,8 +4,7 @@
         <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

@@ -4,8 +4,7 @@
         <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/oa_signin_tv_bg.xml

@@ -8,7 +8,7 @@
         android:width="0.5dp"
         android:color="@android:color/black" />
     <!-- 圆角 -->
-    <corners android:radius="360dp" />
+    <corners android:radius="9dp" />
     <!-- 边距 -->
     <padding
         android:bottom="10dp"

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

@@ -5,12 +5,11 @@
     android:layout_height="match_parent"
     android:background="@color/item_color2"
     tools:context="com.xzjmyk.pm.activity.ui.erp.activity.oa.AddMeetTaskActivity">
+
     <com.handmark.pulltorefresh.library.PullToRefreshListView
         android:id="@+id/listview"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_below="@+id/seach_top"
-        android:layout_marginTop="10dp"
         android:background="@color/item_color2"
         android:divider="@color/item_line"
         android:dividerHeight="10dp" />

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

@@ -43,7 +43,6 @@
                 android:layout_height="wrap_content"
                 android:layout_alignTop="@id/head_img"
                 android:layout_toRightOf="@id/head_img"
-                android:text="name"
                 android:textColor="@color/text_main" />
 
             <TextView
@@ -53,7 +52,7 @@
                 android:layout_alignLeft="@id/name_tv"
                 android:layout_below="@id/name_tv"
                 android:layout_marginTop="5dp"
-                android:text="name"
+                android:visibility="gone"
                 android:textColor="@color/text_hine" />
 
             <TextView

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

@@ -252,7 +252,6 @@
 
 
         <RelativeLayout
-
             android:id="@+id/email_erp_rl"
             style="@style/form_relative_customer"
             android:layout_height="wrap_content"
@@ -263,10 +262,10 @@
                 android:id="@+id/email_text"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_centerVertical="true"
+                android:layout_alignTop="@+id/tv_content"
                 android:layout_marginLeft="20dp"
                 android:drawablePadding="10dp"
-                android:gravity="center"
+                android:padding="5dp"
                 android:text="详情"
                 android:textColor="@color/text_main"
                 android:textSize="@dimen/text_main" />
@@ -275,7 +274,6 @@
                 android:id="@+id/tv_content"
                 style="@style/form_relative_right_text"
                 android:gravity="top|left"
-                android:hint="最多输入十五个字符"
                 android:minLines="4"
                 android:padding="5dp"
                 editTextFormExample:testType="nocheck" />

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

@@ -54,7 +54,8 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignBottom="@+id/tv"
-            android:layout_marginLeft="5dp"
+            android:layout_marginLeft="8dp"
+            android:layout_marginRight="8dp"
             android:layout_toRightOf="@+id/tv"
             android:text=" 0"
             android:textColor="@color/mainList2"

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

@@ -12,14 +12,17 @@
         android:layout_height="80dp"
         android:layout_marginRight="10dp"
         android:gravity="center"
-        android:textSize="20sp" />
-<TextView
-    android:id="@+id/status_tv"
-    android:textColor="@color/text_hine"
-    android:layout_alignParentRight="true"
-    android:layout_alignTop="@id/head_img"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content" />
+        android:textSize="20sp"
+        android:visibility="gone" />
+
+    <TextView
+        android:id="@+id/status_tv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentRight="true"
+        android:layout_alignTop="@id/head_img"
+        android:textColor="@color/text_hine" />
+
     <TextView
         android:id="@+id/name_tv"
         android:layout_width="wrap_content"
@@ -49,7 +52,8 @@
         android:layout_marginTop="10dp"
         android:drawableLeft="@drawable/icon_meeting"
         android:drawablePadding="10dp"
-        android:text="OA,CRM讨论"
+        android:ellipsize="end"
+        android:lines="2"
         android:textColor="@color/text_main"
         android:textSize="@dimen/text_main" />
 

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

@@ -3,7 +3,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
-    android:padding="8dp">
+    android:padding="10dp">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -68,8 +68,7 @@
             android:layout_height="wrap_content"
             android:layout_alignLeft="@id/addr"
             android:layout_below="@id/addr"
-            android:layout_marginTop="6dp"
-  />
+            android:layout_marginTop="6dp" />
 
         <ImageView
             android:id="@+id/image"
@@ -81,43 +80,4 @@
             android:visibility="gone" />
     </RelativeLayout>
 
-    <!--<ImageView-->
-    <!--android:id="@+id/image"-->
-    <!--android:layout_width="80dp"-->
-    <!--android:layout_height="80dp"-->
-    <!--/>-->
-
-    <!--<TextView-->
-    <!--android:id="@+id/name"-->
-    <!--android:layout_marginLeft="10dp"-->
-    <!--android:layout_width="wrap_content"-->
-    <!--android:layout_height="wrap_content"-->
-    <!--android:layout_toRightOf="@+id/image"-->
-    <!--android:text="签到人" />-->
-
-    <!--<TextView-->
-    <!--android:id="@+id/company"-->
-    <!--android:layout_width="wrap_content"-->
-    <!--android:layout_height="wrap_content"-->
-    <!--android:layout_alignParentRight="true"-->
-    <!--android:text="签到企业"-->
-    <!--/>-->
-
-    <!--<TextView-->
-    <!--android:id="@+id/time"-->
-    <!--android:layout_width="wrap_content"-->
-    <!--android:layout_height="wrap_content"-->
-    <!--android:layout_alignLeft="@id/name"-->
-    <!--android:layout_below="@+id/name"-->
-    <!--android:layout_marginTop="8dp"-->
-    <!--android:text="签到地点" />-->
-
-    <!--<TextView-->
-    <!--android:id="@+id/addr"-->
-    <!--android:layout_width="wrap_content"-->
-    <!--android:layout_height="wrap_content"-->
-    <!--android:layout_alignLeft="@id/name"-->
-    <!--android:layout_below="@+id/time"-->
-    <!--android:layout_marginTop="8dp"-->
-    <!--android:text="签到地点" />-->
 </LinearLayout>

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

@@ -25,7 +25,7 @@
     <color name="btn_login_press">#B9D2E3</color>
 
     <color name="btn_orange_normal">#DD9C57</color>
-    <color name="btn_orange_press">#E5AA69</color>
+    <color name="btn_orange_press">#908f8f</color>
     <!--end gongpengming-->
     <color name="shadow">#AA000000</color>
     <color name="default_shadow_color">#88757575</color>

build.gradle

@@ -6,7 +6,7 @@ buildscript {
         maven { url "https://jcenter.bintray.com" }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.3'
+        classpath 'com.android.tools.build:gradle:2.1.0'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.0'
     }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Wed Sep 14 12:34:53 CST 2016
+#Wed Sep 14 14:23:32 CST 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip