Browse Source

解决bug
1、未成交页面,向上滑屏,所有标签页上的数值会变成0
2、crm主界面快速创建商机保存后,页面跳转到crm主界面,弹框没隐藏
3、商机列表无法点击
4、CRM主页面图标替换
5、在抢商机列表页面,点击抢按钮,进入商机详情页面,应该执行抢操作
6、修改ui

RaoMeng 9 years ago
parent
commit
a15b361cfd

+ 10 - 9
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/BusinessDetailActivty.java

@@ -13,9 +13,9 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
 import android.widget.BaseAdapter;
-import android.widget.Button;
 import android.widget.Filter;
 import android.widget.Filterable;
+import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.ListView;
 import android.widget.TextView;
@@ -194,7 +194,7 @@ public class BusinessDetailActivty extends BaseActivity {
                 holder.tv_source = (TextView) convertView.findViewById(R.id.tv_crm_business_source);
                 //  holder.tv_num= (TextView) convertView.findViewById(R.id.tv_crm_business_num);
                 holder.tv_steps= (TextView) convertView.findViewById(R.id.tv_crm_business_steps);
-                holder.bt_event = (Button) convertView.findViewById(R.id.bt_business_qiang);
+                holder.iv_event = (ImageView) convertView.findViewById(R.id.iv_business_qiang);
                 convertView.setTag(holder);
             } else {
                 holder = (ViewHolder) convertView.getTag();
@@ -211,16 +211,16 @@ public class BusinessDetailActivty extends BaseActivity {
             holder.tv_steps.setText(mdata.get(position).getSteps());
             holder.tv_source.setText(mdata.get(position).getSource());
             if (mdata.get(position).getType() == 0) {
-                holder.bt_event.setVisibility(View.GONE);
+                holder.iv_event.setVisibility(View.GONE);
             } else if (mdata.get(position).getType() == 1) {
-                holder.bt_event.setVisibility(View.VISIBLE);
-                holder.bt_event.setText("抢");
+                holder.iv_event.setVisibility(View.VISIBLE);
+                holder.iv_event.setImageResource(R.drawable.ic_qiang);
             } else if (mdata.get(position).getType() == 2) {
-                holder.bt_event.setVisibility(View.VISIBLE);
-                holder.bt_event.setText("分配");
+                holder.iv_event.setVisibility(View.VISIBLE);
+                holder.iv_event.setImageResource(R.drawable.ic_fenpei);
             }
             // holder.tv_date.setText(mdata.get(position).getDate());
-            holder.bt_event.setOnClickListener(new View.OnClickListener() {
+            holder.iv_event.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
                     if (mdata.get(position).getType() == 1) {
@@ -301,7 +301,8 @@ public class BusinessDetailActivty extends BaseActivity {
             TextView tv_note;
             TextView tv_datetv;
             TextView tv_date;
-            Button bt_event;
+//            Button bt_event;
+            ImageView iv_event;
             int type;
         }
 

+ 11 - 9
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/BusinessStateActivity.java

@@ -13,9 +13,9 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
 import android.widget.BaseAdapter;
-import android.widget.Button;
 import android.widget.Filter;
 import android.widget.Filterable;
+import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.ListView;
 import android.widget.TextView;
@@ -285,7 +285,8 @@ public class BusinessStateActivity extends BaseActivity implements View.OnClickL
                 holder.tv_source = (TextView) convertView.findViewById(R.id.tv_crm_business_source);
                 holder.tv_steps= (TextView) convertView.findViewById(R.id.tv_crm_business_steps);
                 //holder.tv_datetv= (TextView) convertView.findViewById(R.id.tv_crm_business_datetv);
-                holder.bt_event = (Button) convertView.findViewById(R.id.bt_business_qiang);
+//                holder.bt_event = (Button) convertView.findViewById(R.id.bt_business_qiang);
+                holder.iv_event = (ImageView) convertView.findViewById(R.id.iv_business_qiang);
                 convertView.setTag(holder);
             } else {
                 holder = (ViewHolder) convertView.getTag();
@@ -302,16 +303,16 @@ public class BusinessStateActivity extends BaseActivity implements View.OnClickL
             holder.tv_phone.setText(mdata.get(position).getPhone());
             holder.tv_source.setText(mdata.get(position).getSource());
             if (mdata.get(position).getType() == 0) {
-                holder.bt_event.setVisibility(View.GONE);
+                holder.iv_event.setVisibility(View.GONE);
             } else if (mdata.get(position).getType() == 1) {
-                holder.bt_event.setVisibility(View.VISIBLE);
-                holder.bt_event.setText("抢");
+                holder.iv_event.setVisibility(View.VISIBLE);
+                holder.iv_event.setImageResource(R.drawable.ic_qiang);
             } else if (mdata.get(position).getType() == 2) {
-                holder.bt_event.setVisibility(View.VISIBLE);
-                holder.bt_event.setText("分配");
+                holder.iv_event.setVisibility(View.VISIBLE);
+                holder.iv_event.setImageResource(R.drawable.ic_fenpei);
             }
             // holder.tv_date.setText(mdata.get(position).getDate());
-            holder.bt_event.setOnClickListener(new View.OnClickListener() {
+            holder.iv_event.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
                     if (mdata.get(position).getType() == 1) {
@@ -343,7 +344,8 @@ public class BusinessStateActivity extends BaseActivity implements View.OnClickL
             TextView tv_note;
             TextView tv_datetv;
             TextView tv_date;
-            Button bt_event;
+//            Button bt_event;
+            ImageView iv_event;
             int type;
         }
 

+ 0 - 2
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/VisitReportAddActivity.java

@@ -58,8 +58,6 @@ public class VisitReportAddActivity extends BaseActivity implements View.OnClick
     private FormEditText tv_date_end;
     @ViewInject(R.id.tv_visit_theme)
     private FormEditText tv_visit_theme;
-    @ViewInject(R.id.tv_visit_steps)
-    private FormEditText tv_visit_steps;
     @ViewInject(R.id.tv_visit_content)
     private FormEditText tv_visit_content;
 //    @ViewInject(R.id.tv_notes_login)

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

@@ -16,7 +16,6 @@ import android.widget.TextView;
 import com.xzjmyk.pm.activity.R;
 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;
 
 import java.util.ArrayList;
 
@@ -74,7 +73,8 @@ public class HListViewOneAdapter extends BaseAdapter {
                    // holder.tv_item[i].setMinWidth(CommonUtil.dip2px(ct, 50));
                 }else{
                     if (index!=0){
-                        holder.tv_item[i].setText("▇");
+                        holder.tv_item[i].setText("●");
+                        holder.tv_item[i].setTextSize(20);
                         holder.tv_item[i].setTextColor(Color.parseColor(items.get(i)));
                       //  holder.tv_item[i].setMinWidth(CommonUtil.dip2px(ct, 105));
                     }else{

BIN
WeiChat/src/main/res/drawable-hdpi/ic_fenpei.png


BIN
WeiChat/src/main/res/drawable-hdpi/ic_flag.png


BIN
WeiChat/src/main/res/drawable-hdpi/ic_forget_customer.png


BIN
WeiChat/src/main/res/drawable-hdpi/ic_my_branch.png


BIN
WeiChat/src/main/res/drawable-hdpi/ic_my_rank.png


BIN
WeiChat/src/main/res/drawable-hdpi/ic_my_target.png


BIN
WeiChat/src/main/res/drawable-hdpi/ic_qiang.png


BIN
WeiChat/src/main/res/drawable-hdpi/ic_sale_brief.png


+ 269 - 271
WeiChat/src/main/res/layout/activity_business_detail_info.xml

@@ -1,459 +1,455 @@
 <?xml version="1.0" encoding="utf-8"?><!--    com.xzjmyk.pm.activity.ui.erp.view.CustomerScrollView-->
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:background="@drawable/bg_bar"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:background="@drawable/bg_bar">
+
     <ScrollView
-        android:layout_above="@+id/ll_bottom"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_above="@+id/ll_bottom"
         android:fillViewport="true">
+
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:orientation="vertical"
             tools:context="com.xzjmyk.pm.activity.ui.erp.activity.crm.BusinessDetailInfoActivity">
-          <!--  <RelativeLayout
-
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:visibility="gone">
-
-                <LinearLayout
-                    android:id="@+id/ll_left_layout"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_margin="10dp"
-
-                    android:layout_alignParentLeft="true"
-                    android:orientation="vertical">
-
-                    <ImageView
-                        android:layout_width="50dp"
-                        android:layout_height="50dp"
-                        android:layout_marginTop="20dp"
-                        android:layout_gravity="center_horizontal"
-                        android:background="@drawable/shape_crm_round" />
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="10dp"
-                        android:textColor="@color/wheat"
-                        android:text="xxxx提供" />
-                </LinearLayout>
-
-                <View
-                    android:layout_toRightOf="@+id/ll_left_layout"
-                    android:layout_toLeftOf="@+id/ll_center_layout"
-                    android:layout_centerVertical="true"
-                    android:layerType="software"
-                    style="@style/app_line_xuxian_horizontal_05p"></View>
-
-                <LinearLayout
-                    android:id="@+id/ll_center_layout"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_margin="10dp"
-                    android:layout_centerInParent="true"
-                    android:orientation="vertical">
-
-                    <ImageView
-                        android:layout_width="50dp"
-                        android:layout_height="50dp"
-                        android:layout_marginTop="20dp"
-                        android:layout_gravity="center_horizontal"
-                        android:background="@drawable/shape_crm_round" />
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="10dp"
-                        android:textColor="@color/wheat"
-                        android:text="xxxx提供" />
-                </LinearLayout>
-
-                <View
-                    android:layout_toRightOf="@+id/ll_center_layout"
-                    android:layout_toLeftOf="@+id/ll_right_layout"
-                    android:layout_centerVertical="true"
-                    android:layerType="software"
-                    style="@style/app_line_xuxian_horizontal_05p"></View>
-                <LinearLayout
-                    android:id="@+id/ll_right_layout"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_margin="10dp"
-                    android:layout_alignParentRight="true"
-                    android:orientation="vertical">
-
-                    <ImageView
-                        android:layout_width="50dp"
-                        android:layout_height="50dp"
-                        android:layout_marginTop="20dp"
-                        android:layout_gravity="center_horizontal"
-                        android:background="@drawable/shape_crm_round" />
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="10dp"
-                        android:textColor="@color/wheat"
-                        android:text="xxxx提供" />
-                </LinearLayout>
-
-            </RelativeLayout>-->
+            <!--  <RelativeLayout
+
+                  android:layout_width="match_parent"
+                  android:layout_height="wrap_content"
+                  android:visibility="gone">
+
+                  <LinearLayout
+                      android:id="@+id/ll_left_layout"
+                      android:layout_width="wrap_content"
+                      android:layout_height="wrap_content"
+                      android:layout_margin="10dp"
+
+                      android:layout_alignParentLeft="true"
+                      android:orientation="vertical">
+
+                      <ImageView
+                          android:layout_width="50dp"
+                          android:layout_height="50dp"
+                          android:layout_marginTop="20dp"
+                          android:layout_gravity="center_horizontal"
+                          android:background="@drawable/shape_crm_round" />
+
+                      <TextView
+                          android:layout_width="wrap_content"
+                          android:layout_height="wrap_content"
+                          android:layout_marginTop="10dp"
+                          android:textColor="@color/wheat"
+                          android:text="xxxx提供" />
+                  </LinearLayout>
+
+                  <View
+                      android:layout_toRightOf="@+id/ll_left_layout"
+                      android:layout_toLeftOf="@+id/ll_center_layout"
+                      android:layout_centerVertical="true"
+                      android:layerType="software"
+                      style="@style/app_line_xuxian_horizontal_05p"></View>
+
+                  <LinearLayout
+                      android:id="@+id/ll_center_layout"
+                      android:layout_width="wrap_content"
+                      android:layout_height="wrap_content"
+                      android:layout_margin="10dp"
+                      android:layout_centerInParent="true"
+                      android:orientation="vertical">
+
+                      <ImageView
+                          android:layout_width="50dp"
+                          android:layout_height="50dp"
+                          android:layout_marginTop="20dp"
+                          android:layout_gravity="center_horizontal"
+                          android:background="@drawable/shape_crm_round" />
+
+                      <TextView
+                          android:layout_width="wrap_content"
+                          android:layout_height="wrap_content"
+                          android:layout_marginTop="10dp"
+                          android:textColor="@color/wheat"
+                          android:text="xxxx提供" />
+                  </LinearLayout>
+
+                  <View
+                      android:layout_toRightOf="@+id/ll_center_layout"
+                      android:layout_toLeftOf="@+id/ll_right_layout"
+                      android:layout_centerVertical="true"
+                      android:layerType="software"
+                      style="@style/app_line_xuxian_horizontal_05p"></View>
+                  <LinearLayout
+                      android:id="@+id/ll_right_layout"
+                      android:layout_width="wrap_content"
+                      android:layout_height="wrap_content"
+                      android:layout_margin="10dp"
+                      android:layout_alignParentRight="true"
+                      android:orientation="vertical">
+
+                      <ImageView
+                          android:layout_width="50dp"
+                          android:layout_height="50dp"
+                          android:layout_marginTop="20dp"
+                          android:layout_gravity="center_horizontal"
+                          android:background="@drawable/shape_crm_round" />
+
+                      <TextView
+                          android:layout_width="wrap_content"
+                          android:layout_height="wrap_content"
+                          android:layout_marginTop="10dp"
+                          android:textColor="@color/wheat"
+                          android:text="xxxx提供" />
+                  </LinearLayout>
+
+              </RelativeLayout>-->
             <LinearLayout
                 style="@style/crm_ll_card"
                 android:layout_height="wrap_content">
+
                 <LinearLayout style="@style/LinearLayout_horizontal">
-                    <TextView
-                        android:layout_width="10dp"
-                        android:layout_height="15dp"
-                        android:layout_gravity="center_vertical"
-                        android:background="@drawable/shape_tv_color"
-                        android:textColor="#FF8E57" />
+
+                    <ImageView style="@style/sign_imageview" />
 
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_margin="10dp"
-                        android:textSize="15sp"
+                        android:text="基本信息"
                         android:textColor="#FF8E57"
-                        android:text="基本信息" />
+                        android:textSize="15sp" />
                 </LinearLayout>
+
                 <LinearLayout
-                    android:padding="5dp"
-                    style="@style/LinearLayout_horizontal">
+                    style="@style/LinearLayout_horizontal"
+                    android:padding="5dp">
 
                     <TextView
-                        android:text="商机库编号"
-                        android:textColor="@color/gray_light"
-                        android:layout_marginLeft="10dp"
+                        style="@style/TextView_VerticalCenter"
                         android:layout_width="70dp"
-                        style="@style/TextView_VerticalCenter" />
+                        android:layout_marginLeft="10dp"
+                        android:text="商机库编号"
+                        android:textColor="@color/gray_light" />
 
                     <TextView
-                        android:layout_marginLeft="5dp"
+                        android:id="@+id/bc_code"
                         style="@style/TextView_VerticalCenter"
-                        android:id="@+id/bc_code" />
+                        android:layout_marginLeft="5dp" />
                 </LinearLayout>
+
                 <LinearLayout
-                    android:padding="5dp"
-                    style="@style/LinearLayout_horizontal">
+                    style="@style/LinearLayout_horizontal"
+                    android:padding="5dp">
 
                     <TextView
-                        android:text="商机库名称"
-                        android:textColor="@color/gray_light"
-                        android:layout_marginLeft="10dp"
+                        style="@style/TextView_VerticalCenter"
                         android:layout_width="70dp"
-                        style="@style/TextView_VerticalCenter" />
+                        android:layout_marginLeft="10dp"
+                        android:text="商机库名称"
+                        android:textColor="@color/gray_light" />
 
                     <TextView
-                        android:layout_marginLeft="5dp"
+                        android:id="@+id/bc_description"
                         style="@style/TextView_VerticalCenter"
-                        android:id="@+id/bc_description" />
+                        android:layout_marginLeft="5dp" />
                 </LinearLayout>
+
                 <LinearLayout
-                    android:padding="5dp"
-                    style="@style/LinearLayout_horizontal">
+                    style="@style/LinearLayout_horizontal"
+                    android:padding="5dp">
 
                     <TextView
-                        android:text="来源"
-                        android:textColor="@color/gray_light"
-                        android:layout_marginLeft="10dp"
+                        style="@style/TextView_VerticalCenter"
                         android:layout_width="70dp"
-                        style="@style/TextView_VerticalCenter" />
+                        android:layout_marginLeft="10dp"
+                        android:text="来源"
+                        android:textColor="@color/gray_light" />
 
                     <TextView
-                        android:layout_marginLeft="5dp"
+                        android:id="@+id/bc_from"
                         style="@style/TextView_VerticalCenter"
-                        android:id="@+id/bc_from" />
+                        android:layout_marginLeft="5dp" />
                 </LinearLayout>
+
                 <LinearLayout
-                    android:padding="5dp"
-                    style="@style/LinearLayout_horizontal">
+                    style="@style/LinearLayout_horizontal"
+                    android:padding="5dp">
 
                     <TextView
-                        android:text="商机库"
-                        android:textColor="@color/gray_light"
-                        android:layout_marginLeft="10dp"
+                        style="@style/TextView_VerticalCenter"
                         android:layout_width="70dp"
-                        style="@style/TextView_VerticalCenter" />
+                        android:layout_marginLeft="10dp"
+                        android:text="商机库"
+                        android:textColor="@color/gray_light" />
 
                     <TextView
-                        android:layout_marginLeft="5dp"
+                        android:id="@+id/bc_nichehouse"
                         style="@style/TextView_VerticalCenter"
-                        android:id="@+id/bc_nichehouse" />
+                        android:layout_marginLeft="5dp" />
                 </LinearLayout>
+
                 <LinearLayout
-                    android:padding="5dp"
                     style="@style/LinearLayout_horizontal"
+                    android:padding="5dp"
                     android:visibility="gone">
 
                     <TextView
-                        android:text="商机类型"
-                        android:textColor="@color/gray_light"
-                        android:layout_marginLeft="10dp"
+                        style="@style/TextView_VerticalCenter"
                         android:layout_width="70dp"
-                        style="@style/TextView_VerticalCenter" />
+                        android:layout_marginLeft="10dp"
+                        android:text="商机类型"
+                        android:textColor="@color/gray_light" />
 
                     <TextView
-                        android:layout_marginLeft="5dp"
+                        android:id="@+id/bc_type"
                         style="@style/TextView_VerticalCenter"
-                        android:id="@+id/bc_type" />
+                        android:layout_marginLeft="5dp" />
                 </LinearLayout>
+
                 <LinearLayout
-                    android:padding="5dp"
-                    style="@style/LinearLayout_horizontal">
+                    style="@style/LinearLayout_horizontal"
+                    android:padding="5dp">
 
                     <TextView
-                        android:text="当前阶段"
-                        android:textColor="@color/gray_light"
-                        android:layout_marginLeft="10dp"
+                        style="@style/TextView_VerticalCenter"
                         android:layout_width="70dp"
-                        style="@style/TextView_VerticalCenter" />
+                        android:layout_marginLeft="10dp"
+                        android:text="当前阶段"
+                        android:textColor="@color/gray_light" />
 
                     <TextView
-                        android:layout_marginLeft="5dp"
+                        android:id="@+id/bc_currentprocess"
                         style="@style/TextView_VerticalCenter"
-                        android:id="@+id/bc_currentprocess" />
+                        android:layout_marginLeft="5dp" />
                 </LinearLayout>
 
                 <LinearLayout
-                    android:padding="5dp"
-                    style="@style/LinearLayout_horizontal">
+                    style="@style/LinearLayout_horizontal"
+                    android:padding="5dp">
 
                     <TextView
-                        android:text="创建时间"
-                        android:textColor="@color/gray_light"
-                        android:layout_marginLeft="10dp"
+                        style="@style/TextView_VerticalCenter"
                         android:layout_width="70dp"
-                        style="@style/TextView_VerticalCenter" />
+                        android:layout_marginLeft="10dp"
+                        android:text="创建时间"
+                        android:textColor="@color/gray_light" />
 
                     <TextView
-                        android:layout_marginLeft="5dp"
+                        android:id="@+id/bc_recorddate"
                         style="@style/TextView_VerticalCenter"
-                        android:id="@+id/bc_recorddate" />
+                        android:layout_marginLeft="5dp" />
                 </LinearLayout>
+
                 <LinearLayout
-                    android:padding="5dp"
-                    style="@style/LinearLayout_horizontal">
+                    style="@style/LinearLayout_horizontal"
+                    android:padding="5dp">
 
                     <TextView
-                        android:text="创建人"
-                        android:textColor="@color/gray_light"
-                        android:layout_marginLeft="10dp"
+                        style="@style/TextView_VerticalCenter"
                         android:layout_width="70dp"
-                        style="@style/TextView_VerticalCenter" />
+                        android:layout_marginLeft="10dp"
+                        android:text="创建人"
+                        android:textColor="@color/gray_light" />
 
                     <TextView
-                        android:layout_marginLeft="5dp"
+                        android:id="@+id/bc_recorder"
                         style="@style/TextView_VerticalCenter"
-                        android:id="@+id/bc_recorder" />
+                        android:layout_marginLeft="5dp" />
                 </LinearLayout>
 
-          
 
                 <LinearLayout
-                    android:padding="5dp"
-                    style="@style/LinearLayout_horizontal">
+                    style="@style/LinearLayout_horizontal"
+                    android:padding="5dp">
 
                     <TextView
-                        android:text="最后跟进时间"
-                        android:textColor="@color/gray_light"
-                        android:layout_marginLeft="10dp"
+                        style="@style/TextView_VerticalCenter"
                         android:layout_width="70dp"
-                        style="@style/TextView_VerticalCenter" />
+                        android:layout_marginLeft="10dp"
+                        android:text="最后跟进时间"
+                        android:textColor="@color/gray_light" />
 
                     <TextView
-                        android:layout_marginLeft="5dp"
+                        android:id="@+id/bc_lastdate"
                         style="@style/TextView_VerticalCenter"
-                        android:id="@+id/bc_lastdate" />
+                        android:layout_marginLeft="5dp" />
                 </LinearLayout>
-            
+
                 <LinearLayout
-                    android:padding="5dp"
-                    style="@style/LinearLayout_horizontal">
+                    style="@style/LinearLayout_horizontal"
+                    android:padding="5dp">
 
                     <TextView
-                        android:text="跟进人"
-                        android:textColor="@color/gray_light"
-                        android:layout_marginLeft="10dp"
+                        style="@style/TextView_VerticalCenter"
                         android:layout_width="70dp"
-                        style="@style/TextView_VerticalCenter" />
+                        android:layout_marginLeft="10dp"
+                        android:text="跟进人"
+                        android:textColor="@color/gray_light" />
 
                     <TextView
-                        android:layout_marginLeft="5dp"
+                        android:id="@+id/bc_doman"
                         style="@style/TextView_VerticalCenter"
-                        android:id="@+id/bc_doman" />
+                        android:layout_marginLeft="5dp" />
                 </LinearLayout>
-          
 
-         
+
             </LinearLayout>
+
             <LinearLayout
                 style="@style/crm_ll_card"
-                android:layout_marginTop="10dp"
-                android:layout_height="wrap_content">
+                android:layout_height="wrap_content"
+                android:layout_marginTop="10dp">
 
                 <LinearLayout style="@style/LinearLayout_horizontal">
 
-                    <TextView
-                        android:layout_width="10dp"
-                        android:layout_height="15dp"
-                        android:layout_gravity="center_vertical"
-                        android:background="@drawable/shape_tv_color"
-                        android:textColor="#FF8E57" />
+                    <ImageView style="@style/sign_imageview" />
 
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_margin="10dp"
-                        android:textSize="15sp"
+                        android:text="联系方式"
                         android:textColor="#FF8E57"
-                        android:text="联系方式" />
+                        android:textSize="15sp" />
                 </LinearLayout>
 
                 <LinearLayout
-                    android:padding="5dp"
-                    style="@style/LinearLayout_horizontal">
+                    style="@style/LinearLayout_horizontal"
+                    android:padding="5dp">
 
                     <TextView
-                        android:text="企业名称"
-                        android:textColor="@color/gray_light"
-                        android:layout_marginLeft="10dp"
+                        style="@style/TextView_VerticalCenter"
                         android:layout_width="70dp"
-                        style="@style/TextView_VerticalCenter" />
+                        android:layout_marginLeft="10dp"
+                        android:text="企业名称"
+                        android:textColor="@color/gray_light" />
 
                     <TextView
-                        android:layout_marginLeft="5dp"
+                        android:id="@+id/bc_custname"
                         style="@style/TextView_VerticalCenter"
-                        android:id="@+id/bc_custname" />
+                        android:layout_marginLeft="5dp" />
                 </LinearLayout>
 
                 <LinearLayout
-                    android:padding="5dp"
-                    style="@style/LinearLayout_horizontal">
+                    style="@style/LinearLayout_horizontal"
+                    android:padding="5dp">
 
                     <TextView
-                        android:text="地址"
-                        android:textColor="@color/gray_light"
-                        android:layout_marginLeft="10dp"
+                        style="@style/TextView_VerticalCenter"
                         android:layout_width="70dp"
-                        style="@style/TextView_VerticalCenter" />
+                        android:layout_marginLeft="10dp"
+                        android:text="地址"
+                        android:textColor="@color/gray_light" />
 
                     <TextView
-                        android:layout_marginLeft="5dp"
+                        android:id="@+id/bc_address"
                         style="@style/TextView_VerticalCenter"
-                        android:id="@+id/bc_address" />
+                        android:layout_marginLeft="5dp" />
                 </LinearLayout>
 
                 <LinearLayout
-                    android:padding="5dp"
-                    style="@style/LinearLayout_horizontal">
+                    style="@style/LinearLayout_horizontal"
+                    android:padding="5dp">
 
                     <TextView
-                        android:text="联系人"
-                        android:textColor="@color/gray_light"
-                        android:layout_marginLeft="10dp"
+                        style="@style/TextView_VerticalCenter"
                         android:layout_width="70dp"
-                        style="@style/TextView_VerticalCenter" />
+                        android:layout_marginLeft="10dp"
+                        android:text="联系人"
+                        android:textColor="@color/gray_light" />
 
                     <TextView
-                        android:layout_marginLeft="5dp"
+                        android:id="@+id/bc_contact"
                         style="@style/TextView_VerticalCenter"
-                        android:id="@+id/bc_contact" />
+                        android:layout_marginLeft="5dp" />
                 </LinearLayout>
 
                 <LinearLayout
-                    android:padding="5dp"
-                    style="@style/LinearLayout_horizontal">
+                    style="@style/LinearLayout_horizontal"
+                    android:padding="5dp">
 
                     <TextView
-                        android:text="职位"
-                        android:textColor="@color/gray_light"
-                        android:layout_marginLeft="10dp"
+                        style="@style/TextView_VerticalCenter"
                         android:layout_width="70dp"
-                        style="@style/TextView_VerticalCenter" />
+                        android:layout_marginLeft="10dp"
+                        android:text="职位"
+                        android:textColor="@color/gray_light" />
 
                     <TextView
-                        android:layout_marginLeft="5dp"
+                        android:id="@+id/bc_position"
                         style="@style/TextView_VerticalCenter"
-                        android:id="@+id/bc_position" />
+                        android:layout_marginLeft="5dp" />
                 </LinearLayout>
 
                 <LinearLayout
-                    android:padding="5dp"
-                    style="@style/LinearLayout_horizontal">
+                    style="@style/LinearLayout_horizontal"
+                    android:padding="5dp">
 
                     <TextView
-                        android:text="电话"
-                        android:textColor="@color/gray_light"
-                        android:layout_marginLeft="10dp"
+                        style="@style/TextView_VerticalCenter"
                         android:layout_width="70dp"
-                        style="@style/TextView_VerticalCenter" />
+                        android:layout_marginLeft="10dp"
+                        android:text="电话"
+                        android:textColor="@color/gray_light" />
 
                     <TextView
-                        android:layout_marginLeft="5dp"
+                        android:id="@+id/bt_tel"
                         style="@style/TextView_VerticalCenter"
-                        android:id="@+id/bt_tel" />
+                        android:layout_marginLeft="5dp" />
                 </LinearLayout>
             </LinearLayout>
+
             <LinearLayout
                 style="@style/crm_ll_card"
-                android:layout_marginTop="10dp"
+                android:layout_height="wrap_content"
                 android:layout_marginBottom="20dp"
-                android:layout_height="wrap_content">
+                android:layout_marginTop="10dp">
+
                 <LinearLayout style="@style/LinearLayout_horizontal">
 
-                    <TextView
-                        android:layout_width="10dp"
-                        android:layout_height="15dp"
-                        android:layout_gravity="center_vertical"
-                        android:background="@drawable/shape_tv_color"
-                        android:textColor="#FF8E57" />
+                    <ImageView style="@style/sign_imageview" />
 
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_margin="10dp"
-                        android:textSize="15sp"
+                        android:text="其它"
                         android:textColor="#FF8E57"
-                        android:text="其它" />
+                        android:textSize="15sp" />
                 </LinearLayout>
+
                 <LinearLayout
-                    android:padding="5dp"
-                    style="@style/LinearLayout_horizontal">
+                    style="@style/LinearLayout_horizontal"
+                    android:padding="5dp">
 
                     <TextView
-                        android:text="备注"
-                        android:textColor="@color/gray_light"
-                        android:layout_marginLeft="10dp"
+                        style="@style/TextView_VerticalCenter"
                         android:layout_width="70dp"
-                        style="@style/TextView_VerticalCenter" />
+                        android:layout_marginLeft="10dp"
+                        android:text="备注"
+                        android:textColor="@color/gray_light" />
 
                     <TextView
-                        android:layout_marginLeft="5dp"
+                        android:id="@+id/bc_remark"
                         style="@style/TextView_VerticalCenter"
-                        android:id="@+id/bc_remark" />
+                        android:layout_marginLeft="5dp" />
                 </LinearLayout>
 
-            
 
-             
             </LinearLayout>
-     
+
         </LinearLayout>
 
     </ScrollView>
+
     <LinearLayout
         android:id="@+id/ll_bottom"
         style="@style/crm_ll_card"
-        android:layout_alignParentBottom="true"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true">
 
         <LinearLayout
             android:id="@+id/crm_ll_followup"
@@ -462,48 +458,50 @@
 
             <Button
                 android:id="@+id/bt_manage_date"
+                style="@style/crm_business_btn_nomargin"
                 android:layout_weight="1"
-                android:text="添加日程"
-                style="@style/crm_business_btn_nomargin" />
+                android:text="添加日程" />
 
             <Button
                 android:id="@+id/bt_manage_go"
+                style="@style/crm_business_btn_nomargin"
                 android:layout_weight="1"
-                android:text="跟进"
-                style="@style/crm_business_btn_nomargin" />
+                android:text="跟进" />
         </LinearLayout>
 
         <LinearLayout
-            android:visibility="gone"
             android:id="@+id/crm_ll_qiang"
             style="@style/LinearLayout_horizontal"
+            android:visibility="gone"
             android:weightSum="2">
 
             <Button
                 android:id="@+id/bt_qiang"
+                style="@style/crm_business_btn_nomargin"
                 android:layout_weight="1"
-                android:text="抢"
-                style="@style/crm_business_btn_nomargin" />
+                android:textColor="@color/red"
+                android:text="抢" />
 
         </LinearLayout>
 
 
         <LinearLayout
-            android:visibility="gone"
             android:id="@+id/crm_ll_manage"
             style="@style/LinearLayout_horizontal"
+            android:visibility="gone"
             android:weightSum="2">
 
             <Button
                 android:id="@+id/bt_fenpei"
+                style="@style/crm_business_btn_nomargin"
                 android:layout_weight="1"
-                android:text="分配"
-                style="@style/crm_business_btn_nomargin" />
+                android:text="分配" />
+
             <Button
                 android:id="@+id/bt_zhuanyi"
+                style="@style/crm_business_btn_nomargin"
                 android:layout_weight="1"
-                android:text="转移"
-                style="@style/crm_business_btn_nomargin" />
+                android:text="转移" />
         </LinearLayout>
     </LinearLayout>
 </RelativeLayout>

+ 211 - 226
WeiChat/src/main/res/layout/activity_customer_detail.xml

@@ -6,369 +6,362 @@
     tools:context="com.xzjmyk.pm.activity.ui.erp.activity.crm.CustomerDetailActivity">
 
     <LinearLayout
-        android:layout_margin="0dp"
+        style="@style/crm_ll_card"
         android:layout_height="wrap_content"
-        android:background="@color/gray_light"
-        style="@style/crm_ll_card">
+        android:layout_margin="0dp"
+        android:background="@color/gray_light">
 
         <LinearLayout
-            android:layout_height="wrap_content"
             style="@style/LinearLayout_vertical"
+            android:layout_height="wrap_content"
             android:visibility="gone">
 
             <TextView
-              
-                android:textSize="18sp"
+
+                style="@style/TextView_VerticalCenter"
                 android:layout_margin="20dp"
-                android:textColor="@color/white"
                 android:text="深圳市xxx公司"
-                style="@style/TextView_VerticalCenter" />
+                android:textColor="@color/white"
+                android:textSize="18sp" />
 
             <TextView
-              
-                android:layout_marginLeft="20dp"
+
+                style="@style/TextView_VerticalCenter"
                 android:layout_marginBottom="5dp"
-                android:textColor="@color/white"
+                android:layout_marginLeft="20dp"
                 android:text="负责人:深圳市xxx公司"
-                style="@style/TextView_VerticalCenter" />
+                android:textColor="@color/white" />
 
             <TextView
                 android:id="@+id/tv_state"
-                android:layout_marginLeft="20dp"
+                style="@style/TextView_VerticalCenter"
                 android:layout_marginBottom="5dp"
-                android:textColor="@color/white"
+                android:layout_marginLeft="20dp"
                 android:text="未成交:普通客户"
-                style="@style/TextView_VerticalCenter" />
+                android:textColor="@color/white" />
 
             <TextView
-              
-                android:layout_marginLeft="20dp"
+
+                style="@style/TextView_VerticalCenter"
                 android:layout_marginBottom="5dp"
-                android:textColor="@color/white"
+                android:layout_marginLeft="20dp"
                 android:text="最后跟进:2016-07-05 08:08"
-                style="@style/TextView_VerticalCenter" />
+                android:textColor="@color/white" />
 
         </LinearLayout>
 
         <LinearLayout
-            android:layout_height="wrap_content"
-            style="@style/crm_ll_card">
+            style="@style/crm_ll_card"
+            android:layout_height="wrap_content">
 
             <LinearLayout style="@style/LinearLayout_horizontal">
 
-                <TextView
-                    android:layout_width="10dp"
-                    android:layout_height="15dp"
-                    android:layout_gravity="center_vertical"
-                    android:background="@drawable/shape_tv_color"
-                    android:textColor="#FF8E57" />
+                <ImageView style="@style/sign_imageview" />
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_margin="10dp"
-                    android:textSize="15sp"
+                    android:text="基本信息"
                     android:textColor="#FF8E57"
-                    android:text="基本信息" />
+                    android:textSize="15sp" />
             </LinearLayout>
 
             <LinearLayout
-                android:layout_margin="5dp"
-                style="@style/LinearLayout_horizontal">
+                style="@style/LinearLayout_horizontal"
+                android:layout_margin="5dp">
 
                 <TextView
-                    android:text="客户名称"
-                    android:textColor="@color/gray_light"
-                    android:layout_marginLeft="10dp"
+                    style="@style/TextView_VerticalCenter"
                     android:layout_width="70dp"
-                    style="@style/TextView_VerticalCenter" />
+                    android:layout_marginLeft="10dp"
+                    android:text="客户名称"
+                    android:textColor="@color/gray_light" />
 
                 <TextView
                     android:id="@+id/tv_company_name"
-                    android:layout_marginLeft="5dp"
-                    style="@style/TextView_VerticalCenter" />
+                    style="@style/TextView_VerticalCenter"
+                    android:layout_marginLeft="5dp" />
             </LinearLayout>
-       
+
             <LinearLayout
-                android:layout_margin="5dp"
-                style="@style/LinearLayout_horizontal">
+                style="@style/LinearLayout_horizontal"
+                android:layout_margin="5dp">
 
                 <TextView
-                    android:text="客户地址"
-                    android:textColor="@color/gray_light"
-                    android:layout_marginLeft="10dp"
+                    style="@style/TextView_VerticalCenter"
                     android:layout_width="70dp"
-                    style="@style/TextView_VerticalCenter" />
+                    android:layout_marginLeft="10dp"
+                    android:text="客户地址"
+                    android:textColor="@color/gray_light" />
 
                 <TextView
                     android:id="@+id/tv_address"
-                    android:layout_marginLeft="5dp"
-                    style="@style/TextView_VerticalCenter" />
+                    style="@style/TextView_VerticalCenter"
+                    android:layout_marginLeft="5dp" />
             </LinearLayout>
+
             <LinearLayout
-                android:layout_margin="5dp"
-                style="@style/LinearLayout_horizontal">
+                style="@style/LinearLayout_horizontal"
+                android:layout_margin="5dp">
 
                 <TextView
-                    android:text="客户类型"
-                    android:textColor="@color/gray_light"
-                    android:layout_marginLeft="10dp"
+                    style="@style/TextView_VerticalCenter"
                     android:layout_width="70dp"
-                    style="@style/TextView_VerticalCenter" />
+                    android:layout_marginLeft="10dp"
+                    android:text="客户类型"
+                    android:textColor="@color/gray_light" />
 
                 <TextView
                     android:id="@+id/tv_type"
-                    android:layout_marginLeft="5dp"
-                    style="@style/TextView_VerticalCenter" />
+                    style="@style/TextView_VerticalCenter"
+                    android:layout_marginLeft="5dp" />
             </LinearLayout>
 
             <LinearLayout
-                android:layout_margin="5dp"
-                style="@style/LinearLayout_horizontal">
+                style="@style/LinearLayout_horizontal"
+                android:layout_margin="5dp">
 
                 <TextView
-                    android:text="所属地区"
-                    android:textColor="@color/gray_light"
-                    android:layout_marginLeft="10dp"
+                    style="@style/TextView_VerticalCenter"
                     android:layout_width="70dp"
-                    style="@style/TextView_VerticalCenter" />
+                    android:layout_marginLeft="10dp"
+                    android:text="所属地区"
+                    android:textColor="@color/gray_light" />
 
                 <TextView
                     android:id="@+id/tv_diqu"
-                    android:layout_marginLeft="5dp"
-                    style="@style/TextView_VerticalCenter" />
+                    style="@style/TextView_VerticalCenter"
+                    android:layout_marginLeft="5dp" />
             </LinearLayout>
 
             <LinearLayout
-                android:layout_margin="5dp"
-                style="@style/LinearLayout_horizontal">
+                style="@style/LinearLayout_horizontal"
+                android:layout_margin="5dp">
 
                 <TextView
-                    android:text="业务员"
-                    android:textColor="@color/gray_light"
-                    android:layout_marginLeft="10dp"
+                    style="@style/TextView_VerticalCenter"
                     android:layout_width="70dp"
-                    style="@style/TextView_VerticalCenter" />
+                    android:layout_marginLeft="10dp"
+                    android:text="业务员"
+                    android:textColor="@color/gray_light" />
 
                 <TextView
                     android:id="@+id/tv_leader"
-                    android:layout_marginLeft="5dp"
-                    style="@style/TextView_VerticalCenter" />
+                    style="@style/TextView_VerticalCenter"
+                    android:layout_marginLeft="5dp" />
             </LinearLayout>
+
             <LinearLayout
-                android:layout_margin="5dp"
-                style="@style/LinearLayout_horizontal">
+                style="@style/LinearLayout_horizontal"
+                android:layout_margin="5dp">
 
                 <TextView
-                    android:text="营业执照"
-                    android:textColor="@color/gray_light"
-                    android:layout_marginLeft="10dp"
+                    style="@style/TextView_VerticalCenter"
                     android:layout_width="70dp"
-                    style="@style/TextView_VerticalCenter" />
+                    android:layout_marginLeft="10dp"
+                    android:text="营业执照"
+                    android:textColor="@color/gray_light" />
 
                 <TextView
                     android:id="@+id/tv_zhihzhao"
-                    android:layout_marginLeft="5dp"
-                    style="@style/TextView_VerticalCenter" />
+                    style="@style/TextView_VerticalCenter"
+                    android:layout_marginLeft="5dp" />
             </LinearLayout>
+
             <LinearLayout
-                android:layout_margin="5dp"
-                style="@style/LinearLayout_horizontal">
+                style="@style/LinearLayout_horizontal"
+                android:layout_margin="5dp">
 
                 <TextView
-                    android:text="跟进时间"
-                    android:textColor="@color/gray_light"
-                    android:layout_marginLeft="10dp"
+                    style="@style/TextView_VerticalCenter"
                     android:layout_width="70dp"
-                    style="@style/TextView_VerticalCenter" />
+                    android:layout_marginLeft="10dp"
+                    android:text="跟进时间"
+                    android:textColor="@color/gray_light" />
 
                 <TextView
                     android:id="@+id/tv_lastDate"
-                    android:layout_marginLeft="5dp"
-                    style="@style/TextView_VerticalCenter" />
+                    style="@style/TextView_VerticalCenter"
+                    android:layout_marginLeft="5dp" />
             </LinearLayout>
+
             <LinearLayout
-                android:layout_margin="5dp"
                 style="@style/LinearLayout_horizontal"
+                android:layout_margin="5dp"
                 android:visibility="gone">
 
                 <TextView
-                    android:text="来源"
-                    android:textColor="@color/gray_light"
-                    android:layout_marginLeft="10dp"
+                    style="@style/TextView_VerticalCenter"
                     android:layout_width="70dp"
-                    style="@style/TextView_VerticalCenter" />
+                    android:layout_marginLeft="10dp"
+                    android:text="来源"
+                    android:textColor="@color/gray_light" />
 
                 <TextView
                     android:id="@+id/tv_source"
+                    style="@style/TextView_VerticalCenter"
                     android:layout_marginLeft="5dp"
-                    android:text="线上注册"
-                    style="@style/TextView_VerticalCenter" />
+                    android:text="线上注册" />
             </LinearLayout>
 
             <LinearLayout
-                android:layout_margin="5dp"
                 style="@style/LinearLayout_horizontal"
+                android:layout_margin="5dp"
                 android:visibility="gone">
 
                 <TextView
-                    android:text="行业"
-                    android:textColor="@color/gray_light"
-                    android:layout_marginLeft="10dp"
+                    style="@style/TextView_VerticalCenter"
                     android:layout_width="70dp"
-                    style="@style/TextView_VerticalCenter" />
+                    android:layout_marginLeft="10dp"
+                    android:text="行业"
+                    android:textColor="@color/gray_light" />
 
                 <TextView
                     android:id="@+id/tv_industry"
+                    style="@style/TextView_VerticalCenter"
                     android:layout_marginLeft="5dp"
-                    android:text="金融业"
-                    style="@style/TextView_VerticalCenter" />
+                    android:text="金融业" />
             </LinearLayout>
 
             <LinearLayout
-                android:layout_margin="5dp"
                 style="@style/LinearLayout_horizontal"
+                android:layout_margin="5dp"
                 android:visibility="gone">
 
                 <TextView
-                    android:text="电话"
-                    android:textColor="@color/gray_light"
-                    android:layout_marginLeft="10dp"
+                    style="@style/TextView_VerticalCenter"
                     android:layout_width="70dp"
-                    style="@style/TextView_VerticalCenter" />
+                    android:layout_marginLeft="10dp"
+                    android:text="电话"
+                    android:textColor="@color/gray_light" />
 
                 <TextView
                     android:id="@+id/tv_tel"
+                    style="@style/TextView_VerticalCenter"
                     android:layout_marginLeft="5dp"
-                    android:text="0755-21321312"
-                    style="@style/TextView_VerticalCenter" />
+                    android:text="0755-21321312" />
             </LinearLayout>
         </LinearLayout>
 
         <LinearLayout
-            android:layout_marginTop="10dp"
+            style="@style/crm_ll_card"
             android:layout_height="wrap_content"
-            style="@style/crm_ll_card">
+            android:layout_marginTop="10dp">
 
             <LinearLayout style="@style/LinearLayout_horizontal">
 
-                <TextView
-                    android:layout_width="10dp"
-                    android:layout_height="15dp"
-                    android:layout_gravity="center_vertical"
-                    android:background="@drawable/shape_tv_color"
-                    android:textColor="#FF8E57" />
+                <ImageView style="@style/sign_imageview" />
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_margin="10dp"
-                    android:textSize="15sp"
+                    android:text="联系人"
                     android:textColor="#FF8E57"
-                    android:text="联系人" />
+                    android:textSize="15sp" />
 
                 <TextView
                     style="@style/TextView_VerticalCenter"
-                    android:textColor="@color/gray_light"
-                    android:text="1人" />
+                    android:text="1人"
+                    android:textColor="@color/gray_light" />
             </LinearLayout>
 
             <LinearLayout
-                android:layout_margin="5dp"
-                style="@style/LinearLayout_horizontal">
+                style="@style/LinearLayout_horizontal"
+                android:layout_margin="5dp">
 
                 <TextView
-                    android:text="姓名"
+                    style="@style/TextView_VerticalCenter"
 
-                    android:layout_marginLeft="10dp"
                     android:layout_width="70dp"
-                    style="@style/TextView_VerticalCenter"
+                    android:layout_marginLeft="10dp"
+                    android:text="姓名"
                     android:textColor="@color/gray_light" />
 
                 <TextView
-                    android:textColor="@color/gray_light"
-                    android:layout_marginLeft="5dp"
+                    android:id="@+id/tv_name"
                     style="@style/TextView_VerticalCenter"
-                    android:id="@+id/tv_name" />
+                    android:layout_marginLeft="5dp"
+                    android:textColor="@color/gray_light" />
             </LinearLayout>
+
             <LinearLayout
-                android:layout_margin="5dp"
-                style="@style/LinearLayout_horizontal">
+                style="@style/LinearLayout_horizontal"
+                android:layout_margin="5dp">
 
                 <TextView
-                    android:text="岗位"
+                    style="@style/TextView_VerticalCenter"
 
-                    android:layout_marginLeft="10dp"
                     android:layout_width="70dp"
-                    style="@style/TextView_VerticalCenter"
+                    android:layout_marginLeft="10dp"
+                    android:text="岗位"
                     android:textColor="@color/gray_light" />
 
                 <TextView
-                    android:textColor="@color/gray_light"
-                    android:layout_marginLeft="5dp"
+                    android:id="@+id/tv_position"
                     style="@style/TextView_VerticalCenter"
-                    android:id="@+id/tv_position" />
+                    android:layout_marginLeft="5dp"
+                    android:textColor="@color/gray_light" />
             </LinearLayout>
+
             <LinearLayout
-                android:layout_margin="5dp"
-                style="@style/LinearLayout_horizontal">
+                style="@style/LinearLayout_horizontal"
+                android:layout_margin="5dp">
 
                 <TextView
-                    android:text="电话"
+                    style="@style/TextView_VerticalCenter"
 
-                    android:layout_marginLeft="10dp"
                     android:layout_width="70dp"
-                    style="@style/TextView_VerticalCenter"
+                    android:layout_marginLeft="10dp"
+                    android:text="电话"
                     android:textColor="@color/gray_light" />
 
                 <TextView
-                    android:textColor="@color/gray_light"
-                    android:layout_marginLeft="5dp"
+                    android:id="@+id/tv_mobile"
                     style="@style/TextView_VerticalCenter"
-                    android:id="@+id/tv_mobile" />
+                    android:layout_marginLeft="5dp"
+                    android:textColor="@color/gray_light" />
             </LinearLayout>
+
             <LinearLayout
-                android:layout_margin="5dp"
-                style="@style/LinearLayout_horizontal">
+                style="@style/LinearLayout_horizontal"
+                android:layout_margin="5dp">
 
                 <TextView
-                    android:text="邮箱"
+                    style="@style/TextView_VerticalCenter"
 
-                    android:layout_marginLeft="10dp"
                     android:layout_width="70dp"
-                    style="@style/TextView_VerticalCenter"
+                    android:layout_marginLeft="10dp"
+                    android:text="邮箱"
                     android:textColor="@color/gray_light" />
 
                 <TextView
-                    android:textColor="@color/gray_light"
-                    android:layout_marginLeft="5dp"
+                    android:id="@+id/tv_email"
                     style="@style/TextView_VerticalCenter"
-                    android:id="@+id/tv_email" />
+                    android:layout_marginLeft="5dp"
+                    android:textColor="@color/gray_light" />
             </LinearLayout>
         </LinearLayout>
 
         <LinearLayout
-            android:layout_marginTop="10dp"
+            style="@style/crm_ll_card"
             android:layout_height="wrap_content"
-            style="@style/crm_ll_card">
+            android:layout_marginTop="10dp">
 
             <LinearLayout style="@style/LinearLayout_horizontal">
 
-                <TextView
-                    android:layout_width="10dp"
-                    android:layout_height="15dp"
-                    android:layout_gravity="center_vertical"
-                    android:background="@drawable/shape_tv_color"
-                    android:textColor="#FF8E57" />
+                <ImageView style="@style/sign_imageview" />
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_margin="10dp"
-                    android:textSize="15sp"
+                    android:text="商机阶段"
                     android:textColor="#FF8E57"
-                    android:text="商机阶段" />
+                    android:textSize="15sp" />
             </LinearLayout>
+
             <com.xzjmyk.pm.activity.view.steps.StepsView
                 android:id="@+id/stepsView"
                 android:layout_width="match_parent"
@@ -378,26 +371,21 @@
         </LinearLayout>
 
         <LinearLayout
-            android:layout_marginTop="10dp"
+            style="@style/crm_ll_card"
             android:layout_height="wrap_content"
-            style="@style/crm_ll_card">
+            android:layout_marginTop="10dp">
 
             <LinearLayout style="@style/LinearLayout_horizontal">
 
-                <TextView
-                    android:layout_width="10dp"
-                    android:layout_height="15dp"
-                    android:layout_gravity="center_vertical"
-                    android:background="@drawable/shape_tv_color"
-                    android:textColor="#FF8E57" />
+                <ImageView style="@style/sign_imageview" />
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_margin="10dp"
-                    android:textSize="15sp"
+                    android:text="财务信息"
                     android:textColor="#FF8E57"
-                    android:text="财务信息" />
+                    android:textSize="15sp" />
             </LinearLayout>
 
             <RelativeLayout
@@ -405,57 +393,59 @@
                 android:layout_height="wrap_content">
 
                 <LinearLayout
+                    style="@style/LinearLayout_horizontal"
                     android:layout_width="wrap_content"
-                    android:layout_alignParentLeft="true"
-                    style="@style/LinearLayout_horizontal">
+                    android:layout_alignParentLeft="true">
 
                     <TextView
-                        android:text="币别"
+                        style="@style/TextView_VerticalCenter"
                         android:layout_margin="10dp"
-                        style="@style/TextView_VerticalCenter" />
+                        android:text="币别" />
 
                     <TextView
-                     
-                        android:text="人民币"
-                       
+
+                        style="@style/TextView_VerticalCenter"
+
                         android:layout_gravity="center"
                         android:layout_margin="10dp"
-                        style="@style/TextView_VerticalCenter" />
+                        android:text="人民币" />
                 </LinearLayout>
+
                 <LinearLayout
+                    style="@style/LinearLayout_horizontal"
                     android:layout_width="wrap_content"
-                    android:layout_centerInParent="true"
-                    style="@style/LinearLayout_horizontal">
+                    android:layout_centerInParent="true">
 
                     <TextView
-                        android:text="费率"
+                        style="@style/TextView_VerticalCenter"
                         android:layout_margin="10dp"
-                        style="@style/TextView_VerticalCenter" />
+                        android:text="费率" />
 
                     <TextView
                         android:id="@+id/tv_feilv"
-                        android:text="0元"
+                        style="@style/TextView_VerticalCenter"
 
                         android:layout_gravity="center"
                         android:layout_margin="10dp"
-                        style="@style/TextView_VerticalCenter" />
+                        android:text="0元" />
                 </LinearLayout>
+
                 <LinearLayout
+                    style="@style/LinearLayout_horizontal"
                     android:layout_width="wrap_content"
-                    android:layout_alignParentRight="true"
-                    style="@style/LinearLayout_horizontal">
+                    android:layout_alignParentRight="true">
 
                     <TextView
-                        android:text="费用报销"
+                        style="@style/TextView_VerticalCenter"
                         android:layout_margin="10dp"
-                        style="@style/TextView_VerticalCenter" />
+                        android:text="费用报销" />
 
                     <TextView
                         android:id="@+id/tv_feiyonged"
-                        android:text="0元"
+                        style="@style/TextView_VerticalCenter"
                         android:layout_gravity="center"
                         android:layout_margin="10dp"
-                        style="@style/TextView_VerticalCenter" />
+                        android:text="0元" />
                 </LinearLayout>
 
             </RelativeLayout>
@@ -463,26 +453,21 @@
         </LinearLayout>
 
         <LinearLayout
-            android:layout_marginTop="10dp"
+            style="@style/crm_ll_card"
             android:layout_height="wrap_content"
-            style="@style/crm_ll_card">
+            android:layout_marginTop="10dp">
 
             <LinearLayout style="@style/LinearLayout_horizontal">
 
-                <TextView
-                    android:layout_width="10dp"
-                    android:layout_height="15dp"
-                    android:layout_gravity="center_vertical"
-                    android:background="@drawable/shape_tv_color"
-                    android:textColor="#FF8E57" />
+                <ImageView style="@style/sign_imageview" />
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_margin="10dp"
-                    android:textSize="15sp"
+                    android:text="其它"
                     android:textColor="#FF8E57"
-                    android:text="其它" />
+                    android:textSize="15sp" />
             </LinearLayout>
 
             <RelativeLayout
@@ -491,59 +476,59 @@
 
                 <LinearLayout
                     android:id="@+id/ll_left"
-                    android:layout_below="@+id/ll_right"
+                    style="@style/LinearLayout_horizontal"
                     android:layout_width="wrap_content"
                     android:layout_alignParentLeft="true"
-                    style="@style/LinearLayout_horizontal">
+                    android:layout_below="@+id/ll_right">
 
                     <TextView
-                        android:text="备注"
+                        style="@style/TextView_VerticalCenter"
                         android:layout_margin="10dp"
-                        style="@style/TextView_VerticalCenter" />
+                        android:text="备注" />
 
                     <TextView
                         android:id="@+id/tv_modifyRecord"
-                        android:text="0条"
+                        style="@style/TextView_VerticalCenter"
                         android:layout_gravity="center"
                         android:layout_margin="10dp"
-                        style="@style/TextView_VerticalCenter" />
+                        android:text="0条" />
                 </LinearLayout>
 
                 <LinearLayout
                     android:id="@+id/ll_right"
-                    android:layout_width="wrap_content"
-                   
-                    style="@style/LinearLayout_horizontal">
+                    style="@style/LinearLayout_horizontal"
+
+                    android:layout_width="wrap_content">
 
                     <TextView
-                        android:text="拜访次数"
+                        style="@style/TextView_VerticalCenter"
                         android:layout_margin="10dp"
-                        style="@style/TextView_VerticalCenter" />
+                        android:text="拜访次数" />
 
                     <TextView
                         android:id="@+id/tv_visitTimes"
-                        android:text="0次"
+                        style="@style/TextView_VerticalCenter"
                         android:layout_gravity="center"
                         android:layout_margin="10dp"
-                        style="@style/TextView_VerticalCenter" />
+                        android:text="0次" />
                 </LinearLayout>
 
             </RelativeLayout>
         </LinearLayout>
 
         <LinearLayout
-           
-            android:layout_height="wrap_content"
-            style="@style/crm_ll_card">
-            <View style="@style/app_line_gray_1dp"
-                ></View>
-           <Button
-               android:layout_width="match_parent"
-               android:layout_height="wrap_content" 
-               android:padding="10dp"
-               android:background="@null"
-               android:text="添加到拜访记录"
-               />
+
+            style="@style/crm_ll_card"
+            android:layout_height="wrap_content">
+
+            <View style="@style/app_line_gray_1dp"></View>
+
+            <Button
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@null"
+                android:padding="10dp"
+                android:text="添加到拜访记录" />
         </LinearLayout>
     </LinearLayout>
 

+ 9 - 2
WeiChat/src/main/res/layout/item_business_detail.xml

@@ -96,7 +96,7 @@
             android:layout_gravity="center_vertical"
             style="@style/TextView_Basic" />
 
-        <Button
+        <!--<Button
             android:id="@+id/bt_business_qiang"
             android:layout_alignParentRight="true"
             android:text="抢"
@@ -104,7 +104,14 @@
             android:layout_gravity="center_vertical|right"
             style="@style/crm_business_btn_single"
             android:focusable="false"
-            android:gravity="center" />
+            android:gravity="center" />-->
+        <ImageView
+            android:id="@+id/iv_business_qiang"
+            android:layout_width="wrap_content"
+            android:layout_height="30dp"
+            android:layout_alignParentRight="true"
+            android:layout_gravity="center_vertical|right"
+            android:src="@drawable/ic_qiang"/>
     </RelativeLayout>
 
 </LinearLayout>

+ 10 - 2
WeiChat/src/main/res/values/styles.xml

@@ -680,8 +680,8 @@
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:layout_weight">1</item>
-        <item name="android:padding">10dp</item>
-        <item name="android:layout_margin">5dp</item>
+        <item name="android:padding">6dp</item>
+        <item name="android:layout_margin">10dp</item>
         <item name="android:background">@drawable/shape_btn_bussine</item>
     </style>
 
@@ -796,4 +796,12 @@
         <item name="android:windowEnterAnimation">@anim/pop_in</item>
         <item name="android:windowExitAnimation">@anim/pop_out</item>
     </style>
+
+    <style name="sign_imageview">
+        <item name="android:layout_width">15dp</item>
+        <item name="android:layout_height">15dp</item>
+        <item name="android:layout_gravity">center_vertical</item>
+        <item name="android:layout_marginLeft">10dp</item>
+        <item name="android:src">@drawable/ic_flag</item>
+    </style>
 </resources>