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

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

@@ -143,7 +143,7 @@ public class BusinessLessActivity extends BaseActivity implements View.OnClickLi
                 case Constants.HTTP_SUCCESS_INIT:
                     progressDialog.dismiss();
                     Log.i(TAG, "handleMessage:" + msg.getData().getString("result"));
-                    Crouton.makeText(activity,30,"操作成功!",getResources().getColor(R.color.light_green),2000);
+                    Crouton.makeText(activity,30,"操作成功!",getResources().getColor(R.color.light_green),2000).show();
                     if (type == 2) {
                         updataSchedule(0x16);
                     }

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

@@ -401,6 +401,7 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
         //set1.setDrawValues(false);
         set1.setValueFormatter(new ValueFormatter() {
             private DecimalFormat mFormat;
+
             public void DefaultValueFormatter(int digits) {
 
                 StringBuffer b = new StringBuffer();
@@ -412,18 +413,19 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
 
                 mFormat = new DecimalFormat("###,###,###,##0" + b.toString());
             }
+
             @Override
             public String getFormattedValue(float value) {
                 try {
-                    if (value==0){
-                        return "0";
-                    }else {
-                        return mFormat.format(value);
+                    if (value == 0) {
+                        return "";
+                    } else {
+                        return String.valueOf(value);
                     }
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
-                return  "";
+                return "";
             }
         });
         dataSets.clear();
@@ -476,9 +478,9 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
             public String getFormattedValue(float value) {
                 try {
                     if (value==0){
-                        return "0";
+                        return "";
                     }else {
-                        return mFormat.format(value);
+                        return String.valueOf(value);
                     }
                 } catch (Exception e) {
                     e.printStackTrace();

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

@@ -156,8 +156,8 @@ 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) {
-                        tv_company_name.setText(jsonArray.getString("cu_name"));
-                        tv_leader.setText(jsonArray.getString("cu_contact"));
+                        tv_company_name.setText(jsonArray.getString("cu_contact"));
+                        tv_leader.setText(jsonArray.getString("cu_sellername"));
                         tv_state.setText(jsonArray.getString("cu_dealstatus")+"|普通客户");
                         tv_lastDate.setText(jsonArray.getString("cu_lastdate"));
                         tv_address.setText(jsonArray.getString("cu_add1"));

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

@@ -27,6 +27,7 @@ import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
+import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.crm.Business;
 import com.xzjmyk.pm.activity.bean.oa.MeetUserEntity;
@@ -92,7 +93,7 @@ public class CustomerListActivity extends BaseActivity implements View.OnClickLi
         ct = this;
         ViewUtils.inject(this);
         getSupportActionBar().setTitle("客户");
-        tv_name.setText(CommonUtil.getSharedPreferences(ct, "erp_username"));
+        tv_name.setText(MyApplication.getInstance().mLoginUser.getNickName());
         loadParams(3);
 
         mAdapter = new BussinessDetailAdapter(ct, jsonArray);

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

@@ -220,7 +220,7 @@ public class VisitReportAddActivity extends BaseActivity implements View.OnClick
                             "\"vr_nichestep\":\"" +
                             tv_visit_steps.getText().toString() +
                             "\",\n" +
-                            "\"vr_remark\":\"" +
+                            "\"vr_detail\":\"" +
                             tv_visit_content.getText().toString() +
                             "\",\n" +
                             "\"vr_recorddate\":\"" +

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

@@ -448,13 +448,13 @@
                 android:layout_height="wrap_content"
                     android:text="              " />
                 <TextView
-                    android:text="计划销售额/毛利润\n（万万元）"
+                    android:text="计划销售额/毛利润\n（万元）"
                     android:layout_weight="1"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:gravity="center"/>
                 <TextView
-                    android:text="实际销售额/毛利润\n（万万元）"
+                    android:text="实际销售额/毛利润\n（万元）"
                     android:layout_weight="1"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"