Merge remote-tracking branch 'origin/developer' into developer

# Conflicts:
#	WeiChat/src/main/AndroidManifest.xml

WeiChat/build.gradle

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

WeiChat/src/main/java/com/xzjmyk/pm/activity/ApplySubscribeActivity.java

@@ -10,9 +10,12 @@ import android.view.MenuItem;
 
 import com.andreabaccega.widget.FormEditText;
 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.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.util.ListUtils;
 import com.xzjmyk.pm.activity.ui.erp.util.ViewUtil;
 import com.xzjmyk.pm.activity.util.DateFormatUtil;
 import com.xzjmyk.pm.activity.view.crouton.Crouton;
@@ -24,6 +27,7 @@ import org.json.JSONObject;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -36,6 +40,10 @@ public class ApplySubscribeActivity extends BaseActivity {
 
     private FormEditText mSubscribeNameEt, mDataEt, mStatusEt, mSubscribePersonEt, mPostEt, mBranchEt, mReasonEt;
     private int mAsId;
+    private DBManager dbManager;
+
+    private String mEmCode,mEmName,mEmDepart,mEmPort;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -44,8 +52,10 @@ public class ApplySubscribeActivity extends BaseActivity {
 
         initView();
         initEvent();
+        initData();
     }
 
+
     private Handler mHandler = new Handler(){
         @Override
         public void handleMessage(Message msg) {
@@ -80,6 +90,7 @@ public class ApplySubscribeActivity extends BaseActivity {
                     String submitResult = msg.getData().getString("result");
                     Log.d("apply_subscrive_submit",submitResult);
                     Crouton.makeText(ApplySubscribeActivity.this,"申请提交成功",Style.CONFIRM).show();
+                    CommonUtil.imageToast(ApplySubscribeActivity.this,R.drawable.ic_apply_submit_success,"",2000);
                     break;
                 case Constants.APP_SOCKETIMEOUTEXCEPTION:
                     progressDialog.dismiss();
@@ -100,6 +111,8 @@ public class ApplySubscribeActivity extends BaseActivity {
         mReasonEt = (FormEditText) findViewById(R.id.apply_subscribe_reason_et);
 
         CommonUtil.getCommonId(this,"SUBSAPPLY_SEQ",mHandler,GET_AS_ID);
+
+        mEmCode = CommonUtil.getSharedPreferences(ct, "erp_username");
     }
 
     private void initEvent() {
@@ -107,6 +120,31 @@ public class ApplySubscribeActivity extends BaseActivity {
     }
 
 
+    private void initData() {
+        dbManager = new DBManager(ct);
+        List<EmployeesEntity> db = dbManager.select_getEmployee(
+                new String[]{CommonUtil.getSharedPreferences(ct, "erp_master"),
+                        CommonUtil.getSharedPreferences(ct, "erp_username")}
+                , "whichsys=? and em_code=? ");
+        if (!ListUtils.isEmpty(db)) {
+            for (EmployeesEntity model : db) {
+                Log.i(TAG, "initData:" + model.getEM_DEPART());
+                Log.i(TAG, "initData:" + model.getEM_POSITION());
+                Log.i(TAG, "initData:" + model.getCOMPANY());
+                Log.i(TAG, "initData:" +model.getEm_IMID()  );
+
+            }
+            mEmName = db.get(0).getEM_NAME();
+            mEmDepart = db.get(0).getEM_DEPART();
+            mEmPort = db.get(0).getEM_POSITION();
+        }
+
+        mDataEt.setText(DateFormatUtil.getStrDate4Date(new Date(), "yyyy-MM-dd"));
+        mStatusEt.setText("在录入");
+        mSubscribePersonEt.setText(mEmName);
+        mPostEt.setText(mEmPort);
+        mBranchEt.setText(mEmDepart);
+    }
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         getMenuInflater().inflate(R.menu.menu_apply_subscribe, menu);
@@ -118,7 +156,6 @@ public class ApplySubscribeActivity extends BaseActivity {
         switch (item.getItemId()) {
             case R.id.subscribe_apply:
 //                Crouton.makeText(this, "提交成功", Style.CONFIRM).show();
-                progressDialog.show();
                 CodeUtil.getInstance().getCode(ApplySubscribeActivity.this,
                         "SubsApply", new CodeUtil.OnCodeLinstener() {
                             @Override
@@ -155,6 +192,7 @@ public class ApplySubscribeActivity extends BaseActivity {
         if (mSubscribeNameEt.testValidity() && mDataEt.testValidity()
                 && mStatusEt.testValidity() && mSubscribePersonEt.testValidity()
                 && mPostEt.testValidity() && mBranchEt.testValidity()){
+            progressDialog.show();
             formStore =
                     "{\n" +
                             "\"id_\":" + mAsId
@@ -169,11 +207,11 @@ public class ApplySubscribeActivity extends BaseActivity {
                             + "\",\n" +
                             "\"statuscode_\":\"" +"ENTERING"
                             + "\",\n" +
-                            "\"empcode_\":\"" + ""
+                            "\"empcode_\":\"" + mEmCode
                             + "\",\n" +
-                            "\"empname_\":\"" + CommonUtil.getSharedPreferences(ct, "erp_username")
+                            "\"empname_\":\"" + mEmName
                             + "\",\n" +
-                            "\"empdep_\":\"" + ""
+                            "\"empdep_\":\"" + mEmDepart
                             + "\",\n" +
                             "\"num_id_\":\"" + ""
                             + "\",\n" +

WeiChat/src/main/java/com/xzjmyk/pm/activity/MySwipeMenuCreator.java

@@ -24,7 +24,7 @@ public class MySwipeMenuCreator implements SwipeMenuCreator {
             case 0:
 //                menu.removeMenuItem(deleteItem);
                 break;
-            case 1:
+            case -1:
                 SwipeMenuItem deleteItem = new SwipeMenuItem(mContext);
                 deleteItem.setBackground(new ColorDrawable(mContext.getResources().getColor(R.color.red)));
                 deleteItem.setTitleColor(mContext.getResources().getColor(R.color.white));

WeiChat/src/main/java/com/xzjmyk/pm/activity/adapter/MySubscriptionAdapter.java

@@ -8,29 +8,39 @@ import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.xzjmyk.pm.activity.R;
+import com.xzjmyk.pm.activity.bean.PersonalSubscriptionBean;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
- * Created by PROD on 2016/9/1.
+ * Created by RaoMeng on 2016/9/1.
  */
 public class MySubscriptionAdapter extends BaseAdapter {
     private Context mContext;
-    private List<String> mStrings;
+    private List<PersonalSubscriptionBean> mPersonalSubscriptionBeans;
+    private List<Integer> mImageIds;
 
-    public MySubscriptionAdapter(Context mContext, List<String> mStrings) {
+    public MySubscriptionAdapter(Context mContext, List<PersonalSubscriptionBean> mPersonalSubscriptionBeans) {
         this.mContext = mContext;
-        this.mStrings = mStrings;
+        this.mPersonalSubscriptionBeans = mPersonalSubscriptionBeans;
+
+        mImageIds = new ArrayList<>();
+        mImageIds.add(R.drawable.ic_subscription_icon1);
+        mImageIds.add(R.drawable.ic_subscription_icon2);
+        mImageIds.add(R.drawable.ic_subscription_icon3);
+        mImageIds.add(R.drawable.ic_subscription_icon4);
+        mImageIds.add(R.drawable.ic_subscription_icon5);
     }
 
     @Override
     public int getCount() {
-        return mStrings.size();
+        return mPersonalSubscriptionBeans.size();
     }
 
     @Override
     public Object getItem(int i) {
-        return mStrings.get(i);
+        return mPersonalSubscriptionBeans.get(i);
     }
 
     @Override
@@ -45,7 +55,7 @@ public class MySubscriptionAdapter extends BaseAdapter {
 
     @Override
     public int getItemViewType(int position) {
-        return position % 2;
+        return mPersonalSubscriptionBeans.get(position).getISAPPLED();
     }
 
     @Override
@@ -66,9 +76,16 @@ public class MySubscriptionAdapter extends BaseAdapter {
         int itemViewType = getItemViewType(i);
         if (itemViewType == 0){
             viewHolder.lockIv.setVisibility(View.VISIBLE);
-        }else if (itemViewType == 1){
+        }else if (itemViewType == -1){
             viewHolder.lockIv.setVisibility(View.GONE);
         }
+        viewHolder.subscribeIv.setImageResource(mImageIds.get(i % 5));
+        if ("private".equals(mPersonalSubscriptionBeans.get(i).getKIND())){
+            viewHolder.titleTv.setText(mPersonalSubscriptionBeans.get(i).getTITLE()+"私");
+        }else {
+            viewHolder.titleTv.setText(mPersonalSubscriptionBeans.get(i).getTITLE()+"公");
+        }
+        viewHolder.contentTv.setText("该订阅号属于"+mPersonalSubscriptionBeans.get(i).getTYPE()+"类订阅号");
         return view;
     }
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/bean/PersonalSubscriptionBean.java

@@ -0,0 +1,63 @@
+package com.xzjmyk.pm.activity.bean;
+
+/**
+ * Created by RaoMeng on 2016/9/20.
+ */
+public class PersonalSubscriptionBean {
+    private int NUM_ID;
+    private String TITLE;
+    private String KIND;
+    private String TYPE;
+    private int ISAPPLED;
+
+    public int getNUM_ID() {
+        return NUM_ID;
+    }
+
+    public void setNUM_ID(int NUM_ID) {
+        this.NUM_ID = NUM_ID;
+    }
+
+    public String getTITLE() {
+        return TITLE;
+    }
+
+    public void setTITLE(String TITLE) {
+        this.TITLE = TITLE;
+    }
+
+    public String getKIND() {
+        return KIND;
+    }
+
+    public void setKIND(String KIND) {
+        this.KIND = KIND;
+    }
+
+    public String getTYPE() {
+        return TYPE;
+    }
+
+    public void setTYPE(String TYPE) {
+        this.TYPE = TYPE;
+    }
+
+    public int getISAPPLED() {
+        return ISAPPLED;
+    }
+
+    public void setISAPPLED(int ISAPPLED) {
+        this.ISAPPLED = ISAPPLED;
+    }
+
+    @Override
+    public String toString() {
+        return "PersonalSubscriptionBean{" +
+                "NUM_ID=" + NUM_ID +
+                ", TITLE='" + TITLE + '\'' +
+                ", KIND='" + KIND + '\'' +
+                ", TYPE='" + TYPE + '\'' +
+                ", ISAPPLED=" + ISAPPLED +
+                '}';
+    }
+}

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

@@ -129,7 +129,7 @@ public class BusinessDetailActivty extends BaseActivity {
             @Override
             public void onTextChanged(CharSequence s, int start, int before, int count) {
                 if (!StringUtils.isEmpty(search_edit.getText().toString())) {
-                    mAdapter.getFilter().filter(search_edit.getText().toString());
+                    mAdapter.getFilter().filter(search_edit.getText().toString().trim());
                 } else {
                     mAdapter.getFilter().filter("");
                 }

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

@@ -297,7 +297,7 @@ public class BusinessLessActivity extends BaseActivity implements View.OnClickLi
                 loadLeader(2);
                 break;
             case R.id.tv_date:
-                showDateWheel(R.id.tv_date);
+               // showDateWheel(R.id.tv_date);
                 break;
             case R.id.tv_business_state:
                 loadJieDuan(5);

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

@@ -35,6 +35,7 @@ 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.LogUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
+import com.xzjmyk.pm.activity.ui.erp.view.EmptyLayout;
 import com.xzjmyk.pm.activity.view.ClearEditText;
 import com.xzjmyk.pm.activity.view.SmoothCheckBox;
 import com.xzjmyk.pm.activity.view.crouton.Crouton;
@@ -53,6 +54,8 @@ public class BusinessSelectCustomerActivity extends BaseActivity {
     private String code;
     @ViewInject(R.id.search_edit)
     private ClearEditText search_edit;
+    
+    private EmptyLayout mEmptyLayout;
 
     private String cu_code;
     private String cu_name;
@@ -75,6 +78,11 @@ public class BusinessSelectCustomerActivity extends BaseActivity {
     }
 
     private void initListener() {
+
+        mEmptyLayout = new EmptyLayout(this, mlist.getRefreshableView());
+        mEmptyLayout.setShowLoadingButton(false);
+        mEmptyLayout.setShowEmptyButton(false);
+        mEmptyLayout.setShowErrorButton(false);
         mlist.setMode(PullToRefreshBase.Mode.DISABLED);
         mlist.setOnRefreshListener(new PullToRefreshBase.OnRefreshListener2<ListView>() {
             @Override
@@ -93,13 +101,16 @@ public class BusinessSelectCustomerActivity extends BaseActivity {
                 BusinessSelectCustomerActivity.BussinessDetailAdapter.ViewHolder holder = (BussinessDetailAdapter.ViewHolder) view.getTag();
                 cu_code = holder.code;
                 cu_name = holder.tv_business_name.getText().toString();
-                final boolean flag = !mData.get(position - 1).isChecked;
+                final boolean flag = !mAdapter.getMdata().get(position - 1).isChecked;
                 Log.i(TAG, "onClick:" + position + " check:" + !flag);
+                for (Business model : mAdapter.getMdata()) {
+                    model.setIsChecked(false);
+                }
+                //把源数据清空
                 for (Business model : mData) {
                     model.setIsChecked(false);
                 }
-
-                mData.get(position - 1).setIsChecked(flag);
+                mAdapter.getMdata().get(position - 1).setIsChecked(flag);
                 mHandler.postDelayed(new Runnable() {
                     @Override
                     public void run() {
@@ -117,7 +128,11 @@ public class BusinessSelectCustomerActivity extends BaseActivity {
 
             @Override
             public void onTextChanged(CharSequence s, int start, int before, int count) {
-                
+                if (!StringUtils.isEmpty(search_edit.getText().toString())) {
+                    mAdapter.getFilter().filter(search_edit.getText().toString());
+                } else {
+                    mAdapter.getFilter().filter("");
+                }
             }
 
             @Override
@@ -162,6 +177,11 @@ public class BusinessSelectCustomerActivity extends BaseActivity {
         private Context ct;
         private ArrayList<Business> mdata = new ArrayList<>();
         private LayoutInflater inflater;
+        private String searchkeys;
+
+        public ArrayList<Business> getMdata() {
+            return mdata;
+        }
 
         public BussinessDetailAdapter(Context ct, ArrayList<Business> data) {
             this.ct = ct;
@@ -218,15 +238,64 @@ public class BusinessSelectCustomerActivity extends BaseActivity {
             holder.cb_left.setEnabled(false);
             holder.cb_left.setClickable(false);
             holder.code=mdata.get(position).getCode();
-            holder.tv_business_name.setText(mdata.get(position).getName());
             holder.cb_left.setChecked(mdata.get(position).isChecked(), mdata.get(position).isChecked());
-            holder.tv_business_leader.setText("负责人:"+mdata.get(position).getLeader());
+            
+            if (!StringUtils.isEmpty(searchkeys)){
+              //  holder.tv_business_name.setText(mdata.get(position).getName());
+
+                //holder.tv_business_leader.setText("负责人:"+mdata.get(position).getLeader());
+                CommonUtil.textSpanForStyle(holder.tv_business_name, mdata.get(position).getName(),
+                        searchkeys, ct.getResources().getColor(R.color.yellow));
+                CommonUtil.textSpanForStyle(holder.tv_business_leader, "负责人:"+mdata.get(position).getLeader(),
+                        searchkeys, ct.getResources().getColor(R.color.yellow));
+            }else{
+                holder.tv_business_name.setText(mdata.get(position).getName());
+
+                holder.tv_business_leader.setText("负责人:"+mdata.get(position).getLeader());
+            }
+         
             return convertView;
         }
 
         @Override
         public Filter getFilter() {
-            return null;
+          return   new Filter() {
+                @Override
+                protected FilterResults performFiltering(CharSequence constraint) {
+                    //过滤数据
+                    FilterResults searchResults = new FilterResults();
+
+                    if (constraint == null || constraint.length() == 0){
+                        
+                        searchResults.values=mData;
+                        searchResults.count=mData.size();
+                    }else{
+                        mdata=mData;
+                        ArrayList<Business> newArry=new ArrayList<Business>();
+                        for (int i=0;i<mdata.size();i++){
+                           Business model=mdata.get(i);
+                           if (model.getName().contains(constraint)||model.getLeader().contains(constraint)){
+                               newArry.add(model);
+                           }
+                        }
+
+                        searchResults.values=newArry;
+                        searchResults.count=newArry.size();
+                    }
+                    return searchResults;
+                }
+
+                @Override
+                protected void publishResults(CharSequence constraint, FilterResults results) {
+                    //装配数据
+                    mdata= (ArrayList<Business>) results.values;
+                    searchkeys=constraint.toString();
+                    if (mAdapter.getCount() == 0) {
+
+                    }
+                    notifyDataSetChanged();
+                }
+            };
         }
 
 
@@ -258,6 +327,10 @@ public class BusinessSelectCustomerActivity extends BaseActivity {
                    }
                     mAdapter = new BussinessDetailAdapter(ct, mData);
                     mlist.setAdapter(mAdapter);
+                    if (mAdapter.getCount()==0){
+                        mEmptyLayout.showEmpty();
+                        
+                    }
                     break;
                 case 2:
                     progressDialog.dismiss();

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

@@ -156,7 +156,7 @@ public class BusinessStateActivity extends BaseActivity implements View.OnClickL
             @Override
             public void onTextChanged(CharSequence s, int start, int before, int count) {
                 if (!StringUtils.isEmpty(search_edit.getText().toString())) {
-                    mAdapter.getFilter().filter(search_edit.getText().toString());
+                    mAdapter.getFilter().filter(search_edit.getText().toString().trim());
                 } else {
                     mAdapter.getFilter().filter("");
                 }
@@ -179,13 +179,13 @@ public class BusinessStateActivity extends BaseActivity implements View.OnClickL
             type = intent.getIntExtra("bt_type", 0);
         }
         if (type == 0) {
-            getSupportActionBar().setTitle("跟进");
+            getSupportActionBar().setTitle("商机跟进");
             ll_top_state.setVisibility(View.VISIBLE);
         } else if (type == 1) {
-            getSupportActionBar().setTitle("抢");
+            getSupportActionBar().setTitle("抢商机");
             ll_top_state.setVisibility(View.GONE);
         } else if (type == 2) {
-            getSupportActionBar().setTitle("分配");
+            getSupportActionBar().setTitle("商机分配");
             ll_top_state.setVisibility(View.GONE);
         }
     }
@@ -418,10 +418,10 @@ public class BusinessStateActivity extends BaseActivity implements View.OnClickL
                     int countb = JSON.parseObject(msg.getData().getString("result")).getInteger("countb");
                     int countc = JSON.parseObject(msg.getData().getString("result")).getInteger("countc");
                     int countd = JSON.parseObject(msg.getData().getString("result")).getInteger("countd");
-                    CommonUtil.textSpanForStyle(tv_unmanger, "未排日程 " + counta, String.valueOf(counta), ct.getResources().getColor(R.color.yellow_home));
-                    CommonUtil.textSpanForStyle(tv_manged, "已排日程 " + countb, String.valueOf(countb), ct.getResources().getColor(R.color.yellow_home));
-                    CommonUtil.textSpanForStyle(tv_timeout, "即将超时 " + countc, String.valueOf(countc), ct.getResources().getColor(R.color.yellow_home));
-                    CommonUtil.textSpanForStyle(tv_transtered, "已转客户 " + countd, String.valueOf(countd), ct.getResources().getColor(R.color.yellow_home));
+                    CommonUtil.textSpanForStyle(tv_unmanger, counta + "\n未排日程", String.valueOf(counta), ct.getResources().getColor(R.color.yellow_home));
+                    CommonUtil.textSpanForStyle(tv_manged, countb + "\n已排日程", String.valueOf(countb), ct.getResources().getColor(R.color.yellow_home));
+                    CommonUtil.textSpanForStyle(tv_timeout, countc + "\n即将超时", String.valueOf(countc), ct.getResources().getColor(R.color.yellow_home));
+                    CommonUtil.textSpanForStyle(tv_transtered, countd + "\n已转客户", String.valueOf(countd), ct.getResources().getColor(R.color.yellow_home));
                     JSONArray array = new JSONArray();
                     switch (business_state) {
                         case 0:

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

@@ -18,6 +18,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.andreabaccega.widget.FormEditText;
 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.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.DbfindListActivity;
@@ -27,12 +28,14 @@ import com.xzjmyk.pm.activity.ui.erp.util.Constants;
 import com.xzjmyk.pm.activity.ui.erp.util.LogUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 import com.xzjmyk.pm.activity.ui.erp.view.SingleDialog;
+import com.xzjmyk.pm.activity.util.DateFormatUtil;
 
 import org.json.JSONException;
 import org.json.JSONObject;
 
 import java.net.URLEncoder;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -197,8 +200,12 @@ public class CustomerAddActivity extends BaseActivity implements View.OnClickLis
                     && tv_cu_businesscode.testValidity() && tv_cu_currency.testValidity()
                     && tv_cu_taxrate.testValidity() && tv_cu_nichestep.testValidity()
                    ) {
+                //  
                 formStore = "{\n" +
                         " \"cu_id\":" + mCuId + ",\n" +
+                        " \"cu_recordman\":" + MyApplication.getInstance().mLoginUser.getNickName()+ ",\n" +
+                        " \"cu_recorddate\":" + DateFormatUtil.getStrDate4Date(new Date(),"yyyy-MM-dd HH:mm:ss")+ ",\n" +
+                        " \"cu_status\":" +"\"长期\""+ ",\n" +
                         " \"cu_arcode\":" +"\"\""+ ",\n" +
                         " \"cu_arname\":" + "\"\""+ ",\n" +
                         " \"cu_code\":\"" + CommonUtil.getNoMarkEditText(et_cu_code) + "\",\n" +
@@ -552,10 +559,9 @@ public class CustomerAddActivity extends BaseActivity implements View.OnClickLis
         params.put("which", "form");
         params.put("caller", "Customer!base");
         params.put("field", "cu_paymentscode");
-
+        params.put("pageSize",1000);
         LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
         headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
-
         ViewUtil.httpSendRequest(ct, url, params, mHandler, headers, PAY_METHODS, null, null, "post");
     }
 

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

@@ -85,7 +85,7 @@ public class CustomerListActivity extends BaseActivity implements View.OnClickLi
     private int falg = 0;//是否启用预录入客户
 
     private EmptyLayout mEmptyLayout;
-
+    private DBManager dbManager;
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -151,8 +151,7 @@ public class CustomerListActivity extends BaseActivity implements View.OnClickLi
     private void initData() {
         em_code = CommonUtil.getSharedPreferences(ct, "erp_username");
         sendHttpResquest(Constants.HTTP_SUCCESS_INIT, kind, page, 0, "");
-        DBManager dbManager = new DBManager(ct);
-        //查询数据库失败---------------
+        dbManager = new DBManager(ct);
         List<EmployeesEntity> db = dbManager.select_getEmployee(
                 new String[]{CommonUtil.getSharedPreferences(ct, "erp_master"),
                         CommonUtil.getSharedPreferences(ct, "erp_username")}
@@ -486,8 +485,9 @@ public class CustomerListActivity extends BaseActivity implements View.OnClickLi
             kind = 0;
             em_code = entity.getEm_code();
             tv_name.setText(entity.getEm_name());
-            tv_department.setText(entity.getEm_depart());
+            tv_department.setText(entity.getEm_depart() + "->");
             tv_position.setText(entity.getEm_position());
+            AvatarHelper.getInstance().displayAvatar(String.valueOf(entity.getEm_id()), iv_head, false);
             sendHttpResquest(Constants.HTTP_SUCCESS_INIT, kind, page, isSelected, em_code);
         }
     }

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

@@ -6,6 +6,7 @@ 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;
@@ -64,13 +65,14 @@ public class UserSelectActivity extends BaseActivity {
             switch (msg.what) {
                 case WHAT_LOAD:
                     JSONArray array = JSON.parseObject(message).getJSONArray("datas");//获取到数据
+                    Log.d("userMsg",array.toString());
                     if (array == null || array.size() <= 0) return;
                     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
+                    int imId;//em_department->em_post
                     JSONObject object = null;
                     for (int i = 0; i < array.size(); i++) {
                         object = array.getJSONObject(i);
@@ -78,12 +80,12 @@ public class UserSelectActivity extends BaseActivity {
                         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") : "";
+                        imId = object.containsKey("em_imid") ? object.getIntValue("em_imid") : 0;
                         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_id(imId);
                         entity.setEm_depart(company);
                         entity.setEm_position(position);
                         list.add(entity);

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

@@ -1,5 +1,8 @@
 package com.xzjmyk.pm.activity.ui.erp.fragment;
 
+import android.os.Handler;
+import android.os.Message;
+import android.util.Log;
 import android.view.Gravity;
 import android.view.View;
 import android.widget.LinearLayout;
@@ -15,11 +18,23 @@ import com.handmark.pulltorefresh.library.PullToRefreshScrollView;
 import com.xzjmyk.pm.activity.MySwipeMenuCreator;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.adapter.MySubscriptionAdapter;
+import com.xzjmyk.pm.activity.bean.PersonalSubscriptionBean;
+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.util.DisplayUtil;
 import com.xzjmyk.pm.activity.view.crouton.Crouton;
+import com.xzjmyk.pm.activity.view.crouton.Style;
+
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
 
 import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Created by PROD on 2016/9/5.
@@ -27,12 +42,17 @@ import java.util.List;
 public class SubscriptionMyFragment extends BaseFragment {
     private PullToRefreshScrollView mPullToRefreshScrollView;
     private SwipeMenuListView mSwipeMenuListView;
-    private List<String> mStrings = new ArrayList<>();
+    private List<PersonalSubscriptionBean> mPersonalSubscriptionBeans;
     private MySwipeMenuCreator mMySwipeMenuCreator;
     private MySubscriptionAdapter mMySubscriptionAdapter;
     private PopupWindow mCancleWindow;
     private int mStartSwipe;
     private int mEndSwipe;
+
+    private final static int GET_MY_SUBSCRIPTION = 12;
+    private final static int REMOVE_MY_SUBSCRIPTION = 13;
+
+    private int mCanclePosition;
     @Override
     protected int getLayout() {
         return R.layout.fragment_my_subscription;
@@ -40,13 +60,10 @@ public class SubscriptionMyFragment extends BaseFragment {
 
     @Override
     protected void initViews() {
-        for (int i = 0; i < 10; i++) {
-            mStrings.add("this is item "+i);
-        }
-
+        mPersonalSubscriptionBeans = new ArrayList<>();
         mPullToRefreshScrollView = (PullToRefreshScrollView) root.findViewById(R.id.my_subscription_ptrsv);
         mSwipeMenuListView = (SwipeMenuListView) root.findViewById(R.id.my_subscripton_smlv);
-        mMySubscriptionAdapter = new MySubscriptionAdapter(getActivity(),mStrings);
+        mMySubscriptionAdapter = new MySubscriptionAdapter(getActivity(),mPersonalSubscriptionBeans);
         mMySwipeMenuCreator = new MySwipeMenuCreator(getActivity());
 
     }
@@ -66,7 +83,7 @@ public class SubscriptionMyFragment extends BaseFragment {
             @Override
             public void onSwipeEnd(int position) {
                 mEndSwipe = position;
-                if ((mStartSwipe % 2) == 0) {
+                if (mPersonalSubscriptionBeans.get(mStartSwipe).getISAPPLED() == 0) {
                     mSwipeMenuListView.smoothCloseMenu();
                 }
 
@@ -74,7 +91,7 @@ public class SubscriptionMyFragment extends BaseFragment {
         });
         mSwipeMenuListView.setOnMenuItemClickListener(new SwipeMenuListView.OnMenuItemClickListener() {
             @Override
-            public boolean onMenuItemClick(int position, SwipeMenu menu, int index) {
+            public boolean onMenuItemClick(final int position, SwipeMenu menu, int index) {
                 View cancleView = View.inflate(getActivity(), R.layout.pop_cancle_my_subscribe, null);
                 TextView cancleTextView = (TextView) cancleView.findViewById(R.id.cancel_subscribe_cancle_tv);
                 TextView contineTextView = (TextView) cancleView.findViewById(R.id.cancel_subscribe_contine_tv);
@@ -83,6 +100,8 @@ public class SubscriptionMyFragment extends BaseFragment {
                     @Override
                     public void onClick(View v) {
                         Crouton.makeText(getActivity(), "取消成功", 0xff99cc00, 1500).show();
+                        mCanclePosition = position;
+                        sendRemoveRequest(mCanclePosition);
                         closeWarningPopupWindow();
                     }
                 });
@@ -113,21 +132,12 @@ public class SubscriptionMyFragment extends BaseFragment {
         mPullToRefreshScrollView.setOnRefreshListener(new PullToRefreshBase.OnRefreshListener2<ScrollView>() {
             @Override
             public void onPullDownToRefresh(PullToRefreshBase<ScrollView> refreshView) {
-                mStrings.clear();
-                for (int i = 0; i < 10; i++) {
-                    mStrings.add("this is item "+i);
-                }
-                mMySubscriptionAdapter.notifyDataSetChanged();
-
-                Toast.makeText(getActivity(), "refresh down success", Toast.LENGTH_SHORT).show();
-                mPullToRefreshScrollView.onRefreshComplete();
+                mPersonalSubscriptionBeans.clear();
+                sendSubscriptionRequest();
             }
 
             @Override
             public void onPullUpToRefresh(PullToRefreshBase<ScrollView> refreshView) {
-                mStrings.add("add item");
-                mMySubscriptionAdapter.notifyDataSetChanged();
-
                 Toast.makeText(getActivity(), "refresh up success", Toast.LENGTH_SHORT).show();
                 mPullToRefreshScrollView.onRefreshComplete();
             }
@@ -136,9 +146,87 @@ public class SubscriptionMyFragment extends BaseFragment {
 
     @Override
     protected void initDatas() {
+        sendSubscriptionRequest();
+    }
+
+    /**
+     * 获取当前用户的订阅号
+     */
+    private void sendSubscriptionRequest() {
+        String subsUrl = Constants.getAppBaseUrl(getActivity()) + "common/charts/getPersonalSubs.action";
+        Map<String, Object> params = new HashMap<>();
+        params.put("em_code", CommonUtil.getSharedPreferences(getActivity(),"erp_username"));
+
+        LinkedHashMap headers = new LinkedHashMap();
+        headers.put("Cookie","JSESSIONID=" + CommonUtil.getSharedPreferences(getActivity(),"sessionId"));
+        ViewUtil.httpSendRequest(getActivity(), subsUrl, params, mHandler, headers, GET_MY_SUBSCRIPTION, null, null, "post");
+    }
+
+    /**
+     * 取消订阅
+     */
+    private void sendRemoveRequest(int position) {
+        String subsUrl = Constants.getAppBaseUrl(getActivity()) + "common/charts/removeSubsMans.action";
+        Map<String, Object> params = new HashMap<>();
+        params.put("em_code", CommonUtil.getSharedPreferences(getActivity(),"erp_username"));
+        params.put("numIds", mPersonalSubscriptionBeans.get(position).getNUM_ID());
+
+        LinkedHashMap headers = new LinkedHashMap();
+        headers.put("Cookie","JSESSIONID=" + CommonUtil.getSharedPreferences(getActivity(),"sessionId"));
+        ViewUtil.httpSendRequest(getActivity(), subsUrl, params, mHandler, headers, REMOVE_MY_SUBSCRIPTION, null, null, "post");
 
     }
 
+
+    private Handler mHandler = new Handler(){
+        @Override
+        public void handleMessage(Message msg) {
+            switch (msg.what){
+                case GET_MY_SUBSCRIPTION:
+                    String resultJson = msg.getData().getString("result");
+                    Log.d("subscriptionResult",resultJson);
+                    try {
+                        JSONObject resultObject = new JSONObject(resultJson);
+                        JSONArray resultArray = resultObject.getJSONArray("datas");
+                        for (int i = 0; i < resultArray.length(); i++) {
+                            JSONObject currentObject = resultArray.getJSONObject(i);
+                            PersonalSubscriptionBean personalSubscriptionBean = new PersonalSubscriptionBean();
+                            personalSubscriptionBean.setNUM_ID(currentObject.getInt("NUM_ID"));
+                            personalSubscriptionBean.setTITLE(currentObject.getString("TITLE_"));
+                            personalSubscriptionBean.setKIND(currentObject.getString("KIND_"));
+                            personalSubscriptionBean.setTYPE(currentObject.getString("TYPE_"));
+                            personalSubscriptionBean.setISAPPLED(currentObject.getInt("ISAPPLIED_"));
+
+                            mPersonalSubscriptionBeans.add(personalSubscriptionBean);
+                        }
+                        mMySubscriptionAdapter.notifyDataSetChanged();
+                        Crouton.makeText(getActivity(),"刷新成功", Style.CONFIRM).show();
+                        if (mPullToRefreshScrollView.isRefreshing()){
+                            mPullToRefreshScrollView.onRefreshComplete();
+                        }
+                    } catch (JSONException e) {
+                        e.printStackTrace();
+                    }
+
+                    break;
+
+                case REMOVE_MY_SUBSCRIPTION:
+                    Crouton.makeText(getActivity(), "取消订阅成功", 0xff99cc00, 1500).show();
+                    mPersonalSubscriptionBeans.remove(mCanclePosition);
+                    mMySubscriptionAdapter.notifyDataSetChanged();
+                    break;
+
+                case Constants.APP_SOCKETIMEOUTEXCEPTION:
+                    Crouton.makeText(getActivity(), msg.getData().getString("result"), Style.CONFIRM).show();
+                    if (mPullToRefreshScrollView.isRefreshing()){
+                        mPullToRefreshScrollView.onRefreshComplete();
+                    }
+                    break;
+
+            }
+        }
+    };
+
     private void closeWarningPopupWindow() {
         if (mCancleWindow != null) {
             mCancleWindow.dismiss();

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

@@ -26,15 +26,19 @@ import android.text.SpannableStringBuilder;
 import android.text.TextUtils;
 import android.text.style.ForegroundColorSpan;
 import android.text.style.StyleSpan;
-import android.text.style.UnderlineSpan;
 import android.util.DisplayMetrics;
 import android.util.Log;
 import android.util.Patterns;
+import android.view.Gravity;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import com.andreabaccega.widget.FormEditText;
 import com.nostra13.universalimageloader.core.DisplayImageOptions;
 import com.nostra13.universalimageloader.core.assist.ImageScaleType;
+import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.Friend;
 import com.xzjmyk.pm.activity.bean.message.ChatMessage;
 import com.xzjmyk.pm.activity.bean.message.XmppMessage;
@@ -658,8 +662,8 @@ public class CommonUtil {
                     Spannable.SPAN_INCLUSIVE_INCLUSIVE);
 //            style.setSpan(new StrikethroughSpan(), m.start(), m.end(), 
 //                    Spannable.SPAN_INCLUSIVE_INCLUSIVE);
-            style.setSpan(new UnderlineSpan(), m.start(), m.end(),
-                    Spannable.SPAN_INCLUSIVE_INCLUSIVE);
+//            style.setSpan(new UnderlineSpan(), m.start(), m.end(),
+//                    Spannable.SPAN_INCLUSIVE_INCLUSIVE);
         }
         view.setText(style);
     }
@@ -785,4 +789,39 @@ public class CommonUtil {
         temp = removeStringMark(temp);
         return temp;
     }
+
+    /**
+     * 添加图片的toast
+     * @param context
+     * @param imageId 图片id
+     * @param content 文字内容
+     * @param duration 显示时长
+     */
+    public static void imageToast(Context context, int imageId, String content, int duration){
+        Toast toast = new Toast(context);
+        //显示的时间
+        toast.setDuration(duration);
+        //显示的位置
+        toast.setGravity(Gravity.BOTTOM, 0, 300);
+
+        //自定义toast布局
+        LinearLayout toastLayout = new LinearLayout(context);
+        toastLayout.setGravity(Gravity.CENTER_VERTICAL);
+        toastLayout.setOrientation(LinearLayout.HORIZONTAL);
+
+        //添加ImageView
+        ImageView toastImage = new ImageView(context);
+        toastImage.setImageResource(imageId);
+        toastLayout.addView(toastImage);
+
+        //添加TextView
+        TextView toastText = new TextView(context);
+        toastText.setBackgroundColor(context.getResources().getColor(R.color.toast_bg));
+        toastText.setText(content);
+        toastLayout.addView(toastText);
+
+        toastLayout.setBackgroundColor(context.getResources().getColor(R.color.toast_bg));
+        toast.setView(toastLayout);
+        toast.show();
+    }
 }

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

@@ -2,57 +2,63 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     style="@style/crm_ll_card"
-    android:layout_height="wrap_content"
+    android:layout_height="match_parent"
     android:background="@color/white"
     tools:context="com.xzjmyk.pm.activity.ui.erp.activity.crm.BusinessLessActivity">
 
-    <TextView
-        android:text="处理结果:"
-        android:layout_margin="10dp"
-        style="@style/TextView_Basic"></TextView>
+    <LinearLayout
+        android:id="@+id/ll_result"
+        style="@style/LinearLayout_horizontal">
 
-    <EditText
-        android:id="@+id/et_remark"
-        android:layout_width="match_parent"
-        android:layout_height="120dp"
-        android:gravity="left|top"
-        android:layout_marginLeft="10dp"
-        android:layout_marginRight="10dp"
-        android:background="@drawable/shape_from_edit" />
+        <TextView
+            style="@style/TextView_Basic"
+            android:layout_margin="10dp"
+            android:text="处理结果:"></TextView>
+
+        <EditText
+            android:id="@+id/et_remark"
+            android:layout_width="260dp"
+            android:layout_height="120dp"
+            android:layout_margin="10dp"
+            android:padding="5dp"
+            android:background="@drawable/shape_from_edit"
+            android:gravity="left|top" />
+    </LinearLayout>
 
     <LinearLayout
         android:id="@+id/ll_leader"
         style="@style/LinearLayout_horizontal">
 
         <TextView
-            android:text="直属领导:"
+            style="@style/TextView_Basic"
             android:layout_margin="10dp"
-            style="@style/TextView_Basic" />
+            android:text="直属领导:" />
+
         <TextView
+            android:id="@+id/tv_leader"
+            style="@style/TextView_Basic"
+            android:layout_width="260dp"
+            android:layout_margin="10dp"
             android:background="@drawable/shape_from_edit"
             android:drawableRight="@drawable/nav_icon_search_default"
-            android:layout_margin="10dp"
-            android:layout_width="260dp"
-            android:padding="5dp"
-            style="@style/TextView_Basic"
-            android:id="@+id/tv_leader" />
+            android:padding="5dp" />
     </LinearLayout>
 
     <LinearLayout style="@style/LinearLayout_horizontal">
 
         <TextView
-            android:text="处理时间:"
+            style="@style/TextView_Basic"
             android:layout_margin="10dp"
-            style="@style/TextView_Basic" />
+            android:text="处理时间:" />
 
         <TextView
+            android:id="@+id/tv_date"
+            style="@style/TextView_Basic"
+            android:layout_width="260dp"
+            android:layout_margin="10dp"
             android:background="@drawable/shape_from_edit"
             android:drawableRight="@drawable/nav_icon_search_default"
-            android:layout_margin="10dp"
-            android:layout_width="260dp"
-            android:padding="5dp"
-            style="@style/TextView_Basic"
-            android:id="@+id/tv_date" />
+            android:padding="5dp" />
     </LinearLayout>
 
     <LinearLayout
@@ -60,19 +66,19 @@
         style="@style/LinearLayout_horizontal">
 
         <TextView
-            android:text="商机阶段:"
+            style="@style/TextView_Basic"
             android:layout_margin="10dp"
-            style="@style/TextView_Basic" />
+            android:text="商机阶段:" />
 
         <TextView
             android:id="@+id/tv_business_state"
-            android:text="未分配"
+            style="@style/TextView_Basic"
+            android:layout_width="260dp"
+            android:layout_margin="10dp"
             android:background="@drawable/shape_from_edit"
             android:drawableRight="@drawable/nav_icon_search_default"
-            android:layout_margin="10dp"
-            android:layout_width="260dp"
             android:padding="5dp"
-            style="@style/TextView_Basic" />
+            android:text="未分配" />
     </LinearLayout>
 </LinearLayout>
 

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

@@ -65,7 +65,7 @@
                 style="@style/form_relative_right_text"
                 android:hint="请输入"
                 whatever:testType="regexp"
-                whatever:customRegexp="^[\u4e00-\u9fa5_a-zA-Z0-9_]{0,300}$"
+                whatever:customRegexp="^[\u4e00-\u9fa5_a-zA-Z0-9_\n]{0,300}$"
                 whatever:testErrorString="限定字符长度不大于300" />
         </RelativeLayout>
 

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

@@ -168,7 +168,7 @@
                 android:drawableLeft="@drawable/my_shangwu"
                 android:drawablePadding="10dp"
                 android:gravity="center"
-                android:text="商务管理"
+                android:text="B2B商务"
                 android:textColor="@color/text_main"
                 android:textSize="14sp" />
 

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

@@ -54,7 +54,7 @@
     <LinearLayout style="@style/crm_ll_sale_item">
 
         <TextView
-            android:text="当前阶段："
+            android:text="当前阶段"
             android:minWidth="100dp"
             android:gravity="left"
             style="@style/TextView_Basic" />
@@ -83,7 +83,7 @@
     <LinearLayout style="@style/crm_ll_sale_item">
 
         <TextView
-            android:text="业务员："
+            android:text="业务员"
             android:minWidth="100dp"
             android:gravity="left"
             style="@style/TextView_Basic" />
@@ -102,7 +102,7 @@
             android:minWidth="100dp"
             android:gravity="left"
             android:id="@+id/tv_crm_business_datetv"
-            android:text="最后更进时间："
+            android:text="最后更进时间"
             android:layout_gravity="center_vertical"
             style="@style/TextView_Basic" />
 

WeiChat/src/main/res/menu/main_btn_submit.xml

@@ -3,6 +3,6 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/btn_save"
-        android:title="保存"
+        android:title="确定"
         app:showAsAction="ifRoom" />
 </menu>

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

@@ -271,4 +271,6 @@
 
     <color name="replay_text_color_normal">#ffa19992</color>
     <color name="oa_background_orange">#DC9A54</color>
+
+    <color name="toast_bg">#60808080</color><!--自定义toast背景色-->
 </resources>