测试版本5.2.4 9-9

WeiChat/src/main/AndroidManifest.xml

@@ -462,9 +462,6 @@
         <activity
             android:name=".ui.erp.activity.crm.CustomerListActivity"
             android:theme="@style/CrmThemeCustomer" />
-        <activity
-            android:name=".ui.erp.activity.crm.CustomerMutilSelectActivity"
-            android:theme="@style/CrmThemeCustomer" />
         <activity
             android:name=".ui.erp.activity.crm.SalesRankingActivity"
             android:label="@string/title_activity_sales_ranking"

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

@@ -376,7 +376,7 @@ public class BusinessAddActivity extends BaseActivity implements View.OnClickLis
         progressDialog.show();
         String url = Constants.getAppBaseUrl(ct) + "/mobile/crm/getBusinessChanceCombo.action";
         Map<String, Object> params = new HashMap<>();
-        params.put("caller", "nichefrom");
+        params.put("caller", "BusinessChance");
         params.put("field", "bc_from");
         LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
         headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));

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

@@ -246,15 +246,15 @@ public class BusinessDetailInfoActivity extends BaseActivity implements View.OnC
                                     .putExtra("process", bt_process)
                                     .putExtra("doman", bt_doman));
                             break;
-                        case 4:
+                      /*  case 4:
                             startActivity(new Intent(BusinessDetailInfoActivity.this, BusinessTransferActivity.class)
                                     .putExtra("code", bt_code));
-                            break;
-                        case 5:
+                            break;*/
+                        case 4:
                             startActivity(new Intent(BusinessDetailInfoActivity.this, CustomerAddActivity.class)
                             );
                             break;
-                        case 6:
+                        case 5:
                             startActivity(new Intent(BusinessDetailInfoActivity.this, BusinessSelectCustomerActivity.class)
                                     .putExtra("code", bt_code));
                             break;

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

@@ -78,22 +78,21 @@ public class BusinessTransferActivity extends BaseActivity {
         mlist.setOnItemClickListener(new AdapterView.OnItemClickListener() {
             @Override
             public void onItemClick(final AdapterView<?> parent,final View view, final int position, long id) {
-                for (int i=0;i<mData.size();i++){
-                    if (position-1!=i){
-                        mData.get(i).setIsChecked(false);
-                    }
-                }
-                mAdapter.notifyDataSetChanged();
-               new Handler().postDelayed(new Runnable() {
-                   @Override
-                   public void run() {
-                       Business bean = (Business) parent.getAdapter().getItem(position);
-                       nicehouse=bean.getName();
-                       bean.isChecked = !bean.isChecked;
-                       SmoothCheckBox checkBox = (SmoothCheckBox) view.findViewById(R.id.cb_left);
-                       checkBox.setChecked(bean.isChecked, true);
-                   }
-               },100);
+
+                final  boolean flag = !mData.get(position-1).isChecked;
+                         Log.i(TAG, "onClick:" + position + " check:" + !flag);
+
+                         for (Business model : mData) {
+                             model.setIsChecked(false);
+                         }
+
+                        
+                      
+                         mData.get(position-1).setIsChecked(flag);
+                         mAdapter.notifyDataSetChanged();
+                        
+                
+                
             }
         });
 
@@ -175,24 +174,45 @@ public class BusinessTransferActivity extends BaseActivity {
                 holder = new ViewHolder();
                 holder.cb_left = (SmoothCheckBox) convertView.findViewById(R.id.cb_left);
                 holder.tv_business_name = (TextView) convertView.findViewById(R.id.tv_business_name);
+                
+//                convertView.setClickable(true);
+//                convertView.setFocusable(true);
+                holder.view=convertView;
                 convertView.setTag(holder);
             } else {
                 holder = (ViewHolder) convertView.getTag();
             }
-            holder.cb_left.setOnCheckedChangeListener(new SmoothCheckBox.OnCheckedChangeListener() {
-                @Override
-                public void onCheckedChanged(SmoothCheckBox checkBox, boolean isChecked) {
-                    mdata.get(position).setIsChecked(isChecked);
-                }
-            });
+//            holder.cb_left.setOnCheckedChangeListener(new SmoothCheckBox.OnCheckedChangeListener() {
+//                @Override
+//                public void onCheckedChanged(SmoothCheckBox checkBox, boolean isChecked) {
+//                    
+//                    mdata.get(position).setIsChecked(isChecked);
+//                }
+//            });
+//            holder.view.setOnClickListener(new View.OnClickListener() {
+//                @Override
+//                public void onClick(View v) {
+//                    boolean flag = !mdata.get(position).isChecked;
+//                    Log.i(TAG, "onClick:" +position+" check:"+!flag );
+//
+//                    for (Business model : mdata) {
+//                        model.setIsChecked(false);
+//                    }
+//
+//                    mdata.get(position).setIsChecked(flag);
+//                    notifyDataSetChanged();
+//                }
+//            });
 
             holder.tv_business_name.setText(mdata.get(position).getName());
-            holder.cb_left.setChecked(mdata.get(position).isChecked());
+          
+            holder.cb_left.setChecked(mdata.get(position).isChecked(), mdata.get(position).isChecked());
             return convertView;
         }
 
 
         class ViewHolder {
+            View view;
             SmoothCheckBox cb_left;
             TextView tv_business_name;
         }

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

@@ -83,6 +83,7 @@ public class CustomerDetailActivity extends BaseActivity {
     private StepsView mStepsView;
     @ViewInject(R.id.customer_detail_add_plan)
     private Button mAddPlanBtn;
+    String falg;
 
     private Context ct;
     private final String[] labels = {"初次沟通", "立项评估","产品演示", "合同签约", "样品报价", "多次交易"
@@ -116,6 +117,7 @@ public class CustomerDetailActivity extends BaseActivity {
 
     private void initData() {
         String code = getIntent().getStringExtra("code");
+        falg=getIntent().getStringExtra("falg");
         sendHttpResquest(Constants.HTTP_SUCCESS_INIT, code);
         // sendAdd(Constants.HTTP_SUCCESS_INIT);
         mStepsView.setCompletedPosition(0 % labels.length)

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

@@ -128,7 +128,7 @@ public class CustomerListActivity extends BaseActivity implements View.OnClickLi
                 BussinessDetailAdapter.ViewHolder viewHolder = (BussinessDetailAdapter.ViewHolder) view.getTag();
                 Log.i(TAG, "onItemClick:" + viewHolder.tv_code.getText().toString());
                 startActivity(new Intent(ct, CustomerDetailActivity.class).putExtra("code", viewHolder.tv_code
-                        .getText().toString()));
+                        .getText().toString()).putExtra("falg",falg));
             }
         });
     }

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

@@ -1,39 +0,0 @@
-package com.xzjmyk.pm.activity.ui.erp.activity.crm;
-
-import android.os.Bundle;
-
-import com.lidroid.xutils.ViewUtils;
-import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.ui.base.BaseActivity;
-
-/**
- * @功能:多条件筛选
- * @author:Arisono
- * @param:
- * @return:
- */
-public class CustomerMutilSelectActivity extends BaseActivity {
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_customer_mutil_select);
-        initView();
-        initData();
-        initListener();
-    }
-
-
-    private void initView() {
-        ViewUtils.inject(this);
-        getSupportActionBar().setTitle("筛选");
-    }
-
-    private void initListener() {
-
-    }
-
-    private void initData() {
-
-    }
-}

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

@@ -16,6 +16,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.bean.oa.OABean;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
@@ -238,6 +239,8 @@ public class VisitReportAddActivity extends BaseActivity implements View.OnClick
                             tv_date_end.getText().toString() +//结束时间
                             "\"\n" +
                             "}";
+            
+            
         } else {
             return;
         }
@@ -247,9 +250,10 @@ public class VisitReportAddActivity extends BaseActivity implements View.OnClick
         Map<String, Object> params = new HashMap<>();
         params.put("formStore", formStore);
         params.put("caller", "VisitRecord");
+        String param1="{\"pl_detno\":1,\"pl_name\":"+ MyApplication.getInstance().mLoginUser.getNickName()+",\"pl_vrid\":"+mVrId+"}";
         params.put("param1", "[]");
         params.put("param2", "[]");
-        params.put("param3", "[]");
+        params.put("param3", param1);
         params.put("param4", "[]");
         params.put("param5", "[]");
         params.put("param6", "[]");

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

@@ -6,6 +6,7 @@
     android:paddingLeft="@dimen/activity_horizontal_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
+    android:descendantFocusability="blocksDescendants"
     style="@style/crm_ll_card"
     android:layout_height="wrap_content">
 
@@ -14,6 +15,7 @@
         android:layout_width="30dp"
         android:layout_height="30dp"
         android:layout_gravity="center_vertical|left"
+        android:clickable="false"
         android:layout_margin="5dp"
         app:color_checked="#149A45" />
 

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

@@ -4,7 +4,6 @@
         <item>商机释放</item>
         <item>商机失效</item>
         <item>继续跟进</item>
-        <item>转移</item>
         <item>转为新客户</item>
         <item>关联已有客户</item>
     </string-array>