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

WeiChat/src/main/java/com/xzjmyk/pm/activity/db/dao/SignAutoLogDao.java

@@ -80,11 +80,11 @@ public class SignAutoLogDao {
     }
 
     /**
-     * 当本地数据超过50条时开始删除 sendstatus = 1 的数据
+     * 删除 sendstatus = 1 的数据
      */
     public void cleanLocalData(){
-        List<SignAutoLogEntity> signAutoLogEntity = getAllDatas();
-        if (signAutoLogEntity.size() < 50) return;
+//        List<SignAutoLogEntity> signAutoLogEntity = getAllDatas();
+//        if (signAutoLogEntity.size() < 50) return;
         SQLiteDatabase stepDb = DatabaseManager.getInstance().openDatabase();
         stepDb.beginTransaction();
         stepDb.delete("SignAutoLog", "sendstatus=?", new String[]{"1"});

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/MainActivity.java

@@ -152,14 +152,14 @@ public class MainActivity extends BaseActivity implements NetWorkObservable.NetW
             
             if (msg.what == LOG_SEND_REQUEST){
                 String Log_Send_request = msg.getData().getString("result");
-                Log.i("Log_Send_request",Log_Send_request);
+                Log.i("Log_Send_request",Log_Send_request+"");
+                signAutoLogDao.cleanLocalData(); // 整理本地数据
                 try {
                     if (!StringUtils.isEmpty(Log_Send_request) &&
                             JSON.parseObject(Log_Send_request).containsKey("result") &&
-                            JSON.parseObject(Log_Send_request).getBoolean("result")){
+                            JSON.parseObject(Log_Send_request).getBoolean("result")) {
 
-                        signAutoLogDao.updateCurData(isendEntity); // 将上传的日志状态标为1
-                        signAutoLogDao.cleanLocalData(); // 整理本地数据
+                        signAutoLogDao.updateCurData(isendEntity); // 将上传的日志状态标为1 ，是本地数据保留本次上传的和产生的
                         Toast.makeText(ct,"日志上传成功",Toast.LENGTH_LONG);
                     }
                 } catch (Exception e) {

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

@@ -143,8 +143,9 @@ public class ContactFragment extends EasyFragment implements View.OnClickListene
     public boolean onOptionsItemSelected(MenuItem item) {
         if (item.getItemId() == R.id.search) {
             if (!isB2b) {
-//                if (CommonUtil.isReleaseVersion())
                 startActivity(new Intent(getActivity(), UserSearchActivity.class));
+//                if (CommonUtil.isReleaseVersion())
+//                    startActivity(new Intent(getActivity(), UserSearchActivity.class));
 //                else
 //                    startActivity(new Intent(getActivity(), AddContactsActivity.class));
 

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

@@ -15,6 +15,9 @@ import android.widget.ImageView;
 import android.widget.ListView;
 import android.widget.TextView;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.android.volley.Response;
 import com.android.volley.VolleyError;
 import com.handmark.pulltorefresh.library.PullToRefreshBase;
@@ -42,6 +45,10 @@ 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.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.ListUtils;
+import com.xzjmyk.pm.activity.ui.erp.util.OACheckUtil;
+import com.xzjmyk.pm.activity.ui.erp.util.oa.http.OAHttpHelper;
+import com.xzjmyk.pm.activity.ui.erp.util.oa.http.OnHttpResultListener;
+import com.xzjmyk.pm.activity.ui.erp.util.oa.http.Request;
 import com.xzjmyk.pm.activity.ui.message.ChatActivity;
 import com.xzjmyk.pm.activity.ui.message.NewFriendActivity;
 import com.xzjmyk.pm.activity.util.ProgressDialogUtil;
@@ -56,11 +63,12 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Created by 123 on 2016/4/7.
  */
-public class MyFriendActivity extends BaseActivity implements RecognizerDialogListener{
+public class MyFriendActivity extends BaseActivity implements RecognizerDialogListener {
     private PullToRefreshListView mPullToRefreshListView;
     private TextView mTextDialog;
     private SideBar mSideBar;
@@ -73,7 +81,7 @@ public class MyFriendActivity extends BaseActivity implements RecognizerDialogLi
     private Handler mHandler = new Handler();
     private boolean mNeedUpdate = true;
     private DBManager manager;
-    private boolean isPeculiar = false;
+    private boolean isPeculiar = false;//是否是常用联系人
     private ClearEditText search_edit;
     private ImageView voice_search;
 
@@ -225,7 +233,7 @@ public class MyFriendActivity extends BaseActivity implements RecognizerDialogLi
             }
         });
 
-        final VoiceToWord voice = new VoiceToWord(MyFriendActivity.this,"534e3fe2");
+        final VoiceToWord voice = new VoiceToWord(MyFriendActivity.this, "534e3fe2");
         voice.setRecognizerDialogListener(this);  //自己调用自己
         voice_search.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -263,6 +271,8 @@ public class MyFriendActivity extends BaseActivity implements RecognizerDialogLi
     List<Friend> friends;//临时变量
 
     private void loadData() {
+//        if (isPeculiar) loadContactByERpNet();
+//        else
         new Thread(new Runnable() {
             @Override
             public void run() {
@@ -283,26 +293,7 @@ public class MyFriendActivity extends BaseActivity implements RecognizerDialogLi
                 mHandler.postDelayed(new Runnable() {
                     @Override
                     public void run() {
-                        search_edit.setText("");
-                        mSortFriends.clear();
-                        allFriends.clear();
-                        mSideBar.clearExist();
-                        mSideBar.addExist("↑");
-                        mSideBar.addExist("↑");
-                        mSideBar.addExist("↑");
-                        if (friends != null && friends.size() > 0) {
-                            for (int i = 0; i < friends.size(); i++) {
-                                BaseSortModel<Friend> mode = new BaseSortModel<Friend>();
-                                mode.setBean(friends.get(i));
-                                setSortCondition(mode);
-                                mSortFriends.add(mode);
-                                allFriends.add(mode);
-                            }
-                            Collections.sort(mSortFriends, mBaseComparator);
-                            Collections.sort(allFriends, mBaseComparator);
-                        }
-                        mAdapter.notifyDataSetInvalidated();
-                        mPullToRefreshListView.onRefreshComplete();
+                        handlerFriends(friends);
                     }
                 }, delayTime);
             }
@@ -322,9 +313,81 @@ public class MyFriendActivity extends BaseActivity implements RecognizerDialogLi
         friend.setStatus(Friend.STATUS_UNKNOW);
     }
 
+
+    private void loadContactByERpNet() {
+        String url = "mobile/crm/getContactPerson.action";
+        Map<String, Object> param = new HashMap<>();
+        param.put("page", 1);
+//        param.put("condition", "1=1");
+        param.put("size", 1000);
+        Request request = new Request.Bulider()
+                .setWhat(0)
+                .setUrl(url)
+                .setParam(param)
+                .bulid();
+        OAHttpHelper.getInstance().requestHttp(request, new OnHttpResultListener() {
+            @Override
+            public void result(int what, boolean isJSON, String message, Bundle bundle) {
+                if (!isJSON) return;
+                JSONObject object = JSON.parseObject(message);
+                JSONArray listdata = object.getJSONArray("datalist");
+                if (ListUtils.isEmpty(listdata)) return;
+                JSONObject o = null;
+                Friend friend = null;
+                List<Friend> friends = new ArrayList<Friend>();
+                for (int i = 0; i < listdata.size(); i++) {
+                    o = listdata.getJSONObject(i);
+                    String name = OACheckUtil.getJson2Text(o, "ct_name");
+                    String ct_job = OACheckUtil.getJson2Text(o, "ct_job");
+                    String ct_cucode = OACheckUtil.getJson2Text(o, "ct_cucode");
+                    String ct_cuname = OACheckUtil.getJson2Text(o, "ct_cuname");
+                    friend = new Friend();
+                    friend.setEmCode(ct_cucode);
+                    friend.setRemarkName(ct_cuname);
+                    friend.setNickName(name);
+                    friend.setPosition(ct_job);
+                    friend.setUserId(Friend.ID_SYSTEM_MESSAGE);
+                    friends.add(friend);
+                }
+                handlerFriends(friends);
+            }
+
+            @Override
+            public void error(int what, String message, Bundle bundle) {
+
+            }
+        });
+
+    }
+
+
+    private void handlerFriends(List<Friend> friends) {
+        search_edit.setText("");
+        mSortFriends.clear();
+        allFriends.clear();
+        mSideBar.clearExist();
+        mSideBar.addExist("↑");
+        mSideBar.addExist("↑");
+        mSideBar.addExist("↑");
+        if (friends != null && friends.size() > 0) {
+            for (int i = 0; i < friends.size(); i++) {
+                BaseSortModel<Friend> mode = new BaseSortModel<Friend>();
+                mode.setBean(friends.get(i));
+                setSortCondition(mode);
+                mSortFriends.add(mode);
+                allFriends.add(mode);
+            }
+            Collections.sort(mSortFriends, mBaseComparator);
+            Collections.sort(allFriends, mBaseComparator);
+        }
+        this.friends = friends;
+        mAdapter.notifyDataSetInvalidated();
+        mPullToRefreshListView.onRefreshComplete();
+    }
+
     private void getFriendByErp(List<Friend> friends) {
         if (manager == null)
-            manager = new DBManager(MyApplication.getInstance());
+            manager = new DBManager();
         String master = CommonUtil.getSharedPreferences(ct, "erp_master");
         List<EmployeesEntity> emList = null;
         if (!StringUtils.isEmpty(master)) {

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

@@ -144,7 +144,7 @@ public class BusinessActivity extends BaseActivity implements View.OnClickListen
             case R.id.bt_create:
                 startActivity(new Intent(this, BusinessAddActivity.class));
 //                if (CommonUtil.isReleaseVersion())
-//
+//                    startActivity(new Intent(this, BusinessAddActivity.class));
 //                else
 //                    startActivity(new Intent(this, AddBusinessActivity.class));
                 break;

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

@@ -1069,8 +1069,8 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
                             break;*/
                         case 0:
                             startActivity(new Intent(ClientActivity.this, BusinessAddActivity.class));
-
 //                            if (CommonUtil.isReleaseVersion())
+//                                startActivity(new Intent(ClientActivity.this, BusinessAddActivity.class));
 //                            else
 //                                startActivity(new Intent(ClientActivity.this, AddBusinessActivity.class));
 

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

@@ -12,6 +12,8 @@ import android.widget.LinearLayout;
 import android.widget.PopupWindow;
 import android.widget.TextView;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.andreabaccega.widget.FormEditText;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
@@ -19,6 +21,8 @@ import com.nostra13.universalimageloader.core.ImageLoader;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.model.oa.SelectAimModel;
+import com.xzjmyk.pm.activity.ui.erp.util.JsonValidator;
+import com.xzjmyk.pm.activity.ui.erp.util.OACheckUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.PopupWindowHelper;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 import com.xzjmyk.pm.activity.ui.erp.util.oa.CommonInterface;
@@ -82,7 +86,7 @@ public class AddContactsActivity extends BaseActivity implements View.OnClickLis
                 }
                 break;
             case R.id.company_tv:
-                startActivityForResult(new Intent(ct, SelectAimActivity.class), SELECT_COMPANY);
+                startActivityForResult(new Intent(ct, SelectAimActivity.class).putExtra("type", 1), SELECT_COMPANY);
                 break;
             case R.id.card_img:
                 createImagePopWindow();
@@ -162,9 +166,15 @@ public class AddContactsActivity extends BaseActivity implements View.OnClickLis
             PopupWindowHelper.create(this, getString(R.string.perfect_company_name), entity, new PopupWindowHelper.OnClickListener() {
                 @Override
                 public void result(SelectAimModel model) {
-                    company_tv.setTag(model);
-                    company_tv.setText(model.getName());
-                    company_add_tv.setText(model.getAddress());
+                    if (new JsonValidator().validate(model.getObject())) {
+                        JSONObject object = JSON.parseObject(model.getObject());
+                        String code = OACheckUtil.getJson2Text(object, "CU_CODE");
+                        String name = OACheckUtil.getJson2Text(object, "CU_NAME");
+                        String address = OACheckUtil.getJson2Text(object, "CU_ADD1");
+                        company_tv.setText(StringUtils.isEmpty(name) ? "" : model.getName());
+                        company_add_tv.setText(StringUtils.isEmpty(address) ? "" : model.getAddress());
+                        company_tv.setTag(code);
+                    }
                 }
             });
         } else if (resultCode == Activity.RESULT_OK) {
@@ -194,7 +204,14 @@ public class AddContactsActivity extends BaseActivity implements View.OnClickLis
 
     @Override
     public void result(int what, boolean isJSON, String message, Bundle bundle) {
-
+        if (isJSON) {
+            switch (what) {
+                case CommonInterface.ADD_CONTACT:
+                    ToastUtil.showToast(ct, R.string.save_success);
+                    //TODO 保存成功后
+                    break;
+            }
+        }
     }
 
     @Override

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

@@ -119,7 +119,7 @@ public class AddVisitReportActivity extends OABaseActivity implements IAddVisitR
     @Override
     public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
         AddVisitReportActivity.this.position = position;
-        Intent intent = new Intent(ct, SelectRemarkActivity.class);
+        Intent intent = new Intent(ct, SelectRemarkActivity.class).putExtra("isContact", true).putExtra("cuname", presenter.getCuName());
         startActivityForResult(intent, SELECT_CONTACT);
     }
 

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

@@ -42,7 +42,7 @@ public class SelectRemarkActivity extends BaseActivity implements OnHttpResultLi
     private RecyclerView recyclerview;
     private List<Bean> beanList;
     private RecycleAdapter adapter;
-    private boolean isContact=false;
+    private boolean isRemark = false;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -135,12 +135,12 @@ public class SelectRemarkActivity extends BaseActivity implements OnHttpResultLi
     }
 
     private void initData() {
-        isContact=getIntent() == null || !getIntent().getBooleanExtra("isContact", false);
-        if (isContact) {
+        isRemark = getIntent() == null || !getIntent().getBooleanExtra("isContact", false);
+        if (isRemark) {
             loadLocalData();
             loadBusinessRemark();
         } else {
-            //TODO 获取联系人
+            loadContact(getIntent().getStringExtra("cuname"));
         }
     }
 
@@ -172,6 +172,21 @@ public class SelectRemarkActivity extends BaseActivity implements OnHttpResultLi
         OAHttpHelper.getInstance().requestHttp(request, this);
     }
 
+    private void loadContact(String cuName) {
+        progressDialog.show();
+        String url = "mobile/crm/getContactPerson.action";
+        Map<String, Object> param = new HashMap<>();
+        param.put("page", 1);
+        if (!StringUtils.isEmpty(cuName))
+            param.put("condition", "ct_cuname='" + cuName + "'");
+        param.put("size", 1000);
+        Request request = new Request.Bulider()
+                .setWhat(0)
+                .setUrl(url)
+                .setParam(param)
+                .bulid();
+        OAHttpHelper.getInstance().requestHttp(request, this);
+    }
 
     private void handlerData(JSONArray array) {
         if (ListUtils.isEmpty(array)) return;

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

@@ -2,7 +2,6 @@ package com.xzjmyk.pm.activity.ui.erp.adapter.oa;
 
 import android.text.Editable;
 import android.view.LayoutInflater;
-import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.BaseAdapter;
@@ -57,43 +56,34 @@ public class AddBusinessAdapter extends BaseAdapter {
     @Override
     public View getView(int position, View convertView, ViewGroup parent) {
         final ViewHolder holder;
-        if (convertView == null) {
-            convertView = LayoutInflater.from(MyApplication.getInstance()).inflate(R.layout.item_business_contact, null);
-            holder = new ViewHolder();
-            holder.name_et = (EditText) convertView.findViewById(R.id.company_tv);
-            holder.phone_et = (EditText) convertView.findViewById(R.id.company_add_tv);
-            holder.item_tv = (TextView) convertView.findViewById(R.id.item);
-            holder.delete_tv = (TextView) convertView.findViewById(R.id.delete_tv);
-            holder.name_et.setTag(position);
-            holder.phone_et.setTag(position);
-            // 让ViewHolder持有一个TextWathcer，动态更新position来防治数据错乱；不能将position定义成final直接使用，必须动态更新
-            holder.textWatcher = new MyTextWatcher(position, true);
-            holder.name_et.addTextChangedListener(holder.textWatcher);
-            holder.phone_et.addTextChangedListener(holder.textWatcher);
-            holder.name_et.setOnTouchListener(new View.OnTouchListener() {
-                @Override
-                public boolean onTouch(View v, MotionEvent event) {
-                    int position = (int) v.getTag();
-                    holder.updateStatus(position, v.getId() == R.id.name_et);
-                    return false;
-                }
-            });
-            holder.phone_et.setOnTouchListener(new View.OnTouchListener() {
-                @Override
-                public boolean onTouch(View v, MotionEvent event) {
-                    int position = (int) v.getTag();
-                    holder.updateStatus(position, v.getId() == R.id.name_et);
-                    return false;
-                }
-            });
-            convertView.setTag(holder);
-        } else {
-            holder = (ViewHolder) convertView.getTag();
-        }
-        Contact contact = contacts.get(position);
+        final Contact contact = contacts.get(position);
+        convertView = LayoutInflater.from(MyApplication.getInstance()).inflate(R.layout.item_business_contact, null);
+        holder = new ViewHolder();
+        holder.name_et = (EditText) convertView.findViewById(R.id.company_tv);
+        holder.phone_et = (EditText) convertView.findViewById(R.id.company_add_tv);
+        holder.item_tv = (TextView) convertView.findViewById(R.id.item);
+        holder.delete_tv = (TextView) convertView.findViewById(R.id.delete_tv);
         holder.item_tv.setText(MyApplication.getInstance().getString(R.string.common_Contact_person) + (position + 1));
         holder.name_et.setText(StringUtils.isEmpty(contact.name) ? "" : contact.name);
         holder.phone_et.setText(StringUtils.isEmpty(contact.phone) ? "" : contact.phone);
+        holder.name_et.addTextChangedListener(new EditChangeListener() {
+            @Override
+            public void afterTextChanged(Editable s) {
+                contact.setName(s.toString());
+            }
+        });
+        holder.phone_et.addTextChangedListener(new EditChangeListener() {
+            @Override
+            public void afterTextChanged(Editable s) {
+                contact.setPhone(s.toString());
+            }
+        });
+        holder.delete_tv.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+
+            }
+        });
         return convertView;
     }
 
@@ -102,37 +92,9 @@ public class AddBusinessAdapter extends BaseAdapter {
         EditText phone_et;
         TextView item_tv;
         TextView delete_tv;
-        MyTextWatcher textWatcher;
-
-        public void updateStatus(int position, boolean isName) {
-            textWatcher.updateStatus(position, isName);
-        }
     }
 
 
-    class MyTextWatcher extends EditChangeListener {
-        //由于TextWatcher的afterTextChanged中拿不到对应的position值，所以自己创建一个子类
-        private int mPosition;
-        private boolean isName;
-
-        public MyTextWatcher(int position, boolean isName) {
-            updateStatus(position, isName);
-        }
-
-        public void updateStatus(int position, boolean isName) {
-            mPosition = position;
-            this.isName = isName;
-        }
-
-        @Override
-        public void afterTextChanged(Editable s) {
-            if (this.isName)
-                contacts.get(mPosition).setName(s.toString());
-            else
-                contacts.get(mPosition).setPhone(s.toString());
-        }
-    }
-
     public static class Contact {
         public String name;
         public String phone;

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

@@ -78,6 +78,12 @@ public class AddVisitReportPresenter implements OnHttpResultListener {
         getIdByNet(bundle);
     }
 
+    public String getCuName() {
+        if (client == null) return "";
+        if (StringUtils.isEmpty(client.name)) return "";
+        return client.name;
+    }
+
     private void getIdByNet(Bundle bundle) {
         if (isB2b) return;
         Map<String, Object> param = new HashMap<>();

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

@@ -60,6 +60,7 @@ public class SelectAimPresenter implements OnHttpResultListener {
     public void start(int type) {
         isB2b = ApiUtils.getApiModel() instanceof ApiPlatform;
         if (type == 1 && !isB2b) {
+            iSelectAim.setTitle(MyApplication.getInstance().getString(R.string.select_client));
             loadCustomerData();
         } else {
             loadOutAddress();

WeiChat/src/main/java/com/xzjmyk/pm/activity/view/OACalendarView.java

@@ -8,7 +8,6 @@ import android.util.AttributeSet;
 import android.view.MotionEvent;
 import android.view.View;
 
-import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 import com.xzjmyk.pm.activity.util.DisplayUtil;
 
@@ -35,7 +34,7 @@ public class OACalendarView extends View implements View.OnTouchListener {
     //装饰物 decorat
     private String decoratDays;
     private int maxDay;//当月有多少天
-    private int[] workWeeks={2,3,4,5,6};
+    private int[] workWeeks = {2, 3, 4, 5, 6};
 
 
     private Calendar calendar;
@@ -313,15 +312,15 @@ public class OACalendarView extends View implements View.OnTouchListener {
     }
 
     public Date getDownDate() {
-        int day= date[downIndex];
-        Calendar c=Calendar.getInstance();
+        int day = date[Math.min(downIndex, date.length - 1)];
+        Calendar c = Calendar.getInstance();
         c.setTime(curDate);
-        c.set(Calendar.DAY_OF_MONTH,day);
+        c.set(Calendar.DAY_OF_MONTH, day);
         return c.getTime();
     }
 
     public void setDownIndex(int day) {
-        this.downIndex = startIndex + day-1;
+        this.downIndex = Math.min(startIndex + day - 1, date.length - 1);
         invalidate();
     }
 

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

@@ -26,7 +26,8 @@
                 style="@style/item_menu_input"
                 android:layout_toRightOf="@id/date_tag"
                 android:drawablePadding="6dp"
-                android:hint="@string/common_select_not_must" />
+                android:hint="@string/common_select_not_must"
+                android:paddingRight="10dp" />
         </RelativeLayout>
 
 
@@ -91,7 +92,9 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/item_margin_top"
-            android:background="@color/me_menu_item_normal" />
+            android:background="@color/me_menu_item_normal"
+            android:divider="@color/item_line"
+            android:dividerHeight="@dimen/line" />
 
         <View
             android:layout_width="match_parent"

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

@@ -524,6 +524,7 @@
             android:id="@+id/test_rl"
             style="@style/IMTbleLine_UP_Me"
             android:layout_marginTop="7dp"
+            android:visibility="gone"
             android:background="@drawable/selector_me_menu_item_bg">
 
             <TextView

WeiChat/src/main/res/raw/versionconfiguration.properties

@@ -1,4 +1,4 @@
 
 #发布版本状态改为true,测试版本状态为false
 #release_version = true
-release_version = true
+release_version = false

WeiChat/src/main/res/values-zh-rCN/strings.xml

@@ -632,7 +632,6 @@
         <item>上班前4个小时</item>
         <item>上班前5个小时</item>
     </string-array>
-
     <string name="create_business">创建商机</string>
     <string name="describe">描述</string>
     <string name="visit_content">拜访内容</string>
@@ -643,6 +642,8 @@
     <string name="realtime_distance">实时距离</string>
     <string name="real_arrival_time">实际到达时间</string>
     <string name="recent_record_time">最近记录时间</string>
+
+    <string name="select_client">选择客户</string>
     <!--end by Bitliker-->
 
     <!--start by Arison-->

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

@@ -1537,6 +1537,18 @@
     <string name="app_start_log">APP启动</string>
     <string name="app_monitor_log">APP监控</string>
     <string name="app_outplan_running">APP外勤任务进行中</string>
+
+    <string name="create_business">创建商机</string>
+    <string name="describe">描述</string>
+    <string name="visit_content">拜访内容</string>
+    <string name="is_must_input">为必填项</string>
+    <string name="times">时段</string>
+    <string name="longs">距离</string>
+    <string name="create_addree">创建地点</string>
+    <string name="realtime_distance">实时距离</string>
+    <string name="real_arrival_time">实际到达时间</string>
+    <string name="recent_record_time">最近记录时间</string>
+    <string name="select_client">选择客户</string>
     <string name="work_business_find">商品查询</string>
     <string name="app_trytoget_outplan">获取外勤计划失败</string>
 </resources>