百度云更新到2.7版本

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

@@ -71,15 +71,15 @@ public class BusinessActivity extends BaseActivity implements View.OnClickListen
     private ArrayList<ArrayList<String>> gridlists = new ArrayList<ArrayList<String>>();
     private String gridData = "  [\n" +
             "[\"颜色\",\"商机阶段\",\"商机数量\",\"商机转化率\"],\n" +
-            "[\"#FF0000\",\"152,002\",\"1223\",\"22\"],\n" +
-            "[\"#00CCFF\",\"8,775\",\"22\",\"323\"],\n" +
-            "[\"#FFFF00\",\"2,000\",\"232\",\"43242\"],\n" +
-            "[\"#00FF00\",\"11\",\"12312\",\"232433432\"],\n" +
-            "[\"#FF00FF\",\"11\",\"12312\",\"232433432\"],\n" +
-            "[\"#FF9900\",\"11\",\"12312\",\"232433432\"],\n" +
-            "[\"#993366\",\"11\",\"12312\",\"232433432\"],\n" +
-            "[\"#C0C0C0\",\"11\",\"12312\",\"232433432\"],\n" +
-            "[\"#FFCC99\",\"11\",\"12312\",\"232433432\"]\n" +
+            "[\"#FF0000\",\"0\",\"0\",\"0\"],\n" +
+            "[\"#00CCFF\",\"0\",\"0\",\"0\"],\n" +
+            "[\"#FFFF00\",\"0\",\"0\",\"0\"],\n" +
+            "[\"#00FF00\",\"0\",\"0\",\"0\"],\n" +
+            "[\"#FF00FF\",\"0\",\"0\",\"0\"],\n" +
+            "[\"#FF9900\",\"0\",\"0\",\"0\"],\n" +
+            "[\"#993366\",\"0\",\"0\",\"0\"],\n" +
+            "[\"#C0C0C0\",\"0\",\"0\",\"0\"],\n" +
+            "[\"#FFCC99\",\"0\",\"0\",\"0\"]\n" +
             "]";
 
     @Override

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

@@ -82,6 +82,7 @@ public class BusinessAddActivity extends BaseActivity implements View.OnClickLis
     private List<String> lists = new ArrayList<String>();
     private int et_business_enterCode;
     private int mBcId;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -97,7 +98,7 @@ public class BusinessAddActivity extends BaseActivity implements View.OnClickLis
         et_business_source.setOnClickListener(this);
         et_business_enterMan.setOnClickListener(this);
 //        et_business_no.setOnClickListener(this);
-     //   et_business.setKeyListener(null);
+        //   et_business.setKeyListener(null);
 //        et_business_no.setKeyListener(null);
         //et_business_jieDuan.setKeyListener(null);
         et_business_source.setKeyListener(null);
@@ -115,7 +116,7 @@ public class BusinessAddActivity extends BaseActivity implements View.OnClickLis
     }
 
     private void initData() {
-        CommonUtil.getCommonId(this,"BUSINESSCHANCE_SEQ",mHandler,GET_BC_ID);
+        CommonUtil.getCommonId(this, "BUSINESSCHANCE_SEQ", mHandler, GET_BC_ID);
         getCodeByNet();
     }
 
@@ -164,7 +165,7 @@ public class BusinessAddActivity extends BaseActivity implements View.OnClickLis
         switch (item.getItemId()) {
             case R.id.btn_save:
                 if (et_business_name.testValidity() && et_business_source.testValidity() &&
-                        et_business.testValidity() && et_business_type.testValidity() &&
+                        et_business.testValidity() &&
                         et_business_jieDuan.testValidity()) {
                     sendHttpResquest();
                 }
@@ -183,7 +184,7 @@ public class BusinessAddActivity extends BaseActivity implements View.OnClickLis
     private static final int LOAD_MANGENJIN = 5;
     private static final int GET_BC_ID = 6;
     private JSONArray jsons;
-    
+
     private Handler mHandler = new Handler() {
         @Override
         public void handleMessage(Message msg) {
@@ -272,7 +273,7 @@ public class BusinessAddActivity extends BaseActivity implements View.OnClickLis
                     String resultStr = msg.getData().getString("result");
                     try {
                         JSONObject resultJsonObject = new JSONObject(resultStr);
-                        if (resultJsonObject != null && resultJsonObject.getBoolean("success")){
+                        if (resultJsonObject != null && resultJsonObject.getBoolean("success")) {
                             mBcId = resultJsonObject.getInt("id");
                         }
                     } catch (JSONException e) {
@@ -313,19 +314,19 @@ public class BusinessAddActivity extends BaseActivity implements View.OnClickLis
         String bc_remark = getEditText(et_business_remark);//备注
         String bc_position = getEditText(et_company_position); //职位
         String bc_type = getEditText(et_business_type);  //商机类型
-        String enterCode=null;
-        if (et_business_enterCode==0){
-            enterCode="";
-        }else{
-            enterCode=CommonUtil.getSharedPreferences(ct,"erp_username");
+        String enterCode = null;
+        if (et_business_enterCode == 0) {
+            enterCode = "";
+        } else {
+            enterCode = CommonUtil.getSharedPreferences(ct, "erp_username");
         }
-        LogUtil.e("commonbcid",mBcId+"");
+        LogUtil.e("commonbcid", mBcId + "");
         String formStore =
                 "{\n" +
                         "\"bc_id\":" + mBcId + ",\n" +
                         "\"bc_code\":\"" + et_business_no.getText().toString() + "\",\n" +   //商机名称
                         "\"bc_status\":\"" + "在录入" + "\",\n" +
-                        "\"bc_domancode\":\"" + enterCode+ "\",\n" +
+                        "\"bc_domancode\":\"" + enterCode + "\",\n" +
                         "\"bc_statuscode\":\"" + "ENTERING" + "\",\n" +
                         "\"bc_description\":\"" + name + "\",\n" +   //商机名称
                         "\"bc_from\":\"" + from + "\",\n" +          //商机来源
@@ -438,17 +439,17 @@ public class BusinessAddActivity extends BaseActivity implements View.OnClickLis
                     public void onListItemClick(int position, String value) {
                         et.setText(value);
                         for (int i = 0; i < jsons.size(); i++) {
-                            if (jsons.getJSONObject(i).getString("BD_NAME").equals(value)){
-                             String bd_prop=   jsons.getJSONObject(i).getString("BD_PROP");
-                                if (bd_prop.equals("公有")){
+                            if (jsons.getJSONObject(i).getString("BD_NAME").equals(value)) {
+                                String bd_prop = jsons.getJSONObject(i).getString("BD_PROP");
+                                if (bd_prop.equals("公有")) {
                                     //跟进人不可编辑，不可点击
                                     et_business_enterMan.setClickable(false);
                                     et_business_enterMan.setEnabled(false);
                                     et_business_enterMan.setText("");
-                                    et_business_enterCode=0;
-                                }else{
+                                    et_business_enterCode = 0;
+                                } else {
                                     //跟进人可编辑
-                                    et_business_enterCode=1;
+                                    et_business_enterCode = 1;
                                     et_business_enterMan.setEnabled(true);
                                     et_business_enterMan.setClickable(true);
                                     et_business_enterMan.setText(MyApplication.getInstance().mLoginUser.getNickName());

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

@@ -113,9 +113,9 @@ public class BusinessDetailActivty extends BaseActivity {
                 final BussinessDetailAdapter.ViewHolder holder = (BussinessDetailAdapter.ViewHolder) view.getTag();
 
                 startActivity(new Intent(BusinessDetailActivty.this, BusinessDetailInfoActivity.class)
-                        .putExtra("type", holder.type)
-                        .putExtra("formCondition", formCondition + "=" + holder.bc_id)
-                        .putExtra("gridCondition", gridCondition + "=" + holder.bc_id)
+                                .putExtra("type", holder.type)
+                                .putExtra("formCondition", formCondition + "=" + holder.bc_id)
+                                .putExtra("gridCondition", gridCondition + "=" + holder.bc_id)
                 );
             }
         });
@@ -353,7 +353,7 @@ public class BusinessDetailActivty extends BaseActivity {
                             model.setName(array.getJSONObject(i).getString("bc_description"));
                             model.setPhone(array.getJSONObject(i).getString("bc_tel"));
                             model.setNote(array.getJSONObject(i).getString("bc_remark"));
-                            model.setSource(array.getJSONObject(i).getString("bc_from"));//BC_NICHEHOUSE
+                            model.setSource(array.getJSONObject(i).getString("bc_from"));
                             model.setSteps(array.getJSONObject(i).getString("bc_nichehouse"));
                             if (array.getJSONObject(i).getObject("bc_id", Object.class) instanceof Integer) {
                                 model.setBc_id(array.getJSONObject(i).getInteger("bc_id"));
@@ -363,15 +363,13 @@ public class BusinessDetailActivty extends BaseActivity {
                         }
                     } else {
                         mEmptyLayout.showEmpty();
-                        ToastMessage("数据加载完毕！");
+                        if (page == 1) {
+                            Crouton.makeText(activity, 30, "暂时没有数据!", getResources().getColor(R.color.light_green), 3000).show();
+                        } else {
+                            Crouton.makeText(activity, 30, "数据加载完成!", getResources().getColor(R.color.light_green), 3000).show();
+                        }
+
                     }
-//                    "bc_tel":"",
-//                        "bc_code":"2016050004",
-//                        "bc_remark":"",
-//                        "bc_recorddate":"2016-05-24 00:00:00",
-//                        "bc_description":"测试",
-//                        "bc_from":"",
-//                        "bc_id":730
                     mAdapter = new BussinessDetailAdapter(ct, mData);
                     mlist.setAdapter(mAdapter);
                     if (page != 1) {
@@ -387,15 +385,15 @@ public class BusinessDetailActivty extends BaseActivity {
                 case BUSINESS_QIANG:
                     Log.i(TAG, "handleMessage:" + msg.getData().getString("result"));
                     progressDialog.dismiss();
-                    Crouton.makeText(BusinessDetailActivty.this,45,"成功抢得此商机，\n" +
-                            "请到商机跟进中查看商机!\n",
+                    Crouton.makeText(BusinessDetailActivty.this, 45, "成功抢得此商机，\n" +
+                                    "请到商机跟进中查看商机!\n",
                             getResources().getColor(R.color.light_green),
                             5000).show();
                     sendHttpResquest(Constants.HTTP_SUCCESS_INIT, page = 1);
                     break;
                 case BUSINESS_FENPEI:
                     progressDialog.dismiss();
-                    Crouton.makeText(BusinessDetailActivty.this,45,"成功分配商机！",
+                    Crouton.makeText(BusinessDetailActivty.this, 45, "成功分配商机！",
                             getResources().getColor(R.color.light_green),
                             5000).show();
                     sendHttpResquest(Constants.HTTP_SUCCESS_INIT, page = 1);

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

@@ -391,6 +391,7 @@ public class BusinessDetailInfoActivity extends BaseActivity implements View.OnC
                         Crouton.makeText(BusinessDetailInfoActivity.this, "您已超出最大获取商机数！", 0xffff4444, 2000).show();
                     }
                 case 5:
+                    progressDialog.dismiss();
                      result = JSON.parseObject(msg.getData().getString("result"));
                     JSONArray items=result.getJSONArray("result");
                     if (items!=null){
@@ -407,7 +408,8 @@ public class BusinessDetailInfoActivity extends BaseActivity implements View.OnC
                 case Constants.APP_SOCKETIMEOUTEXCEPTION:
                     progressDialog.dismiss();
                     Log.i(TAG, "handleMessage:" + msg.getData().getString("result"));
-
+                    Crouton.makeText(BusinessDetailInfoActivity.this, msg.getData().getString("result"),
+                            0xffff4444, 2000).show();
                     break;
             }
         }

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

@@ -23,6 +23,7 @@ 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.util.ToastUtil;
+import com.xzjmyk.pm.activity.view.crouton.Crouton;
 import com.xzjmyk.pm.activity.view.wheel.DatePicker;
 
 import java.util.Calendar;
@@ -142,7 +143,7 @@ public class BusinessLessActivity extends BaseActivity implements View.OnClickLi
                 case Constants.HTTP_SUCCESS_INIT:
                     progressDialog.dismiss();
                     Log.i(TAG, "handleMessage:" + msg.getData().getString("result"));
-                    ViewUtil.ToastMessage(ct, "操作成功！");
+                    Crouton.makeText(activity,30,"操作成功!",getResources().getColor(R.color.light_green),2000);
                     if (type == 2) {
                         updataSchedule(0x16);
                     }
@@ -153,6 +154,8 @@ public class BusinessLessActivity extends BaseActivity implements View.OnClickLi
                 case Constants.APP_SOCKETIMEOUTEXCEPTION:
                     progressDialog.dismiss();
                     Log.i(TAG, "handleMessage:" + msg.getData().getString("result"));
+                    Crouton.makeText(activity, 30, msg.getData().getString("result"), 
+                            getResources().getColor(R.color.red), 2000);
                     break;
                 case 2:
                     progressDialog.dismiss();

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

@@ -906,26 +906,26 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
                             startActivity(new Intent(ClientActivity.this, BusinessAddActivity.class));
                             break;
                         case 1:
-                            startActivity(new Intent(ClientActivity.this, CustomerAddActivity.class));
+                            startActivity(new Intent(ClientActivity.this, CustomerAddActivity.class).putExtra("type",1));
                             break;
-                        case 2:
+                       /* case 2:
                             startActivity(new Intent(ClientActivity.this, TaskAddActivity.class).putExtra("type", 0));
                             break;
                         case 3:
                             startActivity(new Intent(ClientActivity.this, TaskAddActivity.class).putExtra("type", 1));
-                            break;
+                            break;*/
                         /*case 5:
 
                             break;*/
-                        case 4:
+                        case 2:
                             startActivity(new Intent(ClientActivity.this, VisitReportPlanActivity.class));
                             break;
-                        case 5:
+                        case 3:
                             startActivity(new Intent(ClientActivity.this, VisitReportAddActivity.class));
                             break;
-                        case 6:
+                       /* case 4:
                             startActivity(new Intent(ClientActivity.this, CustomerAddActivity.class).putExtra("type",1));
-                            break;
+                            break;*/
                     }
                     closePoppupWindow();
                 }
@@ -964,36 +964,36 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
         list.add(map);*/
 
         map = new HashMap<String, Object>();
-        map.put("item_name", "新建商机");
+        map.put("item_name", "创建商机");
         list.add(map);
 
         map = new HashMap<String, Object>();
-        map.put("item_name", "预录入客户");
+        map.put("item_name", "新增客户");
         list.add(map);
         
         
-        map = new HashMap<String, Object>();
+      /*  map = new HashMap<String, Object>();
         map.put("item_name", "新增任务");
         list.add(map);
         map = new HashMap<String, Object>();
         map.put("item_name", "新增日程");
-        list.add(map);
+        list.add(map);*/
 
         /*map = new HashMap<String, Object>();
         map.put("item_name", "新增分享");
         list.add(map);*/
 
         map = new HashMap<String, Object>();
-        map.put("item_name", "拜访计划");
+        map.put("item_name", "新增拜访计划");
         list.add(map);
 
         map = new HashMap<String, Object>();
-        map.put("item_name", "拜访报告");
+        map.put("item_name", "新增拜访报告");
         list.add(map);
 
-        map = new HashMap<String, Object>();
+     /*   map = new HashMap<String, Object>();
         map.put("item_name", "录入客户");
-        list.add(map);
+        list.add(map);*/
         return list;
     }
 

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

@@ -231,10 +231,12 @@ public class CustomerAddActivity extends BaseActivity implements View.OnClickLis
     }
 
     private static final int CURRENT_STAGE = 21;
+    private final int CUSTOMTER_TYPE=24;
     private static final int PAY_METHODS = 22;
     private static final int GET_CURRENCY = 23;
     private static final int REQUEST_CLERK = 1;
     private static final int GET_CU_ID = 25;
+    
     private Handler mHandler = new Handler() {
         @Override
         public void handleMessage(Message msg) {
@@ -306,9 +308,9 @@ public class CustomerAddActivity extends BaseActivity implements View.OnClickLis
                     showSimpleDialog(tv_cu_currency, "币别");
                     break;
                 case GET_CU_ID:
-                    String resultStr = msg.getData().getString("result");
+                    json = msg.getData().getString("result");
                     try {
-                        JSONObject resultJsonObject = new JSONObject(resultStr);
+                        JSONObject resultJsonObject = new JSONObject(json);
                         if (resultJsonObject != null && resultJsonObject.getBoolean("success")){
                             mCuId = resultJsonObject.getInt("id");
                         }
@@ -316,6 +318,23 @@ public class CustomerAddActivity extends BaseActivity implements View.OnClickLis
                         e.printStackTrace();
                     }
                     break;
+                case CUSTOMTER_TYPE:
+                     progressDialog.dismiss();
+                     json = msg.getData().getString("result");
+                     Log.i(TAG, "handleMessage:" +json );
+                     mLists.clear();
+                    array = JSON.parseObject(json).getJSONArray("datas");
+                    if (!array.isEmpty()) {
+                        for (int i = 0; i < array.size(); i++) {
+                            mLists.add(array.getJSONObject(i).getString("ck_kind"));
+                        }
+                    }
+
+                    if (mLists.isEmpty()) {
+                        mLists.add("无");
+                    }
+                    showSimpleDialog(et_cu_kind, "客户类型");
+                    break;
             }
         }
     };
@@ -461,6 +480,17 @@ public class CustomerAddActivity extends BaseActivity implements View.OnClickLis
         ViewUtil.httpSendRequest(ct, url, params, mHandler, headers, CURRENT_STAGE, null, null, "post");
     }
 
+    public void loadCustomerType(){
+        progressDialog.show();
+        String url = Constants.getAppBaseUrl(ct) + "mobile/common/getDbfind.action";
+        Map<String, Object> params = new HashMap<>();
+        params.put("which", "form");
+        params.put("caller", "Customer!Base");
+        params.put("field", "cu_kind");
+        LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
+        headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
+        ViewUtil.httpSendRequest(ct, url, params, mHandler, headers, CUSTOMTER_TYPE, null, null, "post");
+    }
     /**
      * 加载收款方式
      */
@@ -508,7 +538,7 @@ public class CustomerAddActivity extends BaseActivity implements View.OnClickLis
     public void onClick(View v) {
         switch (v.getId()) {
             case R.id.et_cu_kind:
-                onPopupButtonClick(v);
+                loadCustomerType();
                 break;
             case R.id.et_cu_district:
                 onPopupButtonClick(v);

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

@@ -198,7 +198,7 @@ public class VisitReportAddActivity extends BaseActivity implements View.OnClick
                 && tv_visit_steps.testValidity() && tv_visit_content.testValidity()) {
             formStore =
                     "{\n" +
-                            " \"vr_id\":" + mVrId + ",\n" +
+                            "\"vr_id\":" + mVrId + ",\n" +
                             "\"vr_code\":\"" + code
                             + "\",\n" +
                             "\"vr_visittime\":\""

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

@@ -74,11 +74,12 @@ public class HListViewOneAdapter extends BaseAdapter {
                 }else{
                     if (index!=0){
                         holder.tv_item[i].setText("●");
-                        holder.tv_item[i].setTextSize(18);
+                        holder.tv_item[i].setTextSize(TypedValue.COMPLEX_UNIT_SP, 16);
                         holder.tv_item[i].setTextColor(Color.parseColor(items.get(i)));
-                      //  holder.tv_item[i].setMinWidth(CommonUtil.dip2px(ct, 105));
+//                        holder.tv_item[i].setMinWidth(CommonUtil.dip2px(ct, 50));
+//                        holder.tv_item[i].setMinHeight(CommonUtil.dip2px(ct, 50));
                     }else{
-                        holder.tv_item[i].setTextSize(14);
+                        holder.tv_item[i].setTextSize(TypedValue.COMPLEX_UNIT_SP,14);
                         holder.tv_item[i].setTextColor(ct.getResources().getColor(R.color.black));
                       //  holder.tv_item[i].setBackgroundColor(ct.getResources().getColor(R.color.yellow_home));
                     }

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

@@ -146,7 +146,8 @@
             <RelativeLayout
                 android:id="@+id/ry_business_phone"
                 style="@style/form_relative_customer"
-                android:background="@color/item_color2">
+                android:background="@color/item_color2"
+                android:visibility="gone">
 
 
                 <TextView

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

@@ -5,8 +5,8 @@
         <item>商机失效</item>
         <item>继续跟进</item>
         <item>转移</item>
-        <item>转为预录入客户</item>
-        <item>转为已有客户</item>
+        <item>转为新客户</item>
+        <item>关联已有客户</item>
     </string-array>
 
     <string name="crm_sale_num">****元  (第**名)</string>