9.14部分bug

WeiChat/build.gradle

@@ -4,7 +4,7 @@ apply plugin: 'com.getkeepsafe.dexcount'
 android {
     signingConfigs {
         config {
-            storeFile file('D:/config/applicationsignname[20150409]')
+            storeFile file('E:/CompanyProject/applicationsignname[20150409]')
             storePassword '13237658359'
             keyAlias 'jie-20150409'
             keyPassword '13237658359'

WeiChat/src/main/java/com/xzjmyk/pm/activity/CommonWebviewActivity.java

@@ -4,6 +4,7 @@ import android.app.Activity;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
+import android.view.KeyEvent;
 import android.webkit.DownloadListener;
 import android.webkit.WebSettings;
 import android.webkit.WebView;
@@ -54,4 +55,15 @@ public class CommonWebviewActivity extends Activity {
 
         mWebView.loadUrl(mUrl);
     }
+
+    @Override
+    public boolean onKeyDown(int keyCode, KeyEvent event) {
+        if (keyCode == KeyEvent.KEYCODE_BACK){
+            if (mWebView.canGoBack()){
+                mWebView.goBack();
+                return true;
+            }
+        }
+        return super.onKeyDown(keyCode, event);
+    }
 }

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

@@ -74,7 +74,7 @@ public class BusinessLessActivity extends BaseActivity implements View.OnClickLi
     }
 
     private void initListener() {
-        tv_date.setOnClickListener(this);
+//        tv_date.setOnClickListener(this);
         tv_leader.setOnClickListener(this);
         tv_business_state.setOnClickListener(this);
     }

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

@@ -37,6 +37,8 @@ import com.xzjmyk.pm.activity.ui.erp.util.LogUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 import com.xzjmyk.pm.activity.view.ClearEditText;
 import com.xzjmyk.pm.activity.view.SmoothCheckBox;
+import com.xzjmyk.pm.activity.view.crouton.Crouton;
+import com.xzjmyk.pm.activity.view.crouton.Style;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -273,7 +275,7 @@ public class BusinessSelectCustomerActivity extends BaseActivity {
                     progressDialog.dismiss();
                     Log.i(TAG, "handleMessage:" + msg.getData().getString("result"));
                   //  ToastMessage(JSON.parseObject(msg.getData().getString("result")).getString("exceptionInfo"));
-                  
+                    Crouton.makeText(BusinessSelectCustomerActivity.this, msg.getData().getString("result"), Style.ALERT).show();
                     break;
             }
         }

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

@@ -166,8 +166,8 @@ public class CustomerListSelectActivity extends BaseActivity {
             holder.tv_money.setText(mdata.getJSONObject(position).getString("count"));
             holder.tv_step.setText(mdata.getJSONObject(position).getString("cu_nichestep"));
             holder.tv_date.setText(mdata.getJSONObject(position).getString("cu_lastdate"));
-            holder.tv_datetv.setText("最后跟进时间:");
-            holder.tv_leader.setText(mdata.getJSONObject(position).getString("cu_contact"));
+            holder.tv_datetv.setText("最后跟进时间：");
+            holder.tv_leader.setText(mdata.getJSONObject(position).getString("cu_sellername"));
             holder.tv_code.setText(mdata.getJSONObject(position).getString("cu_code"));
             return convertView;
         }

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

@@ -263,7 +263,6 @@
 
                 <TextView
                     style="@style/TextView_VerticalCenter"
-                    android:text="1人"
                     android:textColor="@color/gray_light" />
             </LinearLayout>