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

# Conflicts:
#	WeiChat/build.gradle

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

@@ -128,7 +128,8 @@ public class WebViewCommActivity extends BaseActivity implements View.OnClickLis
             url = mSubsurl + "?numId=" + mSubscriptionMessages.get(mPosition).getNumId()
                     + "&mainId=" + mSubscriptionMessages.get(mPosition).getInstanceId()
                     + "&insId=" + mSubscriptionMessages.get(mPosition).getId()
-                    + "&title=" + mSubscriptionMessages.get(mPosition).getTitle();
+                    + "&title=" + mSubscriptionMessages.get(mPosition).getTitle()
+                    + "&sessionId=" + CommonUtil.getSharedPreferences(ct, "sessionId");
             if (mSubscriptionMessages.size() == 1) {
                 mPreTv.setVisibility(View.GONE);
                 mNextTv.setVisibility(View.GONE);

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

@@ -40,6 +40,7 @@ import com.xzjmyk.pm.activity.util.TimeUtils;
 import com.xzjmyk.pm.activity.view.MostLinearLayoutManager;
 import com.xzjmyk.pm.activity.view.crouton.Crouton;
 
+import java.util.ArrayList;
 import java.util.List;
 
 
@@ -260,6 +261,22 @@ public class MissionActivity extends BaseActivity implements View.OnClickListene
                     }
                 });
                 break;
+            case R.id.item_remark_tv:
+                String[] str = new String[]{"客情维护", "业务办理", "其它拜访"};
+                ArrayList<SelectBean> beans = new ArrayList<>();
+                SelectBean bean = null;
+                for (String e : str) {
+                    bean = new SelectBean();
+                    bean.setName(e);
+                    bean.setClick(false);
+                    beans.add(bean);
+                }
+                intent = new Intent(ct, SelectActivity.class);
+                intent.putExtra("type", 2);
+                intent.putParcelableArrayListExtra("data", beans);
+                intent.putExtra("title", "拜访目的");
+                startActivityForResult(intent, 0x23);
+                break;
         }
     }
 
@@ -322,8 +339,9 @@ public class MissionActivity extends BaseActivity implements View.OnClickListene
         } else if (0x23 == requestCode) {
             SelectBean b = data.getParcelableExtra("data");
             if (b == null) return;
-            int type = StringUtils.isEmpty(b.getName()) ? 1 : "半天".equals(b.getName()) ? 1 : 2;
-            adapter.getModels().get(position).setType(type);
+
+            String mudi = StringUtils.isEmpty(b.getName()) ? "客户维护" : b.getName();
+            adapter.getModels().get(position).setRemark(mudi);
             adapter.notifyItemChanged(position);
         }
     }

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

@@ -144,82 +144,89 @@ public class OAActivity extends BaseActivity implements View.OnClickListener, Wo
     private Handler handler = new Handler() {
         @Override
         public void handleMessage(Message msg) {
-            if (progressDialog.isShowing())
-                progressDialog.dismiss();
-            String message = (String) msg.getData().get("result");
-            switch (msg.what) {
-                case 0x11:
-                    JSONObject jsonObject = parseObject(message);
-                    if (!jsonObject.containsKey("success") || !jsonObject.getBoolean("success") || jsonObject.isEmpty()) {
-                        emptyLayout.showEmpty();
-                        return;
-                    }
-                    JSONObject chche = null;
-                    meArray = new JSONArray();
-                    otherArray = new JSONArray();
-                    //处理我的
-                    if (jsonObject.containsKey("me")) {
-                        chche = jsonObject.getJSONObject("me");
-                        addJsonToArray(meArray, chche);
-                        meInt.clear();
-                        if (meArray != null && meArray.size() > 0) {
-                            meInt.addAll(getDay(meArray));
+            try {
+                try {
+                    if (progressDialog.isShowing())
+                        progressDialog.dismiss();
+                } catch (Exception e) {
+
+                }
+                String message = (String) msg.getData().get("result");
+                switch (msg.what) {
+                    case 0x11:
+                        JSONObject jsonObject = parseObject(message);
+                        if (!jsonObject.containsKey("success") || !jsonObject.getBoolean("success") || jsonObject.isEmpty()) {
+                            emptyLayout.showEmpty();
+                            return;
                         }
-                    }
-                    //处理下属
-                    if (jsonObject.containsKey("other")) {
-                        chche = jsonObject.getJSONObject("other");
-                        addJsonToArray(otherArray, chche);
-                        otherInt.clear();
-                        if (otherArray != null && otherArray.size() > 0) {
-                            otherInt.addAll(getDay(otherArray));
+                        JSONObject chche = null;
+                        meArray = new JSONArray();
+                        otherArray = new JSONArray();
+                        //处理我的
+                        if (jsonObject.containsKey("me")) {
+                            chche = jsonObject.getJSONObject("me");
+                            addJsonToArray(meArray, chche);
+                            meInt.clear();
+                            if (meArray != null && meArray.size() > 0) {
+                                meInt.addAll(getDay(meArray));
+                            }
+                        }
+                        //处理下属
+                        if (jsonObject.containsKey("other")) {
+                            chche = jsonObject.getJSONObject("other");
+                            addJsonToArray(otherArray, chche);
+                            otherInt.clear();
+                            if (otherArray != null && otherArray.size() > 0) {
+                                otherInt.addAll(getDay(otherArray));
+                            }
                         }
-                    }
-                    loadSuccess();
-                    if (mPullToRefreshScrollView.isRefreshing()) {
-                        ViewUtil.ToastMessage(OAActivity.this, "刷新成功", Style.holoGreenLight, 2000);
-                        mPullToRefreshScrollView.onRefreshComplete();
-                    }
-                    break;
-                case 0x12:
-                    JSONArray array = JSON.parseObject(message).getJSONArray("datas");//获取到数据
-                    if (array == null || array.size() <= 0) {//无下属
-                        hasOther = false;
-                        chaneTAG(true);
-                    }
-                    break;
-                case 0x14://是否为管理员
-                    JSONObject object = JSON.parseObject(message);
-                    if (!object.containsKey("success") || !object.getBoolean("success")) return;
-                    String isAdmin = object.getString("isAdmin");
-                    if (StringUtils.isEmpty(isAdmin)) return;
-                    try {
-                        adminStatus = Integer.valueOf(isAdmin);
-                    } catch (Exception e) {
-
-                    }
-                    break;
-                default:
-                    if (mPullToRefreshScrollView.isRefreshing()) {
                         loadSuccess();
-                        mPullToRefreshScrollView.onRefreshComplete();
-                    }
-                    try {
-                        if (!StringUtils.isEmpty(message) && StringUtils.isInclude(message, "会话已断开")) {
-                            returnLogin();
-                            return;
+                        if (mPullToRefreshScrollView.isRefreshing()) {
+                            ViewUtil.ToastMessage(OAActivity.this, "刷新成功", Style.holoGreenLight, 2000);
+                            mPullToRefreshScrollView.onRefreshComplete();
                         }
-                        JsonValidator validator = new JsonValidator();
-                        if (validator.validate(message)) {
-                            JSONObject object1 = JSON.parseObject(message);
-                            Crouton.makeText(ct, StringUtils.isEmpty(object1.getString("exceptionInfo")) ? "程序错误" : object1.getString("exceptionInfo"));
-                        } else {
-                            Crouton.makeText(ct, StringUtils.isEmpty(message) ? "程序错误" : StringUtils.getChinese(message));
+                        break;
+                    case 0x12:
+                        JSONArray array = JSON.parseObject(message).getJSONArray("datas");//获取到数据
+                        if (array == null || array.size() <= 0) {//无下属
+                            hasOther = false;
+                            chaneTAG(true);
                         }
-                    } catch (Exception e) {
+                        break;
+                    case 0x14://是否为管理员
+                        JSONObject object = JSON.parseObject(message);
+                        if (!object.containsKey("success") || !object.getBoolean("success")) return;
+                        String isAdmin = object.getString("isAdmin");
+                        if (StringUtils.isEmpty(isAdmin)) return;
+                        try {
+                            adminStatus = Integer.valueOf(isAdmin);
+                        } catch (Exception e) {
 
-                    }
-                    break;
+                        }
+                        break;
+                    default:
+                        if (mPullToRefreshScrollView.isRefreshing()) {
+                            loadSuccess();
+                            mPullToRefreshScrollView.onRefreshComplete();
+                        }
+                        try {
+                            if (!StringUtils.isEmpty(message) && StringUtils.isInclude(message, "会话已断开")) {
+                                returnLogin();
+                                return;
+                            }
+                            JsonValidator validator = new JsonValidator();
+                            if (validator.validate(message)) {
+                                JSONObject object1 = JSON.parseObject(message);
+                                Crouton.makeText(ct, StringUtils.isEmpty(object1.getString("exceptionInfo")) ? "程序错误" : object1.getString("exceptionInfo"));
+                            } else {
+                                Crouton.makeText(ct, StringUtils.isEmpty(message) ? "程序错误" : StringUtils.getChinese(message));
+                            }
+                        } catch (Exception e) {
+
+                        }
+                        break;
+                }
+            } catch (Exception e) {
             }
         }
     };
@@ -290,15 +297,15 @@ public class OAActivity extends BaseActivity implements View.OnClickListener, Wo
             if (data == null) return;
             Employees entity = data.getParcelableExtra("data");
             if (entity == null) return;
-            //TODO 选择下属后返回
             String otherName = entity.getEm_name();
             if (!StringUtils.isEmpty(otherName)) {
                 JSONArray array = new JSONArray();
                 for (int i = 0; i < otherArray.size(); i++) {
                     JSONObject object = otherArray.getJSONObject(i);
-                    String name = "," + (object.containsKey("handler") ? object.getString("handler") :
-                            (object.containsKey("recordman") ? object.getString("recordman") :
-                                    (object.containsKey("visitman") ? object.getString("visitman") : ""))) + ",";
+                    String name = "," + getString(object, "handler") +
+                            getString(object, "recordman") +
+                            getString(object, "visitman") +
+                            getString(object, "mp_recorder") + ",";
                     if (StringUtils.isEmpty(otherName)//没有选择下属
                             || getIsDecorat(name, "," + otherName + ",")) {
                         array.add(object);
@@ -385,10 +392,15 @@ public class OAActivity extends BaseActivity implements View.OnClickListener, Wo
                     intent.putExtra("data", object.toString());
                     startActivityForResult(intent, isMe ? 0x20 : 0x21);
                 } else if (adapter.isOutplan(object)) {
-                    //TODO 发布版本关闭
                     String actdate = adapter.getJSONString(object, "mpd_actdate");
                     String outdate = adapter.getJSONString(object, "mpd_outdate");
-                    if (StringUtils.isEmpty(actdate) || StringUtils.isEmpty(outdate)) return;
+                    if (StringUtils.isEmpty(actdate) || StringUtils.isEmpty(outdate)) {
+                        try {
+                            Crouton.makeText(ct, "当前外勤计划未完成，不能创建拜访报告");
+                        } catch (Exception e) {
+                        }
+                        return;
+                    }
                     intent = new Intent(activity, VisitReportAddActivity.class);
                     intent.putExtra("type", 3);
                     intent.putExtra("isMe", isMe);//可以提交拜访报告
@@ -943,6 +955,10 @@ public class OAActivity extends BaseActivity implements View.OnClickListener, Wo
         return super.dispatchTouchEvent(ev);
     }
 
+    private String getString(JSONObject object, String key) {
+        return object == null ? "" : (object.containsKey(key) ? object.getString(key) : "");
+    }
+
     public interface OnTaskChangeListener {
         void onChange(Set<Integer> in);
     }

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

@@ -240,11 +240,13 @@ public class WorkActivity extends BaseActivity implements View.OnClickListener,
 
     @Override
     public void showToast(String message, int colorId) {
+        Log.i("gongpengming", "message=" + message);
         Crouton.showToast(ct, message, colorId);
     }
 
     @Override
     public void showToast(int reId, int colorId) {
+        Log.i("gongpengming", "message=" + getString(reId));
         Crouton.showToast(ct, reId, colorId);
     }
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/adapter/MissionAdapter.java

@@ -1,24 +1,22 @@
 package com.xzjmyk.pm.activity.ui.erp.adapter;
 
 import android.support.v7.widget.RecyclerView;
-import android.text.Editable;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.CompoundButton;
-import android.widget.EditText;
 import android.widget.RadioButton;
 import android.widget.TextView;
 
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
-import com.xzjmyk.pm.activity.ui.erp.entity.EditChangeListener;
 import com.xzjmyk.pm.activity.ui.erp.model.MissionModel;
 import com.xzjmyk.pm.activity.ui.erp.util.ListUtils;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 import com.xzjmyk.pm.activity.util.BaiduMapUtil;
 
+import java.text.DecimalFormat;
 import java.util.List;
 
 /**
@@ -66,14 +64,19 @@ public class MissionAdapter extends RecyclerView.Adapter<MissionAdapter.BaseView
     private void initView(BaseViewHolder holder, int position) {
         MissionModel entity = models.get(position);
         if (entity == null) return;
+//        Log.i("gongpengming", "entity.getCompanyName()=" + entity.getCompanyName());
+//        Log.i("gongpengming", "entity.getDistance()=" + entity.getDistance());
+//        if (entity.getLatLng() != null) {
+//            Log.i("gongpengming", "latitude=" + entity.getLatLng().latitude);
+//            Log.i("gongpengming", "longitude=" + entity.getLatLng().longitude);
+//        }
         holder.item_title_tv.setText("目的地 " + (position + 1));
         holder.item_delete_tv.setVisibility((entity.getStatus() != 1 && position != 0) ? View.VISIBLE : View.GONE);
         if (entity.getDistance() != 0)
-            holder.item_length_tv.setText(entity.getDistance() + "米");
+            holder.item_length_tv.setText(getKm(entity.getDistance()) + "km");
         else holder.item_length_tv.setText("");
         if (entity.getLatLng() != null) {
-            holder.item_long_tv.setText(BaiduMapUtil.getInstence().
-                    getDistance(entity.getLatLng()) + "米");
+            holder.item_long_tv.setText(getKm(BaiduMapUtil.getInstence().getDistance(entity.getLatLng())) + "km");
         } else {
             holder.item_long_tv.setText("");
         }
@@ -142,14 +145,21 @@ public class MissionAdapter extends RecyclerView.Adapter<MissionAdapter.BaseView
                     onitemClickListener.click(position, models.get(position), holder.item_reckontime_tv);
             }
         });
-        holder.item_remark_tv.addTextChangedListener(new EditChangeListener() {
+        holder.item_remark_tv.setOnClickListener(new View.OnClickListener() {
             @Override
-            public void afterTextChanged(Editable editable) {
-                String strInput = editable.toString();
-                if (!StringUtils.isEmpty(strInput))
-                    models.get(position).setRemark(strInput);
+            public void onClick(View view) {
+                if (onitemClickListener != null)
+                    onitemClickListener.click(position, models.get(position), holder.item_remark_tv);
             }
         });
+//        addTextChangedListener(new EditChangeListener() {
+//            @Override
+//            public void afterTextChanged(Editable editable) {
+//                String strInput = editable.toString();
+//                if (!StringUtils.isEmpty(strInput))
+//                    models.get(position).setRemark(strInput);
+//            }
+//        });
         holder.item_half_rb.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
             @Override
             public void onCheckedChanged(CompoundButton compoundButton, boolean b) {
@@ -179,8 +189,8 @@ public class MissionAdapter extends RecyclerView.Adapter<MissionAdapter.BaseView
                 item_location_tv,//创建地点
                 item_time_tv,//创建时间
                 item_long_tv,
-                item_company_tv;//公司名称
-        EditText item_remark_tv;
+                item_company_tv, //公司名称
+                item_remark_tv;
         RadioButton item_half_rb, item_all_rb;
 
         public BaseViewHolder(View itemView) {
@@ -196,7 +206,7 @@ public class MissionAdapter extends RecyclerView.Adapter<MissionAdapter.BaseView
             item_location_tv = (TextView) itemView.findViewById(R.id.item_location_tv);
             item_time_tv = (TextView) itemView.findViewById(R.id.item_time_tv);
             item_long_tv = (TextView) itemView.findViewById(R.id.item_long_tv);
-            item_remark_tv = (EditText) itemView.findViewById(R.id.item_remark_tv);
+            item_remark_tv = (TextView) itemView.findViewById(R.id.item_remark_tv);
             item_half_rb = (RadioButton) itemView.findViewById(R.id.item_half_rb);
             item_all_rb = (RadioButton) itemView.findViewById(R.id.item_all_rb);
         }
@@ -207,6 +217,28 @@ public class MissionAdapter extends RecyclerView.Adapter<MissionAdapter.BaseView
         return str;
     }
 
+    private String getKm(double dis) {
+        try {
+            return getKm(String.valueOf(dis));
+        } catch (Exception e) {
+            return String.valueOf(0);
+        }
+    }
+
+    private String getKm(String dis) {
+        if (StringUtils.isEmpty(dis)) return String.valueOf(0);
+        try {
+            DecimalFormat fnum = new DecimalFormat("##0.00");
+            String dd = fnum.format(Float.valueOf(dis) / 1000);
+            return dd;
+        } catch (ClassCastException e) {
+            return String.valueOf(0);
+        } catch (Exception e) {
+            return String.valueOf(0);
+        }
+
+    }
+
     public interface OnitemClickListener {
         void click(int position, MissionModel model, View view);
     }

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/adapter/OAListAdapter.java

@@ -87,12 +87,12 @@ public class OAListAdapter extends BaseAdapter {
         drawable.setBounds(0, 0, DisplayUtil.dip2px(ct, 13), DisplayUtil.dip2px(ct, 13));
         if (isTask(object)) {
 //            holder.title_tv.setVisibility(View.GONE);
-            holder.title_tv.setText("");
+            holder.title_tv.setText(getJSONString(object, "startdate"));
             holder.doit_img.setVisibility(View.GONE);
             holder.addr_time_tv.setCompoundDrawables(null, null, null, null);
             holder.name_remak_tv.setText(getJSONString(object, "name"));
             holder.status_tv.setText(getJSONString(object, "status"));
-            holder.addr_time_tv.setText(getJSONString(object, "startdate"));
+            holder.addr_time_tv.setText(getJSONString(object, "enddate"));
             holder.object_tv.setText(getJSONString(object, "handler"));
         } else if (isVisit(object)) {
             holder.addr_time_tv.setCompoundDrawables(drawable, null, null, null);
@@ -156,7 +156,9 @@ public class OAListAdapter extends BaseAdapter {
             String actdate = getJSONString(object, "mpd_actdate");
             String outdate = getJSONString(object, "mpd_outdate");
             holder.addr_time_tv.setText(actdate);//实际到达时间
-            holder.object_tv.setText(outdate);//实际离开时间
+            if (!isMe)
+                holder.object_tv.setText(getJSONString(object, "mp_recorder"));//实际离开时间
+            else holder.object_tv.setText("");//实际离开时间
             //当天未完成的不显示任何图标，状态为未完成，超过拜访时间，即第二天0点，添加图标 未完成。
             holder.status_tv.setText("");
             if (isMoreToday) {

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/presenter/WorkPresenter.java

@@ -67,7 +67,6 @@ public class WorkPresenter implements HttpHandler.OnResultListener, IWorkPresent
     public WorkPresenter(IWorkView iWorkView, String macAddress) {
         this.iWorkView = iWorkView;
         this.macAddress = macAddress;
-        getMacByNet();
     }
 
     private void loadLog(ArrayList<WorkModel> models, long time) {
@@ -480,6 +479,9 @@ public class WorkPresenter implements HttpHandler.OnResultListener, IWorkPresent
     public void start() {
         MyApplication.getInstance().getBdLocationHelper().requestLocation();
         loadWorkData(System.currentTimeMillis());
+        if (MyApplication.getInstance().isNetworkActive()) {
+            getMacByNet();
+        }
     }
 
     public void loadWorkData(long time) {
@@ -487,6 +489,7 @@ public class WorkPresenter implements HttpHandler.OnResultListener, IWorkPresent
             iWorkView.showToast(R.string.networks_out, R.color.load_error);
             return;
         }
+
         if (iWorkView != null)
             iWorkView.showLoading();
         Map<String, Object> param = new HashMap<>();

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/util/attendance/AutoErpSigninUitl.java

@@ -15,12 +15,14 @@ import com.xzjmyk.pm.activity.AppConfig;
 import com.xzjmyk.pm.activity.BdLocationHelper;
 import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
+import com.xzjmyk.pm.activity.db.dao.ErrorMagDao;
 import com.xzjmyk.pm.activity.db.dao.MissionDao;
 import com.xzjmyk.pm.activity.db.dao.WorkModelDao;
 import com.xzjmyk.pm.activity.ui.MainActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.MissionActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.OutSigninOKActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.WorkActivity;
+import com.xzjmyk.pm.activity.ui.erp.entity.ErrorEntity;
 import com.xzjmyk.pm.activity.ui.erp.model.MissionModel;
 import com.xzjmyk.pm.activity.ui.erp.model.WorkModel;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonInterface;
@@ -130,14 +132,25 @@ public class AutoErpSigninUitl implements HttpHandler.OnResultListener {
                 param, bundle, this);
     }
 
-
     //签到
     private void signinWork(Bundle bunder, String code) {
         Context ct = MyApplication.getInstance();
         Map<String, Object> param = new HashMap<>();
         Map<String, Object> form = new HashMap<>();
         form.put("cl_code", code);
-        form.put("cl_phone", MyApplication.getInstance().mLoginUser.getTelephone());
+        String phone = MyApplication.getInstance().mLoginUser.getTelephone();
+        if (StringUtils.isEmpty(phone)) {
+            try {
+                ErrorEntity bean = new ErrorEntity();
+                bean.setMsg("phone 为空");
+                bean.setTitle("自动打卡");
+                bean.setTime(TimeUtils.f_long_2_str(System.currentTimeMillis()));
+                ErrorMagDao.getInstance().insert(bean);
+            } catch (Exception e) {
+
+            }
+        }
+        form.put("cl_phone", phone);
         form.put("cl_emcode", getSharedPreferences(ct, "erp_username"));
         String emname = getSharedPreferences(ct, "erp_emname");
         if (StringUtils.isEmpty(emname)) {

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

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@color/me_menu_item_press" android:state_checked="true" />
+    <item android:drawable="@color/me_menu_item_press" android:state_pressed="true" />
+    <item android:drawable="@color/me_menu_item_press" android:state_selected="true" />
+
+    <item android:drawable="@color/oa_bg" />
+</selector>

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

@@ -47,11 +47,14 @@
             android:text="测试按钮" />
     </LinearLayout>
 
+
+
     <ListView
         android:id="@+id/listView"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_above="@id/bottom"
-        android:layout_below="@id/ll"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
+        android:layout_alignParentTop="true"
         android:divider="@color/item_line" />
 </RelativeLayout>

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

@@ -230,13 +230,14 @@
             android:layout_width="match_parent"
             android:layout_height="@dimen/line"
             android:background="@color/item_line" />
+
         <RelativeLayout
             android:id="@+id/uu_sport_step"
             style="@style/IMTbleLine_UP_Me"
             android:layout_marginTop="7dp"
             android:background="@drawable/selector_me_menu_item_bg"
-            android:visibility="gone"
-            >
+            android:visibility="gone">
+
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -257,6 +258,7 @@
                 android:background="@drawable/oa_next"
                 android:contentDescription="@string/app_name" />
         </RelativeLayout>
+
         <View
             android:layout_width="match_parent"
             android:layout_height="@dimen/line"

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

@@ -200,15 +200,15 @@
             android:textColor="@color/text_main"
             android:textSize="@dimen/text_main" />
 
-        <EditText
+        <TextView
             android:id="@+id/item_remark_tv"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignParentRight="true"
             android:layout_toRightOf="@+id/remark_tag"
-            android:background="@null"
+            android:drawableRight="@drawable/oa_next"
             android:gravity="center|right"
-            android:hint="@string/input_must"
+            android:hint="@string/select_must"
             android:minHeight="@dimen/misson_item_height"
             android:textColor="@color/text_hine"
             android:textSize="@dimen/text_hine" />

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

@@ -4,7 +4,7 @@
     android:layout_height="match_parent"
     android:descendantFocusability="blocksDescendants"
     android:padding="10dp"
-    android:background="@drawable/selector_me_menu_item_bg">
+    android:background="@drawable/selector_oa_itembg">
 
     <TextView
         android:id="@+id/status_tv"

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

@@ -306,4 +306,5 @@
     <color name="me_menu_item_press">#DFDEDE</color>
     <color name="bg_underlying">#ebe9e9</color>
     <color name="orange_text">#f17e21</color>
+    <color name="oa_bg">#EBE9E9</color>
 </resources>