Prechádzať zdrojové kódy

测试版本5.2.6 9-9

Arison 9 rokov pred
rodič
commit
9064c69949

+ 1 - 0
WeiChat/src/main/AndroidManifest.xml

@@ -433,6 +433,7 @@
             android:theme="@style/CrmThemeBlue" />
         <activity
             android:name=".ui.erp.activity.crm.BusinessSelectCustomerActivity"
+            android:launchMode="singleTask"
             android:theme="@style/CrmThemeBlue" />
         <activity
             android:name=".ui.message.uas.B2bMsgActivity"

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

@@ -2,9 +2,9 @@ package com.xzjmyk.pm.activity.ui.erp.activity.crm;
 
 import android.content.Context;
 import android.content.Intent;
+import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
-import android.os.Bundle;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -239,7 +239,8 @@ public class BusinessSelectCustomerActivity extends BaseActivity {
                 case Constants.APP_SOCKETIMEOUTEXCEPTION:
                     progressDialog.dismiss();
                     Log.i(TAG, "handleMessage:" + msg.getData().getString("result"));
-
+                  //  ToastMessage(JSON.parseObject(msg.getData().getString("result")).getString("exceptionInfo"));
+                  
                     break;
             }
         }

+ 15 - 3
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/CustomerListActivity.java

@@ -193,6 +193,7 @@ public class CustomerListActivity extends BaseActivity implements View.OnClickLi
         switch (v.getId()) {
             case R.id.tv_count_unend:
                 type = 0;
+                jsonArray.clear();
 //                Crouton.makeText(this,"切换成功", 0xffff8888, 10000).show();
                 page = 1;
                 sendHttpResquest(Constants.HTTP_SUCCESS_INIT, kind, page, 0, "");
@@ -200,10 +201,12 @@ public class CustomerListActivity extends BaseActivity implements View.OnClickLi
             case R.id.tv_count_end:
                 type = 1;
                 page = 1;
+                jsonArray.clear();
 //                Crouton.makeText(this,"切换成功", Style.CONFIRM).show();
                 sendHttpResquest(Constants.HTTP_SUCCESS_INIT, kind, page, 0, "");
                 break;
             case R.id.tv_count_total:
+                jsonArray.clear();
                 type = 2;
                 page = 1;
 //                Crouton.makeText(this,"切换成功", Style.CONFIRM).show();
@@ -386,9 +389,18 @@ public class CustomerListActivity extends BaseActivity implements View.OnClickLi
                     JSONArray json1 = JSON.parseObject(msg.getData().getString("result")).getJSONArray("customers1");
                     if (json0 != null && json1 != null) {
                         if (page == 1){
-                            unEndSize = json0.getJSONObject(0).getIntValue("count");
-                            endSize = json1.getJSONObject(0).getIntValue("count");
-                            totalSize = json.getJSONObject(0).getIntValue("count");
+                            if (json0.size()>0){
+                                unEndSize = json0.getJSONObject(0).getIntValue("count");
+                            }
+                            if (json.size()>0){
+                                totalSize = json.getJSONObject(0).getIntValue("count");
+                            }
+                            if (json1.size()>0){
+                                endSize = json1.getJSONObject(0).getIntValue("count");
+                            }
+                          
+                          
+                           
 
                             CommonUtil.textSpanForStyle(tv_count_unend, unEndSize + "\n未成交", String.valueOf(unEndSize),
                                     ct.getResources().getColor(R.color.yellow_home));