Browse Source

根据测试返回,处理关于下一条时候重复显示问题

Bitliker 8 years ago
parent
commit
e68469a445

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

@@ -39,7 +39,6 @@ import com.xzjmyk.pm.activity.util.DateFormatUtil;
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import java.net.URLEncoder;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
@@ -377,7 +376,7 @@ public class CustomerAddActivity extends BaseActivity implements View.OnClickLis
                         " \"cu_add1\":\"" + CommonUtil.getNoMarkEditText(tv_cu_address) + "\",\n" +
                         " \"cu_kind\":\"" + CommonUtil.getNoMarkEditText(et_cu_kind) + "\",\n" +
                         " \"cu_district\":\"" + CommonUtil.getNoMarkEditText(et_cu_district) + "\",\n" +
-                        " \"cu_payments\":\"" + URLEncoder.encode(et_cu_payments.getText().toString()) + "\",\n" +
+                        " \"cu_payments\":\"" +CommonUtil.getNoMarkEditText(et_cu_payments) + "\",\n" +
                         " \"cu_paymentscode\":\"" + pa_code + "\",\n" +
                         " \"cu_sellername\":\"" + CommonUtil.getNoMarkEditText(et_cu_sellername) + "\",\n" +
                         " \"cu_contact\":\"" + CommonUtil.getNoMarkEditText(tv_cu_contact) + "\",\n" +

+ 18 - 0
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/ApprovalActivity.java

@@ -2,6 +2,7 @@ package com.xzjmyk.pm.activity.ui.erp.activity.oa;
 
 import android.content.Intent;
 import android.os.Bundle;
+import android.support.annotation.NonNull;
 import android.support.v7.widget.DefaultItemAnimator;
 import android.support.v7.widget.RecyclerView;
 import android.text.Editable;
@@ -47,6 +48,7 @@ import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 import com.xzjmyk.pm.activity.ui.erp.util.oa.OAConfig;
 import com.xzjmyk.pm.activity.ui.erp.util.oa.RecognizerDialogUtil;
 import com.xzjmyk.pm.activity.util.DisplayUtil;
+import com.xzjmyk.pm.activity.util.PermissionUtil;
 import com.xzjmyk.pm.activity.util.PreferenceUtils;
 import com.xzjmyk.pm.activity.view.CrashLinearLayoutManager;
 
@@ -57,6 +59,7 @@ import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+
 public class ApprovalActivity extends OABaseActivity implements IApproval, ApprovalAdapter.OnChangeClickListener, View.OnClickListener, RecognizerDialogListener {
     @ViewInject(R.id.opinionRL)
     RelativeLayout opinionRL;//操作和意见输入
@@ -71,6 +74,7 @@ public class ApprovalActivity extends OABaseActivity implements IApproval, Appro
     private ApprovalAdapter mAdapter;
     private boolean isApprove;
 
+
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         if (item.getItemId() == R.id.oa_approval_set && mAdapter != null && !ListUtils.isEmpty(mAdapter.getApprovals())) {
@@ -108,6 +112,20 @@ public class ApprovalActivity extends OABaseActivity implements IApproval, Appro
         mPresenter.closeDB();
     }
 
+    @Override
+    protected void onResume() {
+        super.onResume();
+        String permission=android.Manifest.permission.WRITE_EXTERNAL_STORAGE;
+        if (PermissionUtil.lacksPermissions(this,permission)){
+            PermissionUtil.requestPermission(this,0x12,permission);
+        }
+    }
+
+    @Override
+    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
+    }
+
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         if (data != null && requestCode == 0x20) {

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

@@ -31,6 +31,7 @@ import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 import com.xzjmyk.pm.activity.ui.erp.view.CustomProgressDialog;
 import com.xzjmyk.pm.activity.ui.tool.SingleImagePreviewActivity;
 import com.xzjmyk.pm.activity.util.CalendarUtils;
+import com.xzjmyk.pm.activity.util.ToastUtil;
 import com.xzjmyk.pm.activity.view.wheel.DatePicker;
 
 import java.io.File;
@@ -317,6 +318,7 @@ public class ApprovalAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
                     @Override
                     public void onFailure(String exception) {
                         LogUtil.i("exception=" + exception);
+                        ToastUtil.showToast(ct,exception);
                     }
                 });
             }