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

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

@@ -842,31 +842,31 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
                 @Override
                 public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
                     switch (position) {
-                        case 0:
+                        /*case 0:
                             startActivity(new Intent(ClientActivity.this, ContactManAddActivity.class));
-                            break;
-                        case 1:
+                            break;*/
+                        case 0:
                             startActivity(new Intent(ClientActivity.this, BusinessAddActivity.class));
                             break;
-                        case 2:
+                        case 1:
                             startActivity(new Intent(ClientActivity.this, CustomerAddActivity.class));
                             break;
-                        case 3:
+                        case 2:
                             startActivity(new Intent(ClientActivity.this, TaskAddActivity.class).putExtra("type", 0));
                             break;
-                        case 4:
+                        case 3:
                             startActivity(new Intent(ClientActivity.this, TaskAddActivity.class).putExtra("type", 1));
                             break;
-                        case 5:
+                        /*case 5:
 
-                            break;
-                        case 6:
+                            break;*/
+                        case 4:
                             startActivity(new Intent(ClientActivity.this, VisitReportPlanActivity.class));
                             break;
-                        case 7:
+                        case 5:
                             startActivity(new Intent(ClientActivity.this, VisitReportAddActivity.class));
                             break;
-                        case 8:
+                        case 6:
                             startActivity(new Intent(ClientActivity.this, CustomerAddActivity.class).putExtra("type",1));
                             break;
                     }
@@ -903,8 +903,8 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
     private List<Map<String, Object>> getPopData() {
         List<Map<String, Object>> list = new ArrayList<Map<String, Object>>();
         Map<String, Object> map = new HashMap<String, Object>();
-        map.put("item_name", "新建联系人");
-        list.add(map);
+        /*map.put("item_name", "新建联系人");
+        list.add(map);*/
 
         map = new HashMap<String, Object>();
         map.put("item_name", "新建商机");
@@ -922,12 +922,14 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
         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);*/
+
         map = new HashMap<String, Object>();
         map.put("item_name", "拜访计划");
         list.add(map);
+
         map = new HashMap<String, Object>();
         map.put("item_name", "拜访报告");
         list.add(map);

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

@@ -8,10 +8,11 @@ import android.os.Message;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
+import android.view.View;
+import android.widget.Button;
 import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
@@ -79,6 +80,9 @@ public class CustomerDetailActivity extends BaseActivity {
     private TextView  tv_feiyonged;
     @ViewInject(R.id.stepsView)
     private StepsView mStepsView;
+    @ViewInject(R.id.customer_detail_add_plan)
+    private Button mAddPlanBtn;
+
     private Context ct;
     private final String[] labels = {"初次沟通", "立项评估","产品演示", "合同签约", "样品报价", "多次交易"
             , "商务谈判", "需求分析", "完成交易"};
@@ -99,7 +103,14 @@ public class CustomerDetailActivity extends BaseActivity {
     }
 
     private void initListener() {
-
+        mAddPlanBtn.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Intent intent = new Intent();
+                intent.setClass(CustomerDetailActivity.this,VisitReportPlanActivity.class);
+                startActivity(intent);
+            }
+        });
     }
 
     private void initData() {

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

@@ -524,11 +524,12 @@
             <View style="@style/app_line_gray_1dp"></View>
 
             <Button
+                android:id="@+id/customer_detail_add_plan"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:background="@null"
                 android:padding="10dp"
-                android:text="添加到拜访记录" />
+                android:text="添加到拜访计划" />
         </LinearLayout>
     </LinearLayout>