|
|
@@ -2,8 +2,6 @@ package com.uas.appworks.crm3_0.activity;
|
|
|
|
|
|
import android.content.Context;
|
|
|
import android.content.Intent;
|
|
|
-import android.graphics.Bitmap;
|
|
|
-import android.graphics.BitmapFactory;
|
|
|
import android.graphics.drawable.BitmapDrawable;
|
|
|
import android.os.Bundle;
|
|
|
import android.text.Editable;
|
|
|
@@ -31,10 +29,8 @@ import com.alibaba.fastjson.JSON;
|
|
|
import com.common.LogUtil;
|
|
|
import com.common.data.ListUtils;
|
|
|
import com.common.data.StringUtil;
|
|
|
-import com.common.file.FileUtils;
|
|
|
import com.common.system.DisplayUtil;
|
|
|
import com.common.system.SystemUtil;
|
|
|
-import com.common.ui.ImageUtil;
|
|
|
import com.core.app.MyApplication;
|
|
|
import com.core.base.BaseActivity;
|
|
|
import com.core.utils.ToastUtil;
|
|
|
@@ -61,8 +57,6 @@ import java.util.HashMap;
|
|
|
import java.util.List;
|
|
|
import java.util.Map;
|
|
|
|
|
|
-import io.card.payment.CardIOActivity;
|
|
|
-
|
|
|
|
|
|
/**
|
|
|
* @desc:联系人新增+动态表单界面
|
|
|
@@ -140,7 +134,7 @@ public class ContactsAddActivity extends BaseActivity implements OnItemsButtonAd
|
|
|
}
|
|
|
if (action==1){
|
|
|
//名片导入
|
|
|
- CardIOActivity.activityStart(ContactsAddActivity.this, 0xFF00C5DC, 100);
|
|
|
+ //CardIOActivity.activityStart(ContactsAddActivity.this, 0xFF00C5DC, 100);
|
|
|
}
|
|
|
}
|
|
|
LogUtil.d(TAG,"model:"+JSON.toJSONString(model));
|
|
|
@@ -253,14 +247,14 @@ public class ContactsAddActivity extends BaseActivity implements OnItemsButtonAd
|
|
|
tvUpload.setOnClickListener(new View.OnClickListener() {
|
|
|
@Override
|
|
|
public void onClick(View view) {
|
|
|
- CardIOActivity.activityStart(ContactsAddActivity.this, 0xFF00C5DC, 100);
|
|
|
+ // CardIOActivity.activityStart(ContactsAddActivity.this, 0xFF00C5DC, 100);
|
|
|
}
|
|
|
});
|
|
|
|
|
|
iv_header.setOnClickListener(new View.OnClickListener() {
|
|
|
@Override
|
|
|
public void onClick(View view) {
|
|
|
- CardIOActivity.activityStart(ContactsAddActivity.this, 0xFF00C5DC, 100);
|
|
|
+ //CardIOActivity.activityStart(ContactsAddActivity.this, 0xFF00C5DC, 100);
|
|
|
}
|
|
|
});
|
|
|
|
|
|
@@ -408,20 +402,20 @@ public class ContactsAddActivity extends BaseActivity implements OnItemsButtonAd
|
|
|
|
|
|
@Override
|
|
|
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
|
|
|
- if (null != data && data.hasExtra(CardIOActivity.EXTRA_CAPTURED_CARD_IMAGE)) {
|
|
|
- byte[] byteArrayExtra = data.getByteArrayExtra(CardIOActivity.EXTRA_CAPTURED_CARD_IMAGE);
|
|
|
- int length = byteArrayExtra.length;
|
|
|
- System.out.println("压缩前的大小====" + (length / 1024f / 1024f) + " M");
|
|
|
-// tv.setText((length / 1024f / 1024f) + " M");
|
|
|
- Bitmap bitmap = BitmapFactory.decodeByteArray(byteArrayExtra, 0, length);
|
|
|
- iv_header.setImageBitmap(bitmap);
|
|
|
-
|
|
|
- tvUpload.setVisibility(View.INVISIBLE);
|
|
|
- ivUpload.setVisibility(View.INVISIBLE);
|
|
|
- File file= ImageUtil.saveBitmapFile(bitmap, FileUtils.getSDRoot()+"/uu/linkheadtop.png");
|
|
|
- upload(file);
|
|
|
- // bitmapBase64 = bitmapToBase64(bitmap);
|
|
|
- }
|
|
|
+// if (null != data && data.hasExtra(CardIOActivity.EXTRA_CAPTURED_CARD_IMAGE)) {
|
|
|
+// byte[] byteArrayExtra = data.getByteArrayExtra(CardIOActivity.EXTRA_CAPTURED_CARD_IMAGE);
|
|
|
+// int length = byteArrayExtra.length;
|
|
|
+// System.out.println("压缩前的大小====" + (length / 1024f / 1024f) + " M");
|
|
|
+//// tv.setText((length / 1024f / 1024f) + " M");
|
|
|
+// Bitmap bitmap = BitmapFactory.decodeByteArray(byteArrayExtra, 0, length);
|
|
|
+// iv_header.setImageBitmap(bitmap);
|
|
|
+//
|
|
|
+// tvUpload.setVisibility(View.INVISIBLE);
|
|
|
+// ivUpload.setVisibility(View.INVISIBLE);
|
|
|
+// File file= ImageUtil.saveBitmapFile(bitmap, FileUtils.getSDRoot()+"/uu/linkheadtop.png");
|
|
|
+// upload(file);
|
|
|
+// // bitmapBase64 = bitmapToBase64(bitmap);
|
|
|
+// }
|
|
|
|
|
|
|
|
|
if (requestCode == UPDATE_SEX && data != null) {
|