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

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

@@ -225,7 +225,7 @@ public class BusinessDetailActivty extends BaseActivity {
             holder.type = mdata.get(position).getType();
             holder.tv_num.setText(mdata.get(position).getNum());
             holder.tv_name.setText(mdata.get(position).getName());
-            holder.tv_date.setText(mdata.get(position).getDate());
+            holder.tv_date.setText(mdata.get(position).getDate().substring(0,10));
             holder.tv_datetv.setText("创建时间");
             //holder.tv_leader.setText(mdata.get(position).getLeader());
             holder.tv_note.setText(mdata.get(position).getNote());

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

@@ -215,7 +215,7 @@ public class BusinessDetailInfoActivity extends BaseActivity implements View.OnC
                         case 1:
                             // ViewUtil.ToastMessage(BusinessDetailInfoActivity.this, "释放");
                             new MaterialDialog.Builder(ct).title("系统提示")
-                                    .content("确定释放这个线索？")
+                                    .content("确定释放这个商机？")
                                     .negativeText("取消")
                                     .positiveText("确定")
                                     .contentGravity(GravityEnum.CENTER)

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

@@ -102,7 +102,7 @@ public class BusinessLessActivity extends BaseActivity implements View.OnClickLi
                 ll_moment.setVisibility(View.GONE);
                 break;
             case 2:
-                getSupportActionBar().setTitle("商机跟进");
+                getSupportActionBar().setTitle("继续跟进");
                 tv_business_state.setText(process);
                 ll_leader.setVisibility(View.GONE);
                 ll_moment.setVisibility(View.VISIBLE);
@@ -257,7 +257,8 @@ public class BusinessLessActivity extends BaseActivity implements View.OnClickLi
         //Calendar.getInstance().get(Calendar.DAY_OF_MONTH)
         picker.setSelectedItem(
                 Calendar.getInstance().get(Calendar.YEAR),
-                Calendar.getInstance().get(Calendar.MONTH) + 1);
+                Calendar.getInstance().get(Calendar.MONTH) + 1,
+                Calendar.getInstance().get(Calendar.DAY_OF_MONTH));
         picker.setOnDatePickListener(new DatePicker.OnYearMonthDayPickListener() {
             @Override
             public void onDatePicked(String year, String month, String day) {

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

@@ -166,6 +166,7 @@ public class BusinessSelectCustomerActivity 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);
+                holder.tv_business_leader = (TextView) convertView.findViewById(R.id.tv_business_leader);
                 convertView.setTag(holder);
             } else {
                 holder = (ViewHolder) convertView.getTag();
@@ -193,6 +194,7 @@ public class BusinessSelectCustomerActivity extends BaseActivity {
             holder.code=mdata.get(position).getCode();
             holder.tv_business_name.setText(mdata.get(position).getName());
             holder.cb_left.setChecked(mdata.get(position).isChecked(), mdata.get(position).isChecked());
+            holder.tv_business_leader.setText("负责人:"+mdata.get(position).getLeader());
             return convertView;
         }
 
@@ -200,6 +202,7 @@ public class BusinessSelectCustomerActivity extends BaseActivity {
         class ViewHolder {
             SmoothCheckBox cb_left;
             TextView tv_business_name;
+            TextView tv_business_leader;
             String code;
         }
     }
@@ -218,6 +221,7 @@ public class BusinessSelectCustomerActivity extends BaseActivity {
                            Business model = new Business();
                            model.setName(object.getString("CU_NAME"));
                            model.setCode(object.getString("CU_CODE"));
+                           model.setLeader(object.getString("CU_CONTACT"));
                            mData.add(model);
                        }
                    }

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

@@ -596,9 +596,9 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
                         if (visits.size() != 2) {
                             if (visits.getJSONArray(0).getString(1).equals(CommonUtil.getSharedPreferences(ct, "erp_username"))) {
                                 CommonUtil.textAarrySpanForStyle(tv_rank_visit_left,
-                                        "第" + visits.getJSONArray(0).getString(0)
+                                        "第" + visits.getJSONArray(0).get(3).toString()
                                                 + "名"
-                                        , new String[]{visits.getJSONArray(0).getString(0)},
+                                        , new String[]{visits.getJSONArray(0).get(3).toString()},
                                         ct.getResources().getColor(R.color.red));
 
                                 CommonUtil.textAarrySpanForStyle(tv_rank_visit_right, visits.getJSONArray(0).getIntValue(2)

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

@@ -89,6 +89,7 @@ public class CustomerDetailActivity extends BaseActivity {
     private final String[] labels = {"初次沟通", "立项评估","产品演示", "合同签约", "样品报价", "多次交易"
             , "商务谈判", "需求分析", "完成交易"};
 
+    private String mCustomerName,mContactName,mCustomerAddress;
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -110,6 +111,9 @@ public class CustomerDetailActivity extends BaseActivity {
             public void onClick(View v) {
                 Intent intent = new Intent();
                 intent.setClass(CustomerDetailActivity.this,VisitReportPlanActivity.class);
+                intent.putExtra("customer_name", mCustomerName);
+                intent.putExtra("contact_name", mContactName);
+                intent.putExtra("customer_address", mCustomerAddress);
                 startActivity(intent);
             }
         });
@@ -158,6 +162,10 @@ public class CustomerDetailActivity extends BaseActivity {
                     Log.i(TAG, "handleMessage:" + msg.getData().getString("result"));
                     JSONObject jsonArray = JSON.parseObject(msg.getData().getString("result")).getJSONObject("customer");
                     if (jsonArray != null) {
+                        mCustomerName = jsonArray.getString("cu_name");
+                        mContactName = jsonArray.getString("cu_contact");
+                        mCustomerAddress = jsonArray.getString("cu_add1");
+
                         tv_company_name.setText(jsonArray.getString("cu_name"));
                         tv_leader.setText(jsonArray.getString("cu_sellername"));
                         tv_state.setText(jsonArray.getString("cu_dealstatus")+"|普通客户");

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

@@ -45,6 +45,7 @@ import java.util.Map;
  */
 public class VisitReportAddActivity extends BaseActivity implements View.OnClickListener {
 
+    private static final int LOAD_JIEDUAN = 67;
     @ViewInject(R.id.tv_address_login)
     private FormEditText tv_address_login;
     @ViewInject(R.id.tv_address_refresh)
@@ -90,6 +91,9 @@ public class VisitReportAddActivity extends BaseActivity implements View.OnClick
         tv_date_start.setKeyListener(null);
         tv_date_end.setKeyListener(null);
         tv_customer_login.setOnClickListener(this);
+
+        tv_visit_steps.setKeyListener(null);
+        tv_visit_steps.setOnClickListener(this);
     }
 
     private void initData() {
@@ -186,6 +190,22 @@ public class VisitReportAddActivity extends BaseActivity implements View.OnClick
                         e.printStackTrace();
                     }
                     break;
+                case LOAD_JIEDUAN:
+                    progressDialog.dismiss();
+                    lists.clear();
+                    Log.i(TAG, "handleMessage:" + msg.getData().getString("result"));
+                    String jieduanJson = msg.getData().getString("result");
+                    array = JSON.parseObject(jieduanJson).getJSONArray("stages");
+                    if (!array.isEmpty()) {
+                        for (int i = 0; i < array.size(); i++) {
+                            lists.add(array.getJSONObject(i).getString("BS_NAME"));
+                        }
+                    }
+                    if (lists.isEmpty()) {
+                        lists.add("无");
+                    }
+                    showSimpleDialog(tv_visit_steps, "商机阶段");
+                    break;
             }
         }
     };
@@ -289,8 +309,24 @@ public class VisitReportAddActivity extends BaseActivity implements View.OnClick
             case R.id.tv_customer_login:
                 loadCustomer(3);
                 break;
+            case R.id.tv_visit_steps:
+                loadJieDuan();
+                break;
         }
     }
+    /**
+     * @desc:加载阶段
+     * @author：Arison on 2016/7/20
+     */
+    public void loadJieDuan() {
+        progressDialog.show();
+        String url = Constants.getAppBaseUrl(ct) + "/mobile/crm/getBusinessChanceStage.action";
+        Map<String, Object> params = new HashMap<>();
+        params.put("condition", "1=1");
+        LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
+        headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
+        com.xzjmyk.pm.activity.ui.erp.net.ViewUtil.httpSendRequest(ct, url, params, mHandler, headers, LOAD_JIEDUAN, null, null, "post");
+    }
 
     private void showDateDialog(final FormEditText tv) {
         DateTimePicker picker = new DateTimePicker(this, DateTimePicker.HOUR_OF_DAY);

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

@@ -4,6 +4,7 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
+import android.text.TextUtils;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -63,6 +64,8 @@ public class VisitReportPlanActivity extends BaseActivity implements View.OnClic
     private int mVpId;
     private static final String TAG = "VisitReportPlanActivity";
 
+    private String mCustomerName,mContactName,mCustomerAddress;
+
 //    @ViewInject(R.id.tv_visit_login)
 //    private FormEditText tv_visit_login;
 
@@ -70,6 +73,13 @@ public class VisitReportPlanActivity extends BaseActivity implements View.OnClic
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_visit_report_plan);
+        Intent intent = getIntent();
+        if (intent != null){
+            mCustomerName = intent.getStringExtra("customer_name");
+            mContactName = intent.getStringExtra("contact_name");
+            mCustomerAddress = intent.getStringExtra("customer_address");
+
+        }
         initView();
         initData();
     }
@@ -79,7 +89,6 @@ public class VisitReportPlanActivity extends BaseActivity implements View.OnClic
         ViewUtils.inject(this);
         getSupportActionBar().setTitle("拜访计划");
         tv_date_select.setText(DateFormatUtil.getStrDate4Date(new Date(), "yyyy-MM-dd HH:mm:ss"));
-        tv_address_login.setText(MyApplication.getInstance().getBdLocationHelper().getAddress());
 
         tv_date_select.setKeyListener(null);
         tv_date_select.setFocusable(false);
@@ -92,6 +101,17 @@ public class VisitReportPlanActivity extends BaseActivity implements View.OnClic
         tv_address_refresh.setOnClickListener(this);
         tv_customer_login.setOnClickListener(this);
 
+        if (!TextUtils.isEmpty(mCustomerName)){
+            tv_customer_login.setText(mCustomerName);
+        }
+        if (!TextUtils.isEmpty(mContactName)){
+            tv_linksman_login.setText(mContactName);
+        }
+        if (!TextUtils.isEmpty(mCustomerAddress)){
+            tv_address_login.setText(mCustomerAddress);
+        }else {
+            tv_address_login.setText(MyApplication.getInstance().getBdLocationHelper().getAddress());
+        }
     }
 
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/message/SubscriptionActivity.java

@@ -2,6 +2,7 @@ package com.xzjmyk.pm.activity.ui.message;
 
 import android.app.AlertDialog;
 import android.content.DialogInterface;
+import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
@@ -26,6 +27,7 @@ import com.xzjmyk.pm.activity.bean.message.SortSubsrciprion;
 import com.xzjmyk.pm.activity.bean.message.SubscriptionMessage;
 import com.xzjmyk.pm.activity.db.dao.SubscriptionDao;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+import com.xzjmyk.pm.activity.ui.erp.activity.SubcribeManageActivity;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.Constants;
@@ -112,7 +114,7 @@ public class SubscriptionActivity extends BaseActivity {
 
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
-//        getMenuInflater().inflate(R.menu.menu_manage_subscribe, menu);
+        getMenuInflater().inflate(R.menu.menu_manage_subscribe, menu);
         return super.onCreateOptionsMenu(menu);
     }
 
@@ -156,11 +158,11 @@ public class SubscriptionActivity extends BaseActivity {
 
                 break;*/
 
-//            case R.id.subscribe_manage:
-//                Intent intent = new Intent();
-//                intent.setClass(this,SubcribeManageActivity.class);
-//                startActivity(intent);
-//                break;
+            case R.id.subscribe_manage:
+                Intent intent = new Intent();
+                intent.setClass(this,SubcribeManageActivity.class);
+                startActivity(intent);
+                break;
             case android.R.id.home:
                 onBackPressed();
                 break;

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

@@ -41,6 +41,8 @@
                 <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
                     android:id="@+id/et_business_no"
                     style="@style/form_relative_right_text"
+                    android:focusable="false"
+                    android:focusableInTouchMode="false"
                     editTextFormExample:testType="nocheck" />
             </RelativeLayout>
 
@@ -114,6 +116,8 @@
                     style="@style/form_relative_right_text"
                     android:drawableRight="@drawable/nav_icon_search_default"
                     editTextFormExample:testType="nocheck"
+                    android:focusable="false"
+                    android:focusableInTouchMode="false"
                     android:hint="请选择" />
             </RelativeLayout>
             <RelativeLayout
@@ -139,6 +143,8 @@
                     android:drawableRight="@drawable/nav_icon_search_default"
                     style="@style/form_relative_right_text"
                     editTextFormExample:testType="nocheck"
+                    android:focusable="false"
+                    android:focusableInTouchMode="false"
                     android:hint="请选择" />
             </RelativeLayout>
             <!--<ImageView style="@style/app_comm_list_line_gray" />-->
@@ -203,6 +209,8 @@
                     android:drawableRight="@drawable/nav_icon_search_default"
                     editTextFormExample:customFormat="yyyy-MM-dd HH:mm"
                     editTextFormExample:testType="nocheck"
+                    android:focusable="false"
+                    android:focusableInTouchMode="false"
                     android:hint="请选择" />
             </RelativeLayout>
 
@@ -234,6 +242,8 @@
                     android:drawableRight="@drawable/nav_icon_search_default"
                     editTextFormExample:customFormat="yyyy-MM-dd HH:mm"
                     editTextFormExample:testType="nocheck"
+                    android:focusable="false"
+                    android:focusableInTouchMode="false"
                     android:hint="请选择" />
             </RelativeLayout>
             <RelativeLayout

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

@@ -129,9 +129,9 @@
 
                     <TextView
                         style="@style/TextView_VerticalCenter"
-                        android:layout_width="70dp"
+                        android:layout_width="90dp"
                         android:layout_marginLeft="10dp"
-                        android:text="商机库编号"
+                        android:text="商机编号"
                         android:textColor="@color/gray_light" />
 
                     <TextView
@@ -146,9 +146,9 @@
 
                     <TextView
                         style="@style/TextView_VerticalCenter"
-                        android:layout_width="70dp"
+                        android:layout_width="90dp"
                         android:layout_marginLeft="10dp"
-                        android:text="商机库名称"
+                        android:text="商机名称"
                         android:textColor="@color/gray_light" />
 
                     <TextView
@@ -163,7 +163,7 @@
 
                     <TextView
                         style="@style/TextView_VerticalCenter"
-                        android:layout_width="70dp"
+                        android:layout_width="90dp"
                         android:layout_marginLeft="10dp"
                         android:text="来源"
                         android:textColor="@color/gray_light" />
@@ -180,7 +180,7 @@
 
                     <TextView
                         style="@style/TextView_VerticalCenter"
-                        android:layout_width="70dp"
+                        android:layout_width="90dp"
                         android:layout_marginLeft="10dp"
                         android:text="商机库"
                         android:textColor="@color/gray_light" />
@@ -215,7 +215,7 @@
 
                     <TextView
                         style="@style/TextView_VerticalCenter"
-                        android:layout_width="70dp"
+                        android:layout_width="90dp"
                         android:layout_marginLeft="10dp"
                         android:text="当前阶段"
                         android:textColor="@color/gray_light" />
@@ -232,7 +232,7 @@
 
                     <TextView
                         style="@style/TextView_VerticalCenter"
-                        android:layout_width="70dp"
+                        android:layout_width="90dp"
                         android:layout_marginLeft="10dp"
                         android:text="创建时间"
                         android:textColor="@color/gray_light" />
@@ -249,7 +249,7 @@
 
                     <TextView
                         style="@style/TextView_VerticalCenter"
-                        android:layout_width="70dp"
+                        android:layout_width="90dp"
                         android:layout_marginLeft="10dp"
                         android:text="创建人"
                         android:textColor="@color/gray_light" />
@@ -267,7 +267,7 @@
 
                     <TextView
                         style="@style/TextView_VerticalCenter"
-                        android:layout_width="70dp"
+                        android:layout_width="90dp"
                         android:layout_marginLeft="10dp"
                         android:text="最后跟进时间"
                         android:textColor="@color/gray_light" />
@@ -284,7 +284,7 @@
 
                     <TextView
                         style="@style/TextView_VerticalCenter"
-                        android:layout_width="70dp"
+                        android:layout_width="90dp"
                         android:layout_marginLeft="10dp"
                         android:text="跟进人"
                         android:textColor="@color/gray_light" />
@@ -430,6 +430,7 @@
                         android:layout_width="70dp"
                         android:layout_marginLeft="10dp"
                         android:text="备注"
+                        android:layout_gravity="top"
                         android:textColor="@color/gray_light" />
 
                     <TextView

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

@@ -3,6 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     style="@style/crm_ll_card"
     android:layout_height="wrap_content"
+    android:background="@color/white"
     tools:context="com.xzjmyk.pm.activity.ui.erp.activity.crm.BusinessLessActivity">
 
     <TextView

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

@@ -36,6 +36,8 @@
                 android:id="@+id/et_cu_code"
                 style="@style/form_relative_right_text"
                 android:hint="请输入"
+                android:focusable="false"
+                android:focusableInTouchMode="false"
                 editTextFormExample:testType="nocheck" />
         </RelativeLayout>
 
@@ -134,6 +136,8 @@
                 style="@style/form_relative_right_text"
                 android:drawableRight="@drawable/nav_icon_search_default"
                 android:hint="请选择"
+                android:focusable="false"
+                android:focusableInTouchMode="false"
                 editTextFormExample:testType="nocheck" />
 
         </RelativeLayout>
@@ -166,6 +170,8 @@
                 android:hint="请选择"
                 whatever:customRegexp="^(([0-9])|([0-9]+\\.?[0-9]+))$"
                 whatever:testErrorString="@string/error_only_numeric_digits_allowed"
+                android:focusable="false"
+                android:focusableInTouchMode="false"
                 whatever:testType="nocheck" />
         </RelativeLayout>
 
@@ -198,6 +204,8 @@
                 android:hint="请选择"
                 whatever:customRegexp="^(([0-9])|([0-9]+\\.?[0-9]+))$"
                 whatever:testErrorString="@string/error_only_numeric_digits_allowed"
+                android:focusable="false"
+                android:focusableInTouchMode="false"
                 whatever:testType="nocheck" />
         </RelativeLayout>
 
@@ -227,6 +235,8 @@
                 style="@style/form_relative_right_text"
                 android:drawableRight="@drawable/nav_icon_search_default"
                 android:hint="请选择"
+                android:focusable="false"
+                android:focusableInTouchMode="false"
                 editTextFormExample:testType="nocheck" />
         </RelativeLayout>
 

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

@@ -4,6 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
+    android:background="@color/white"
     tools:context="com.xzjmyk.pm.activity.ui.erp.activity.crm.VisitReportPlanActivity">
 
     <RelativeLayout
@@ -35,6 +36,8 @@
             style="@style/form_relative_right_text"
             android:drawableRight="@drawable/nav_icon_search_default"
             editTextFormExample:testType="nocheck"
+            android:focusable="false"
+            android:focusableInTouchMode="false"
             android:hint="请选择" />
 
     </RelativeLayout>
@@ -66,6 +69,8 @@
             style="@style/form_relative_right_text"
             android:drawableRight="@drawable/nav_icon_search_default"
             editTextFormExample:testType="nocheck"
+            android:focusable="false"
+            android:focusableInTouchMode="false"
             android:hint="请选择" />
     </RelativeLayout>
 
@@ -117,6 +122,8 @@
             style="@style/form_relative_right_text"
             android:drawableRight="@drawable/nav_icon_search_default"
             editTextFormExample:testType="nocheck"
+            android:focusable="false"
+            android:focusableInTouchMode="false"
             android:hint="请输入" />
     </RelativeLayout>
 
@@ -238,6 +245,8 @@
             style="@style/form_relative_right_text"
             android:drawableRight="@drawable/nav_icon_search_default"
             editTextFormExample:testType="nocheck"
+            android:focusable="false"
+            android:focusableInTouchMode="false"
             android:hint="请选择" />
     </RelativeLayout>
     <RelativeLayout

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

@@ -4,6 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
+    android:background="@color/white"
     tools:context="com.xzjmyk.pm.activity.ui.erp.activity.crm.VisitReportPlanActivity">
 
     <RelativeLayout
@@ -35,6 +36,8 @@
             style="@style/form_relative_right_text"
             android:drawableRight="@drawable/nav_icon_search_default"
             editTextFormExample:testType="nocheck"
+            android:focusable="false"
+            android:focusableInTouchMode="false"
             android:hint="请输入" />
         
     </RelativeLayout>
@@ -66,6 +69,8 @@
             style="@style/form_relative_right_text"
             android:drawableRight="@drawable/nav_icon_search_default"
             editTextFormExample:testType="nocheck"
+            android:focusable="false"
+            android:focusableInTouchMode="false"
             android:hint="请输入" />
     </RelativeLayout>
 
@@ -118,6 +123,8 @@
             android:drawableRight="@drawable/nav_icon_search_default"
             editTextFormExample:testType="nocheck"
             android:maxHeight="70dp"
+            android:focusable="false"
+            android:focusableInTouchMode="false"
             android:hint="请输入" />
     </RelativeLayout>
 

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

@@ -19,29 +19,29 @@
                 android:text="XXXXXXX"
                 style="@style/TextView_Basic" />
         </LinearLayout>
+
         <LinearLayout style="@style/crm_ll_sale_item">
 
             <TextView
                 android:minWidth="90dp"
-                android:text="商机库"
+                android:text="商机名称"
                 style="@style/TextView_Basic" />
+
             <TextView
-                android:id="@+id/tv_crm_business_steps"
+                android:id="@+id/tv_crm_business_name"
+                android:text="XXXXXXX"
                 style="@style/TextView_Basic" />
         </LinearLayout>
         <LinearLayout style="@style/crm_ll_sale_item">
 
             <TextView
                 android:minWidth="90dp"
-                android:text="商机名称"
+                android:text="商机库"
                 style="@style/TextView_Basic" />
-
             <TextView
-                android:id="@+id/tv_crm_business_name"
-                android:text="XXXXXXX"
+                android:id="@+id/tv_crm_business_steps"
                 style="@style/TextView_Basic" />
         </LinearLayout>
-
         <LinearLayout style="@style/crm_ll_sale_item">
 
             <TextView

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

@@ -303,7 +303,7 @@
         <item name="android:gravity">left|center_vertical</item>
         <item name="android:maxWidth">290dp</item>
         <item name="android:minHeight">35dp</item>
-        <item name="android:maxHeight">35dp</item>
+        <item name="android:maxHeight">150dp</item>
         <item name="android:padding">5dp</item>
         <item name="android:width">160dp</item>
         <item name="android:layout_marginTop">8dp</item>