Browse Source

去除无用的相关依赖step2

shuij 4 years ago
parent
commit
374811e90d

+ 4 - 4
app_modular/appworks/build.gradle

@@ -19,14 +19,14 @@ android {
     }
 }
 dependencies {
+
+    implementation 'com.android.support.constraint:constraint-layout:1.0.2'
     //project
     api project(':apputils')
     api project(path: ':imageload')
-    implementation 'com.android.support.constraint:constraint-layout:1.0.2'
-    api project(':facesdk')
     api project(path: ':appbooking')
     implementation 'com.android.support:support-v4:28.0.0'
-
-    api project(path: ':scancardlibrary')
     implementation deps.circleprogressbar
+    // api project(path: ':scancardlibrary')
+    // api project(':facesdk')
 }

+ 12 - 15
app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/activity/MissionActivity.java

@@ -1,6 +1,5 @@
 package com.uas.appworks.OA.erp.activity;
 
-import android.Manifest;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.DialogInterface;
@@ -17,7 +16,6 @@ import android.view.View;
 import android.widget.PopupWindow;
 
 import com.afollestad.materialdialogs.MaterialDialog;
-import com.baidu.aip.excep.activity.RealTimeDetectFaceActivty;
 import com.baidu.mapapi.model.LatLng;
 import com.baidu.mapapi.search.route.DrivingRouteLine;
 import com.baidu.mapapi.search.route.DrivingRouteResult;
@@ -37,7 +35,6 @@ import com.core.model.SelectBean;
 import com.core.utils.BaiduMapUtil;
 import com.core.utils.OnGetDrivingRouteResult;
 import com.core.utils.TimeUtils;
-import com.core.utils.ToastUtil;
 import com.core.utils.time.wheel.DateTimePicker;
 import com.core.widget.view.Activity.SelectActivity;
 import com.core.widget.view.model.SelectAimModel;
@@ -241,18 +238,18 @@ public class MissionActivity extends OABaseActivity implements View.OnClickListe
 
     @Override
     public void faceSign(MissionModel missionModel) {
-        mMissionModel = missionModel;
-        requestPermission(Manifest.permission.CAMERA, new Runnable() {
-            @Override
-            public void run() {
-                startActivityForResult(new Intent(ct, RealTimeDetectFaceActivty.class), 0x223);
-            }
-        }, new Runnable() {
-            @Override
-            public void run() {
-                ToastUtil.showToast(ct, R.string.not_camera_permission);
-            }
-        });
+//        mMissionModel = missionModel;
+//        requestPermission(Manifest.permission.CAMERA, new Runnable() {
+//            @Override
+//            public void run() {
+//                startActivityForResult(new Intent(ct, RealTimeDetectFaceActivty.class), 0x223);
+//            }
+//        }, new Runnable() {
+//            @Override
+//            public void run() {
+//                ToastUtil.showToast(ct, R.string.not_camera_permission);
+//            }
+//        });
     }
 
     @Override

+ 13 - 16
app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/activity/WorkActivity.java

@@ -1,6 +1,5 @@
 package com.uas.appworks.OA.erp.activity;
 
-import android.Manifest;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
@@ -21,7 +20,6 @@ import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import com.afollestad.materialdialogs.MaterialDialog;
-import com.baidu.aip.excep.activity.RealTimeDetectFaceActivty;
 import com.baidu.mapapi.model.LatLng;
 import com.baidu.mapapi.search.core.PoiInfo;
 import com.common.data.CalendarUtil;
@@ -37,7 +35,6 @@ import com.core.base.OABaseActivity;
 import com.core.model.OAConfig;
 import com.core.model.WorkModel;
 import com.core.utils.CommonUtil;
-import com.core.utils.ToastUtil;
 import com.core.utils.time.wheel.OASigninPicker;
 import com.lidroid.xutils.ViewUtils;
 import com.modular.apputils.utils.PopupWindowHelper;
@@ -292,19 +289,19 @@ public class WorkActivity extends OABaseActivity implements View.OnClickListener
             if (OAConfig.needValidateFace) {
                 ArrayList<WorkModel> arrayList = (ArrayList<WorkModel>) adapter.getModels();
                 isShowTocstAble = true;
-                if (isSubmitAble() && presenter.isSubmitAble(arrayList)) {
-                    requestPermission(Manifest.permission.CAMERA, new Runnable() {
-                        @Override
-                        public void run() {
-                            startActivityForResult(new Intent(ct, RealTimeDetectFaceActivty.class), 0x223);
-                        }
-                    }, new Runnable() {
-                        @Override
-                        public void run() {
-                            ToastUtil.showToast(ct, R.string.not_camera_permission);
-                        }
-                    });
-                }
+//                if (isSubmitAble() && presenter.isSubmitAble(arrayList)) {
+//                    requestPermission(Manifest.permission.CAMERA, new Runnable() {
+//                        @Override
+//                        public void run() {
+//                            startActivityForResult(new Intent(ct, RealTimeDetectFaceActivty.class), 0x223);
+//                        }
+//                    }, new Runnable() {
+//                        @Override
+//                        public void run() {
+//                            ToastUtil.showToast(ct, R.string.not_camera_permission);
+//                        }
+//                    });
+//                }
             } else {
                 presenter.submit(null, macAddress);
             }

+ 1 - 4
app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/presenter/MissionPresenter.java

@@ -9,13 +9,11 @@ import android.widget.Toast;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.baidu.aip.excep.utils.Base64Util;
 import com.common.LogUtil;
 import com.common.data.DateFormatUtil;
 import com.common.data.JSONUtil;
 import com.common.data.ListUtils;
 import com.common.data.StringUtil;
-import com.common.file.FileUtils;
 import com.common.preferences.PreferenceUtils;
 import com.core.api.wxapi.ApiConfig;
 import com.core.api.wxapi.ApiPlatform;
@@ -30,7 +28,6 @@ import com.core.model.SelectBean;
 import com.core.net.http.http.OAHttpHelper;
 import com.core.net.http.http.OnHttpResultListener;
 import com.core.net.http.http.Request;
-import com.core.utils.BitmapUtils;
 import com.core.utils.CommonUtil;
 import com.core.utils.TimeUtils;
 import com.core.utils.ToastUtil;
@@ -685,7 +682,7 @@ public class MissionPresenter implements IMissionPresenter, OnHttpResultListener
         mUploadLoading.show();
         File faceFile = null;
         try {
-            faceFile = BitmapUtils.saveBitmapToFile(Base64Util.base64ToBitmap(faceBase64), "face");
+            //faceFile = BitmapUtils.saveBitmapToFile(Base64Util.base64ToBitmap(faceBase64), "face");
         } catch (Exception e) {
             e.printStackTrace();
         }

+ 17 - 23
app_modular/appworks/src/main/java/com/uas/appworks/crm3_0/activity/ContactsAddActivity.java

@@ -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) {

+ 16 - 20
app_modular/appworks/src/main/java/com/uas/appworks/crm3_0/activity/ContactsDetialActivity.java

@@ -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,7 +57,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import io.card.payment.CardIOActivity;
+
 
 
 /**
@@ -260,7 +256,7 @@ public class ContactsDetialActivity extends BaseActivity implements OnItemsButto
         tvUpload.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                CardIOActivity.activityStart(ContactsDetialActivity.this, 0xFF00C5DC, 100);
+               // CardIOActivity.activityStart(ContactsDetialActivity.this, 0xFF00C5DC, 100);
             }
         });
 
@@ -424,20 +420,20 @@ public class ContactsDetialActivity extends BaseActivity implements OnItemsButto
 
     @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) {