删除

app/build.gradle

@@ -35,18 +35,17 @@ android {
 
     defaultConfig {
         applicationId "com.arpa.hndahesudintocctmsdriver"
-        minSdkVersion 24
+        minSdkVersion 23
         targetSdkVersion 30
-        versionCode 68
-        versionName "3.3.8"
+        versionCode 57
+        versionName "3.2.7"
         flavorDimensions "CHANNEL_VALUE"
-        flavorDimensions "app_icon"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         javaCompileOptions {
 
             annotationProcessorOptions {
                 includeCompileClasspath = true
-                arguments = [moduleName: project.getName()]
+                arguments = [moduleName :project.getName() ]
             }
         }
 
@@ -57,7 +56,27 @@ android {
             // 还可以添加 'x86', 'x86_64', 'mips', 'mips64' , 'arm64-v8a'
 
         }
+
+        manifestPlaceholders = [
+                JPUSH_PKGNAME : applicationId,
+                JPUSH_APPKEY : "571d93ae5117da6dee848c92", //JPush 上注册的包名对应的 Appkey.
+                JPUSH_CHANNEL : "developer-default", //暂时填写默认值即可.
+                MEIZU_APPKEY : "MZ-魅族的APPKEY",
+                MEIZU_APPID : "MZ-魅族的APPID",
+                XIAOMI_APPID : "MI-小米的APPID",
+                XIAOMI_APPKEY : "MI-小米的APPKEY",
+                OPPO_APPKEY : "OP-oppo的APPKEY",
+                OPPO_APPID : "OP-oppo的APPID",
+                OPPO_APPSECRET : "OP-oppo的APPSECRET",
+                VIVO_APPKEY : "vivo的APPKEY",
+                VIVO_APPID : "vivo的APPID"
+        ]
     }
+//    sourceSets {
+//        main {
+//            jniLibs.srcDirs = ['libs']
+//        }
+//    }
 
     sourceSets {
         main {
@@ -88,7 +107,7 @@ android {
         }
     }
 
-    repositories {
+    repositories{
         flatDir {
             dirs 'libs'
         }
@@ -96,29 +115,15 @@ android {
 
     productFlavors {
         qa {
-            applicationId "com.arpa.hndahesudintocctmsdriver.text"
-            manifestPlaceholders = [CHANNEL_VALUE: "司机测试",
-                                    app_icon     : "@drawable/diver_logo_text",
-                                    GAODEKEY     : "6791d69f6221a0841b521763af86eb01",
-                                    JPUSH_PKGNAME: applicationId,
-                                    JPUSH_APPKEY : "fba6f55621c670d8c1fe9191", //JPush 上注册的包名对应的 Appkey.
-                                    JPUSH_CHANNEL: "developer-default"//暂时填写默认值即可.
-            ]
+            manifestPlaceholders = [CHANNEL_VALUE: "好运司机测试"]
             buildConfigField("String", "OPEN_AL_URL", "\"https://oapi-staging.alct56.com\"")
-            buildConfigField("String", "BASE_URL", "\"https://app.test.dahehuoyun.com/api/\"")
+            buildConfigField("String", "BASE_URL", "\"http://app.test.dahehuoyun.com/api/\"")
             buildConfigField "boolean", "isTest", "true"
             //APP名称，可以在androidMainfest中引用
             resValue "string", "appName", "司机测试"
         }
         product {
-            applicationId "com.arpa.hndahesudintocctmsdriver"
-            manifestPlaceholders = [CHANNEL_VALUE: "大河好运司机",
-                                    app_icon     : "@drawable/diver_logo",
-                                    GAODEKEY     : "9480fd96746922630e9bf6c75a101059",
-                                    JPUSH_PKGNAME: applicationId,
-                                    JPUSH_APPKEY : "fba6f55621c670d8c1fe9191", //JPush 上注册的包名对应的 Appkey.
-                                    JPUSH_CHANNEL: "developer-default"//暂时填写默认值即可.
-            ]
+            manifestPlaceholders = [CHANNEL_VALUE: "大河好运司机"]
             buildConfigField("String", "OPEN_AL_URL", "\"https://oapi.alct56.com\"")
             buildConfigField("String", "BASE_URL", "\"http://app.dahehuoyun.com/api/\"")
             buildConfigField "boolean", "isTest", "false"
@@ -127,22 +132,22 @@ android {
         }
 
     }
-//    productFlavors.all { flavor ->
-//        flavor.manifestPlaceholders = [CHANNEL_VALUE: name]
-//    }
+    productFlavors.all { flavor ->
+        flavor.manifestPlaceholders = [CHANNEL_VALUE: name]
+    }
 
 
     android.applicationVariants.all { variant ->
         variant.outputs.all {
-            def date = new Date().format("MMdd_HH-mm", TimeZone.getTimeZone("GMT+08"))
-            def isText = variant.productFlavors[0].properties.get("buildConfigFields").getAt("isTest").properties.get("value")
+            def date = new Date().format("MMdd_HH-mm" , TimeZone.getTimeZone("GMT+08"))
+            def  isText = variant.productFlavors[0].properties.get("buildConfigFields").getAt("isTest").properties.get("value")
             def appName = null
-            if (isText == "true") {
+            if (isText=="true") {
                 appName = '大河好运司机测试_'
-            } else {
+            }else{
                 appName = '大河好运司机_'
             }
-            outputFileName = appName + "${variant.buildType.name}_${defaultConfig.versionName}_${date}.apk"
+            outputFileName =appName+"${variant.buildType.name}_${defaultConfig.versionName}_${date}.apk"
         }
     }
     lintOptions {
@@ -166,13 +171,13 @@ dependencies {
     //角标
     implementation 'com.haozhang.libary:android-slanted-textview:1.2'
     //刷新头部，底部样式
-    implementation 'com.scwang.smart:refresh-layout-kernel:2.0.1'
-    implementation 'com.scwang.smart:refresh-header-material:2.0.1'
-    implementation 'com.scwang.smart:refresh-footer-ball:2.0.1'        //球脉冲加载
-    implementation 'com.scwang.smart:refresh-footer-classics:2.0.1'    //经典加载
+    implementation  'com.scwang.smart:refresh-layout-kernel:2.0.1'
+    implementation  'com.scwang.smart:refresh-header-material:2.0.1'
+    implementation  'com.scwang.smart:refresh-footer-ball:2.0.1'        //球脉冲加载
+    implementation  'com.scwang.smart:refresh-footer-classics:2.0.1'    //经典加载
     //更新版本
-    implementation 'com.github.jenly1314.AppUpdater:app-updater:1.2.0'
-    implementation 'com.github.jenly1314.AppUpdater:app-dialog:1.2.0'
+    implementation 'com.github.jenly1314.AppUpdater:app-updater:1.1.0'
+    implementation 'com.github.jenly1314.AppUpdater:app-dialog:1.1.0'
     //轮播插件
     implementation 'com.github.zhpanvip:BannerViewPager:3.5.4'
     //
@@ -184,7 +189,7 @@ dependencies {
     implementation 'com.alibaba:fastjson:1.2.61'
     implementation 'org.bouncycastle:bcprov-jdk15on:1.55'
     implementation 'org.apache.commons:commons-lang3:3.5'
-    implementation(name: 'locationgd-androidx_2.1.0', ext: 'aar')//交通厅
+    implementation (name:'locationgd-androidx_2.1.0', ext:'aar')//交通厅
     //安联
 //    implementation 'com.google.code.gson:gson:2.8.6'
     implementation 'com.loopj.android:android-async-http:1.4.9'
@@ -199,10 +204,10 @@ dependencies {
     //友盟
     // 下面各SDK根据宿主App是否使用相关业务按需引入。
     // 友盟统计SDK
-    implementation 'com.umeng.umsdk:common:9.4.2'// 必选
-    implementation 'com.umeng.umsdk:asms:1.4.1'// 必选
+    implementation  'com.umeng.umsdk:common:9.4.2'// 必选
+    implementation  'com.umeng.umsdk:asms:1.4.1'// 必选
     implementation 'com.umeng.umsdk:apm:1.4.2' // 错误分析升级为独立SDK，看crash数据请一定集成，可选
-    implementation 'com.umeng.umsdk:abtest:1.0.0'//使用U-App中ABTest能力，可选
+    implementation  'com.umeng.umsdk:abtest:1.0.0'//使用U-App中ABTest能力，可选
     //动态权限获取
     implementation "org.permissionsdispatcher:permissionsdispatcher:4.6.0"
     kapt "org.permissionsdispatcher:permissionsdispatcher-processor:4.6.0"
@@ -211,8 +216,8 @@ dependencies {
     //EventBus
     implementation 'org.greenrobot:eventbus:3.1.1'
     //易签宝
-    implementation(name: 'EsignSDK', ext: 'aar')
-    implementation 'pub.devrel:easypermissions:1.3.0'
+    implementation(name:'EsignSDK', ext:'aar')
+    implementation'pub.devrel:easypermissions:1.3.0'
 
     implementation "com.squareup.retrofit2:retrofit:2.4.0"
 //    implementation "com.squareup.retrofit2:converter-gson:2.4.0"
@@ -228,5 +233,6 @@ dependencies {
     implementation 'com.github.getActivity:XToast:8.2'
 
     implementation project(path: ':mylibrary')
+    implementation project(path: ':ocr_ui')
 
 }

app/src/main/AndroidManifest.xml

@@ -53,7 +53,7 @@
         android:name="com.arpa.hndahesudintocctmsdriver.App"
         android:allowBackup="true"
         android:excludeFromRecents="true"
-        android:icon="@mipmap/diver_logo"
+        android:icon="@drawable/diver_logo"
         android:label="@string/appName"
         android:largeHeap="true"
         android:requestLegacyExternalStorage="true"
@@ -93,7 +93,6 @@
             android:screenOrientation="portrait" />
         <activity
             android:name="com.arpa.hndahesudintocctmsdriver.ui.auth.PhotoCarActivity"
-            android:windowSoftInputMode="adjustPan|stateHidden"
             android:screenOrientation="portrait"  />
         <activity
             android:name="com.arpa.hndahesudintocctmsdriver.ui.auth.VehicleAuthActivity"
@@ -112,21 +111,6 @@
 
         </activity>
 
-        <activity
-            android:name="com.arpa.hndahesudintocctmsdriver.ui.home.shangchuan.ShangChuangImgActivityBC"
-            android:screenOrientation="portrait">
-
-            <intent-filter>
-                <action android:name="android.nfc.action.TAG_DISCOVERED" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-
-                <data android:mimeType="*/*" />
-            </intent-filter>
-
-        </activity>
-
-
         <activity
             android:name="com.arpa.hndahesudintocctmsdriver.ui.home.shangchuan.ShangChuangImgActivity2"
             android:screenOrientation="portrait">
@@ -161,7 +145,6 @@
         </activity>
         <activity
             android:name="com.arpa.hndahesudintocctmsdriver.ui.auth.CertificatesActivity"
-            android:windowSoftInputMode="adjustPan|stateHidden"
             android:screenOrientation="portrait"/>
         <activity
             android:name="com.arpa.hndahesudintocctmsdriver.ui.auth.AddCarSuccActivity"
@@ -171,7 +154,6 @@
             android:screenOrientation="portrait"/>
         <activity
             android:name="com.arpa.hndahesudintocctmsdriver.ui.login.WelcomeActivity"
-            android:exported="true"
             android:screenOrientation="portrait">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -265,7 +247,7 @@
         <!--高德地图-->
         <meta-data
             android:name="com.amap.api.v2.apikey"
-            android:value="${GAODEKEY}" />
+            android:value="78019612271411eca3af34db91930620" />
 <!--            android:value="702eaa84675618b8eb69298d9fd42ca3" />-->
 
         <service android:name="com.amap.api.location.APSService"></service>
@@ -277,7 +259,7 @@
         <!-- 极光-->
         <meta-data
             android:name="JPUSH_APPKEY"
-            android:value="fba6f55621c670d8c1fe9191" /> <!-- </>值来自开发者平台取得的AppKey -->
+            android:value="571d93ae5117da6dee848c92" /> <!-- </>值来自开发者平台取得的AppKey -->
 
         <meta-data
             android:name="JPUSH_CHANNEL"
@@ -400,7 +382,7 @@
         </receiver>
         <provider
             android:name="androidx.core.content.FileProvider"
-            android:authorities="${applicationId}.fileprovider"
+            android:authorities="com.arpa.hndahesudintocctmsdriver.fileprovider"
             android:exported="false"
             android:grantUriPermissions="true"
             tools:ignore="WrongManifestParent">

app/src/main/java/com/arpa/hndahesudintocctmsdriver/App.java

@@ -23,7 +23,6 @@ import com.arpa.hndahesudintocctmsdriver.util.sp.SPUtil;
 import com.gyf.cactus.Cactus;
 import com.gyf.cactus.callback.CactusBackgroundCallback;
 import com.gyf.cactus.callback.CactusCallback;
-import com.tencent.bugly.crashreport.CrashReport;
 import com.umeng.commonsdk.UMConfigure;
 
 import cn.jiguang.verifysdk.api.JVerificationInterface;
@@ -47,7 +46,6 @@ public class App extends Application {
         mApplication = this;
         con = getBaseContext();
         CommonBaseLibrary.getInstance().init(this, Api.BASE_URL);
-        CrashReport.initCrashReport(getApplicationContext(), "0fa55ffad8", false);
         String state = SPUtil.getSP(con, "state_data", "authorization_state");
         if ("1".equals(state)) {
             try {

app/src/main/java/com/arpa/hndahesudintocctmsdriver/H5Activity.java

@@ -224,6 +224,27 @@ public class H5Activity extends AppCompatActivity {
 
             Uri uri = Uri.parse(url);
             Log.e("test", "要加载的地址:" + uri.getScheme() + " " + url + " ");
+
+
+//            if (url.contains("callback")) {
+//                // 实名认证结束 返回按钮/倒计时返回/暂不认证
+//                boolean status = uri.getBooleanQueryParameter("passed", false);
+//                if (status) {
+//
+//                    new Handler().postDelayed(() -> {
+//                        FaceEvent he = new FaceEvent("刷脸成功");
+//                        EventBus.getDefault().post(he);
+//                        finish();
+//                    }, 4000);
+//                }else{
+//                    if (mWebView.canGoBack()) {
+//                        mWebView.goBack();
+//                    }
+//                    Toast.makeText(H5Activity.this, "认证失败,请重新刷脸认证", Toast.LENGTH_SHORT).show();
+//                }
+//                return true;
+//            }
+
             if (uri.getScheme().equals("http") || uri.getScheme().equals("https")) {
                 view.loadUrl(url);
                 return true;

app/src/main/java/com/arpa/hndahesudintocctmsdriver/bean/AppInfoBean.java

@@ -1,157 +0,0 @@
-package com.arpa.hndahesudintocctmsdriver.bean;
-
-import android.os.Build;
-import android.provider.Settings;
-
-import androidx.activity.result.contract.ActivityResultContracts;
-
-import com.arpa.hndahesudintocctmsdriver.App;
-import com.dahe.mylibrary.utils.AppUtils;
-
-import java.util.Locale;
-
-/**
- * @ClassName AppInfoBean
- * @Author john
- * @Date 2024/7/22 15:31
- * @Description TODO
- */
-public class AppInfoBean {
-    private String userPhone;
-    private String macIpaddr = Settings.Secure.getString(App.getApp().getContentResolver(),Settings.Secure.ANDROID_ID);
-//    private String macIpaddr = android.os.Build.ID;
-    private String clientSource = "driver";
-    private String status = "";
-    private String mobilePhoneManufacturerName = android.os.Build.BRAND;
-    private String mobilePhoneProductName = android.os.Build.MODEL;
-    private String mobilePhoneMotherboardName = android.os.Build.BOARD;
-    private String mobilePhoneHardwareName = android.os.Build.DEVICE;
-    private String mobilePhoneMachineSystemLanguage = Locale.getDefault().getLanguage();
-    private String androidVersion=android.os.Build.VERSION.RELEASE;
-    private String androidSystemSdk = android.os.Build.VERSION.SDK_INT+"";
-    private String appVersionName = AppUtils.getAppVersionName();
-    private String appVersionNumber = AppUtils.getAppVersionCode()+"";
-
-    public String getUserPhone() {
-        return userPhone;
-    }
-
-    public void setUserPhone(String userPhone) {
-        this.userPhone = userPhone;
-    }
-
-    public String getMacIpaddr() {
-        return macIpaddr;
-    }
-
-    public void setMacIpaddr(String macIpaddr) {
-        this.macIpaddr = macIpaddr;
-    }
-
-    public String getClientSource() {
-        return clientSource;
-    }
-
-    public void setClientSource(String clientSource) {
-        this.clientSource = clientSource;
-    }
-
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    public String getMobilePhoneManufacturerName() {
-        return mobilePhoneManufacturerName;
-    }
-
-    public void setMobilePhoneManufacturerName(String mobilePhoneManufacturerName) {
-        this.mobilePhoneManufacturerName = mobilePhoneManufacturerName;
-    }
-
-    public String getMobilePhoneProductName() {
-        return mobilePhoneProductName;
-    }
-
-    public void setMobilePhoneProductName(String mobilePhoneProductName) {
-        this.mobilePhoneProductName = mobilePhoneProductName;
-    }
-
-    public String getMobilePhoneMotherboardName() {
-        return mobilePhoneMotherboardName;
-    }
-
-    public void setMobilePhoneMotherboardName(String mobilePhoneMotherboardName) {
-        this.mobilePhoneMotherboardName = mobilePhoneMotherboardName;
-    }
-
-    public String getMobilePhoneHardwareName() {
-        return mobilePhoneHardwareName;
-    }
-
-    public void setMobilePhoneHardwareName(String mobilePhoneHardwareName) {
-        this.mobilePhoneHardwareName = mobilePhoneHardwareName;
-    }
-
-    public String getMobilePhoneMachineSystemLanguage() {
-        return mobilePhoneMachineSystemLanguage;
-    }
-
-    public void setMobilePhoneMachineSystemLanguage(String mobilePhoneMachineSystemLanguage) {
-        this.mobilePhoneMachineSystemLanguage = mobilePhoneMachineSystemLanguage;
-    }
-
-    public String getAndroidVersion() {
-        return androidVersion;
-    }
-
-    public void setAndroidVersion(String androidVersion) {
-        this.androidVersion = androidVersion;
-    }
-
-    public String getAndroidSystemSdk() {
-        return androidSystemSdk;
-    }
-
-    public void setAndroidSystemSdk(String androidSystemSdk) {
-        this.androidSystemSdk = androidSystemSdk;
-    }
-
-    public String getAppVersionName() {
-        return appVersionName;
-    }
-
-    public void setAppVersionName(String appVersionName) {
-        this.appVersionName = appVersionName;
-    }
-
-    public String getAppVersionNumber() {
-        return appVersionNumber;
-    }
-
-    public void setAppVersionNumber(String appVersionNumber) {
-        this.appVersionNumber = appVersionNumber;
-    }
-
-    @Override
-    public String toString() {
-        return "AppInfoBean{" +
-                "userPhone='" + userPhone + '\'' +
-                ", macIpaddr='" + macIpaddr + '\'' +
-                ", clientSource='" + clientSource + '\'' +
-                ", status='" + status + '\'' +
-                ", mobilePhoneManufacturerName='" + mobilePhoneManufacturerName + '\'' +
-                ", mobilePhoneProductName='" + mobilePhoneProductName + '\'' +
-                ", mobilePhoneMotherboardName='" + mobilePhoneMotherboardName + '\'' +
-                ", mobilePhoneHardwareName='" + mobilePhoneHardwareName + '\'' +
-                ", mobilePhoneMachineSystemLanguage='" + mobilePhoneMachineSystemLanguage + '\'' +
-                ", androidVersion='" + androidVersion + '\'' +
-                ", androidSystemSdk='" + androidSystemSdk + '\'' +
-                ", appVersionName='" + appVersionName + '\'' +
-                ", appVersionNumber='" + appVersionNumber + '\'' +
-                '}';
-    }
-}

app/src/main/java/com/arpa/hndahesudintocctmsdriver/bean/CarDelBean.java

@@ -66,11 +66,6 @@ public class CarDelBean {
         private String owner;
         private String roadLicense;
         private String roadLicensePhoto;
-        private String trailerLicenseId;
-
-        private String policyPhotoUrl;
-        private String insuranceCompany;
-        private String insuranceEndDay;
         private String roadLicenseSend;
         private String roadLicenseValidity;
         private String threeImage;
@@ -84,14 +79,6 @@ public class CarDelBean {
         private String carPlateColorValue;
         private String needUpQCPhoto;
 
-        public String getTrailerLicenseId() {
-            return trailerLicenseId;
-        }
-
-        public void setTrailerLicenseId(String trailerLicenseId) {
-            this.trailerLicenseId = trailerLicenseId;
-        }
-
         public String getNeedUpQCPhoto() {
             return needUpQCPhoto;
         }
@@ -108,30 +95,6 @@ public class CarDelBean {
             this.carPlateColorValue = carPlateColorValue;
         }
 
-        public String getPolicyPhotoUrl() {
-            return policyPhotoUrl == null ? "" : policyPhotoUrl;
-        }
-
-        public void setPolicyPhotoUrl(String policyPhotoUrl) {
-            this.policyPhotoUrl = policyPhotoUrl;
-        }
-
-        public String getInsuranceCompany() {
-            return insuranceCompany == null ? "" : insuranceCompany;
-        }
-
-        public void setInsuranceCompany(String insuranceCompany) {
-            this.insuranceCompany = insuranceCompany;
-        }
-
-        public String getInsuranceEndDay() {
-            return insuranceEndDay == null ? "" : insuranceEndDay;
-        }
-
-        public void setInsuranceEndDay(String insuranceEndDay) {
-            this.insuranceEndDay = insuranceEndDay;
-        }
-
         public String getCarEnergyTypValue() {
             return carEnergyTypValue;
         }
@@ -308,15 +271,6 @@ public class CarDelBean {
             private String threeImage;
             private String type;
             private String vehicleNumber;
-            private String trailerLicenseId;
-
-            public String getTrailerLicenseId() {
-                return trailerLicenseId;
-            }
-
-            public void setTrailerLicenseId(String trailerLicenseId) {
-                this.trailerLicenseId = trailerLicenseId;
-            }
 
             public String getBackImage() {
                 return backImage == null ? "" : backImage;

app/src/main/java/com/arpa/hndahesudintocctmsdriver/bean/DriverExpireBean.java

@@ -48,33 +48,6 @@ public class DriverExpireBean {
     public static class DataDTO {
         private String driverLicenseUpdateUrl;
         private String idCardUpdateUrl;
-        private String qualificationUpdateUrl;
-        private String roadLicenseUpdateUrl;
-        private String insuranceUpdateUrl;
-
-        public String getRoadLicenseUpdateUrl() {
-            return roadLicenseUpdateUrl;
-        }
-
-        public void setRoadLicenseUpdateUrl(String roadLicenseUpdateUrl) {
-            this.roadLicenseUpdateUrl = roadLicenseUpdateUrl;
-        }
-
-        public String getInsuranceUpdateUrl() {
-            return insuranceUpdateUrl;
-        }
-
-        public void setInsuranceUpdateUrl(String insuranceUpdateUrl) {
-            this.insuranceUpdateUrl = insuranceUpdateUrl;
-        }
-
-        public String getQualificationUpdateUrl() {
-            return qualificationUpdateUrl;
-        }
-
-        public void setQualificationUpdateUrl(String qualificationUpdateUrl) {
-            this.qualificationUpdateUrl = qualificationUpdateUrl;
-        }
 
         public String getDriverLicenseUpdateUrl() {
             return driverLicenseUpdateUrl;

app/src/main/java/com/arpa/hndahesudintocctmsdriver/bean/OCRVehicleBackLicenseBean.java

@@ -59,7 +59,6 @@ public class OCRVehicleBackLicenseBean {
         private int id;
         private String url;
         private String checkRecord;
-        private String isSave;
         private String approvedCapacity;
         private String allCapacity;
         private String size;
@@ -72,14 +71,6 @@ public class OCRVehicleBackLicenseBean {
         private String carNumber;
         private int licenseId;
 
-        public String getIsSave() {
-            return isSave;
-        }
-
-        public void setIsSave(String isSave) {
-            this.isSave = isSave;
-        }
-
         public int getLicenseId() {
             return licenseId;
         }

app/src/main/java/com/arpa/hndahesudintocctmsdriver/bean/OCRVehicleLicenseBean.java

@@ -49,9 +49,7 @@ public class OCRVehicleLicenseBean {
         private String address;
         private int carId;
         private String carNumber;
-        private boolean carExist;
         private String dateIssue;
-        private String backImage;
         private String engineNumber;
         private int id;
         private String model;
@@ -62,41 +60,6 @@ public class OCRVehicleLicenseBean {
         private String type;
         private String url;
         private String vehicleNumber;
-        private String licenseId;
-
-        public String getLicenseId() {
-            return licenseId;
-        }
-
-        public void setLicenseId(String licenseId) {
-            this.licenseId = licenseId;
-        }
-
-        private DataDto2 existCarInfo;
-
-        public DataDto2 getExistCarInfo() {
-            return existCarInfo;
-        }
-
-        public void setExistCarInfo(DataDto2 existCarInfo) {
-            this.existCarInfo = existCarInfo;
-        }
-
-        public boolean isCarExist() {
-            return carExist;
-        }
-
-        public String getBackImage() {
-            return backImage;
-        }
-
-        public void setBackImage(String backImage) {
-            this.backImage = backImage;
-        }
-
-        public void setCarExist(boolean carExist) {
-            this.carExist = carExist;
-        }
 
         public String getAddress() {
             return address == null ? "" : address;
@@ -210,44 +173,4 @@ public class OCRVehicleLicenseBean {
             this.vehicleNumber = vehicleNumber;
         }
     }
-
-    public static class DataDto2 {
-        private String backImage;
-        private String carId;
-        private String licenseId;
-
-        private CarDelBean.DataDTO trailerResVo;
-
-        public CarDelBean.DataDTO getTrailerResVo() {
-            return trailerResVo;
-        }
-
-        public void setTrailerResVo(CarDelBean.DataDTO trailerResVo) {
-            this.trailerResVo = trailerResVo;
-        }
-
-        public String getLicenseId() {
-            return licenseId;
-        }
-
-        public void setLicenseId(String licenseId) {
-            this.licenseId = licenseId;
-        }
-
-        public String getBackImage() {
-            return backImage == null ? "" : backImage;
-        }
-
-        public void setBackImage(String backImage) {
-            this.backImage = backImage;
-        }
-
-        public String getCarId() {
-            return carId;
-        }
-
-        public void setCarId(String carId) {
-            this.carId = carId;
-        }
-    }
 }

app/src/main/java/com/arpa/hndahesudintocctmsdriver/cuspop/MessagePop.kt

@@ -1,18 +1,11 @@
 package com.arpa.hndahesudintocctmsdriver.cuspop
 
-import android.Manifest
 import android.content.Context
 import android.content.Intent
 import android.net.Uri
 import android.view.View
-import android.widget.Toast
-import androidx.fragment.app.FragmentActivity
 import com.arpa.hndahesudintocctmsdriver.R
-import com.arpa.hndahesudintocctmsdriver.util.alert.ToastUtil
-import com.dahe.mylibrary.utils.ToastUtils
 import com.lxj.xpopup.core.CenterPopupView
-import com.lxj.xpopup.util.XPermission
-import com.permissionx.guolindev.PermissionX
 import kotlinx.android.synthetic.main.load.view.*
 import kotlinx.android.synthetic.main.pop_message_center.view.*
 
@@ -55,16 +48,11 @@ class MessagePop(context: Context) : CenterPopupView(context), View.OnClickListe
             }
             R.id.tvOk,R.id.tvPhone -> {
                 dismiss()
-                if (XPermission.create(context).isGranted(Manifest.permission.CALL_PHONE)){
-                    val toString = tvPhone.text.toString()
-                    val intent = Intent(Intent.ACTION_DIAL)
-                    val data = Uri.parse("tel:$toString")
-                    intent.data = data
-                    context.startActivity(intent)
-                }else{
-                    ToastUtils.showToast(context,"请开启电话权限")
-                }
-
+                val toString = tvPhone.text.toString()
+                val intent = Intent(Intent.ACTION_DIAL)
+                val data = Uri.parse("tel:$toString")
+                intent.data = data
+                context.startActivity(intent)
 //                BaseUtils.callPhone(content as Activity, tvPhone.text.toString())
             }
         }

app/src/main/java/com/arpa/hndahesudintocctmsdriver/event/RefreshCarListEvent.java

@@ -1,21 +0,0 @@
-package com.arpa.hndahesudintocctmsdriver.event;
-
-/**
- * @author hlh
- * @version 1.0.0
- * @date 2021/11/2 18:51
- * @description:
- */
-public class RefreshCarListEvent {
-    private String message;
-
-    public RefreshCarListEvent(String message) {
-        this.message = message;
-    }
-    public String getMessage() {
-        return message;
-    }
-    public void setMessage(String message) {
-        this.message = message;
-    }
-}

app/src/main/java/com/arpa/hndahesudintocctmsdriver/request/AuthRequest.java

@@ -124,17 +124,6 @@ public class AuthRequest {
         RequestUtil.start(1, "saveCarRoadLicenseNo", re, con, hd);
     }
 
-    //车辆交强保险
-    public void saveTrafficInsurance(Context con, Handler hd, String id, String insuranceEndDay, String insuranceCompany) {
-        String mt = "{\n" +
-                "\t\"carId\": \"" + id + "\",\n" +
-                "\t\"insuranceEndDay\": \"" + insuranceEndDay + "\",\n" +
-                "\t\"insuranceCompany\": \"" + insuranceCompany + "\",\n" +
-                "}";
-        Request re = OkHttpUtil.posts(new OkDate(RequestConstant.getTrafficInsurance(), mt), getToken(con), con);
-        RequestUtil.start(1, "saveTrafficInsurance", re, con, hd);
-    }
-
     //获取资格证认证信息
     public void isDriverAuthQualification(Context con, Handler hd) {
         Request re = OkHttpUtil.posts(new OkDate(RequestConstant.getIsAuthDriverAuthQualification(), ""), getToken(con), con);

app/src/main/java/com/arpa/hndahesudintocctmsdriver/request/HuoYuanRequset.java

@@ -89,11 +89,6 @@ public class HuoYuanRequset{
         Request re = OkHttpUtil.posts(new OkDate(RequestConstant.getUNLOADING(), gson.toJson(lub)),getToken(con),con);
         RequestUtil.start(1, ShangChuangImgActivity.TYPE_NAME[1],re,con,hd);
     }
-    //卸货-补传
-    public void dischargeCargo4(LUInputBean lub){
-        Request re = OkHttpUtil.posts(new OkDate(RequestConstant.getUNLOADING4(), gson.toJson(lub)),getToken(con),con);
-        RequestUtil.start(1, ShangChuangImgActivity.TYPE_NAME[1],re,con,hd);
-    }
     //回单
     public void receipt(UploadReceiptInputBean urib){
         Request re = OkHttpUtil.posts(new OkDate(RequestConstant.getUploadReceipt(), gson.toJson(urib)),getToken(con),con);

app/src/main/java/com/arpa/hndahesudintocctmsdriver/request/OCRRequest.java

@@ -49,8 +49,8 @@ public class OCRRequest {
         RequestUtil.start(12, CertificatesActivity.TYPE_NAME[2],re,con,hd);
     }
     //行驶证背面识别
-    public void OCRVehicleLicenseBack(Context con, Handler hd, File file,String carId,String carNum,boolean isSave){
-        Request re = OkHttpUtil.postFiles(new OkDate(RequestConstant.getVehicleLicenseBack()),file,getToken(con),carId,carNum,isSave);
+    public void OCRVehicleLicenseBack(Context con, Handler hd, File file,String carId,String carNum){
+        Request re = OkHttpUtil.postFiles(new OkDate(RequestConstant.getVehicleLicenseBack()),file,getToken(con),carId,carNum);
         RequestUtil.start(12, CertificatesActivity.TYPE_NAME_BANK[2],re,con,hd);
     }
 

app/src/main/java/com/arpa/hndahesudintocctmsdriver/request/RequestConstant.java

@@ -4,207 +4,197 @@ import com.arpa.hndahesudintocctmsdriver.BuildConfig;
 
 public class RequestConstant {
 
-    public static String TOKEN = "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJleHAiOjE2MzA0MDE3OTIsInVzZXJJZCI6ODAsImlhdCI6MTYyNzcyMzM5Mn0.f9Q-UZVduW6nt1s0L-3vYsrOJJ8iuSCSlJ9uu8yIxBI";
+    public static String TOKEN="eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJleHAiOjE2MzA0MDE3OTIsInVzZXJJZCI6ODAsImlhdCI6MTYyNzcyMzM5Mn0.f9Q-UZVduW6nt1s0L-3vYsrOJJ8iuSCSlJ9uu8yIxBI";
     //域名地址http://request.one-clouds.com/api https://huoyun.mzxd56.com/api http://app.dahehuoyun.com/api
     public static String BASE_URL = BuildConfig.BASE_URL;
     //版本更新/app/check/version
-    public static String VERSION = "/app/check/version";
+    public static String VERSION ="/app/check/version";
     //全部代码
-    public static String CODE_DATA = "/common/dic/listdata";
+    public static String CODE_DATA ="/common/dic/listdata";
     //短信验证码
     private static final String SEND_CODE = "/common/sendcode";
     //登录
-    private static final String REG = "/common/register";
+    private static final String REG="/common/register";
     //注册
-    private static final String LOGIN = "/common/register";
+    private static final String LOGIN="/common/register";
     //上传文件
-    private static final String UPLOAD = "/common/resource/upload";
+    private static final String UPLOAD="/common/resource/upload";
     //配置项信息
-    private static final String CONFIG = "/common/config/list";
+    private static final String CONFIG="/common/config/list";
     //获取开屏页图片和轮播图
-    private static final String GET_IMAGE = "/common/resource/image/config";
+    private static final String GET_IMAGE="/common/resource/image/config";
     //司机认证信息
-    private static final String DRIVER_AUTH_INFO = "/app/driver/auth/authInfo";
+    private static final String DRIVER_AUTH_INFO="/app/driver/auth/authInfo";
     //货源大厅
-    private static final String GOODS_HALL = "/app/driver/order/getHallList";
+    private static final String GOODS_HALL="/app/driver/order/getHallList";
     //历史成交货源
-    private static final String GET_EXAMPLE_LIST = "/app/driver/order/getExampleList";
+    private static final String GET_EXAMPLE_LIST="/app/driver/order/getExampleList";
     //货源详情
-    private static final String GOODS_DEL = "/app/driver/order/findOrderInfoV2";
+    private static final String GOODS_DEL="/app/driver/order/findOrderInfoV2";
     //账户信息
-    private static final String USER = "/app/user/getUserInfo";
+    private static final String USER="/app/user/getUserInfo";
     //银行卡列表
-    private static final String BANK_CARD_LIST = "/app/bankCard/findPage";
+    private static final String BANK_CARD_LIST="/app/bankCard/findPage";
     //绑定银行卡
-    private static final String INS_BANKCARD = "/app/bankCard/bandCard";
-    //    private static final String INS_BANKCARD="/app/bankCard/save";
+    private static final String INS_BANKCARD="/app/bankCard/bandCard";
+//    private static final String INS_BANKCARD="/app/bankCard/save";
     //删除银行卡
 //    private static final String DELETE_BANKCARD="/app/bankCard/deleteCard";
-    private static final String DELETE_BANKCARD = "/app/bankCard/unBandCard";
+    private static final String DELETE_BANKCARD="/app/bankCard/unBandCard";
     //生成电子账户
-    private static final String ADD_CONTRACTS = "/app/bank/addContracts";
+    private static final String ADD_CONTRACTS="/app/bank/addContracts";
     //获取电子账户
-    private static final String GET_CONTRACTS = "/app/bank/getContracts";
+    private static final String GET_CONTRACTS="/app/bank/getContracts";
     //获取账户未读消息
-    private static final String XIAOXI_LIST = "/app/message/findCurrentUserNotReadCount";
+    private static final String XIAOXI_LIST="/app/message/findCurrentUserNotReadCount";
     //获取账户消息
-    private static final String XIAOXI_ALL = "/app/message/findPage";
+    private static final String XIAOXI_ALL="/app/message/findPage";
     //已读消息
-    private static final String XIAOXI_DEL = "/app/message/setReadById";
+    private static final String XIAOXI_DEL="/app/message/setReadById";
     //已读全部消息
-    private static final String XIAOXI_DEL_ALL = "/app/message/setReadAll";
+    private static final String XIAOXI_DEL_ALL="/app/message/setReadAll";
     //运单列表
-    private static final String ORDER_LIST = "/app/driver/waybill/listV2";
+    private static final String ORDER_LIST="/app/driver/waybill/listV2";
     //抢单
-    private static final String AGREE_ORDER = "/app/driver/waybill/grabDriverOrdersContruct";
+    private static final String AGREE_ORDER="/app/driver/waybill/grabDriverOrdersContruct";
     //获取正在执行的运单/运单详情
-    private static final String GET_START_ORDER = "/app/driver/waybill/getExecuteWaybill";
+    private static final String GET_START_ORDER="/app/driver/waybill/getExecuteWaybill";
     //查看承运合同
-    private static final String GET_CARRY_CONTRACT = "/common/appContract/findCarrierContract";
+    private static final String GET_CARRY_CONTRACT="/common/appContract/findCarrierContract";
     //评价信息保存
-    private static final String EVALUATIONV2 = "/app/driver/waybill/evaluationV2";
+    private static final String EVALUATIONV2="/app/driver/waybill/evaluationV2";
     //装货
-    private static final String LOADING = "/app/driver/waybill/loadingV2";
+    private static final String LOADING="/app/driver/waybill/loadingV2";
     //卸货
-    private static final String UNLOADING = "/app/driver/waybill/unloadV2";
-    //卸货-补传
-    private static final String UNLOADING4 = "/app/driver/waybill/unloadV4";
+    private static final String UNLOADING="/app/driver/waybill/unloadV2";
     //上传回单
-    private static final String UPLOAD_RECEIPT = "/app/driver/waybill/uploadReceipt";
+    private static final String UPLOAD_RECEIPT="/app/driver/waybill/uploadReceipt";
     //轨迹跟踪
-    private static final String TRACK_TRACKING = "/app/driver/waybill/addAppLocation";
+    private static final String TRACK_TRACKING="/app/driver/waybill/addAppLocation";
     //获取评价信息
-    private static final String GET_EVALUATE = "/app/driver/waybill/listAppraises";
+    private static final String GET_EVALUATE="/app/driver/waybill/listAppraises";
     //获取投诉信息
-    private static final String GET_COMPLAINT = "/app/driver/waybill/listComplaint";
+    private static final String GET_COMPLAINT="/app/driver/waybill/listComplaint";
     //保存投诉信息
-    private static final String COMPLAINT = "/app/driver/waybill/complaintV2";
+    private static final String COMPLAINT="/app/driver/waybill/complaintV2";
     //保存评价信息
-    private static final String EVALUATION_V2 = "/app/driver/waybill/evaluationV2";
+    private static final String EVALUATION_V2="/app/driver/waybill/evaluationV2";
     //车辆列表
-    private static final String GET_CAR_LIST = "/app/carDriver/getCarList";
+    private static final String GET_CAR_LIST="/app/carDriver/getCarList";
     //车辆详情
-    private static final String GET_CAR_DEL = "/app/carDriver/getCarInfo";
+    private static final String GET_CAR_DEL="/app/carDriver/getCarInfo";
     //删除车辆
-    private static final String DEL_CAR = "/app/carDriver/unBindCar";
+    private static final String DEL_CAR="/app/carDriver/removeCar";
     //上传车辆照片
-    private static final String SAVECARIMG = "/app/carDriver/saveCarImg";
+    private static final String SAVECARIMG="/app/carDriver/saveCarImg";
     //上传头像保存
-    private static final String UPLOAD_HEAD = "/app/user/uploadHeadportrait";
+    private static final String UPLOAD_HEAD="/app/user/uploadHeadportrait";
     //获取上传失败的订单
-    private static final String GET_ERROR_ORDER = "/app/driver/waybill/getAsymmetryWaybill";
+    private static final String GET_ERROR_ORDER="/app/driver/waybill/getAsymmetryWaybill";
     //提现
-    private static final String TIXIAN = "/app/account/cashApply/bank/charge";
+    private static final String TIXIAN="/app/account/cashApply/bank/charge";
     //--ORC识别--
 
     //银行卡识别
-    private static final String ORC_BANK = "/common/ocr/bank";
+    private static final String ORC_BANK="/common/ocr/bank";
     //身份证正面
-    private static final String ID_CARD_FRONT = "/common/ocr/idCardFront";
+    private static final String ID_CARD_FRONT="/common/ocr/idCardFront";
     //身份证识别反面
-    private static final String ID_CARD_BACK = "/common/ocr/idCardBack";
+    private static final String ID_CARD_BACK="/common/ocr/idCardBack";
     //驾驶证正面
-    private static final String DRIVING_LICENSE = "/common/ocr/drivingLicense";
+    private static final String DRIVING_LICENSE="/common/ocr/drivingLicense";
     //驾驶证副页
-    private static final String DRIVING_LICENSE_BACK = "/common/ocr/drivingLicenseBack";
+    private static final String DRIVING_LICENSE_BACK="/common/ocr/drivingLicenseBack";
     //行驶证正面
-    private static final String VEHICLE_LICENSE = "/common/ocr/vehicleLicense";
+    private static final String VEHICLE_LICENSE="/common/ocr/vehicleLicense";
     //行驶证副页
-    private static final String VEHICLE_LICENSE_BACK = "/common/ocr/v2/vehicleBackLicenseV3";
+    private static final String VEHICLE_LICENSE_BACK="/common/ocr/v2/vehicleBackLicenseV3";
     //身份证认证信息
-    private static final String ISAUTH_IDCARD = "/app/driver/auth/isAuthIdCard";
+    private static final String ISAUTH_IDCARD="/app/driver/auth/isAuthIdCard";
     //驾驶证认证信息
-    private static final String ISAUTH_DRIVERAUTH_LICENSE = "/app/driver/auth/isAuthDriverAuthLicense";
+    private static final String ISAUTH_DRIVERAUTH_LICENSE="/app/driver/auth/isAuthDriverAuthLicense";
     //资格证认证信息
-    private static final String IS_AUTH_DRIVER_AUTH_QUALIFICATION = "/app/driver/auth/isAuthDriverAuthQualification";
+    private static final String IS_AUTH_DRIVER_AUTH_QUALIFICATION="/app/driver/auth/isAuthDriverAuthQualification";
     //行驶证认证信息
     //身份证认证
-    private static final String DRIVERAUTHIDCARD = "/app/driver/auth/driverAuthIdCard";
+    private static final String DRIVERAUTHIDCARD="/app/driver/auth/driverAuthIdCard";
     //驾驶证认证
-    private static final String DRIVERAUTHLICENSE = "/app/driver/auth/driverAuthLicense";
+    private static final String DRIVERAUTHLICENSE="/app/driver/auth/driverAuthLicense";
     //行驶证认证
-    private static final String SAVEVEHICLELICENSE = "/app/carDriver/saveVehicleLicense";
+    private static final String SAVEVEHICLELICENSE="/app/carDriver/saveVehicleLicense";
     //从业资格证认证
-    private static final String DRIVER_AUTH_QUALIFICATION = "/app/driver/auth/driverAuthQualification";
+    private static final String DRIVER_AUTH_QUALIFICATION="/app/driver/auth/driverAuthQualification";
     //车辆等级证书
-    private static final String DRIVER_AUTH_SAVECARREGISTERNO = "/app/carDriver/saveCarRegisterNo";
+    private static final String DRIVER_AUTH_SAVECARREGISTERNO="/app/carDriver/saveCarRegisterNo";
     //道路运输信息
-    private static final String DRIVER_AUTH_SAVECARROADLICENSENO = "/app/carDriver/saveCarRoadLicenseNo";
-
-    //交强险
-    private static final String DRIVER_TRAFFIC_INSU = "/app/carDriver/saveCarInsurace";
+    private static final String DRIVER_AUTH_SAVECARROADLICENSENO="/app/carDriver/saveCarRoadLicenseNo";
     //党员认证
-    private static final String PARTY_MEMBER = "/app/user/partyMember";
+    private static final String PARTY_MEMBER="/app/user/partyMember";
     //实名认证
-    private static final String AUTH_URL = "/app/driver/auth/getAuthUrl";
+    private static final String AUTH_URL="/app/driver/auth/getAuthUrl";
     //车牌号
-    private static final String PLATE_LICENSE = "/common/ocr/plateLicense";
+    private static final String PLATE_LICENSE="/common/ocr/plateLicense";
 
     //车牌号2
-    private static final String PLATE_LICENSE2 = "/common/aliyun/ocr/RecognizeCarNumber";
+    private static final String PLATE_LICENSE2="/common/aliyun/ocr/RecognizeCarNumber";
 
     //添加挂车
-    private static final String SAVE_DRAW_CAR = "/app/carDriver/saveDrawCar";
+    private static final String SAVE_DRAW_CAR="/app/carDriver/saveDrawCar";
     //提现记录
-    private static final String CHANGE_RECORD = "/app/account/change/record";
+    private static final String CHANGE_RECORD="/app/account/change/record";
 
     //提现手续费
-    private static final String WITHDRAWALS_CHARGE = "/app/account/withdrawals/charge";
+    private static final String WITHDRAWALS_CHARGE="/app/account/withdrawals/charge";
 
     //提现配置信息
-    private static final String WITHDRAWALS_CONFIG = "/app/account/withdrawals/config";
+    private static final String WITHDRAWALS_CONFIG="/app/account/withdrawals/config";
 
     //获取车辆颜色
-    private static final String CAR_COLOR = "/app/common/carColorTypeList";
+    private static final String CAR_COLOR="/app/common/carColorTypeList";
 
     //获取车辆颜色
-    private static final String CAR_ENERGYTYPE = "/app/common/carEnergyTypeList";
+    private static final String CAR_ENERGYTYPE="/app/common/carEnergyTypeList";
 
     //车辆自动审核触发器
-    private static final String CAR_AUDIT = "/app/carDriver/carAutomaticAudit";
-    private static final String APP_INFO = "/common/app/logininfor";
+    private static final String CAR_AUDIT="/app/carDriver/carAutomaticAudit";
 
-    public static String getCarAudit() {
-        return BASE_URL + CAR_AUDIT;
+    public static String getCarAudit(){
+        return BASE_URL +CAR_AUDIT;
     }
 
-    public static String postAppInfo() {
-        return BASE_URL + APP_INFO;
+    public static String getCarColor(){
+        return BASE_URL +CAR_COLOR;
     }
 
-    public static String getCarColor() {
-        return BASE_URL + CAR_COLOR;
-    }
-
-    public static String getCarEnergyType() {
+    public static String getCarEnergyType(){
         return BASE_URL + CAR_ENERGYTYPE;
     }
 
     //app/driver/auth/driverExpire
-    public static final String GET_CERTIFICATE_EXPIRED = "/app/driver/auth/driverExpire";
+    public static final String GET_CERTIFICATE_EXPIRED="/app/driver/auth/driverExpire";
 
     public static String getSendCodeUrl() {
-        return BASE_URL + SEND_CODE;
+        return BASE_URL +SEND_CODE;
     }
 
     public static String getREGUrl() {
-        return BASE_URL + REG;
+        return BASE_URL +REG;
     }
 
     public static String getLoginUrl() {
-        return BASE_URL + LOGIN;
+        return BASE_URL +LOGIN;
     }
 
     public static String getDriverAuthInfoUrl() {
-        return BASE_URL + DRIVER_AUTH_INFO;
+        return BASE_URL +DRIVER_AUTH_INFO;
     }
 
     public static String getGoodsHallUrl() {
-        return BASE_URL + GOODS_HALL;
+        return BASE_URL +GOODS_HALL;
     }
 
     public static String getGoodsDelUrl() {
-        return BASE_URL + GOODS_DEL;
+        return BASE_URL +GOODS_DEL;
     }
 
     public static String getUserUrl() {
@@ -219,243 +209,201 @@ public class RequestConstant {
         return BASE_URL + BANK_CARD_LIST;
     }
 
-    public static String getXiaoXiListUrl() {
-        return BASE_URL + XIAOXI_LIST;
-    }
+    public static String getXiaoXiListUrl() { return BASE_URL + XIAOXI_LIST; }
 
-    public static String getXiaoxiAll() {
-        return BASE_URL + XIAOXI_ALL;
-    }
+    public static String getXiaoxiAll() { return BASE_URL +XIAOXI_ALL; }
 
     public static String getOrderList() {
-        return BASE_URL + ORDER_LIST;
+        return BASE_URL +ORDER_LIST;
     }
 
     public static String getAgreeOrder() {
-        return BASE_URL + AGREE_ORDER;
+        return BASE_URL +AGREE_ORDER;
     }
 
     public static String getGetStartOrder() {
-        return BASE_URL + GET_START_ORDER;
+        return BASE_URL +GET_START_ORDER;
     }
 
     public static String getGetCarryContract() {
-        return BASE_URL + GET_CARRY_CONTRACT;
+        return BASE_URL +GET_CARRY_CONTRACT;
     }
 
     public static String getEVALUATIONV2() {
-        return BASE_URL + EVALUATIONV2;
+        return BASE_URL +EVALUATIONV2;
     }
 
     public static String getLOADING() {
-        return BASE_URL + LOADING;
+        return BASE_URL +LOADING;
     }
 
     public static String getUNLOADING() {
-        return BASE_URL + UNLOADING;
-    }
-
-    public static String getUNLOADING4() {
-        return BASE_URL + UNLOADING4;
+        return BASE_URL +UNLOADING;
     }
 
     public static String getGetEvaluate() {
-        return BASE_URL + GET_EVALUATE;
+        return BASE_URL +GET_EVALUATE;
     }
 
     public static String getGetComplaint() {
-        return BASE_URL + GET_COMPLAINT;
+        return BASE_URL +GET_COMPLAINT;
     }
 
     public static String getOrcBank() {
-        return BASE_URL + ORC_BANK;
+        return BASE_URL +ORC_BANK;
     }
 
     public static String getIdCardFront() {
-        return BASE_URL + ID_CARD_FRONT;
+        return BASE_URL +ID_CARD_FRONT;
     }
 
     public static String getIdCardBack() {
-        return BASE_URL + ID_CARD_BACK;
+        return BASE_URL +ID_CARD_BACK;
     }
 
     public static String getDrivingLicense() {
-        return BASE_URL + DRIVING_LICENSE;
+        return BASE_URL +DRIVING_LICENSE;
     }
 
     public static String getDrivingLicenseBack() {
-        return BASE_URL + DRIVING_LICENSE_BACK;
+        return BASE_URL +DRIVING_LICENSE_BACK;
     }
 
     public static String getVehicleLicense() {
-        return BASE_URL + VEHICLE_LICENSE;
+        return BASE_URL +VEHICLE_LICENSE;
     }
 
     public static String getVehicleLicenseBack() {
-        return BASE_URL + VEHICLE_LICENSE_BACK;
+        return BASE_URL +VEHICLE_LICENSE_BACK;
     }
 
     public static String getGetCarList() {
-        return BASE_URL + GET_CAR_LIST;
+        return BASE_URL +GET_CAR_LIST;
     }
 
     public static String getGetCarDel() {
-        return BASE_URL + GET_CAR_DEL;
+        return BASE_URL +GET_CAR_DEL;
     }
 
     public static String getCodeData() {
-        return BASE_URL + CODE_DATA;
+        return BASE_URL +CODE_DATA;
     }
 
     public static String getIsauthIdcard() {
-        return BASE_URL + ISAUTH_IDCARD;
+        return BASE_URL +ISAUTH_IDCARD;
     }
 
-    public static String getIsauthDriverauthLicense() {
-        return BASE_URL + ISAUTH_DRIVERAUTH_LICENSE;
-    }
+    public static String getIsauthDriverauthLicense() { return BASE_URL +ISAUTH_DRIVERAUTH_LICENSE; }
 
-    public static String getUploadReceipt() {
-        return BASE_URL + UPLOAD_RECEIPT;
-    }
+    public static String getUploadReceipt() { return BASE_URL +UPLOAD_RECEIPT; }
 
-    public static String getUPLOAD() {
-        return BASE_URL + UPLOAD;
-    }
+    public static String getUPLOAD() { return BASE_URL +UPLOAD; }
 
-    public static String getTrackTracking() {
-        return BASE_URL + TRACK_TRACKING;
-    }
+    public static String getTrackTracking() {return BASE_URL +TRACK_TRACKING; }
 
-    public static String getEvaluationV2() {
-        return BASE_URL + EVALUATION_V2;
-    }
+    public static String getEvaluationV2() { return BASE_URL +EVALUATION_V2; }
 
     public static String getDRIVERAUTHIDCARD() {
-        return BASE_URL + DRIVERAUTHIDCARD;
+        return BASE_URL +DRIVERAUTHIDCARD;
     }
 
     public static String getDRIVERAUTHLICENSE() {
-        return BASE_URL + DRIVERAUTHLICENSE;
+        return BASE_URL +DRIVERAUTHLICENSE;
     }
 
     public static String getSAVEVEHICLELICENSE() {
-        return BASE_URL + SAVEVEHICLELICENSE;
+        return BASE_URL +SAVEVEHICLELICENSE;
     }
 
     public static String getSAVECARIMG() {
-        return BASE_URL + SAVECARIMG;
+        return BASE_URL +SAVECARIMG;
     }
 
-    public static String getUploadHead() {
-        return BASE_URL + UPLOAD_HEAD;
-    }
+    public static String getUploadHead() { return BASE_URL +UPLOAD_HEAD; }
 
     public static String getInsBankcard() {
-        return BASE_URL + INS_BANKCARD;
+        return BASE_URL +INS_BANKCARD;
     }
 
-    public static String getDelCar() {
-        return BASE_URL + DEL_CAR;
-    }
+    public static String getDelCar() { return BASE_URL +DEL_CAR; }
 
-    public static String getXiaoxiDel() {
-        return BASE_URL + XIAOXI_DEL;
-    }
+    public static String getXiaoxiDel() { return BASE_URL +XIAOXI_DEL; }
 
-    public static String getCOMPLAINT() {
-        return BASE_URL + COMPLAINT;
-    }
+    public static String getCOMPLAINT() { return BASE_URL+COMPLAINT; }
 
-    public static String getXiaoxiDelAll() {
-        return BASE_URL + XIAOXI_DEL_ALL;
-    }
+    public static String getXiaoxiDelAll() { return BASE_URL+XIAOXI_DEL_ALL; }
 
-    public static String getDriverAuthQualification() {
-        return BASE_URL + DRIVER_AUTH_QUALIFICATION;
-    }
+    public static String getDriverAuthQualification() { return BASE_URL+DRIVER_AUTH_QUALIFICATION; }
 
-    public static String getDriverSaveCarRegisterNo() {
-        return BASE_URL + DRIVER_AUTH_SAVECARREGISTERNO;
-    }
+    public static String getDriverSaveCarRegisterNo() { return BASE_URL+DRIVER_AUTH_SAVECARREGISTERNO; }
 
-    public static String getDriverSaveCarRoadLicenseNo() {
-        return BASE_URL + DRIVER_AUTH_SAVECARROADLICENSENO;
-    }
+    public static String getDriverSaveCarRoadLicenseNo() { return BASE_URL+DRIVER_AUTH_SAVECARROADLICENSENO; }
 
-    public static String getTrafficInsurance() {
-        return BASE_URL + DRIVER_TRAFFIC_INSU;
-    }
-
-    public static String getSaveDrawCar() {
-        return BASE_URL + SAVE_DRAW_CAR;
-    }
+    public static String getSaveDrawCar() { return BASE_URL+SAVE_DRAW_CAR; }
 
     public static String getIsAuthDriverAuthQualification() {
-        return BASE_URL + IS_AUTH_DRIVER_AUTH_QUALIFICATION;
+        return BASE_URL+IS_AUTH_DRIVER_AUTH_QUALIFICATION;
     }
 
     public static String getVERSION() {
-        return BASE_URL + VERSION;
+        return BASE_URL+VERSION;
     }
 
     public static String getAddContracts() {
-        return BASE_URL + ADD_CONTRACTS;
+        return BASE_URL+ADD_CONTRACTS;
     }
 
     public static String getGetContracts() {
-        return BASE_URL + GET_CONTRACTS;
+        return BASE_URL+GET_CONTRACTS;
     }
 
     public static String getTIXIAN() {
-        return BASE_URL + TIXIAN;
+        return BASE_URL+TIXIAN;
     }
 
     public static String getPartyMember() {
-        return BASE_URL + PARTY_MEMBER;
+        return BASE_URL+PARTY_MEMBER;
     }
 
     public static String getCONFIG() {
-        return BASE_URL + CONFIG;
+        return BASE_URL+CONFIG;
     }
 
     public static String getChangeRecord() {
-        return BASE_URL + CHANGE_RECORD;
+        return BASE_URL+CHANGE_RECORD;
     }
 
     public static String getChangeCharge() {
-        return BASE_URL + WITHDRAWALS_CHARGE;
+        return BASE_URL+WITHDRAWALS_CHARGE;
     }
 
     public static String getChangeConfig() {
-        return BASE_URL + WITHDRAWALS_CONFIG;
+        return BASE_URL+WITHDRAWALS_CONFIG;
     }
 
-    public static String getGetErrorOrder() {
-        return BASE_URL + GET_ERROR_ORDER;
-    }
+    public static String getGetErrorOrder() { return BASE_URL+GET_ERROR_ORDER; }
 
     public static String getGetExampleList() {
-        return BASE_URL + GET_EXAMPLE_LIST;
+        return BASE_URL+GET_EXAMPLE_LIST;
     }
 
     public static String getAuthUrl() {
-        return BASE_URL + AUTH_URL;
+        return BASE_URL+AUTH_URL;
     }
 
     public static String getPlateLicense() {
-        return BASE_URL + PLATE_LICENSE;
+        return BASE_URL+PLATE_LICENSE;
     }
 
     public static String getPlateLicense2() {
-        return BASE_URL + PLATE_LICENSE2;
+        return BASE_URL+PLATE_LICENSE2;
     }
 
     public static String getGetImage() {
-        return BASE_URL + GET_IMAGE;
+        return BASE_URL+GET_IMAGE;
     }
 
     public static String getGetCertificateExpired() {
-        return BASE_URL + GET_CERTIFICATE_EXPIRED;
+        return BASE_URL+GET_CERTIFICATE_EXPIRED;
     }
 }

app/src/main/java/com/arpa/hndahesudintocctmsdriver/request/UserRequset.java

@@ -10,7 +10,6 @@ import android.provider.Settings;
 
 import androidx.annotation.RequiresApi;
 
-import com.arpa.hndahesudintocctmsdriver.bean.AppInfoBean;
 import com.arpa.hndahesudintocctmsdriver.event.VehicleEvent;
 import com.arpa.hndahesudintocctmsdriver.ui.auth.CertificatesActivity;
 import com.arpa.hndahesudintocctmsdriver.ui.business.Md5Util;
@@ -119,14 +118,6 @@ public class UserRequset {
         RequestUtil.start(1, WoDeFragment.VEHICLE_DEL, re, con, hd);
     }
 
-    //车辆详情
-    public void vehicleDelTwo(String id) {
-        Map<String, Object> map = new HashMap<>();
-        map.put("carId", id);
-        Request re = OkHttpUtil.posts(new OkDate(RequestConstant.getGetCarDel(), MapUtil.mapJson(map)), getToken(con), con);
-        RequestUtil.start(1, "onlyGetDetail", re, con, hd);
-    }
-
     //司机身份证认证
     public void driverIDAuth() {
         String url = RequestConstant.BASE_URL + "/app/driver/auth/authInfo";
@@ -163,7 +154,7 @@ public class UserRequset {
     /**
      * 判断是否开启未知应用安装权限
      */
-    private void isOpenAppNoRe() {
+    private void isOpenAppNoRe(){
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
             boolean b = con.getPackageManager().canRequestPackageInstalls();
             if (!b) {
@@ -178,8 +169,8 @@ public class UserRequset {
     @RequiresApi(api = Build.VERSION_CODES.O)
     private void startInstallPermissionSettingActivity() {
         //注意这个是8.0新API
-        Uri packageURI = Uri.parse("package:" + con.getPackageName());
-        Intent intent = new Intent(Settings.ACTION_MANAGE_UNKNOWN_APP_SOURCES, packageURI);
+        Uri packageURI = Uri.parse("package:" +con.getPackageName());
+        Intent intent = new Intent(Settings.ACTION_MANAGE_UNKNOWN_APP_SOURCES,packageURI);
         intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         con.startActivity(intent);
     }
@@ -230,18 +221,7 @@ public class UserRequset {
     public void carAudit(String carId) {
         Map<String, Object> map = new HashMap<>();
         map.put("carId", carId);
-        Request re = OkHttpUtil.get(new OkDate(RequestConstant.getCarAudit(), "get", Md5Util.resNoUrl(map)), getToken(con));
+        Request re = OkHttpUtil.get(new OkDate(RequestConstant.getCarAudit(),"get", Md5Util.resNoUrl(map)),getToken(con));
         RequestUtil.start(1, VehicleAuthActivity.CAR_AUDIO, re, con, hd);
     }
-
-    public void postAppInfo(AppInfoBean appInfoBean, String type) {
-//        Request re = OkHttpUtil.get(new OkDate(RequestConstant.getCarAudit(),"get", gson.toJson(appInfoBean)),getToken(con));
-        Request re;
-        if ("put".equals(type)) {
-            re = OkHttpUtil.put(new OkDate(RequestConstant.postAppInfo(), type, gson.toJson(appInfoBean)), con);
-        } else {
-            re = OkHttpUtil.post(new OkDate(RequestConstant.postAppInfo(), type, gson.toJson(appInfoBean)), con);
-        }
-        RequestUtil.start(1, VehicleAuthActivity.APP_INFO, re, con, hd);
-    }
 }

app/src/main/java/com/arpa/hndahesudintocctmsdriver/request/bean/LUInputBean.java

@@ -15,15 +15,6 @@ public class LUInputBean {
     private String locationAddress;
     private String longitude;
     private String waybillId;
-    private String realLoadTime;
-
-    public String getRealLoadTime() {
-        return realLoadTime;
-    }
-
-    public void setRealLoadTime(String realLoadTime) {
-        this.realLoadTime = realLoadTime;
-    }
 
     public List<Integer> getImageId() {
         return imageId;

app/src/main/java/com/arpa/hndahesudintocctmsdriver/service/MakeUpService.java

@@ -10,7 +10,6 @@ import android.util.Log;
 
 import androidx.annotation.Nullable;
 
-import com.arpa.hndahesudintocctmsdriver.R;
 import com.arpa.hndahesudintocctmsdriver.request.HuoYuanRequset;
 import com.arpa.hndahesudintocctmsdriver.util.cache.CacheGroup;
 import com.arpa.hndahesudintocctmsdriver.util.http.RequsetCodeConstants;
@@ -28,14 +27,11 @@ public class MakeUpService extends Service {
     public void palyMp3(){
         Log.e("开始播放","-----");
         try {
-            MediaPlayer mediaPlayer = MediaPlayer.create(this, R.raw.kujp9scu);
-            mediaPlayer.setOnPreparedListener(new MediaPlayer.OnPreparedListener() {
-                @Override
-                public void onPrepared(MediaPlayer mediaPlayer) {
-                    mediaPlayer.start();
-                }
-            });
-            mediaPlayer.prepareAsync();
+            AssetFileDescriptor fd =getAssets().openFd("kujp9scu.mp3");
+            mediaPlayer.setDataSource(fd);
+            mediaPlayer.setLooping(false);//设置为循环播放
+            mediaPlayer.prepare();//初始化播放器MediaPlayer
+            mediaPlayer.start();
             Log.e("播放成功","-----");
         } catch (Exception e) {
             e.printStackTrace();

app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/MainActivity.kt

@@ -138,7 +138,6 @@ class MainActivity : BaseAppCompatActivity() {
                 Manifest.permission.ACCESS_BACKGROUND_LOCATION,
                 Manifest.permission.WRITE_EXTERNAL_STORAGE,
                 Manifest.permission.READ_EXTERNAL_STORAGE,
-                Manifest.permission.CALL_PHONE,
                 Manifest.permission.RECORD_AUDIO,
                 Manifest.permission.CAMERA)
             .request { allGranted, grantedList, deniedList ->

app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/alert/UpAppAlert.java

@@ -1,11 +1,7 @@
 package com.arpa.hndahesudintocctmsdriver.ui.alert;
 
 import android.content.Context;
-import android.content.Intent;
-import android.os.Build;
-import android.provider.Settings;
 import android.util.Log;
-import android.view.View;
 import android.widget.Button;
 import android.widget.ImageButton;
 import android.widget.LinearLayout;
@@ -16,8 +12,6 @@ import androidx.annotation.NonNull;
 
 import com.king.app.updater.AppUpdater;
 import com.king.app.updater.callback.AppUpdateCallback;
-import com.king.app.updater.constant.Constants;
-import com.king.app.updater.util.AppUtils;
 import com.lxj.xpopup.core.CenterPopupView;
 import com.arpa.hndahesudintocctmsdriver.R;
 
@@ -33,11 +27,11 @@ import java.io.File;
  */
 public class UpAppAlert extends CenterPopupView {
 
-    private TextView content, vs, tvContent;
-    private Button tv_cancel, tv_confirm, tvOk;
+    private TextView content,vs;
+    private Button tv_cancel,tv_confirm;
     private LinearLayout up_div;
-    private String url = "";
-    private String body = "";
+    private String url="";
+    private String body="";
     private Context con;
     private ProgressBar progress_view;
     private String version;
@@ -45,20 +39,19 @@ public class UpAppAlert extends CenterPopupView {
     private LinearLayout force_box;
     private ImageButton force_btn;
 
-    public UpAppAlert(@NonNull @NotNull Context context, String url, String body, String version, String force) {
+    public UpAppAlert(@NonNull @NotNull Context context, String url, String body,String version,String force) {
         super(context);
-        con = context;
-        this.url = url;
-        this.body = body;
-        this.version = version;
-        this.force = force;
+        con=context;
+        this.url=url;
+        this.body=body;
+        this.version=version;
+        this.force=force;
     }
 
     @Override
     protected int getImplLayoutId() {
         return R.layout.alert_up_app;
     }
-
     public UpAppAlert(@NonNull @NotNull Context context) {
         super(context);
 
@@ -67,17 +60,15 @@ public class UpAppAlert extends CenterPopupView {
     @Override
     protected void onCreate() {
         super.onCreate();
-        content = findViewById(R.id.tv_content);
-        tv_cancel = findViewById(R.id.tv_cancel);
-        tv_confirm = findViewById(R.id.tv_confirm);
-        tvContent = findViewById(R.id.tvContent);
-        tvOk = findViewById(R.id.tvOk);
-        up_div = findViewById(R.id.up_div);
-        progress_view = findViewById(R.id.progress);
-        content = findViewById(R.id.tv_content);
-        force_box = findViewById(R.id.force_box);
-        force_btn = findViewById(R.id.force_btn);
-        if (force.equals("1")) {
+        content=findViewById(R.id.tv_content);
+        tv_cancel=findViewById(R.id.tv_cancel);
+        tv_confirm=findViewById(R.id.tv_confirm);
+        up_div=findViewById(R.id.up_div);
+        progress_view=findViewById(R.id.progress);
+        content=findViewById(R.id.tv_content);
+        force_box=findViewById(R.id.force_box);
+        force_btn=findViewById(R.id.force_btn);
+        if(force.equals("1")){
             force_box.setVisibility(GONE);
         }
         force_btn.setOnClickListener(v -> {
@@ -85,16 +76,16 @@ public class UpAppAlert extends CenterPopupView {
             dismiss();
             //detachFromHost();
         });
-        vs = findViewById(R.id.vs);
+        vs=findViewById(R.id.vs);
         content.setText(body);
         vs.setText(version);
         tv_cancel.setOnClickListener(v -> {
             System.exit(1);
         });
         tv_confirm.setOnClickListener(v -> {
-            new AppUpdater.Builder(con)
+            new AppUpdater.Builder()
                     .setUrl(url)
-                    .build()
+                    .build(con)
                     .setUpdateCallback(new AppUpdateCallback() {
                         @Override
                         public void onStart(String url) {
@@ -102,28 +93,23 @@ public class UpAppAlert extends CenterPopupView {
                             tv_confirm.setVisibility(GONE);
                             up_div.setVisibility(VISIBLE);
                         }
-
                         @Override
                         public void onProgress(long progress, long total, boolean isChange) {
 //                            Log.e("progress",progress+"");
 //                            Log.e("total",total+"");
 //                            Log.e("isChange",isChange+"");
-                            float sum = progress;
-                            float max = total;
-                            if (progress > 0) {
-                                float b = sum / max;
-                                Log.e("百分比", (100 * b) + "");
-                                progress_view.setProgress((int) (100 * b));
+                            float sum=progress;
+                            float max=total;
+                            if(progress>0){
+                                float b=sum/max;
+                                Log.e("百分比",(100*b)+"");
+                                progress_view.setProgress((int) (100*b));
                             }
                         }
 
                         @Override
                         public void onFinish(File file) {
-                            tvContent.setText("下载完成,请及时安装!");
-                            tvOk.setVisibility(VISIBLE);
-                            tvOk.setOnClickListener(v1 -> {
-                                AppUtils.installApk(getContext(), file, getContext().getPackageName() + Constants.DEFAULT_FILE_PROVIDER);
-                            });
+
                         }
                     })
                     .start();

app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/auth/AuthQualificationActivity.java

@@ -18,13 +18,10 @@ import android.widget.Toast;
 
 import androidx.annotation.Nullable;
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
 import com.arpa.hndahesudintocctmsdriver.parts.UserParts;
 import com.arpa.hndahesudintocctmsdriver.util.string.StringUtil;
 import com.bumptech.glide.Glide;
 import com.esign.esignsdk.EsignSdk;
-import com.esign.esignsdk.data.AuthEvent;
 import com.github.gzuliyujiang.wheelpicker.DatePicker;
 import com.github.gzuliyujiang.wheelpicker.annotation.DateMode;
 import com.google.gson.Gson;
@@ -48,8 +45,6 @@ import com.arpa.hndahesudintocctmsdriver.util.statusbar.StateStyleUtil;
 import com.arpa.hndahesudintocctmsdriver.util.view.BaseAppCompatActivity;
 import com.lxj.xpopup.util.SmartGlideImageLoader;
 
-import org.greenrobot.eventbus.Subscribe;
-
 import java.io.File;
 import java.util.List;
 
@@ -106,7 +101,6 @@ public class AuthQualificationActivity extends BaseAppCompatActivity {
                     BaseBean bb = gson.fromJson(CacheGroup.cacheList.get("driverAuthQualification"), BaseBean.class);
                     if (bb.getCode() == 200) {
 //                        initAuth();
-                        isAuth = true;
                         //判断是否从车辆进来 carId为空从个人认证进来需跳转实名认证，不为空车辆信息进入，需跳转车辆照片
                         if (TextUtils.isEmpty(carId)) {
                             //从业资格证->实名认证
@@ -161,7 +155,6 @@ public class AuthQualificationActivity extends BaseAppCompatActivity {
 //                        finish();
                         EsignSdk.getInstance().startH5Activity(act, StringUtil.isNull(String.valueOf(bb.getData()), ""));
                     } else {
-                        finish();
                         Toast.makeText(con, bb.getMsg(), Toast.LENGTH_LONG).show();
                     }//Log.e("url",CacheGroup.cacheList.get("authUrl"));
                     CacheGroup.cacheList.remove("authUrl");
@@ -236,11 +229,6 @@ public class AuthQualificationActivity extends BaseAppCompatActivity {
                 gia.showPopueWindow(this);
             }
         });
-        up_img.setOnClickListener(v -> {
-            if (!isAuth) {
-                gia.showPopueWindow(this);
-            }
-        });
         img.setOnClickListener(v -> {
             if (!"".equals(url)) {
                 new XPopup.Builder(con).asImageViewer(img, url, new SmartGlideImageLoader(R.mipmap.ic_launcher_round)).show();
@@ -250,21 +238,19 @@ public class AuthQualificationActivity extends BaseAppCompatActivity {
             }
         });
         value2.setOnClickListener(v -> {
-            if (!isAuth) {
-                DatePicker picker = new DatePicker(this);
-                picker.setBodyWidth(300);
-                picker.setOnDatePickedListener((year, month, day) -> value2.setText(year + "-" + month + "-" + day));
-                picker.getWheelLayout().setDateMode(DateMode.YEAR_MONTH_DAY);
-                picker.getWheelLayout().setDateLabel("年", "月", "日");
-                picker.show();
-            }
+            DatePicker picker = new DatePicker(this);
+            picker.setBodyWidth(300);
+            picker.setOnDatePickedListener((year, month, day) -> value2.setText(year + "-" + month + "-" + day));
+            picker.getWheelLayout().setDateMode(DateMode.YEAR_MONTH_DAY);
+            picker.getWheelLayout().setDateLabel("年", "月", "日");
+            picker.show();
         });
         submit.setOnClickListener(v -> {
             if (!isAuth) {
                 String id = value1.getText() + "";
                 String date = value2.getText() + "";
                 if ("0".equals(type)) {
-                    if (!"".equals(date) && !"".equals(url)) {
+                    if (!"".equals(id) && !"".equals(date) && !"".equals(url)) {
                         new AuthRequest().driverAuthQualification(con, hd, id, ub.getData().getId(), date);
                     } else {
                         Toast.makeText(con, "请补充证件信息", Toast.LENGTH_SHORT).show();
@@ -388,31 +374,4 @@ public class AuthQualificationActivity extends BaseAppCompatActivity {
         }
     }
 
-
-    @Subscribe
-    public void processResult(AuthEvent auth) {
-        //添加实名/意愿/签署完成之后的逻辑
-        Log.e("-回调信息-", auth.result);
-        JSONObject jsonObject = JSON.parseObject(auth.result);
-        if ("success".equalsIgnoreCase(jsonObject.getString("res"))) {
-            if ("sign".equalsIgnoreCase(jsonObject.getString("key"))) {
-                Toast.makeText(con, "签署场景成功", Toast.LENGTH_SHORT).show();
-            } else if ("realName".equalsIgnoreCase(jsonObject.getString("key"))) {
-                Toast.makeText(con, "实名认证成功", Toast.LENGTH_SHORT).show();
-            } else {
-                Toast.makeText(con, "意愿认证成功", Toast.LENGTH_SHORT).show();
-            }
-            finish();
-        } else {
-            if ("sign".equalsIgnoreCase(jsonObject.getString("key"))) {
-                Toast.makeText(con, "签署场景失败", Toast.LENGTH_SHORT).show();
-            } else if ("realName".equalsIgnoreCase(jsonObject.getString("key"))) {
-                Toast.makeText(con, "实名认证失败", Toast.LENGTH_SHORT).show();
-            } else {
-                Toast.makeText(con, "意愿认证失败", Toast.LENGTH_SHORT).show();
-            }
-            EsignSdk.getInstance().finishH5Activity();
-            finish();
-        }
-    }
 }

app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/auth/CertificatesActivity.java

@@ -37,7 +37,6 @@ import com.bumptech.glide.Glide;
 import com.bumptech.glide.request.RequestOptions;
 import com.bumptech.glide.request.target.Target;
 import com.dahe.mylibrary.utils.ActivityUtils;
-import com.dahe.mylibrary.utils.ToastUtils;
 import com.esign.esignsdk.EsignSdk;
 import com.esign.esignsdk.data.AuthEvent;
 import com.github.gzuliyujiang.wheelpicker.contract.OnOptionPickedListener;
@@ -158,9 +157,6 @@ public class CertificatesActivity extends BaseAppCompatActivity {
                         || CacheGroup.cacheList.get("saveVehicleLicense") != null || CacheGroup.cacheList.get("authUrl") != null
                         || CacheGroup.cacheList.get("saveDrawCar") != null) {
                     if (CacheGroup.cacheList.get("driverAuthIdCard") != null) {
-                        if (customDialog != null) {
-                            customDialog.dismiss();
-                        }
                         BaseBean bb = gson.fromJson(CacheGroup.cacheList.get("driverAuthIdCard"), BaseBean.class);
                         if (bb.getCode() == 200) {
                             Toast.makeText(con, "保存成功", Toast.LENGTH_SHORT).show();
@@ -178,9 +174,6 @@ public class CertificatesActivity extends BaseAppCompatActivity {
                     }
 
                     if (CacheGroup.cacheList.get("driverAuthLicense") != null) {
-                        if (customDialog != null) {
-                            customDialog.dismiss();
-                        }
                         BaseBean bb = gson.fromJson(CacheGroup.cacheList.get("driverAuthLicense"), BaseBean.class);
                         if (bb.getCode() == 200) {
                             Toast.makeText(con, "保存成功", Toast.LENGTH_SHORT).show();
@@ -213,9 +206,6 @@ public class CertificatesActivity extends BaseAppCompatActivity {
                     }
 
                     if (CacheGroup.cacheList.get("saveVehicleLicense") != null) {
-                        if (customDialog != null) {
-                            customDialog.dismiss();
-                        }
                         CarZhengBean czb = gson.fromJson(CacheGroup.cacheList.get("saveVehicleLicense"), CarZhengBean.class);
                         if (czb.getCode() == 200) {
                             String needUpQCPhoto = czb.getData().getNeedUpQCPhoto();//是否需要上传从业资格证
@@ -224,19 +214,13 @@ public class CertificatesActivity extends BaseAppCompatActivity {
                             Toast.makeText(con, "车辆行驶证保存成功", Toast.LENGTH_SHORT).show();
 
                             VehicleEvent ve = new VehicleEvent(String.valueOf(czb.getData().getCarId()));
-                            EventBus.getDefault().postSticky(ve);
+                            EventBus.getDefault().post(ve);
 
                             // TODO: 2023/8/23
                             if ("1".equals(isTrailer)) {//判断是否跳转挂车行驶证
                                 Intent in = new Intent(con, CertificatesActivity.class);
                                 in.putExtra("index", 3);
                                 in.putExtra("carId", String.valueOf(czb.getData().getCarId()));
-                                if (olb != null && olb.getData() != null && olb.getData().isCarExist()) {
-                                    CarDelBean carDelBean = new CarDelBean();
-                                    carDelBean.setRes(1);//保留字段 1：为绑定车辆，可以进行修改挂车信息
-                                    carDelBean.setData(gson.fromJson(gson.toJson(olb.getData().getExistCarInfo()), CarDelBean.DataDTO.class));
-                                    in.putExtra("cheData", gson.toJson(carDelBean));
-                                }
                                 startActivity(in);
                             } else if ("1".equals(needUpQCPhoto)) {//判断是否跳转从业资格证
                                 Intent in = new Intent(con, AuthQualificationActivity.class);
@@ -247,7 +231,6 @@ public class CertificatesActivity extends BaseAppCompatActivity {
                             } else if ("1".equals(needUpRLPhoto)) {//判断是否跳转道路运输许可证
                                 Intent in = new Intent(con, PhotoCarActivity.class);
                                 in.putExtra("type", 3);
-                                in.putExtra("carExist", true);
                                 in.putExtra("carId", String.valueOf(czb.getData().getCarId()));
                                 startActivity(in);
                             } else {
@@ -280,9 +263,6 @@ public class CertificatesActivity extends BaseAppCompatActivity {
                         CacheGroup.cacheList.remove("saveVehicleLicense");
                     }
                     if (CacheGroup.cacheList.get("saveDrawCar") != null) {
-                        if (customDialog != null) {
-                            customDialog.dismiss();
-                        }
                         Log.e("-saveDrawCar-", CacheGroup.cacheList.get("saveDrawCar"));
                         CarZhengBean bb = gson.fromJson(CacheGroup.cacheList.get("saveDrawCar"), CarZhengBean.class);
                         if (bb.getCode() == 200) {
@@ -303,7 +283,6 @@ public class CertificatesActivity extends BaseAppCompatActivity {
                             } else if ("1".equals(needUpRLPhoto)) {//现判断是否跳转道路运输许可证
                                 Intent in = new Intent(con, PhotoCarActivity.class);
                                 in.putExtra("type", 3);
-                                in.putExtra("carExist", true);
                                 in.putExtra("carId", carId);
                                 startActivity(in);
                             } else {
@@ -357,11 +336,8 @@ public class CertificatesActivity extends BaseAppCompatActivity {
                     }//Log.e("url",CacheGroup.cacheList.get("authUrl"));
                     CacheGroup.cacheList.remove("authUrl");
                 } else {
-                    //重复代码?
                     initView(null);
-                    if (!(CacheGroup.cacheList.get(TYPE_NAME_BANK[2]) != null || CacheGroup.cacheList.get(TYPE_NAME_BANK[3]) != null)) {
-                        initData();
-                    }
+                    initData();
                     pathOrcRes();
                 }
                 break;
@@ -439,7 +415,6 @@ public class CertificatesActivity extends BaseAppCompatActivity {
 //                there_div.setVisibility(View.VISIBLE);
                 if (c_str != null && !c_str.equals("")) {
                     cdb = gson.fromJson(c_str, CarDelBean.class);
-                    oCrcarId = cdb.getData().getTrailerResVo().getTrailerLicenseId() + "";
                     initView(null);
                     initData();
                 } else {
@@ -685,9 +660,7 @@ public class CertificatesActivity extends BaseAppCompatActivity {
                 break;
             case 3:
                 Log.e("挂车信息", gson.toJson(cdb));
-                if (cdb != null && cdb.getData().getTrailerResVo() != null
-                        && !TextUtils.isEmpty(cdb.getData().getTrailerResVo().getFrontImage())
-                        && !TextUtils.isEmpty(cdb.getData().getTrailerResVo().getBackImage())) {
+                if (cdb != null && cdb.getData().getTrailerResVo() != null) {
                     url1 = StringUtil.isNull(cdb.getData().getTrailerResVo().getFrontImage(), "");
                     url2 = StringUtil.isNull(cdb.getData().getTrailerResVo().getBackImage(), "");
                     url3 = StringUtil.isNull(cdb.getData().getTrailerResVo().getThreeImage(), "");
@@ -696,16 +669,14 @@ public class CertificatesActivity extends BaseAppCompatActivity {
                     value3.setText(StringUtil.isNull(cdb.getData().getTrailerResVo().getOwner(), "空数据"));
                     value4.setText(StringUtil.isNull(cdb.getData().getTrailerResVo().getVehicleNumber(), "空数据"));
                     value6.setText(StringUtil.isNull(cdb.getData().getCarEnergyTypValue(), "空数据"));
+                    submit.setBackgroundResource(R.drawable.bg_btn_grey);
                     Glide.with(con).load(url1).into(img1);
                     Glide.with(con).load(url2).into(img2);
                     Glide.with(con).load(url3).into(img3);
-                    if (cdb.getRes() != 1) {
-                        submit.setBackgroundResource(R.drawable.bg_btn_grey);
-                        u_img.setText("已上传");
-                        u_img2.setText("已上传");
-                        u_img3.setText("点击查看");
-                        isAuth = true;
-                    }
+                    u_img.setText("已上传");
+                    u_img2.setText("已上传");
+                    u_img3.setText("点击查看");
+                    isAuth = true;
                 }
                 break;
             default:
@@ -765,8 +736,7 @@ public class CertificatesActivity extends BaseAppCompatActivity {
                         value1.setText(ocb.getData().getName());
                         value2.setText(ocb.getData().getCardId());
                         value3.setText(ocb.getData().getAddress());
-//                        Glide.with(con).load(url1).into(img1);
-                        Glide.with(con).load(path).into(img1);
+                        Glide.with(con).load(url1).into(img1);
                         fontId = ocb.getData().getId();
                     } else {
                         Toast.makeText(con, "识别失败", Toast.LENGTH_SHORT).show();
@@ -778,8 +748,7 @@ public class CertificatesActivity extends BaseAppCompatActivity {
                     if (ocbb.getCode() == 200) {
                         url2 = ocbb.getData().getUrl();
                         value4.setText(ocbb.getData().getEndTime());
-//                        Glide.with(con).load(url2).into(img2);
-                        Glide.with(con).load(path).into(img2);
+                        Glide.with(con).load(url2).into(img2);
                         startTime = ocbb.getData().getStartTime();
                         backId = ocbb.getData().getId();
 
@@ -803,8 +772,7 @@ public class CertificatesActivity extends BaseAppCompatActivity {
                         value2.setText(StringUtil.isNull(od.getStartTime(), "识别异常"));
                         value3.setText(StringUtil.isNull(od.getAllowType(), "识别异常"));
                         value4.setText(StringUtil.isNull(od.getEndTime(), "识别异常"));
-//                        Glide.with(con).load(url1).into(img1);
-                        Glide.with(con).load(path).into(img1);
+                        Glide.with(con).load(url1).into(img1);
                         fontId = od.getId();
                     } else {
                         Toast.makeText(con, "识别失败", Toast.LENGTH_SHORT).show();
@@ -816,8 +784,7 @@ public class CertificatesActivity extends BaseAppCompatActivity {
                     if (odlb.getCode() == 200) {
                         url2 = odlb.getData().getUrl();
                         backId = odlb.getData().getId();
-//                        Glide.with(con).load(url2).into(img2);
-                        Glide.with(con).load(path).into(img2);
+                        Glide.with(con).load(url2).into(img2);
                         //自动调取提交功能，实现页面自动跳转
                         subimt();
                     } else {
@@ -833,22 +800,13 @@ public class CertificatesActivity extends BaseAppCompatActivity {
                     Log.e("olb", CacheGroup.cacheList.get(TYPE_NAME[2]));
                     olb = gson.fromJson(CacheGroup.cacheList.get(TYPE_NAME[2]), OCRVehicleLicenseBean.class);
                     if (olb.getCode() == 200) {
-                        if (olb.getData().isCarExist()) {
-                            value1.setEnabled(false);
-                            Glide.with(con).load(olb.getData().getExistCarInfo().getBackImage()).into(img2);
-                            url2 = olb.getData().getExistCarInfo().getBackImage();
-                            ToastUtils.showLongToast(con, "该车辆已存在,请仔细核对相关信息");
-                        } else {
-                            value1.setEnabled(true);
-                        }
                         url1 = olb.getData().getUrl();
                         value1.setText(olb.getData().getCarNumber());
                         value2.setText(olb.getData().getType());
                         value3.setText(olb.getData().getOwner());
                         value4.setText(olb.getData().getVehicleNumber());
                         fontId = olb.getData().getId();
-//                        Glide.with(con).load(url1).into(img1);
-                        Glide.with(con).load(path).into(img1);
+                        Glide.with(con).load(url1).into(img1);
                         oCrcarId = olb.getData().getCarId() + "";
                         Log.e("-cardId-", oCrcarId);
                     } else {
@@ -861,9 +819,8 @@ public class CertificatesActivity extends BaseAppCompatActivity {
                     if (oblb.getCode() == 200) {
                         url2 = oblb.getData().getUrl();
                         backId = oblb.getData().getId();
-//                        Glide.with(con).load(url2).into(img2);
-                        Glide.with(con).load(path).into(img2);
-                        //自动调取提交功能，实现页面自动跳转实现页面自动跳转
+                        Glide.with(con).load(url2).into(img2);
+                        //自动调取提交功能，实现页面自动跳转
                         subimt();
                     } else {
                         Toast.makeText(con, oblb.getMsg(), Toast.LENGTH_SHORT).show();
@@ -875,8 +832,7 @@ public class CertificatesActivity extends BaseAppCompatActivity {
                     if (ub.getCode() == 200) {
                         url3 = ub.getData().getUrl();
                         fid = ub.getData().getId();
-//                        Glide.with(con).load(url3).into(img3);
-                        Glide.with(con).load(path).into(img3);
+                        Glide.with(con).load(url3).into(img3);
                     } else {
                         Toast.makeText(con, ub.getMsg(), Toast.LENGTH_SHORT).show();
                     }
@@ -920,7 +876,7 @@ public class CertificatesActivity extends BaseAppCompatActivity {
                         customDialog.dismiss();
                         return;
                     }
-                    new OCRRequest().OCRVehicleLicenseBack(con, hd, new File(path), oCrcarId, carNum, olb.getData().isCarExist());
+                    new OCRRequest().OCRVehicleLicenseBack(con, hd, new File(path), oCrcarId, carNum);
 
                 } else {
                     new AuthRequest().upload(con, hd, new File(path));
@@ -936,16 +892,7 @@ public class CertificatesActivity extends BaseAppCompatActivity {
                         customDialog.dismiss();
                         return;
                     }
-//                   if (cdb != null && cdb.getData().getTrailerResVo() &&cdb.getRes() == 1)
-                    boolean isExist = false;
-                    if (olb != null) {//主页识别成功后获取
-                        isExist = olb.getData().isCarExist();
-                    } else {
-                        if (cdb != null && cdb.getData().getTrailerResVo() != null && cdb.getRes() == 1) {//上个页面带来数据
-                            isExist = true;
-                        }
-                    }
-                    new OCRRequest().OCRVehicleLicenseBack(con, hd, new File(path), oCrcarId, carNum, isExist);
+                    new OCRRequest().OCRVehicleLicenseBack(con, hd, new File(path), oCrcarId, carNum);
                 } else {
                     new AuthRequest().upload(con, hd, new File(path));
                 }
@@ -968,8 +915,6 @@ public class CertificatesActivity extends BaseAppCompatActivity {
         switch (index) {
             case 0:
                 if (ocb != null && ocbb != null) {
-                    customDialog = new CustomDialog(con, "网络请求中...");
-                    customDialog.show();
                     IDInputBean ib = new IDInputBean();
                     ib.setIdcarName(str1);
                     ib.setIdcard(str2);
@@ -992,8 +937,6 @@ public class CertificatesActivity extends BaseAppCompatActivity {
                 //olb
                 //{"档案编号","初次领证日期","准驾车型","有效期限(止)"},
                 if (odl != null && odlb != null) {
-                    customDialog = new CustomDialog(con, "网络请求中...");
-                    customDialog.show();
                     Log.e("ocr", new Gson().toJson(odl));
                     LicenseInputBean iib = new LicenseInputBean();
                     iib.setArchivesName(str1);
@@ -1010,25 +953,20 @@ public class CertificatesActivity extends BaseAppCompatActivity {
                 }
                 break;
             case 2:
-                if ((olb != null && !olb.getData().isCarExist() && oblb != null) || (olb != null && olb.getData().isCarExist())) {
+                if (olb != null && oblb != null) {
 //                    if (curColor == null || curEnergy == null) {
 //                        Toast.makeText(con, "请完善内容", Toast.LENGTH_SHORT).show();
 //                        return;
 //                    }
-                    customDialog = new CustomDialog(con, "网络请求中...");
-                    customDialog.show();
                     HashMap<String, Object> map = new HashMap<>();
                     if ("".equals(url3)) {
                         map.put("imgId", fid);
                     }
-                    map.put("licenseId", olb.getData().isCarExist() ? olb.getData().getExistCarInfo().getLicenseId() : oblb.getData().getLicenseId());
+                    map.put("licenseId", oblb.getData().getLicenseId());
                     map.put("carNumber", str1);
                     map.put("type", str2);
                     map.put("owner", str3);
                     map.put("vehicleNumber", str4);
-//                    if (olb.getData().isCarExist()) {
-//                        map.put("carId", olb.getData().getCarId());
-//                    }
 //                    map.put("carPlateColor", curColor.getValue());
 //                    map.put("carEnergyTyp", curEnergy.getValue());
                     new AuthRequest().saveVehicleLicense(con, hd, MapUtil.mapJson(map));
@@ -1037,27 +975,22 @@ public class CertificatesActivity extends BaseAppCompatActivity {
                 }
                 break;
             case 3:
-                if (olb != null || (cdb != null && cdb.getRes() == 1)) {
+                if (olb != null && oblb != null) {
 //                    if (curEnergy==null){
 //                        Toast.makeText(con,"请完善内容",Toast.LENGTH_SHORT).show();
 //                        return;
 //                    }
-                    customDialog = new CustomDialog(con, "网络请求中...");
-                    customDialog.show();
                     Map<String, Object> map = new HashMap<>();
                     if ("".equals(url3)) {
                         map.put("imgId", fid);
                     }
-//                    map.put("licenseId", oblb.getData().getLicenseId());
+                    map.put("licenseId", oblb.getData().getLicenseId());
                     map.put("carId", carId);
                     map.put("carNumberDraw", str1);
                     map.put("type", str2);
                     map.put("owner", str3);
 //                    map.put("carEnergyTyp", curEnergy.getValue());
                     map.put("vehicleNumber", str4);
-                    if (cdb != null && cdb.getRes() == 1 && cdb.getData() != null && cdb.getData().getTrailerResVo() != null) {
-                        map.put("oldTrailerNumber", cdb.getData().getTrailerResVo().getCarNumber());
-                    }
                     new AuthRequest().saveDrawCar(con, hd, MapUtil.mapJson(map));
                 } else {
                     Toast.makeText(con, "请先上传资料", Toast.LENGTH_SHORT).show();

app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/auth/PhotoCarActivity.java

@@ -24,7 +24,6 @@ import com.arpa.hndahesudintocctmsdriver.bean.UploadBean;
 import com.arpa.hndahesudintocctmsdriver.request.AuthRequest;
 import com.arpa.hndahesudintocctmsdriver.request.UserRequset;
 import com.arpa.hndahesudintocctmsdriver.ui.my.WoDeFragment;
-import com.arpa.hndahesudintocctmsdriver.util.alert.CustomDialog;
 import com.arpa.hndahesudintocctmsdriver.util.cache.CacheGroup;
 import com.arpa.hndahesudintocctmsdriver.util.file.ImageFileCompressUtil;
 import com.arpa.hndahesudintocctmsdriver.util.img.GetImageAlert;
@@ -32,8 +31,6 @@ import com.arpa.hndahesudintocctmsdriver.util.statusbar.StateStyleUtil;
 import com.arpa.hndahesudintocctmsdriver.util.view.BaseAppCompatActivity;
 import com.arpa.hndahesudintocctmsdriver.util.view.BaseRecyclerView;
 import com.bumptech.glide.Glide;
-import com.github.gzuliyujiang.wheelpicker.DatePicker;
-import com.github.gzuliyujiang.wheelpicker.annotation.DateMode;
 import com.google.gson.Gson;
 import com.luck.picture.lib.PictureSelector;
 import com.luck.picture.lib.config.PictureConfig;
@@ -52,24 +49,23 @@ import java.util.List;
  */
 public class PhotoCarActivity extends BaseAppCompatActivity implements View.OnClickListener {
 
-    private String[] titles = {"车辆照片", "NFC照片", "车辆登记证书", "道路运输许可证", "车辆交强险"};
-    private String[] name1 = {"车辆照片", "NFC照片", "车辆登记证书照片", "道路运输许可证照片", "车辆交强险照片"};
-    private String[] name2 = {"请上传车辆照片", "请上传NFC照片", "请上传车辆登记证书照片", "请上传道路运输许可证照片", "请上传车辆交强险照片"};
-    private Boolean[] isShowEdit = {false, false, true, true, true};
-    private Boolean[] isShowSkip = {true, false, false, true, true};
+    private String[] titles = {"车辆照片", "NFC照片", "车辆登记证书", "道路运输许可证"};
+    private String[] name1 = {"车辆照片", "NFC照片", "车辆登记证书照片", "道路运输许可证照片"};
+    private String[] name2 = {"请上传车辆照片", "请上传NFC照片", "请上传车辆登记证书照片", "请上传道路运输许可证照片"};
+    private Boolean[] isShowEdit = {false, false, true, true};
+    private Boolean[] isShowSkip = {true, false, false, true};
     private String[] tips = {
             "",
             "*注意: 没有粘贴NFC芯片的车辆无需上传,可直接跳过",
             "*注意: 没有可直接跳过,等候下次上传",
-            "*注意: 4.5吨以下车辆不需要上传,可直接跳过",
-            ""};
+            "*注意: 4.5吨以下车辆不需要上传,可直接跳过"};
 
 
     private BaseRecyclerView brv;
     private ImageView img;
-    private TextView title1, title2, title3, zjimg_name, upload_img, tvTips, tvSkip, value2;
+    private TextView title1, title2, title3, zjimg_name, upload_img, tvTips, tvSkip;
     private EditText value1;
-    private LinearLayout llInfo, llDate;
+    private LinearLayout llInfo;
     private RelativeLayout up_img;
     private Button submit;
 
@@ -79,9 +75,7 @@ public class PhotoCarActivity extends BaseAppCompatActivity implements View.OnCl
 
     private int type;//页面类型
     private String path, carId, url;//图片路径
-    private boolean carExist = false;
     private GetImageAlert gia = new GetImageAlert();
-    private CustomDialog customDialog;
 
     @Override
     public void msgMethod(Message m) {
@@ -98,11 +92,6 @@ public class PhotoCarActivity extends BaseAppCompatActivity implements View.OnCl
                     }
                     CacheGroup.cacheList.remove(WoDeFragment.VEHICLE_DEL);
                 }
-                if (CacheGroup.cacheList.get("onlyGetDetail") != null) {
-                    Log.e("--res--", CacheGroup.cacheList.get("onlyGetDetail"));
-                    cdb = gson.fromJson(CacheGroup.cacheList.get("onlyGetDetail"), CarDelBean.class);
-                    CacheGroup.cacheList.remove("onlyGetDetail");
-                }
 
 
                 if (CacheGroup.cacheList.get("upload") != null) {
@@ -120,16 +109,10 @@ public class PhotoCarActivity extends BaseAppCompatActivity implements View.OnCl
                         case 3:
                             new AuthRequest().saveCarImg(con, hd, carId, ub.getData().getId(), 2);
                             break;
-                        case 4:
-                            new AuthRequest().saveCarImg(con, hd, carId, ub.getData().getId(), 7);
-                            break;
                     }
                     url = ub.getData().getUrl();
-//                    Glide.with(con).load(url).into(img);
-                    Glide.with(con).load(path).into(img);
+                    Glide.with(con).load(url).into(img);
 
-                    if (customDialog != null && customDialog.isShowing())
-                        customDialog.dismiss();
                     CacheGroup.cacheList.remove("upload");
                 }
 
@@ -147,12 +130,8 @@ public class PhotoCarActivity extends BaseAppCompatActivity implements View.OnCl
                                 Toast.makeText(con, "上传车辆登记证书照片", Toast.LENGTH_SHORT).show();
                                 break;
                             case 3:
-                                ur.vehicleDelTwo(carId);
                                 Toast.makeText(con, "上传道路运输证成功", Toast.LENGTH_SHORT).show();
                                 break;
-                            case 4:
-                                Toast.makeText(con, "交强险证件上传成功", Toast.LENGTH_SHORT).show();
-                                break;
                         }
                     } else {
                         Toast.makeText(con, bb.getMsg(), Toast.LENGTH_SHORT).show();
@@ -179,13 +158,13 @@ public class PhotoCarActivity extends BaseAppCompatActivity implements View.OnCl
                     IsAuthDriverAuthQualificationBean ib = gson.fromJson(CacheGroup.cacheList.get("saveCarRoadLicenseNo"), IsAuthDriverAuthQualificationBean.class);
                     if (ib.getCode() == 200) {
                         //判断是否需要跳转挂车行驶证页面
-                        if (!"".equals(carId) && cdb.getData() != null) {
-                            if (cdb.getData().getIsTrailer() == 1 && cdb.getData().getTrailerResVo() != null && !TextUtils.isEmpty(cdb.getData().getTrailerResVo().getCarNumber())) {//需要挂车，并且传过挂车直接结束
+                        if (!"".equals(carId) ){
+                            if (cdb.getData().getIsTrailer() == 1&&!TextUtils.isEmpty(cdb.getData().getTrailerResVo().getCarNumber())){//需要挂车，并且传过挂车直接结束
                                 finish();
                                 Intent in = new Intent(con, AddCarSuccActivity.class);
                                 in.putExtra("type", 3);
                                 con.startActivity(in);
-                            } else if (cdb.getData().getIsTrailer() == 1 && cdb.getData().getTrailerResVo() != null && TextUtils.isEmpty(cdb.getData().getTrailerResVo().getCarNumber())) {//需要挂车，没传过挂车，到挂车页面
+                            }else if(cdb.getData().getIsTrailer() == 1&&TextUtils.isEmpty(cdb.getData().getTrailerResVo().getCarNumber())){//需要挂车，没传过挂车，到挂车页面
                                 finish();
                                 Intent in = new Intent(con, CertificatesActivity.class);
                                 in.putExtra("index", 3);
@@ -194,25 +173,22 @@ public class PhotoCarActivity extends BaseAppCompatActivity implements View.OnCl
                                     in.putExtra("cheData", new Gson().toJson(cdb));
                                 }
                                 startActivity(in);
-                            } else if (cdb.getData().getIsTrailer() == 0) {//不需要挂车
-                                if ("1".equals(cdb.getData().getNeedUpQCPhoto())) {//需要从业资格证
+                            }else if(cdb.getData().getIsTrailer() == 0){//不需要挂车
+                                if ("1".equals(cdb.getData().getNeedUpQCPhoto())){//需要从业资格证
                                     Intent in = new Intent(con, AuthQualificationActivity.class);
                                     in.putExtra("type", "0");
                                     in.putExtra("carId", carId);
                                     in.putExtra("isOverCar", false);
                                     startActivity(in);
-                                } else {
+                                }else{
                                     finish();
                                     Intent in = new Intent(con, AddCarSuccActivity.class);
                                     in.putExtra("type", 3);
                                     con.startActivity(in);
                                 }
                             }
-                        } else {
-                            finish();
                         }
 
-
 //                        if (!"".equals(carId) && cdb.getData().getIsTrailer() == 1) {
 //                            if (!"".equals(carId)) {
 //                                finish();
@@ -237,23 +213,8 @@ public class PhotoCarActivity extends BaseAppCompatActivity implements View.OnCl
                     }
                     CacheGroup.cacheList.remove("saveCarRoadLicenseNo");
                 }
-
-                if (CacheGroup.cacheList.get("saveTrafficInsurance") != null) {
-                    Log.e("is", CacheGroup.cacheList.get("saveTrafficInsurance"));
-                    IsAuthDriverAuthQualificationBean ddb = gson.fromJson(CacheGroup.cacheList.get("saveTrafficInsurance"), IsAuthDriverAuthQualificationBean.class);
-                    if (ddb.getCode() == 200) {
-                        Toast.makeText(con, "保存成功", Toast.LENGTH_SHORT).show();
-                        finish();
-                    } else {
-                        Toast.makeText(con, ddb.getMsg(), Toast.LENGTH_SHORT).show();
-                    }
-
-                    CacheGroup.cacheList.remove("saveTrafficInsurance");
-                }
                 break;
             case ImageFileCompressUtil.COMPRESS_SUCCESS:
-                customDialog = new CustomDialog(con, "加载中...");
-                customDialog.show();
                 path = (String) m.obj;
                 new AuthRequest().upload(con, hd, new File(path));
                 break;
@@ -272,7 +233,6 @@ public class PhotoCarActivity extends BaseAppCompatActivity implements View.OnCl
         title1 = findViewById(R.id.title1);
         title2 = findViewById(R.id.title2);
         title3 = findViewById(R.id.name1);
-        value2 = findViewById(R.id.value2);
         up_img = findViewById(R.id.up_img);
         img = findViewById(R.id.img);
         zjimg_name = findViewById(R.id.zjimg_name);
@@ -280,7 +240,6 @@ public class PhotoCarActivity extends BaseAppCompatActivity implements View.OnCl
         tvTips = findViewById(R.id.tvTips);
         value1 = findViewById(R.id.value1);
         llInfo = findViewById(R.id.llInfo);
-        llDate = findViewById(R.id.llDate);
         tvSkip = findViewById(R.id.tvSkip);
         submit = findViewById(R.id.submit);
 
@@ -288,12 +247,10 @@ public class PhotoCarActivity extends BaseAppCompatActivity implements View.OnCl
         submit.setOnClickListener(this);
         upload_img.setOnClickListener(this);
         img.setOnClickListener(this);
-        value2.setOnClickListener(this);
 
 
         type = getIntent().getExtras().getInt("type");
         carId = getIntent().getExtras().getString("carId", "");
-        carExist = getIntent().getExtras().getBoolean("carExist", false);
         changeViewByType(type);
 
         ur = new UserRequset(con, hd);
@@ -350,14 +307,6 @@ public class PhotoCarActivity extends BaseAppCompatActivity implements View.OnCl
             case R.id.img:
                 showBigImg();
                 break;
-            case R.id.value2:
-                DatePicker picker = new DatePicker(this);
-                picker.setBodyWidth(300);
-                picker.setOnDatePickedListener((year, month, day) -> value2.setText(year + "-" + month + "-" + day));
-                picker.getWheelLayout().setDateMode(DateMode.YEAR_MONTH_DAY);
-                picker.getWheelLayout().setDateLabel("年", "月", "日");
-                picker.show();
-                break;
         }
     }
 
@@ -366,15 +315,11 @@ public class PhotoCarActivity extends BaseAppCompatActivity implements View.OnCl
      * 展示大图片
      */
     private void showBigImg() {
-        if ((type == 3 && TextUtils.isEmpty(cdb.getData().getRoadLicensePhoto())) || (type == 4 && TextUtils.isEmpty(cdb.getData().getPolicyPhotoUrl()))) {
-            choicePhoto();
-            return;
-        }
         switch (type) {
             case 0:
                 if (cdb.getData().getRoadLicensePhoto() != null && !cdb.getData().getCarImage().equals("")) {
                     new XPopup.Builder(con)
-                            .asImageViewer(img, cdb.getData().getCarImage(), new SmartGlideImageLoader(R.mipmap.ic_launcher))
+                            .asImageViewer(img, cdb.getData().getCarImage(),  new SmartGlideImageLoader(R.mipmap.ic_launcher))
                             .show();
 //                    new XPopup.Builder(con)
 //                            .asImageViewer(img, cdb.getData().getCarImage(), true, -1, -1, 50, false, new CertificatesActivity.ImageLoader())
@@ -411,21 +356,8 @@ public class PhotoCarActivity extends BaseAppCompatActivity implements View.OnCl
 //                            .asImageViewer(img, cdb.getData().getRoadLicensePhoto(), true, -1, -1, 50, false, new CertificatesActivity.ImageLoader())
 //                            .show();
 
+                    break;
                 }
-                break;
-
-            case 4:
-                if (cdb.getData().getPolicyPhotoUrl() != null && !"".equals(cdb.getData().getPolicyPhotoUrl())) {
-                    //roadLicensePhoto
-                    new XPopup.Builder(con)
-                            .asImageViewer(img, cdb.getData().getPolicyPhotoUrl(), new SmartGlideImageLoader(R.mipmap.ic_launcher))
-                            .show();
-//                    new XPopup.Builder(con)
-//                            .asImageViewer(img, cdb.getData().getRoadLicensePhoto(), true, -1, -1, 50, false, new CertificatesActivity.ImageLoader())
-//                            .show();
-
-                }
-                break;
         }
     }
 
@@ -441,14 +373,14 @@ public class PhotoCarActivity extends BaseAppCompatActivity implements View.OnCl
 
         switch (type) {
             case 0:
-                if (!TextUtils.isEmpty(url) || (cdb != null && !TextUtils.isEmpty(cdb.getData().getCarImage()))) {
+                if (!TextUtils.isEmpty(url)||(cdb!=null&&!TextUtils.isEmpty(cdb.getData().getCarImage()))){
                     finish();
                     Intent in = new Intent(con, PhotoCarActivity.class);
 //                    in.putExtra("type", 1);
                     in.putExtra("type", 3);
                     in.putExtra("carId", carId);
                     con.startActivity(in);
-                } else {
+                } else{
                     Toast.makeText(this, "请上传车辆照片", Toast.LENGTH_SHORT).show();
                 }
                 break;
@@ -465,7 +397,7 @@ public class PhotoCarActivity extends BaseAppCompatActivity implements View.OnCl
                     Toast.makeText(this, "请补充证件信息", Toast.LENGTH_SHORT).show();
                     return;
                 }
-                new AuthRequest().saveCarRegisterNo(con, hd, carId, s);
+                new AuthRequest().saveCarRegisterNo(con,hd,carId,s);
                 break;
             case 3:
                 String s1 = value1.getText().toString();
@@ -473,16 +405,7 @@ public class PhotoCarActivity extends BaseAppCompatActivity implements View.OnCl
                     Toast.makeText(this, "请补充证件信息", Toast.LENGTH_SHORT).show();
                     return;
                 }
-                new AuthRequest().saveCarRoadLicenseNo(con, hd, carId, s1);
-                break;
-            case 4:
-                String s2 = value1.getText().toString();
-                String v2 = value2.getText().toString();
-                if (TextUtils.isEmpty(s2) || TextUtils.isEmpty(v2)) {
-                    Toast.makeText(this, "请补充证件信息", Toast.LENGTH_SHORT).show();
-                    return;
-                }
-                new AuthRequest().saveTrafficInsurance(con, hd, carId, v2, s2);
+                new AuthRequest().saveCarRoadLicenseNo(con,hd,carId,s1);
                 break;
         }
     }
@@ -515,17 +438,6 @@ public class PhotoCarActivity extends BaseAppCompatActivity implements View.OnCl
                 if (!TextUtils.isEmpty(cdb.getData().getRoadLicensePhoto())) {
                     Glide.with(con).load(cdb.getData().getRoadLicensePhoto()).into(img);
                     value1.setText(cdb.getData().getRoadLicense());
-                    if (!carExist) {
-                        submit.setBackgroundResource(R.drawable.bg_btn_grey);
-                        upload_img.setText("已上传");
-                    }
-
-                }
-            } else if (4 == type) {
-                if (!TextUtils.isEmpty(cdb.getData().getPolicyPhotoUrl())) {
-                    Glide.with(con).load(cdb.getData().getPolicyPhotoUrl()).into(img);
-                    value1.setText(cdb.getData().getInsuranceCompany());
-                    value2.setText(cdb.getData().getInsuranceEndDay());
                     submit.setBackgroundResource(R.drawable.bg_btn_grey);
                     upload_img.setText("已上传");
                 }
@@ -611,10 +523,6 @@ public class PhotoCarActivity extends BaseAppCompatActivity implements View.OnCl
         tvTips.setText(tips[type]);
         tvSkip.setVisibility(isShowSkip[type] ? View.GONE : View.VISIBLE);
         llInfo.setVisibility(isShowEdit[type] ? View.VISIBLE : View.GONE);
-        if (type == 4) {
-            llDate.setVisibility(View.VISIBLE);
-            title3.setText("保险公司");
-        }
     }
 
 

app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/auth/VehicleAuthActivity.java

@@ -14,10 +14,7 @@ import android.widget.Toast;
 
 import androidx.annotation.Nullable;
 
-import com.arpa.hndahesudintocctmsdriver.event.RefreshCarListEvent;
 import com.arpa.hndahesudintocctmsdriver.event.VehicleEvent;
-import com.arpa.hndahesudintocctmsdriver.util.alert.ToastUtil;
-import com.dahe.mylibrary.utils.ToastUtils;
 import com.google.gson.Gson;
 import com.luck.picture.lib.PictureSelector;
 import com.luck.picture.lib.config.PictureConfig;
@@ -41,7 +38,6 @@ import com.scwang.smart.refresh.layout.SmartRefreshLayout;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
-import org.greenrobot.eventbus.ThreadMode;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -55,7 +51,6 @@ public class VehicleAuthActivity extends BaseAppCompatActivity {
     public  String carId="";
     public static final String DEL_CAR="delete_che";
     public static final String CAR_AUDIO="CAR_AUDIO";
-    public static final String APP_INFO="APP_INFO";
     private int submitIndex=0;
     private BaseBean bb;
     private ImageView show_img;
@@ -70,7 +65,7 @@ public class VehicleAuthActivity extends BaseAppCompatActivity {
                     CacheGroup.cacheList.remove(CAR_AUDIO);
                 }
                 if(CacheGroup.cacheList.get(WoDeFragment.VEHICLE_DEL)!=null){
-                    Log.e("--res--lijia",CacheGroup.cacheList.get(WoDeFragment.VEHICLE_DEL));
+                    Log.e("--res--",CacheGroup.cacheList.get(WoDeFragment.VEHICLE_DEL));
                     cdb=gson.fromJson(CacheGroup.cacheList.get(WoDeFragment.VEHICLE_DEL), CarDelBean.class);
                     if(cdb.getCode()==200){
                         initView(null);
@@ -84,8 +79,6 @@ public class VehicleAuthActivity extends BaseAppCompatActivity {
                     bb=gson.fromJson(CacheGroup.cacheList.get(DEL_CAR),BaseBean.class);
                     if (bb.getCode()==200) {
                         Toast.makeText(con,"删除成功",Toast.LENGTH_SHORT).show();
-                        RefreshCarListEvent ve = new RefreshCarListEvent("");
-                        EventBus.getDefault().post(ve);
                         finish();
                     }else{
                         Toast.makeText(con,"删除失败:"+bb.getMsg(),Toast.LENGTH_SHORT).show();
@@ -173,13 +166,6 @@ public class VehicleAuthActivity extends BaseAppCompatActivity {
     private GetImageAlert gia=new GetImageAlert();
     private boolean key1,key2,key3=false;
 
-
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-        EventBus.getDefault().unregister(this);
-    }
-
     @Override
     public void initView(Object obj) {
         super.initView(obj);
@@ -221,12 +207,11 @@ public class VehicleAuthActivity extends BaseAppCompatActivity {
             RelativeLayout r5=v.findViewById(R.id.r5);
             RelativeLayout r6=v.findViewById(R.id.r6);
             RelativeLayout r7=v.findViewById(R.id.r7);
-            RelativeLayout r8=v.findViewById(R.id.r8);
             View vs1=v.findViewById(R.id.vs1);
             View vs2=v.findViewById(R.id.vs2);
             r4.setVisibility(View.GONE);
             r5.setVisibility(View.GONE);
-//            vs1.setVisibility(View.GONE);
+            vs1.setVisibility(View.GONE);
             vs2.setVisibility(View.GONE);
             if(!"".equals(carId) && cdb.getData().getIsTrailer()==1){
                 r4.setVisibility(View.VISIBLE);
@@ -316,17 +301,6 @@ public class VehicleAuthActivity extends BaseAppCompatActivity {
                     Toast.makeText(con,"请先绑定挂车",Toast.LENGTH_SHORT).show();
                 }
             });
-
-            r8.setOnClickListener(v1->{
-                if(!"".equals(carId)){
-                    Intent in = new Intent(con, PhotoCarActivity.class);
-                    in.putExtra("type", 4);
-                    in.putExtra("carId", carId);
-                    con.startActivity(in);
-                }else{
-                    Toast.makeText(con,"请先绑定行驶证",Toast.LENGTH_SHORT).show();
-                }
-            });
             del.setOnClickListener(v13 -> {
                 new XPopup.Builder(con)
                         .isDestroyOnDismiss(true) //对于只使用一次的弹窗，推荐设置这个
@@ -410,7 +384,7 @@ public class VehicleAuthActivity extends BaseAppCompatActivity {
         super.onResume();
     }
 
-    @Subscribe(threadMode = ThreadMode.MAIN, sticky = true)
+    @Subscribe
     public void  processResult(VehicleEvent event) {
         Log.e("-msg-",event.getMessage());
         if(!"挂".equals(event.getMessage())) {

app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/HomeFragment.java

@@ -47,6 +47,7 @@ import com.arpa.hndahesudintocctmsdriver.ui.auth.CertificatesActivity;
 import com.arpa.hndahesudintocctmsdriver.ui.news.NewActivity;
 import com.arpa.hndahesudintocctmsdriver.util.MessageUtils;
 import com.arpa.hndahesudintocctmsdriver.util.string.StringUtil;
+import com.baidu.ocr.ui.camera.CameraActivity;
 import com.bumptech.glide.Glide;
 import com.google.gson.Gson;
 import com.gyf.cactus.Cactus;
@@ -94,6 +95,7 @@ import com.youth.banner.loader.ImageLoader;
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 
+import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -146,10 +148,10 @@ public class HomeFragment extends BaseFragment {
                         MsgUtil.addHdMsgWat(hd, 33);
 
                         //新用户注册，需弹窗提示注册
-                        if ("0".equals(ub.getData().getRealAuthentication())) {
+                        if ("0".equals(ub.getData().getRealAuthentication())){
                             new MessageUtils().showSimCenPop(con, "该司机还未认证，未认证无法接单。是否去注册！", () -> {
-                                Intent in = new Intent(con, CertificatesActivity.class);
-                                in.putExtra("index", 0);
+                                Intent in=new Intent(con, CertificatesActivity.class);
+                                in.putExtra("index",0);
                                 startActivity(in);
                             });
                         }
@@ -241,9 +243,7 @@ public class HomeFragment extends BaseFragment {
                                 in.putExtra("url", deb.getData().getIdCardUpdateUrl());
                             }
                         }
-                        if (!TextUtils.isEmpty(deb.getData().getDriverLicenseUpdateUrl()) || !TextUtils.isEmpty(deb.getData().getIdCardUpdateUrl())||
-                                !TextUtils.isEmpty(deb.getData().getQualificationUpdateUrl())||!TextUtils.isEmpty(deb.getData().getRoadLicenseUpdateUrl())||
-                                !TextUtils.isEmpty(deb.getData().getInsuranceUpdateUrl())) {
+                        if (!"".equals(deb.getData().getDriverLicenseUpdateUrl()) || !"".equals(deb.getData().getIdCardUpdateUrl())) {
                             new XToast<>(act)
                                     .setContentView(R.layout.view_bc)
                                     // 设置成可拖拽的
@@ -338,13 +338,20 @@ public class HomeFragment extends BaseFragment {
             }
         });
         news_btn.setOnClickListener(v -> {
-            if (UiAuxiliary.isLogin(con)) {
-                Intent in = new Intent(con, NewActivity.class);
-                startActivity(in);
-            } else {
-                Intent in = new Intent(con, LoginActivity.class);
-                startActivity(in);
-            }
+            // TODO: 2023/8/30 测试orc拍照
+            Intent intent = new Intent(getActivity(), CameraActivity.class);
+            intent.putExtra(CameraActivity.KEY_OUTPUT_FILE_PATH,
+                    new File(getActivity().getFilesDir(), "pic.jpg").getAbsolutePath());
+            intent.putExtra(CameraActivity.KEY_CONTENT_TYPE, CameraActivity.CONTENT_TYPE_ID_CARD_FRONT);
+            startActivityForResult(intent, 1111);
+
+//            if (UiAuxiliary.isLogin(con)) {
+//                Intent in = new Intent(con, NewActivity.class);
+//                startActivity(in);
+//            } else {
+//                Intent in = new Intent(con, LoginActivity.class);
+//                startActivity(in);
+//            }
         });
         //Intent serviceIn=new Intent(con, LocationService.class);
         //getActivity().startService(serviceIn);
@@ -547,6 +554,7 @@ public class HomeFragment extends BaseFragment {
         ur.getImage(1);
 
 
+
         if (UiAuxiliary.isLogin(con)) {
             ur.User();
             ur.getDriverExpire();
@@ -901,49 +909,28 @@ public class HomeFragment extends BaseFragment {
 
     public void initAlct() {
         PermissionX.init(getActivity())
-                .permissions(Manifest.permission.ACCESS_FINE_LOCATION,
-                        Manifest.permission.ACCESS_COARSE_LOCATION,
-                        Manifest.permission.ACCESS_BACKGROUND_LOCATION,
-                        Manifest.permission.WRITE_EXTERNAL_STORAGE,
+                .permissions(Manifest.permission.WRITE_EXTERNAL_STORAGE,
                         Manifest.permission.READ_EXTERNAL_STORAGE,
-                        Manifest.permission.CALL_PHONE,
-                        Manifest.permission.RECORD_AUDIO,
-                        Manifest.permission.CAMERA)
+                        Manifest.permission.RECORD_AUDIO)
                 .request((allGranted, grantedList, deniedList) -> {
-                    boolean isHasLocation = false;
-                    boolean isHasStor = false;
-                    for (int i = 0; i < grantedList.size(); i++) {
-                        if (grantedList.get(i).equals(Manifest.permission.ACCESS_FINE_LOCATION)){
-                            isHasLocation = true;
-                        }
-                        if (grantedList.get(i).equals(Manifest.permission.WRITE_EXTERNAL_STORAGE)){
-                            isHasStor = true;
-                        }
-                    }
-                    if (isHasLocation&&isHasStor){
-                        ALProcess.verification(con);
-                        MDPLocationCollectionManager.getInvoices(con, 10, 1, new OnDownloadResultListener() {
-                            @Override
-                            public void onSuccess(Object o) {
-                                Log.e("--成功信息--", new Gson().toJson(o));
-                            }
+                    if (allGranted) {
+
+                    } else {
 
-                            @Override
-                            public void onFailure(String s, String s1) {
-                                Log.e("--失败信息--", s + s1);
-                            }
-                        });
-                    }else {
-                        if (!isHasLocation){
-                            Toast.makeText(con, "开启权限失败,请在应用设置-权限-定位-始终允许", Toast.LENGTH_SHORT).show();
-                            return;
-                        }
-                        if (!isHasStor){
-                            Toast.makeText(con, "开启权限失败,请在应用设置-权限-媒体与文件-仅媒体", Toast.LENGTH_SHORT).show();
-                        }
                     }
                 });
+        ALProcess.verification(con);
+        MDPLocationCollectionManager.getInvoices(con, 10, 1, new OnDownloadResultListener() {
+            @Override
+            public void onSuccess(Object o) {
+                Log.e("--成功信息--", new Gson().toJson(o));
+            }
 
+            @Override
+            public void onFailure(String s, String s1) {
+                Log.e("--失败信息--", s + s1);
+            }
+        });
     }
 
     private MyLocationStyle myLocationStyle;//地图定位样式

app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/HuoYunDelActivity.java

@@ -4,20 +4,12 @@ import android.Manifest;
 import android.app.Activity;
 import android.content.Intent;
 import android.net.Uri;
-import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
 import android.text.Html;
-import android.text.Layout;
-import android.text.TextUtils;
-import android.text.method.HideReturnsTransformationMethod;
-import android.text.method.PasswordTransformationMethod;
 import android.util.Log;
-import android.view.inputmethod.EditorInfo;
 import android.widget.Button;
-import android.widget.CheckBox;
-import android.widget.CompoundButton;
 import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.TextView;
@@ -110,18 +102,14 @@ public class HuoYunDelActivity extends BaseAppCompatActivity {
                         //Toast.makeText(con,"接单成功",Toast.LENGTH_SHORT).show();
                         customDialog.dismiss();
 //                        EsignSdk.getInstance().startH5Activity(act, (String) bb.getData());
-                        if (null==bb.getData()){
-                            UiAuxiliary.homeRequest("接单");
-                            Intent in = new Intent(con, StartYunDanActivity.class);
-                            in.putExtra("id", "0");
-                            startActivity(in);
-                            finish();
-                        }else{
-                            Intent intent = new Intent(this, H5Activity.class);
-                            intent.putExtra("url", (String) bb.getData());
-                            intent.putExtra("view_file", false);
-                            startActivity(intent);
-                        }
+
+
+                        Intent intent = new Intent(this, H5Activity.class);
+                        intent.putExtra("url", (String) bb.getData());
+                        intent.putExtra("view_file", false);
+                        startActivity(intent);
+
+
                         //finish();
                     } else {
                         Toast.makeText(con, bb.getMsg(), Toast.LENGTH_SHORT).show();
@@ -207,8 +195,6 @@ public class HuoYunDelActivity extends BaseAppCompatActivity {
                     //2021/02/27记，类型声明错误
                     ImageButton return_btn = v.findViewById(R.id.return_btn);
                     ImageButton xuan = v.findViewById(R.id.xuan);
-                    CheckBox checkBox = v.findViewById(R.id.cb);
-                    TextView totalFreight = v.findViewById(R.id.totalFreight);
                     ImageButton btnFp = v.findViewById(R.id.btnFp);
                     TextView effectiveTime = v.findViewById(R.id.effectiveTime);
                     TextView check_contract = v.findViewById(R.id.check_contract);
@@ -219,15 +205,6 @@ public class HuoYunDelActivity extends BaseAppCompatActivity {
                     return_btn.setOnClickListener(v16 -> {
                         finish();
                     });
-                    totalFreight.setText("****");
-                    checkBox.setOnCheckedChangeListener((buttonView, isChecked) -> {
-                        if (isChecked){
-                            totalFreight.setText(hyd.getData().getTotalFreight());
-                        }else{
-                            totalFreight.setText("****");
-                        }
-//                        totalFreight.setTransformationMethod(isChecked? HideReturnsTransformationMethod.getInstance(): PasswordTransformationMethod.getInstance());
-                    });
 //                    String textSource = "同意在符合相关税务机关要求的情况下代开<font color='#ff0000'>增值税发票</font>";
                     String textSource = "公司已对运输合同条款充分解释说明，本人已充分理解、认可并签署；同意符合税务机关要求下<font color='#ff0000'>代开增值税发票</font>，产生的增值税及附加税本人承担。";
                     tvZzs.setText(Html.fromHtml(textSource));

app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/StartYunDanActivity.java

@@ -40,7 +40,6 @@ import com.amap.api.services.route.DriveStep;
 import com.amap.api.services.route.RideRouteResult;
 import com.amap.api.services.route.RouteSearch;
 import com.amap.api.services.route.WalkRouteResult;
-import com.arpa.hndahesudintocctmsdriver.util.alert.CustomDialog;
 import com.arpa.hndahesudintocctmsdriver.util.alert.ToastUtil;
 import com.bumptech.glide.Glide;
 import com.dahe.mylibrary.utils.TimeUtil;
@@ -74,7 +73,6 @@ import org.jetbrains.annotations.NotNull;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
-import java.util.function.Predicate;
 
 public class StartYunDanActivity extends BaseActivity {
 
@@ -111,9 +109,6 @@ public class StartYunDanActivity extends BaseActivity {
                     Log.e("-运单-", CacheGroup.cacheList.get(HuoYuanFragmengt.START_ORDER));
                     sob = gson.fromJson(CacheGroup.cacheList.get(HuoYuanFragmengt.START_ORDER), StartOrderBean.class);
                     wnb = gson.fromJson(CacheGroup.cacheList.get(GET_EVALUTE), WNewsBean.class);
-                    if (!isFinishing() && customDialog != null && customDialog.isShowing()) {
-                        customDialog.dismiss();
-                    }
                     if (sob.getCode() == 200 && sob.getData() != null) {
                         id = sob.getData().getWaybillId();
                         initView(null);
@@ -207,30 +202,6 @@ public class StartYunDanActivity extends BaseActivity {
                     initStartBody(v);
                     break;
                 case R.layout.item_yundan_yunxing:
-                    LinearLayout llMoney = v.findViewById(R.id.llMoney);
-                    if (!sob.getData().getWaybillStatus().equals("已装货")
-                            && !sob.getData().getWaybillStatus().equals("待装货")
-                            && !sob.getData().getWaybillStatus().equals("待接单")) {
-                        if (sob.getData().getWaybillStatus().equals("已装货")) {
-                            StartOrderBean.DataDTO.WayChildrenDTO mySdw = new StartOrderBean.DataDTO.WayChildrenDTO();
-                            for (int i = 0; i < sob.getData().getWayChildren().size(); i++) {
-                                StartOrderBean.DataDTO.WayChildrenDTO sdw = sob.getData().getWayChildren().get(i);
-                                if (sdw.getType() == 1) {
-                                    mySdw = sdw;
-                                    break;
-                                }
-                            }
-                            if (mySdw.getStatus() == 3) {
-                                llMoney.setVisibility(View.GONE);
-                            } else {
-                                llMoney.setVisibility(View.VISIBLE);
-                            }
-                        } else {
-                            llMoney.setVisibility(View.VISIBLE);
-                        }
-                    } else {
-                        llMoney.setVisibility(View.GONE);
-                    }
                     ImageView head_img = v.findViewById(R.id.head_img);
                     if (ub != null && ub.getData() != null && !ub.getData().getHeadportraitUrl().equals("")) {
                         Glide.with(con).load(ub.getData().getHeadportraitUrl()).into(head_img);
@@ -416,21 +387,21 @@ public class StartYunDanActivity extends BaseActivity {
                     for (int i = 0; i < sob.getData().getWayChildren().size(); i++) {
                         if (sob.getData().getWayChildren().get(i).getType() == 1) {
                             zInfo = sob.getData().getWayChildren().get(i);
-                            if (zInfo.getReceiptUrl() != null && zInfo.getReceiptUrl().size() > 0) {
-                                int dis = TimeUtil.compareNowDate(TimeUtil.string2Millis(zInfo.getImageTakenDate(), TimeUtil.DEFAULT_FORMAT4));
-                                if (dis > 5) {//大于五分钟可以接单
+                            int dis = TimeUtil.compareNowDate(TimeUtil.string2Millis(zInfo.getImageTakenDate(), TimeUtil.DEFAULT_FORMAT4));
+                            if (dis > 5) {
+                                if (zInfo.getReceiptUrl() != null && zInfo.getReceiptUrl().size() > 0) {
                                     Intent in = new Intent(con, ShangChuangImgActivity.class);
                                     in.putExtra("type", type);
                                     in.putExtra("wid", wid);
                                     in.putExtra("sob", gson.toJson(sob));
                                     in.putExtra("keys", key);
                                     startActivity(in);
+                                    break;
                                 } else {
-                                    ToastUtils.showToast(StartYunDanActivity.this, "请到卸货地再进行卸货操作!");
+                                    ToastUtils.showToast(StartYunDanActivity.this, "请先上传出货单,再进行卸货操作!");
                                 }
-                                break;
-                            } else {
-                                ToastUtils.showToast(StartYunDanActivity.this, "请先上传出货单,再进行卸货操作!");
+                            } else {//大于五分钟可以接单
+                                ToastUtils.showToast(StartYunDanActivity.this, "装卸货时间间隔过短,请稍后重试!");
                             }
                             break;
                         }
@@ -475,16 +446,12 @@ public class StartYunDanActivity extends BaseActivity {
         return str;
     }
 
-    private CustomDialog customDialog;
-
     @Override
     protected void onResume() {
         super.onResume();
         if (map != null) {
             map.onResume();
         }
-        customDialog = new CustomDialog(con, "网络请求中...");
-        customDialog.show();
         hyr.startOrder(id);
         hyr.getEvaluate(id);
     }

app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/shangchuan/ShangChuangImgActivity.java

@@ -19,7 +19,6 @@ import com.alct.mdp.callback.OnResultListener;
 import com.alct.mdp.model.Goods;
 import com.alct.mdp.model.Image;
 import com.alct.mdp.model.Location;
-import com.arpa.hndahesudintocctmsdriver.BuildConfig;
 import com.arpa.hndahesudintocctmsdriver.bean.CarInfoBean;
 import com.arpa.hndahesudintocctmsdriver.report.ALProcess;
 import com.arpa.hndahesudintocctmsdriver.report.JTTProcess;
@@ -30,9 +29,12 @@ import com.arpa.hndahesudintocctmsdriver.util.NfcUtils;
 import com.arpa.hndahesudintocctmsdriver.util.alert.ToastUtil;
 import com.arpa.hndahesudintocctmsdriver.util.img.GetCarImageAlert;
 import com.arpa.hndahesudintocctmsdriver.util.location.LocationUtil;
+import com.baidu.mapapi.CoordType;
+import com.baidu.mapapi.SDKInitializer;
 import com.baidu.mapapi.model.LatLng;
 import com.baidu.mapapi.utils.CoordinateConverter;
 import com.bumptech.glide.Glide;
+import com.dahe.mylibrary.utils.ToastUtils;
 import com.google.gson.Gson;
 import com.luck.picture.lib.PictureSelector;
 import com.luck.picture.lib.config.PictureConfig;
@@ -45,6 +47,7 @@ import com.arpa.hndahesudintocctmsdriver.bean.UploadBean;
 import com.arpa.hndahesudintocctmsdriver.request.HuoYuanRequset;
 import com.arpa.hndahesudintocctmsdriver.request.bean.LUInputBean;
 import com.arpa.hndahesudintocctmsdriver.request.bean.UploadReceiptInputBean;
+import com.arpa.hndahesudintocctmsdriver.ui.auth.CertificatesActivity;
 import com.arpa.hndahesudintocctmsdriver.util.location.LocationGDUtil;
 import com.arpa.hndahesudintocctmsdriver.util.alert.CustomDialog;
 import com.arpa.hndahesudintocctmsdriver.util.cache.CacheGroup;
@@ -94,15 +97,11 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
         switch (m.what) {
             case RequsetCodeConstants.SUCCESS:
                 if (CacheGroup.cacheList.get("upload") != null) {
-                    if (!isFinishing() && customDialog != null && customDialog.isShowing()) {
-                        customDialog.dismiss();
-                    }
                     Log.e("upload", CacheGroup.cacheList.get("upload"));
                     ub = gson.fromJson(CacheGroup.cacheList.remove("upload"), UploadBean.class);
                     if (ub.getCode() == 200) {
                         imgIds.add(ub.getData().getId());
-//                        Glide.with(con).load(ub.getData().getUrl()).into(res_img);
-                        Glide.with(con).load(path).into(res_img);
+                        Glide.with(con).load(ub.getData().getUrl()).into(res_img);
                         res_img.setVisibility(View.VISIBLE);
                         img_delete.setVisibility(View.VISIBLE);
                         img_icon.setVisibility(View.GONE);
@@ -116,20 +115,17 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
                     if (CacheGroup.cacheList.get(TYPE_NAME[i]) != null) {
                         BaseBean bb = gson.fromJson(CacheGroup.cacheList.get(TYPE_NAME[i]), BaseBean.class);
                         if (bb.getCode() == 200) {
-                            if (index == 2) {
-                                if (!keys) {//装货回单
-                                    if (!isFinishing() && customDialog != null && customDialog.isShowing()) {
-                                        customDialog.dismiss();
-                                    }
-                                    Toast.makeText(con, "上传成功", Toast.LENGTH_SHORT).show();
-                                    finish();
-                                }
+                            if (!keys) {
+                                Toast.makeText(con, "上传成功", Toast.LENGTH_SHORT).show();
+                                finish();
+                            } else {
+                                Toast.makeText(con, "上传成功", Toast.LENGTH_SHORT).show();
+                                finish();
                             }
                         } else {
                             Toast.makeText(con, bb.getMsg(), Toast.LENGTH_SHORT).show();
                         }
                         CacheGroup.cacheList.remove(TYPE_NAME[i]);
-                        break;
                     }
                 }
                 if (CacheGroup.cacheList.get("carName") != null) {
@@ -156,9 +152,6 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
                             hyr.uploadFile(new File(path));
                         }
                     } else {//识别失败后返回code500
-                        if (!isFinishing() && customDialog != null && customDialog.isShowing()) {
-                            customDialog.dismiss();
-                        }
                         if (index == 0) {//装卸货车辆需要识别车牌号){
                             Toast.makeText(con, "装货照片包含车牌号、三分之二车身或者装卸货场景。", Toast.LENGTH_SHORT).show();
                         } else if (index == 1) {
@@ -171,19 +164,14 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
                 break;
             case 14://定位成功
                 locationKey = true;
-                if (!isFinishing() && customDialog != null && customDialog.isShowing()) {
-                    customDialog.dismiss();
-                }
+                customDialog.dismiss();
                 tv_loaction.setText("定位成功");
                 tv_loaction.setTextColor(getResources().getColor(R.color.theme_color, null));
-                latLng = convertGPSToBaidu(new LatLng(lgdu.getLatitude(), lgdu.getLongitude()));
                 initLocation();
                 break;
             case 16://定位失败
                 locationKey = false;
-                if (!isFinishing() && customDialog != null && customDialog.isShowing()) {
-                    customDialog.dismiss();
-                }
+                customDialog.dismiss();
                 tv_loaction.setText("定位失败，点击重试");
                 tv_loaction.setTextColor(getResources().getColor(R.color.loaction_no_color, null));
                 Toast.makeText(con, "定位失败，请确认开启定位后重试！", Toast.LENGTH_LONG).show();
@@ -201,7 +189,7 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
 //                if(index==1 || index==2){
 //                    new OCRRequest().OCRPlateLicense(con,hd,new File(path));
 //                }
-                if ((index == 0 || index == 1) && !BuildConfig.isTest) {//装卸货车辆需要识别车牌号,测试环境不校验车牌号
+                if (index == 0 || index == 1) {//装卸货车辆需要识别车牌号
                     new OCRRequest().OCRCarPlateLicense(con, hd, new File(path));
                 } else {
                     hyr.uploadFile(new File(path));
@@ -212,15 +200,6 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
         }
     }
 
-    private LatLng latLng;
-
-    public LatLng convertGPSToBaidu(LatLng srLatLng) {
-        CoordinateConverter converter = new CoordinateConverter();
-        converter.from(CoordinateConverter.CoordType.COMMON);
-        converter.coord(srLatLng);
-        return converter.convert();
-    }
-
     private String wid;
     private int h_type;
     String sobStr = "";
@@ -256,8 +235,8 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
         lgdu = new LocationGDUtil(con, hd);
         //启动定位
         lgdu.onCreate();
-//        lu = new LocationUtil(con, hd);
-//        lu.onCreate();
+        lu = new LocationUtil(con, hd);
+        lu.onCreate();
 //        if (keys) {
 //            lu = new LocationUtil(con, hd);
 //            lu.onCreate();
@@ -266,8 +245,8 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
             if (!locationKey) {
                 customDialog.show();
                 lgdu.onCreate();
-//                lu = new LocationUtil(con, hd);
-//                lu.onCreate();
+                lu = new LocationUtil(con, hd);
+                lu.onCreate();
             }
         });
         hyr = new HuoYuanRequset(con, hd);
@@ -339,12 +318,6 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
             path = gia.getFile().getPath();
             Log.e("图片地址:", path);
             gia.dis();
-
-            if (customDialog != null && !customDialog.isShowing()) {
-                customDialog = new CustomDialog(con, "网络请求中...");
-                customDialog.show();
-            }
-
             ImageFileCompressUtil.imageFileCompress(con, new File(path), hd);
         } else if (requestCode == PictureConfig.CHOOSE_REQUEST && resultCode == RESULT_OK) {
             List<LocalMedia> imgs = PictureSelector.obtainMultipleResult(data);
@@ -358,12 +331,6 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
                 path = paths;
                 Log.e("图片地址:", path);
                 gia.dis();
-
-                if (customDialog != null && !customDialog.isShowing()) {
-                    customDialog = new CustomDialog(con, "网络请求中...");
-                    customDialog.show();
-                }
-
                 ImageFileCompressUtil.imageFileCompress(con, new File(path), hd);
             }
         }
@@ -377,10 +344,6 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
 //        for(int i=0;i<imgIds.size();i++){
 //            Log.e("--imgIds--",imgIds.get(i)+"");
 //        }
-        if (customDialog != null && !customDialog.isShowing()) {
-            customDialog = new CustomDialog(con, "网络请求中...");
-            customDialog.show();
-        }
         switch (index) {
             case 0:
                 //装货
@@ -393,6 +356,10 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
                     Log.e("--装货信息", gson.toJson(lub));
                     if (locationKey) {//高德定位
                         if (keys) {
+                            if (lu!=null&&lu.getErrorCode()!=161){
+                                ToastUtils.showToast(this,"百度地图定位失败，请确认开启定位后重试！");
+                                return;
+                            }
                             nfc();
                             loadInfo();
 //                            up_traffic_start();
@@ -417,6 +384,10 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
                     Log.e("--卸货信息", gson.toJson(lub));
                     if (locationKey) {
                         if (keys) {
+                            if (lu!=null&&lu.getErrorCode()!=161){
+                                ToastUtils.showToast(this,"百度地图定位失败，请确认开启定位后重试！");
+                                return;
+                            }
                             nfc();
                             uploadInfo();
 
@@ -445,6 +416,10 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
                     Log.e("--回单信息", gson.toJson(urib));
                     if (locationKey) {
                         if (index == 2 && keys) {
+                            if (lu!=null&&lu.getErrorCode()!=161){
+                                ToastUtils.showToast(this,"百度地图定位失败，请确认开启定位后重试！");
+                                return;
+                            }
                             up_trafficSign();
                             up_trafficReceipt();
                             receipt_image();
@@ -464,6 +439,34 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
 
     private StartOrderBean sob;
 
+    //上传安联和交通厅-装货
+    public void up_traffic_start() {
+        //安联
+        if (sob.getData().getReportAlct() == 1) {
+            Location l = new Location();
+            l.setBaiduLongitude(lu.getLongitude());
+            l.setBaiduLatitude(lu.getLatitude());
+            l.setLocation(lu.getAddress());
+            l.setTime(Timer.getTimerT());
+            MDPLocationCollectionManager.pickup(con, sob.getData().getShippingNoteNumber(), l, new com.alct.mdp.callback.OnResultListener() {
+                @Override
+                public void onSuccess() {
+                    Log.e("上报安联", "装货上传成功");
+                }
+
+                @Override
+                public void onFailure(String s, String s1) {
+                    Log.e("上报安联失败(装货):", s + s1);
+                    new MessageUtils().showCenMessage(con, s1);
+                }
+            });
+        }
+        //交通厅
+        if (sob.getData().getReport() == 1) {
+            JTTProcess.start(con, sob, "");
+        }
+    }
+
     public void nfc() {
 //        if(sob.getData().getNfcId().equals(nfcStr)){
 //            Toast.makeText(con,"nfcId匹配失败",Toast.LENGTH_LONG).show();
@@ -485,13 +488,41 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
                 });
     }
 
+    //上传安联和交通厅-卸货
+    public void up_traffic_end() {
+        //安联
+        if (sob.getData().getReportAlct() == 1) {
+            Location l = new Location();
+            l.setBaiduLongitude(lu.getLongitude());
+            l.setBaiduLatitude(lu.getLatitude());
+            l.setLocation(lu.getAddress());
+            l.setTime(Timer.getTimerT());
+            Log.e("-安联卸货信息-", gson.toJson(l));
+            MDPLocationCollectionManager.unload(con, sob.getData().getShippingNoteNumber(), l, new com.alct.mdp.callback.OnResultListener() {
+                @Override
+                public void onSuccess() {
+                    Log.e("上报安联", "卸货上传成功");
+                }
+
+                @Override
+                public void onFailure(String s, String s1) {
+                    Log.e("上报安联失败(卸货):", s + s1);
+                }
+            });
+        }
+        //交通厅
+        if (sob.getData().getReport() == 1) {
+            JTTProcess.stop(con, sob, "");
+        }
+    }
+
     //上传安联-签收
     public void up_trafficSign() {
         //安联
         Location l = new Location();
-        l.setBaiduLongitude(latLng.longitude);
-        l.setBaiduLatitude(latLng.latitude);
-        l.setLocation(lgdu.getAddress());
+        l.setBaiduLongitude(lu.getLongitude());
+        l.setBaiduLatitude(lu.getLatitude());
+        l.setLocation(lu.getAddress());
         l.setTime(Timer.getTimerT());
         List<Goods> gs = new ArrayList<>();
         for (StartOrderBean.DataDTO.WayChildrenDTO wayChild : sob.getData().getWayChildren()) {
@@ -529,9 +560,9 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
     public void up_trafficReceipt() {
         //安联
         Location l = new Location();
-        l.setBaiduLongitude(latLng.longitude);
-        l.setBaiduLatitude(latLng.latitude);
-        l.setLocation(lgdu.getAddress());
+        l.setBaiduLongitude(lu.getLongitude());
+        l.setBaiduLatitude(lu.getLatitude());
+        l.setLocation(lu.getAddress());
         l.setTime(Timer.getTimerT());
         MDPLocationCollectionManager.pod(con, sob.getData().getShippingNoteNumber(), l, new com.alct.mdp.callback.OnResultListener() {
 
@@ -557,19 +588,14 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
         image.setFileExt(FileUtil.lastName(file));
         image.setFileName(FileUtil.fileName(file));
         image.setImageTakenDate(Timer.getTimerT());
-        image.setBaiduLongitude(latLng.longitude);
-        image.setBaiduLatitude(latLng.latitude);
-        image.setLocation(lgdu.getAddress());
+        image.setBaiduLongitude(lu.getLongitude());
+        image.setBaiduLatitude(lu.getLatitude());
+        image.setLocation(lu.getAddress());
         MDPLocationCollectionManager.uploadPickupImage(con, sob.getData().getShippingNoteNumber(), image, new com.alct.mdp.callback.OnResultListener() {
 
             @Override
             public void onSuccess() {
-                if (!isFinishing() && customDialog != null && customDialog.isShowing()) {
-                    customDialog.dismiss();
-                }
                 Log.e("上报安联", "装货照片上传成功");
-                Toast.makeText(con, "上传成功", Toast.LENGTH_SHORT).show();
-                finish();
             }
 
             @Override
@@ -592,27 +618,19 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
         image.setFileExt(FileUtil.lastName(file));
         image.setFileName(FileUtil.fileName(file));
         image.setImageTakenDate(Timer.getTimerT());
-        image.setBaiduLongitude(latLng.longitude);
-        image.setBaiduLatitude(latLng.latitude);
-        image.setLocation(lgdu.getAddress());
+        image.setBaiduLongitude(lu.getLongitude());
+        image.setBaiduLatitude(lu.getLatitude());
+        image.setLocation(lu.getAddress());
         MDPLocationCollectionManager.uploadUnloadImage(con, sob.getData().getShippingNoteNumber(), image, new com.alct.mdp.callback.OnResultListener() {
 
             @Override
             public void onSuccess() {
-                if (!isFinishing() && customDialog != null && customDialog.isShowing()) {
-                    customDialog.dismiss();
-                }
                 Log.e("上报安联", "卸货照片上传成功");
-                Toast.makeText(con, "上传成功", Toast.LENGTH_SHORT).show();
-                finish();
             }
 
             @Override
             public void onFailure(String s, String s1) {
                 Log.e("上报安联失败(卸货照片):", s + s1);
-                if (!isFinishing() && customDialog != null && customDialog.isShowing()) {
-                    customDialog.dismiss();
-                }
 //                SPUtil.insSP(con,"make","卸货",sob.getData().getShippingNoteNumber());
 //                SPUtil.insSP(con,"make","卸货-"+sob.getData().getShippingNoteNumber(),gson.toJson(image));
 //                Intent serviceIn=new Intent(con, MakeUpAlService.class);
@@ -631,19 +649,14 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
         image.setFileExt(FileUtil.lastName(file));
         image.setFileName(FileUtil.fileName(file));
         image.setImageTakenDate(Timer.getTimerT());
-        image.setBaiduLongitude(latLng.longitude);
-        image.setBaiduLatitude(latLng.latitude);
-        image.setLocation(lgdu.getAddress());
+        image.setBaiduLongitude(lu.getLongitude());
+        image.setBaiduLatitude(lu.getLatitude());
+        image.setLocation(lu.getAddress());
         MDPLocationCollectionManager.uploadPODImage(con, sob.getData().getShippingNoteNumber(), image, new com.alct.mdp.callback.OnResultListener() {
 
             @Override
             public void onSuccess() {
-                if (!isFinishing() && customDialog != null && customDialog.isShowing()) {
-                    customDialog.dismiss();
-                }
                 Log.e("上报安联", "回单照片上传成功");
-                Toast.makeText(con, "上传成功", Toast.LENGTH_SHORT).show();
-                finish();
             }
 
             @Override
@@ -687,7 +700,6 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
         Log.e("nfc", nfcStr);
     }
 
-
     /**
      * 上传安联和交通厅,平台-装货
      */
@@ -695,9 +707,9 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
         //安联
         if (sob.getData().getReportAlct() == 1) {
             Location l = new Location();
-            l.setBaiduLongitude(latLng.longitude);
-            l.setBaiduLatitude(latLng.latitude);
-            l.setLocation(lgdu.getAddress());
+            l.setBaiduLongitude(lu.getLongitude());
+            l.setBaiduLatitude(lu.getLatitude());
+            l.setLocation(lu.getAddress());
             l.setTime(Timer.getTimerT());
             MDPLocationCollectionManager.pickup(con, sob.getData().getShippingNoteNumber(), l, new com.alct.mdp.callback.OnResultListener() {
                 @Override
@@ -707,18 +719,15 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
                     if (sob.getData().getReport() == 1) {
                         JTTProcess.start(con, sob, "");
                     }
-                    //装货状态
-                    hyr.loading(lub);
                     //装货照片
                     up_image_z();
+                    //装货状态
+                    hyr.loading(lub);
                 }
 
                 @Override
                 public void onFailure(String s, String s1) {
                     Log.e("上报安联失败(装货):", s + s1);
-                    if (!isFinishing() && customDialog != null && customDialog.isShowing()) {
-                        customDialog.dismiss();
-                    }
                     new MessageUtils().showCenMessage(con, s1);
                 }
             });
@@ -734,9 +743,9 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
         //安联
         if (sob.getData().getReportAlct() == 1) {
             Location l = new Location();
-            l.setBaiduLongitude(latLng.longitude);
-            l.setBaiduLatitude(latLng.latitude);
-            l.setLocation(lgdu.getAddress());
+            l.setBaiduLongitude(lu.getLongitude());
+            l.setBaiduLatitude(lu.getLatitude());
+            l.setLocation(lu.getAddress());
             l.setTime(Timer.getTimerT());
             Log.e("-安联卸货信息-", gson.toJson(l));
             MDPLocationCollectionManager.unload(con, sob.getData().getShippingNoteNumber(), l, new com.alct.mdp.callback.OnResultListener() {
@@ -747,18 +756,15 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity {
                     if (sob.getData().getReport() == 1) {
                         JTTProcess.stop(con, sob, "");
                     }
-                    //卸货状态-平台
-                    hyr.dischargeCargo(lub);
                     //卸货照片-安联
                     up_image();
+                    //卸货状态-平台
+                    hyr.dischargeCargo(lub);
                 }
 
                 @Override
                 public void onFailure(String s, String s1) {
                     Log.e("上报安联失败(卸货):", s + s1);
-                    if (!isFinishing() && customDialog != null && customDialog.isShowing()) {
-                        customDialog.dismiss();
-                    }
                     new MessageUtils().showCenMessage(con, s1);
                 }
             });

app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/shangchuan/ShangChuangImgActivityBC.java

@@ -1,889 +0,0 @@
-package com.arpa.hndahesudintocctmsdriver.ui.home.shangchuan;
-
-import android.content.Intent;
-import android.os.Bundle;
-import android.os.Message;
-import android.text.TextUtils;
-import android.util.Log;
-import android.view.Gravity;
-import android.view.View;
-import android.widget.Button;
-import android.widget.EditText;
-import android.widget.ImageView;
-import android.widget.RelativeLayout;
-import android.widget.SimpleAdapter;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import androidx.annotation.Nullable;
-
-import com.alct.mdp.MDPLocationCollectionManager;
-import com.alct.mdp.callback.OnResultListener;
-import com.alct.mdp.model.Goods;
-import com.alct.mdp.model.Image;
-import com.alct.mdp.model.Location;
-import com.amap.api.maps.CameraUpdateFactory;
-import com.amap.api.services.core.AMapException;
-import com.amap.api.services.core.LatLonPoint;
-import com.amap.api.services.geocoder.GeocodeAddress;
-import com.amap.api.services.geocoder.GeocodeQuery;
-import com.amap.api.services.geocoder.GeocodeResult;
-import com.amap.api.services.geocoder.GeocodeSearch;
-import com.amap.api.services.geocoder.RegeocodeResult;
-import com.amap.api.services.help.Inputtips;
-import com.amap.api.services.help.InputtipsQuery;
-import com.amap.api.services.help.Tip;
-import com.arpa.hndahesudintocctmsdriver.R;
-import com.arpa.hndahesudintocctmsdriver.bean.BaseBean;
-import com.arpa.hndahesudintocctmsdriver.bean.CarInfoBean;
-import com.arpa.hndahesudintocctmsdriver.bean.StartOrderBean;
-import com.arpa.hndahesudintocctmsdriver.bean.UploadBean;
-import com.arpa.hndahesudintocctmsdriver.report.JTTProcess;
-import com.arpa.hndahesudintocctmsdriver.request.HuoYuanRequset;
-import com.arpa.hndahesudintocctmsdriver.request.OCRRequest;
-import com.arpa.hndahesudintocctmsdriver.request.bean.LUInputBean;
-import com.arpa.hndahesudintocctmsdriver.request.bean.UploadReceiptInputBean;
-import com.arpa.hndahesudintocctmsdriver.util.BitmapUtil;
-import com.arpa.hndahesudintocctmsdriver.util.MessageUtils;
-import com.arpa.hndahesudintocctmsdriver.util.NfcUtils;
-import com.arpa.hndahesudintocctmsdriver.util.alert.CustomDialog;
-import com.arpa.hndahesudintocctmsdriver.util.alert.ToastUtil;
-import com.arpa.hndahesudintocctmsdriver.util.cache.CacheGroup;
-import com.arpa.hndahesudintocctmsdriver.util.file.FileUtil;
-import com.arpa.hndahesudintocctmsdriver.util.file.ImageFileCompressUtil;
-import com.arpa.hndahesudintocctmsdriver.util.http.RequsetCodeConstants;
-import com.arpa.hndahesudintocctmsdriver.util.img.GetCarImageAlert;
-import com.arpa.hndahesudintocctmsdriver.util.location.LocationGDUtil;
-import com.arpa.hndahesudintocctmsdriver.util.location.LocationUtil;
-import com.arpa.hndahesudintocctmsdriver.util.statusbar.StateStyleUtil;
-import com.arpa.hndahesudintocctmsdriver.util.time.Timer;
-import com.arpa.hndahesudintocctmsdriver.util.view.BaseAppCompatActivity;
-import com.baidu.mapapi.model.LatLng;
-import com.baidu.mapapi.utils.CoordinateConverter;
-import com.bumptech.glide.Glide;
-import com.dahe.mylibrary.utils.ToastUtils;
-import com.github.gzuliyujiang.wheelpicker.DatePicker;
-import com.github.gzuliyujiang.wheelpicker.DatimePicker;
-import com.github.gzuliyujiang.wheelpicker.annotation.DateMode;
-import com.github.gzuliyujiang.wheelpicker.annotation.TimeMode;
-import com.github.gzuliyujiang.wheelpicker.contract.OnDatePickedListener;
-import com.github.gzuliyujiang.wheelpicker.contract.OnDatimePickedListener;
-import com.github.gzuliyujiang.wheelpicker.entity.DateEntity;
-import com.github.gzuliyujiang.wheelpicker.entity.DatimeEntity;
-import com.google.gson.Gson;
-import com.luck.picture.lib.PictureSelector;
-import com.luck.picture.lib.config.PictureConfig;
-import com.luck.picture.lib.entity.LocalMedia;
-import com.lxj.xpopup.XPopup;
-import com.lxj.xpopup.interfaces.OnSelectListener;
-import com.lxj.xpopup.util.SmartGlideImageLoader;
-
-import java.io.File;
-import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-
-public class ShangChuangImgActivityBC extends BaseAppCompatActivity implements Inputtips.InputtipsListener {
-
-    private TextView submit, name_top, name_body, address, tips, tips_x,tvDate,tvLocation;
-    private RelativeLayout getImg;
-    private EditText etAddress;
-    private Button btnOk;
-    private ImageView res_img, img_icon, img_delete;
-    private String[] names = {"装货", "卸货", "回单"};
-    public static String[] TYPE_NAME = {"zhuanghuo", "xiehuo", "huidan"};
-    private int index = 0;
-    //
-    private Gson gson = new Gson();
-    //
-    private LUInputBean lub = new LUInputBean();
-    private UploadReceiptInputBean urib = new UploadReceiptInputBean();
-    private LocationGDUtil lgdu;
-    public LocationUtil lu;
-    private List<Integer> imgIds = new ArrayList<>();
-    private UploadBean ub;
-    private HuoYuanRequset hyr;
-    //
-    private GetCarImageAlert gia = new GetCarImageAlert();
-    private CustomDialog customDialog;
-    private int id = 0;
-    private boolean key = true;
-    private boolean keys = false;
-    private boolean locationKey = false;
-    private TextView tv_loaction;
-
-
-    private String selDate;
-    private GeocodeSearch geocoderSearch;
-
-    private TempLoca tempLoca = new TempLoca();
-    private TempLoca tempLocaBd = new TempLoca();
-
-
-    @Override
-    public void onGetInputtips(List<Tip> tipList, int rCode) {
-        if (rCode == AMapException.CODE_AMAP_SUCCESS) {
-            List<String> names = new ArrayList<String>();
-            if(tipList != null) {
-                int size = tipList.size();
-                for (int i = 0; i < size; i++) {
-                    Tip tip = tipList.get(i);
-                    if(tip != null) {
-                        names.add(tip.getDistrict()+tip.getName());
-                    }
-                }
-
-                new XPopup.Builder(this)
-                        .isDestroyOnDismiss(true) //对于只使用一次的弹窗，推荐设置这个
-                        .hasShadowBg(false) // 去掉半透明背景
-                        .atView(etAddress)
-                        .asAttachList(names.toArray(new String[0]), new int[]{}, new OnSelectListener() {
-                            @Override
-                            public void onSelect(int position, String text) {
-                                Tip tip = tipList.get(position);
-                                etAddress.setText(tip.getDistrict()+tip.getAddress()+tip.getName());
-                                LatLonPoint latLonPoint = tip.getPoint();
-                                tempLoca.setAddress(etAddress.getText().toString());
-                                tempLoca.setLatitude(latLonPoint.getLatitude());
-                                tempLoca.setLongitude(latLonPoint.getLongitude());
-                                tempLoca.setTime(tvDate.getText().toString());
-
-                                LatLng latLng = convertGPSToBaidu(new LatLng(latLonPoint.getLatitude(), latLonPoint.getLongitude()));
-                                tempLocaBd.setLongitude(latLng.longitude);
-                                tempLocaBd.setLatitude(latLng.latitude);
-                                tempLocaBd.setAddress(etAddress.getText().toString());
-                                tempLocaBd.setTime(tvDate.getText().toString());
-
-                            }
-                        })
-                        .show();
-
-
-
-//                SimpleAdapter aAdapter = new SimpleAdapter(getApplicationContext(), listString, R.layout.item_layout,
-//                        new String[]{"name", "address"}, new int[]{R.id.poi_field_id, R.id.poi_value_id});
-//
-//                minputlist.setAdapter(aAdapter);
-//                aAdapter.notifyDataSetChanged();
-            }
-
-        } else {
-        }
-    }
-
-    class TempLoca{
-        private double latitude;
-        private double longitude;
-        private String address;
-        private String time;
-
-        public TempLoca() {
-
-        }
-
-        public TempLoca(double latitude, double longitude, String address, String time) {
-            this.latitude = latitude;
-            this.longitude = longitude;
-            this.address = address;
-            this.time = time;
-        }
-
-        public double getLatitude() {
-            return latitude;
-        }
-
-        public void setLatitude(double latitude) {
-            this.latitude = latitude;
-        }
-
-        public double getLongitude() {
-            return longitude;
-        }
-
-        public void setLongitude(double longitude) {
-            this.longitude = longitude;
-        }
-
-        public String getAddress() {
-            return address;
-        }
-
-        public void setAddress(String address) {
-            this.address = address;
-        }
-
-        public String getTime() {
-            return time;
-        }
-
-        public void setTime(String time) {
-            this.time = time;
-        }
-    }
-
-    @Override
-    public void msgMethod(Message m) {
-        super.msgMethod(m);
-        switch (m.what) {
-            case RequsetCodeConstants.SUCCESS:
-                if (CacheGroup.cacheList.get("upload") != null) {
-                    Log.e("upload", CacheGroup.cacheList.get("upload"));
-                    ub = gson.fromJson(CacheGroup.cacheList.remove("upload"), UploadBean.class);
-                    if (ub.getCode() == 200) {
-                        imgIds.add(ub.getData().getId());
-                        Glide.with(con).load(ub.getData().getUrl()).into(res_img);
-                        res_img.setVisibility(View.VISIBLE);
-                        img_delete.setVisibility(View.VISIBLE);
-                        img_icon.setVisibility(View.GONE);
-                        key = false;
-                    } else {
-                        Toast.makeText(con, ub.getMsg(), Toast.LENGTH_SHORT).show();
-                    }
-                    CacheGroup.cacheList.remove("upload");
-                }
-                for (int i = 0; i < TYPE_NAME.length; i++) {
-                    if (CacheGroup.cacheList.get(TYPE_NAME[i]) != null) {
-                        BaseBean bb = gson.fromJson(CacheGroup.cacheList.get(TYPE_NAME[i]), BaseBean.class);
-                        if (bb.getCode() == 200) {
-                            if (index == 2) {
-                                if (!keys){//装货回单
-                                    Toast.makeText(con, "上传成功", Toast.LENGTH_SHORT).show();
-                                    finish();
-                                }
-                            }
-                        } else {
-                            Toast.makeText(con, bb.getMsg(), Toast.LENGTH_SHORT).show();
-                        }
-                        CacheGroup.cacheList.remove(TYPE_NAME[i]);
-                        break;
-                    }
-                }
-                if (CacheGroup.cacheList.get("carName") != null) {
-                    BaseBean bb = gson.fromJson(CacheGroup.cacheList.get("carName"), BaseBean.class);
-                    if (bb.getCode() == 200) {
-
-                    }
-                    CacheGroup.cacheList.remove("carName");
-                }
-
-                if (CacheGroup.cacheList.get("carNum") != null) {
-                    Log.e("upload", CacheGroup.cacheList.get("carNum"));
-                    CarInfoBean ub = gson.fromJson(CacheGroup.cacheList.remove("carNum"), CarInfoBean.class);
-                    if (ub.getCode() == 200 && ub.getData().getData().getPrism_keyValueInfo().size() > 0) {
-                        String value = ub.getData().getData().getPrism_keyValueInfo().get(0).getValue();
-                        String forceMatching = ub.getData().getForceMatching();
-                        if ("1".equals(forceMatching)) {//是否强校验车牌号 1:强校验
-                            if (sob.getData().getCarNumber().equals(value)) {
-                                hyr.uploadFile(new File(path));
-                            } else {
-                                new MessageUtils().showCenMessage(ShangChuangImgActivityBC.this, "车牌号不匹配!", "请重新拍照或联系管理员");
-                            }
-                        } else {
-                            hyr.uploadFile(new File(path));
-                        }
-                    } else {//识别失败后返回code500
-                        if (index == 0) {//装卸货车辆需要识别车牌号){
-                            Toast.makeText(con, "装货照片包含车牌号、三分之二车身或者装卸货场景。", Toast.LENGTH_SHORT).show();
-                        } else if (index == 1) {
-                            Toast.makeText(con, "卸货照片包含车牌号、三分之二车身或者装卸货场景。", Toast.LENGTH_SHORT).show();
-                        }
-
-                    }
-                    CacheGroup.cacheList.remove("carNum");
-                }
-                break;
-            case 14://定位成功
-                locationKey = true;
-                customDialog.dismiss();
-                tv_loaction.setText("定位成功");
-                tv_loaction.setTextColor(getResources().getColor(R.color.theme_color, null));
-                latLng = convertGPSToBaidu(new LatLng(lgdu.getLatitude(), lgdu.getLongitude()));
-                initLocation();
-                break;
-            case 16://定位失败
-                locationKey = false;
-                customDialog.dismiss();
-                tv_loaction.setText("定位失败，点击重试");
-                tv_loaction.setTextColor(getResources().getColor(R.color.loaction_no_color, null));
-                Toast.makeText(con, "定位失败，请确认开启定位后重试！", Toast.LENGTH_LONG).show();
-                //定位结果接收
-                //finish();
-                break;
-            case 15:
-                break;
-
-            case ImageFileCompressUtil.COMPRESS_SUCCESS:
-                path = (String) m.obj;
-                Log.e("res:", "选定图片结果");
-                Log.e("res:", path);
-                //选定图片结果
-//                if(index==1 || index==2){
-//                    new OCRRequest().OCRPlateLicense(con,hd,new File(path));
-//                }
-                if (index == 0 || index == 1) {//装卸货车辆需要识别车牌号
-                    new OCRRequest().OCRCarPlateLicense(con, hd, new File(path));
-                } else {
-                    hyr.uploadFile(new File(path));
-                }
-                break;
-            default:
-                break;
-        }
-    }
-    private LatLng latLng;
-
-    public LatLng convertGPSToBaidu(LatLng srLatLng) {
-        CoordinateConverter converter = new CoordinateConverter();
-        converter.from(CoordinateConverter.CoordType.COMMON);
-        converter.coord(srLatLng);
-        return converter.convert();
-    }
-
-    private String wid;
-    private int h_type;
-    String sobStr = "";
-
-    @Override
-    protected void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        StateStyleUtil.stateTextColor(this);
-        setContentView(R.layout.activity_shangchuan_bc);
-        con = this;
-        submit = findViewById(R.id.submit);
-        name_top = findViewById(R.id.name_top);
-        name_body = findViewById(R.id.name_body);
-        address = findViewById(R.id.address);
-        getImg = findViewById(R.id.getImg);
-        res_img = findViewById(R.id.res_img);
-        img_icon = findViewById(R.id.img_icon);
-        img_delete = findViewById(R.id.img_delete);
-        tv_loaction = findViewById(R.id.tv_loaction);
-        btnOk = findViewById(R.id.btnOk);
-        etAddress = findViewById(R.id.etAddress);
-        tvDate = findViewById(R.id.tvDate);
-        tvLocation = findViewById(R.id.tvLocation);
-        tips = findViewById(R.id.tips);
-        tips_x = findViewById(R.id.tips_x);
-        Bundle ins = getIntent().getExtras();
-        index = ins.getInt("type");
-        wid = ins.getString("wid");
-        h_type = ins.getInt("h_type");
-        keys = ins.getBoolean("keys");
-        sobStr = getIntent().getExtras().getString("sob");
-        //Log.e("---sdwStr--",sdwStr);
-        sob = new Gson().fromJson(sobStr, StartOrderBean.class);
-        initView(null);
-        customDialog = new CustomDialog(con, "正在定位当前位置...");
-        customDialog.show();
-        lgdu = new LocationGDUtil(con, hd);
-        //启动定位
-        lgdu.onCreate();
-        tv_loaction.setOnClickListener(v -> {
-            if (!locationKey) {
-                customDialog.show();
-                lgdu.onCreate();
-            }
-        });
-
-        btnOk.setOnClickListener(v -> {
-            String s = etAddress.getText().toString();
-            if (TextUtils.isEmpty(selDate)){
-                ToastUtils.showToast(this,"请先选择时间");
-                return;
-            }
-            if (!TextUtils.isEmpty(s)&&s.length()>=4){
-
-                InputtipsQuery inputquery = new InputtipsQuery(s, "");
-//                inputquery.setCityLimit(true);
-                Inputtips inputTips = new Inputtips(this, inputquery);
-                inputTips.setInputtipsListener(this);
-                inputTips.requestInputtipsAsyn();
-
-
-//                GeocodeQuery query = new GeocodeQuery(s, "100000");// 第一个参数表示地址，第二个参数表示查询城市，中文或者中文全拼，citycode、adcode，
-//                geocoderSearch.getFromLocationNameAsyn(query);// 设置同步地理编码请求
-            }else{
-                ToastUtils.showToast(this,"请输入地址且长度大于4");
-            }
-        });
-
-        tvDate.setOnClickListener(v -> {
-
-            DatimePicker datimePicker = new DatimePicker(this);
-            datimePicker.setBodyWidth(300);
-            datimePicker.getWheelLayout().setRange(DatimeEntity.yearOnFuture(-1),DatimeEntity.yearOnFuture(10),DatimeEntity.now());
-            datimePicker.setOnDatimePickedListener((year, month, day, hour, minute, second) -> {
-                selDate = year+"-"+month+"-"+day+" "+ hour+":"+minute;
-                tvDate.setText(selDate);
-            });
-            datimePicker.getWheelLayout().setDateLabel("年", "月", "日");
-            datimePicker.getWheelLayout().setTimeLabel("时","分","");
-            datimePicker.getWheelLayout().setTimeMode(TimeMode.HOUR_24_NO_SECOND);
-            datimePicker.show();
-        });
-
-        hyr = new HuoYuanRequset(con, hd);
-    }
-
-    public void initData() {
-        //nfc初始化设置
-        NfcUtils nfcUtils = new NfcUtils(this);
-    }
-
-    @Override
-    public void initView(Object obj) {
-        super.initView(obj);
-        name_top.setText("上传" + names[index] + "照片");
-        name_body.setText(names[index] + "照片");
-        if (index == 1) {
-            tips.setVisibility(View.VISIBLE);
-            tips_x.setVisibility(View.VISIBLE);
-        }
-        submit.setOnClickListener(v -> {
-            if (imgIds.size() != 0) {
-                typeRequest();
-            } else {
-                Toast.makeText(con, "请先上传一张图片", Toast.LENGTH_SHORT).show();
-            }
-        });
-        getImg.setOnClickListener(v -> {
-            if (key) {
-                Log.e("--imgIds.size()--", imgIds.size() + "");
-                gia.showPopueWindow(this, true);
-            } else {
-                new XPopup.Builder(con)
-                        .asImageViewer(res_img, ub.getData().getUrl(), new SmartGlideImageLoader(R.mipmap.ic_launcher))
-                        .show();
-//                new XPopup.Builder(con)
-//                        .asImageViewer(res_img, ub.getData().getUrl(), true, -1, -1, 50, false,new CertificatesActivity.ImageLoader())
-//                        .show();
-                Toast.makeText(con, "查看了照片", Toast.LENGTH_SHORT).show();
-            }
-        });
-        img_delete.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                imgIds = new ArrayList<>();
-                ub = new UploadBean();
-                res_img.setVisibility(View.GONE);
-                img_delete.setVisibility(View.GONE);
-                img_icon.setVisibility(View.VISIBLE);
-                key = true;
-            }
-        });
-    }
-
-    String path;
-
-    @Override
-    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-        super.onActivityResult(requestCode, resultCode, data);
-        if (requestCode == 12 && resultCode == RESULT_OK) {
-            if (null == gia.getFile()) {
-                new ToastUtil(con, Gravity.CENTER, "图片选择失败").show(Toast.LENGTH_SHORT);
-                return;
-            }
-            path = gia.getFile().getPath();
-            Log.e("图片地址:", path);
-            gia.dis();
-            ImageFileCompressUtil.imageFileCompress(con, new File(path), hd);
-        } else if (requestCode == PictureConfig.CHOOSE_REQUEST && resultCode == RESULT_OK) {
-            List<LocalMedia> imgs = PictureSelector.obtainMultipleResult(data);
-            if (imgs != null && imgs.size() > 0) {
-                LocalMedia image = imgs.get(0);
-
-                String paths = image.getAndroidQToPath();
-                if (TextUtils.isEmpty(paths)) {
-                    paths = image.getPath();
-                }
-                path = paths;
-                Log.e("图片地址:", path);
-                gia.dis();
-                ImageFileCompressUtil.imageFileCompress(con, new File(path), hd);
-            }
-        }
-    }
-
-    public void initLocation() {
-        address.setText(lgdu.getAddress());
-    }
-
-    public void typeRequest() {
-//        for(int i=0;i<imgIds.size();i++){
-//            Log.e("--imgIds--",imgIds.get(i)+"");
-//        }
-        switch (index) {
-            case 0:
-                //装货
-                if (imgIds != null && imgIds.size() > 0) {
-                    lub.setLatitude(tempLoca.getLatitude() + "");
-                    lub.setLongitude(tempLoca.getLongitude() + "");
-                    lub.setLocationAddress(tempLoca.getAddress());
-                    lub.setImageId(imgIds);
-                    lub.setWaybillId(wid);
-                    Log.e("--装货信息", gson.toJson(lub));
-                    if (locationKey) {//高德定位
-                        if (keys) {
-                            nfc();
-                            loadInfo();
-//                            up_traffic_start();
-//                            up_image_z();
-                        }
-                    } else {
-                        Toast.makeText(con, "定位异常，请重新定位", Toast.LENGTH_SHORT).show();
-                    }
-
-                } else {
-                    Toast.makeText(con, "图片上传异常，请重新上传", Toast.LENGTH_SHORT).show();
-                }
-                break;
-            case 1:
-                if (imgIds != null && imgIds.size() > 0) {
-                    //卸货
-                    lub.setLatitude(tempLoca.getLatitude() + "");
-                    lub.setLongitude(tempLoca.getLongitude() + "");
-                    lub.setLocationAddress(tempLoca.getAddress());
-                    lub.setImageId(imgIds);
-                    lub.setWaybillId(wid);
-                    lub.setRealLoadTime(tempLoca.getTime());
-                    Log.e("--卸货信息", gson.toJson(lub));
-                    if (locationKey&&!TextUtils.isEmpty(tempLoca.address)) {
-                        if (keys) {
-                            nfc();
-                            uploadInfo();
-
-                        }
-
-                    } else {
-                        Toast.makeText(con, "定位异常，请重新定位", Toast.LENGTH_SHORT).show();
-                    }
-
-                } else {
-                    Toast.makeText(con, "图片上传异常，请重新上传", Toast.LENGTH_SHORT).show();
-                }
-                break;
-            case 2:
-                if (imgIds != null && imgIds.size() > 0) {//卸货回单
-                    //上传回单
-                    urib.setLatitude(lgdu.getLatitude() + "");
-                    urib.setLongitude(lgdu.getLongitude() + "");
-                    urib.setLocationAddress(lgdu.getAddress());
-                    //装卸货类型
-                    urib.setType(h_type + 1);
-                    //回单id 数组
-                    urib.setReceiptId(imgIds);
-                    //子运运单ID
-                    urib.setWaybillId(wid);
-                    Log.e("--回单信息", gson.toJson(urib));
-                    if (locationKey) {
-                        if (index == 2 && keys && !TextUtils.isEmpty(tempLoca.address)) {
-                            up_trafficSign();
-                            up_trafficReceipt();
-                            receipt_image();
-                        }
-                        hyr.receipt(urib);
-                    } else {
-                        Toast.makeText(con, "定位异常，请重新定位", Toast.LENGTH_SHORT).show();
-                    }
-                } else {
-                    Toast.makeText(con, "图片上传异常，请重新上传", Toast.LENGTH_SHORT).show();
-                }
-                break;
-            default:
-                break;
-        }
-    }
-
-    private StartOrderBean sob;
-
-    public void nfc() {
-//        if(sob.getData().getNfcId().equals(nfcStr)){
-//            Toast.makeText(con,"nfcId匹配失败",Toast.LENGTH_LONG).show();
-//        }
-        if ("".equals(sob.getData().getNfcId()) || sob.getData().getNfcId() == null) {
-            return;
-        }
-        MDPLocationCollectionManager.checkNfc(con, sob.getData().getShippingNoteNumber(),
-                sob.getData().getNfcId(), new OnResultListener() {
-                    @Override
-                    public void onSuccess() {
-                        Toast.makeText(con, "nfcId匹配成功", Toast.LENGTH_LONG).show();
-                    }
-
-                    @Override
-                    public void onFailure(String s, String s1) {
-                        Log.e("不匹配", "" + s + s1);
-                    }
-                });
-    }
-
-    //上传安联-签收
-    public void up_trafficSign() {
-        //安联
-        Location l = new Location();
-        l.setBaiduLongitude(tempLocaBd.longitude);
-        l.setBaiduLatitude(tempLocaBd.latitude);
-        l.setLocation(tempLocaBd.getAddress());
-        l.setTime(tempLocaBd.getTime());
-        List<Goods> gs = new ArrayList<>();
-        for (StartOrderBean.DataDTO.WayChildrenDTO wayChild : sob.getData().getWayChildren()) {
-            if (wid.equals(wayChild.getId() + "")) {
-                for (StartOrderBean.DataDTO.WayChildrenDTO.GoodsDTO good : wayChild.getGoods()) {
-                    Goods g = new Goods();
-                    g.setGoodsName(good.getGoodName());
-                    g.setUnit(good.getGoodUnit());
-                    g.setItemNo(good.getId());
-                    //实收
-                    g.setQuantity(1);
-                    //应收
-                    g.setReceivedQuantity(1);
-                    //破损
-                    g.setDamageQuantity(1);
-                    //丢失
-                    g.setQuantity(1);
-                }
-            }
-        }
-        MDPLocationCollectionManager.sign(con, sob.getData().getShippingNoteNumber(), l, gs, new OnResultListener() {
-            @Override
-            public void onSuccess() {
-                Log.e("上报安联", "签收成功");
-            }
-
-            @Override
-            public void onFailure(String s, String s1) {
-                Log.e("上报安联失败(签收):", s + s1);
-            }
-        });
-    }
-
-    //上传安联-回单
-    public void up_trafficReceipt() {
-        //安联
-        Location l = new Location();
-        l.setBaiduLongitude(tempLocaBd.longitude);
-        l.setBaiduLatitude(tempLocaBd.latitude);
-        l.setLocation(tempLocaBd.getAddress());
-        l.setTime(tempLocaBd.getTime());
-        MDPLocationCollectionManager.pod(con, sob.getData().getShippingNoteNumber(), l, new OnResultListener() {
-
-            @Override
-            public void onSuccess() {
-                Log.e("上报安联", "回单上传成功");
-            }
-
-            @Override
-            public void onFailure(String s, String s1) {
-                Log.e("上报安联失败(回单):", s + s1);
-            }
-
-        });
-    }
-
-    public void up_image_z() {
-        ///storage/emulated/0/Android/data/com.oneclouds.wangluohuoyun/files/Pictures/163124593063154.jpg
-        File file = new File(path);
-        Image image = new Image();
-        String base = BitmapUtil.imageToBase64(path);
-        image.setFileData("data:image/" + FileUtil.lastName(file) + ";base64," + base);
-        image.setFileExt(FileUtil.lastName(file));
-        image.setFileName(FileUtil.fileName(file));
-        image.setImageTakenDate(Timer.getTimerT());
-        image.setBaiduLongitude(tempLocaBd.longitude);
-        image.setBaiduLatitude(tempLocaBd.latitude);
-        image.setLocation(tempLocaBd.getAddress());
-        MDPLocationCollectionManager.uploadPickupImage(con, sob.getData().getShippingNoteNumber(), image, new OnResultListener() {
-
-            @Override
-            public void onSuccess() {
-                Log.e("上报安联", "装货照片上传成功");
-                Toast.makeText(con, "上传成功", Toast.LENGTH_SHORT).show();
-                finish();
-            }
-
-            @Override
-            public void onFailure(String s, String s1) {
-                Log.e("上报安联失败(装货照片):", s + s1);
-//              SPUtil.insSP(con,"make","装货",sob.getData().getShippingNoteNumber());
-//              SPUtil.insSP(con,"make","装货-"+sob.getData().getShippingNoteNumber(),gson.toJson(image));
-//              Intent serviceIn=new Intent(con, MakeUpAlService.class);
-//              startService(serviceIn);
-            }
-
-        });
-    }
-
-    public void up_image() {
-        File file = new File(path);
-        Image image = new Image();
-        String base = BitmapUtil.imageToBase64(path);
-        image.setFileData("data:image/" + FileUtil.lastName(file) + ";base64," + base);
-        image.setFileExt(FileUtil.lastName(file));
-        image.setFileName(FileUtil.fileName(file));
-        image.setImageTakenDate(tempLocaBd.getTime());
-        image.setBaiduLongitude(tempLocaBd.longitude);
-        image.setBaiduLatitude(tempLocaBd.latitude);
-        image.setLocation(tempLocaBd.getAddress());
-        MDPLocationCollectionManager.uploadUnloadImage(con, sob.getData().getShippingNoteNumber(), image, new OnResultListener() {
-
-            @Override
-            public void onSuccess() {
-                Log.e("上报安联", "卸货照片上传成功");
-                Toast.makeText(con, "上传成功", Toast.LENGTH_SHORT).show();
-                finish();
-            }
-
-            @Override
-            public void onFailure(String s, String s1) {
-                Log.e("上报安联失败(卸货照片):", s + s1);
-//                SPUtil.insSP(con,"make","卸货",sob.getData().getShippingNoteNumber());
-//                SPUtil.insSP(con,"make","卸货-"+sob.getData().getShippingNoteNumber(),gson.toJson(image));
-//                Intent serviceIn=new Intent(con, MakeUpAlService.class);
-//                startService(serviceIn);
-            }
-
-        });
-    }
-
-    public void receipt_image() {
-        ///storage/emulated/0/Android/data/com.oneclouds.wangluohuoyun/files/Pictures/163124593063154.jpg
-        File file = new File(path);
-        Image image = new Image();
-        String base = BitmapUtil.imageToBase64(path);
-        image.setFileData("data:image/" + FileUtil.lastName(file) + ";base64," + base);
-        image.setFileExt(FileUtil.lastName(file));
-        image.setFileName(FileUtil.fileName(file));
-        image.setImageTakenDate(tempLocaBd.getTime());
-        image.setBaiduLongitude(tempLocaBd.longitude);
-        image.setBaiduLatitude(tempLocaBd.latitude);
-        image.setLocation(tempLocaBd.getAddress());
-        MDPLocationCollectionManager.uploadPODImage(con, sob.getData().getShippingNoteNumber(), image, new OnResultListener() {
-
-            @Override
-            public void onSuccess() {
-                Log.e("上报安联", "回单照片上传成功");
-                Toast.makeText(con, "上传成功", Toast.LENGTH_SHORT).show();
-                finish();
-            }
-
-            @Override
-            public void onFailure(String s, String s1) {
-                Log.e("上报安联失败(回单照片):", s + s1);
-//                SPUtil.insSP(con,"make","回单",sob.getData().getShippingNoteNumber());
-////                SPUtil.insSP(con,"make","回单-"+sob.getData().getShippingNoteNumber(),gson.toJson(image));
-////                Intent serviceIn=new Intent(con, MakeUpAlService.class);
-////                startService(serviceIn);
-            }
-
-        });
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-        //开启前台调度系统
-        //NfcUtils.mNfcAdapter.enableForegroundDispatch(this, NfcUtils.mPendingIntent, NfcUtils.mIntentFilter, NfcUtils.mTechList);
-    }
-
-    @Override
-    protected void onPause() {
-        super.onPause();
-        //关闭前台调度系统
-        //NfcUtils.mNfcAdapter.disableForegroundDispatch(this);
-    }
-
-    String nfcStr = "";
-
-    @Override
-    protected void onNewIntent(Intent intent) {
-        super.onNewIntent(intent);
-        //当该Activity接收到NFC标签时，运行该方法
-        //调用工具方法，读取NFC数据
-        try {
-            nfcStr = NfcUtils.readNFCId(intent);
-        } catch (UnsupportedEncodingException e) {
-            e.printStackTrace();
-        }
-        Log.e("nfc", nfcStr);
-    }
-
-
-
-
-    /**
-     * 上传安联和交通厅,平台-装货
-     */
-    private void loadInfo() {
-        //安联
-        if (sob.getData().getReportAlct() == 1) {
-            Location l = new Location();
-            l.setBaiduLongitude(tempLocaBd.longitude);
-            l.setBaiduLatitude(tempLocaBd.latitude);
-            l.setLocation(tempLocaBd.getAddress());
-            l.setTime(tempLocaBd.getTime());
-            MDPLocationCollectionManager.pickup(con, sob.getData().getShippingNoteNumber(), l, new OnResultListener() {
-                @Override
-                public void onSuccess() {
-                    Log.e("上报安联", "装货上传成功");
-                    //交通厅
-                    if (sob.getData().getReport() == 1) {
-                        JTTProcess.start(con, sob, "");
-                    }
-                    //装货状态
-                    hyr.loading(lub);
-                    //装货照片
-                    up_image_z();
-                }
-
-                @Override
-                public void onFailure(String s, String s1) {
-                    Log.e("上报安联失败(装货):", s + s1);
-                    new MessageUtils().showCenMessage(con, s1);
-                }
-            });
-        }
-
-    }
-
-    /**
-     * 上传安联和交通厅，平台-卸货
-     */
-    private void uploadInfo() {
-
-        //安联
-        if (sob.getData().getReportAlct() == 1) {
-            Location l = new Location();
-            l.setBaiduLongitude(tempLocaBd.longitude);
-            l.setBaiduLatitude(tempLocaBd.latitude);
-            l.setLocation(tempLocaBd.getAddress());
-            l.setTime(tempLocaBd.getTime());
-            Log.e("-安联卸货信息-", gson.toJson(l));
-            MDPLocationCollectionManager.unload(con, sob.getData().getShippingNoteNumber(), l, new OnResultListener() {
-                @Override
-                public void onSuccess() {
-                    Log.e("上报安联", "卸货上传成功");
-                    //交通厅
-                    if (sob.getData().getReport() == 1) {
-                        JTTProcess.stop(con, sob, "");
-                    }
-                    //卸货状态-平台
-                    hyr.dischargeCargo4(lub);
-                    //卸货照片-安联
-                    up_image();
-                }
-
-                @Override
-                public void onFailure(String s, String s1) {
-                    Log.e("上报安联失败(卸货):", s + s1);
-//                    new MessageUtils().showCenMessage(con, s1);
-                    //运单状态不一致，平台更新状态
-                    hyr.dischargeCargo4(lub);
-                }
-            });
-        }
-
-
-    }
-
-}

app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/login/LoginActivity.java

@@ -1,14 +1,8 @@
 package com.arpa.hndahesudintocctmsdriver.ui.login;
 
-import android.content.Context;
 import android.content.Intent;
-import android.net.wifi.WifiManager;
-import android.os.Build;
 import android.os.Bundle;
 import android.os.Message;
-import android.provider.Settings;
-import android.telecom.TelecomManager;
-import android.telephony.TelephonyManager;
 import android.text.SpannableStringBuilder;
 import android.text.TextPaint;
 import android.text.method.LinkMovementMethod;
@@ -16,8 +10,6 @@ import android.text.style.ClickableSpan;
 import android.util.Log;
 import android.view.View;
 import android.widget.Button;
-import android.widget.CheckBox;
-import android.widget.CompoundButton;
 import android.widget.EditText;
 import android.widget.ImageButton;
 import android.widget.TextView;
@@ -26,7 +18,6 @@ import android.widget.Toast;
 import androidx.annotation.Nullable;
 import androidx.cardview.widget.CardView;
 
-import com.arpa.hndahesudintocctmsdriver.bean.AppInfoBean;
 import com.arpa.hndahesudintocctmsdriver.parts.ConfigParts;
 import com.arpa.hndahesudintocctmsdriver.request.net.BaseObserver;
 import com.arpa.hndahesudintocctmsdriver.request.net.DataManager;
@@ -47,7 +38,6 @@ import com.arpa.hndahesudintocctmsdriver.util.http.RequsetCodeConstants;
 import com.arpa.hndahesudintocctmsdriver.util.statusbar.StatusBarUtil;
 import com.arpa.hndahesudintocctmsdriver.util.view.BaseActivity;
 
-import java.util.Locale;
 import java.util.TimerTask;
 
 import cn.jiguang.verifysdk.api.AuthPageEventListener;
@@ -74,7 +64,8 @@ public class LoginActivity extends BaseActivity {
     private LoginBean loginBean;
     private TimerTask tt;
     private int timer_sum = 60;
-    private CheckBox cb;
+    private ImageButton agree_btn;
+    private CardView no_btn;
     private UserRequset ur;
 
     @Override
@@ -97,22 +88,15 @@ public class LoginActivity extends BaseActivity {
                     //存储登录记录
                     loginBean = new Gson().fromJson(CacheGroup.cacheList.get(LOGIN_RESULT), LoginBean.class);
                     Log.e("--登录信息--", new Gson().toJson(loginBean));
-                    AppInfoBean appInfoBean = new AppInfoBean();
                     if (loginBean.getCode() == 200) {
                         SPUtil.insSP(con, USER, USER_TOKEN, loginBean.getData().getToken());
                         SPUtil.insSP(con, USER, USER_UNAME, loginBean.getData().getUname());
                         SPUtil.insSP(con, USER, USER_RNAME, loginBean.getData().getRname());
                         SPUtil.insSP(con, USER, USER_ID, loginBean.getData().getId() + "");
                         JPushInterface.setAlias(con, 0, loginBean.getData().getUname());
-                        appInfoBean.setStatus("0");
-                        appInfoBean.setUserPhone(String.valueOf(input_phone.getText()));
-                        ur.postAppInfo(appInfoBean,"post");
                         UiAuxiliary.homeRequest("登录成功");
                         finish();
                     } else {
-                        appInfoBean.setStatus("1");
-                        appInfoBean.setUserPhone(String.valueOf(input_phone.getText()));
-                        ur.postAppInfo(appInfoBean,"post");
                         Toast.makeText(con, loginBean.getMsg(), Toast.LENGTH_SHORT).show();
                     }
                     CacheGroup.cacheList.remove(LOGIN_RESULT);
@@ -134,7 +118,8 @@ public class LoginActivity extends BaseActivity {
         input_phone = findViewById(R.id.input_phone);
         input_code = findViewById(R.id.input_code);
         getCode = findViewById(R.id.getCode);
-        cb = findViewById(R.id.cb);
+        agree_btn = findViewById(R.id.agree_btn);
+        no_btn = findViewById(R.id.no_btn);
         ur = new UserRequset(con, hd);
         initView(null);
     }
@@ -147,18 +132,21 @@ public class LoginActivity extends BaseActivity {
     @Override
     public void initView(Object obj) {
         super.initView(obj);
-        cb.setOnCheckedChangeListener((buttonView, isChecked) -> {
-            if (isChecked) {
-                key = true;
-            } else {
-                key = false;
-            }
+        agree_btn.setOnClickListener(v -> {
+            agree_btn.setVisibility(View.GONE);
+            no_btn.setVisibility(View.VISIBLE);
+            key = false;
         });
+        no_btn.setOnClickListener(v -> {
+            agree_btn.setVisibility(View.VISIBLE);
+            no_btn.setVisibility(View.GONE);
+            key = true;
 
+        });
         ConfigBean cb = ConfigParts.getConfigParts(con);
         if (cb != null) {
             url1 = cb.getData().getUserUrl();
-            url2 = "https://agreement.dahehuoyun.com/currency/#/";
+            url2 = "https://agreement.dahehuoyun.com/huawei/#/private";
         }
         TextView tv_content = findViewById(R.id.tv_content);
         String str = "我已阅读并同意相关服务条款和隐私政策《用户服务协议》和《隐私政策》";

app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/login/WelcomeActivity.java

@@ -30,12 +30,10 @@ import androidx.core.app.ActivityCompat;
 
 import com.alct.mdp.MDPLocationCollectionManager;
 import com.arpa.hndahesudintocctmsdriver.BuildConfig;
-import com.arpa.hndahesudintocctmsdriver.bean.AppInfoBean;
 import com.arpa.hndahesudintocctmsdriver.bean.ImageConfig;
 import com.arpa.hndahesudintocctmsdriver.parts.ConfigParts;
 import com.arpa.hndahesudintocctmsdriver.report.JTTProcess;
 import com.arpa.hndahesudintocctmsdriver.request.UserRequset;
-import com.arpa.hndahesudintocctmsdriver.ui.UiAuxiliary;
 import com.arpa.hndahesudintocctmsdriver.ui.business.BusinessActivity;
 import com.arpa.hndahesudintocctmsdriver.util.SPUtils;
 import com.arpa.hndahesudintocctmsdriver.util.cache.CacheGroup;
@@ -140,8 +138,8 @@ public class WelcomeActivity extends BaseAppCompatActivity {
             new XPopup.Builder(con)
                     .dismissOnBackPressed(false)
                     .dismissOnTouchOutside(false)
-                    .asCustom(new AgreementAlert(con, "http://agreement.dahehuoyun.com/currency/#/",
-                            "http://agreement.dahehuoyun.com/rule/serviceAgreement/dist/index.html#/", hd))
+                    .asCustom(new AgreementAlert(con, "https://agreement.dahehuoyun.com/huawei/#/private",
+                            "http://agreement.dahehuoyun.com/#/user", hd))
                     .show();
         }
         Glide.with(con)
@@ -161,16 +159,6 @@ public class WelcomeActivity extends BaseAppCompatActivity {
                 initRequest();
             }
         }, 1000);
-        AppInfoBean appInfoBean = new AppInfoBean();
-
-        if (!UiAuxiliary.isLogin(con)) {
-            ur.postAppInfo(appInfoBean, "post");
-        }else{
-            String sp = SPUtil.getSP(con, LoginActivity.USER, LoginActivity.USER_UNAME);
-            appInfoBean.setUserPhone(sp);
-            appInfoBean.setStatus("0");
-            ur.postAppInfo(appInfoBean, "post");
-        }
 
 //        String[] permissions=new String[]{
 //                Manifest.permission.ACCESS_FINE_LOCATION,

app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/my/MyFragment.java

@@ -18,7 +18,6 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import com.arpa.hndahesudintocctmsdriver.event.PersonEvent;
-import com.arpa.hndahesudintocctmsdriver.event.RefreshCarListEvent;
 import com.arpa.hndahesudintocctmsdriver.event.VehicleEvent;
 import com.arpa.hndahesudintocctmsdriver.parts.ConfigParts;
 import com.arpa.hndahesudintocctmsdriver.parts.StartOrderParts;
@@ -64,32 +63,32 @@ public class MyFragment extends BaseFragment {
     private UserBean userBean;
     private StartOrderBean sob;
     private CarListBean clb;
-    private Gson gson = new Gson();
+    private Gson gson=new Gson();
     private UserRequset ur;
 
     @Override
     public void msgMethod(Message m) {
         super.msgMethod(m);
-        switch (m.what) {
+        switch (m.what){
             case 200:
                 refreshLayout.finishRefresh();
-                if (CacheGroup.cacheList.get(WoDeFragment.VEHICLE_LIST) != null) {
-                    clb = gson.fromJson(CacheGroup.cacheList.get(WoDeFragment.VEHICLE_LIST), CarListBean.class);
-                    if (clb.getCode() == 200) {
+                if(CacheGroup.cacheList.get(WoDeFragment.VEHICLE_LIST)!=null){
+                    clb=gson.fromJson(CacheGroup.cacheList.get(WoDeFragment.VEHICLE_LIST),CarListBean.class);
+                    if(clb.getCode()==200){
                         initVehicleList(true);
-                    } else {
-                        Toast.makeText(con, clb.getRes(), Toast.LENGTH_LONG).show();
+                    }else{
+                        Toast.makeText(con,clb.getRes(),Toast.LENGTH_LONG).show();
                         initVehicleList(false);
                     }
                     CacheGroup.cacheList.remove(WoDeFragment.VEHICLE_LIST);
                 }
-                if (CacheGroup.cacheList.get("userdata") != null) {
-                    userBean = gson.fromJson(CacheGroup.cacheList.get("userdata"), UserBean.class);
-                    if (userBean.getCode() == 200) {
-                        SPUtil.insSP(con, "data", "userdata", CacheGroup.cacheList.get("userdata"));
+                if (CacheGroup.cacheList.get("userdata")!=null){
+                    userBean=gson.fromJson(CacheGroup.cacheList.get("userdata"), UserBean.class);
+                    if(userBean.getCode()==200 ){
+                        SPUtil.insSP(con,"data","userdata",CacheGroup.cacheList.get("userdata"));
                         initAuth();
-                    } else {
-                        Toast.makeText(con, userBean.getMsg(), Toast.LENGTH_SHORT).show();
+                    }else{
+                        Toast.makeText(con,userBean.getMsg(),Toast.LENGTH_SHORT).show();
                     }
                     CacheGroup.cacheList.remove("userdata");
                 }
@@ -101,12 +100,12 @@ public class MyFragment extends BaseFragment {
     @org.jetbrains.annotations.Nullable
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable @org.jetbrains.annotations.Nullable ViewGroup container, @Nullable @org.jetbrains.annotations.Nullable Bundle savedInstanceState) {
-        root = inflater.inflate(R.layout.fragment_my, container, false);
-        con = root.getContext();
-        brv = root.findViewById(R.id.rv);
+        root=inflater.inflate(R.layout.fragment_my,container,false);
+        con=root.getContext();
+        brv=root.findViewById(R.id.rv);
         EventBus.getDefault().register(this);
-        userBean = UserParts.getUser(con);
-        ur = new UserRequset(con, hd);
+        userBean= UserParts.getUser(con);
+        ur=new UserRequset(con,hd);
         getRequest();
         initId();
         initRefreshLoad();
@@ -115,7 +114,7 @@ public class MyFragment extends BaseFragment {
     }
 
     public void initRefreshLoad() {
-        refreshLayout = root.findViewById(R.id.srl);
+        refreshLayout =root.findViewById(R.id.srl);
         refreshLayout.setOnRefreshListener(refreshLayout -> {
             getRequest();
         });
@@ -124,7 +123,7 @@ public class MyFragment extends BaseFragment {
     @Override
     public void initView(Object obj) {
         super.initView(obj);
-        brv_vehicle = root.findViewById(R.id.brv_vehicle);
+        brv_vehicle=root.findViewById(R.id.brv_vehicle);
         ur.vehicleList("1");
     }
 
@@ -132,85 +131,83 @@ public class MyFragment extends BaseFragment {
     //执行中订单
 
     //车辆信息
-    public void initVehicleList(boolean isSuccess) {
+    public void initVehicleList(boolean isSuccess){
         //车辆信息
-        List<ManyBean> list_vehicle = new ArrayList<>();
+        List<ManyBean> list_vehicle=new ArrayList<>();
         for (CarListBean.DataDTO datum : clb.getData()) {
-            list_vehicle.add(new ManyBean(datum, R.layout.my_item_vehicle));
+            list_vehicle.add(new ManyBean(datum,R.layout.my_item_vehicle));
         }
-        if (list_vehicle.size() == 0) {
-            list_vehicle.add(new ManyBean(new Model(), R.layout.my_item_vehicle_null));
+        if(list_vehicle.size()==0){
+            list_vehicle.add(new ManyBean(new Model(),R.layout.my_item_vehicle_null));
         }
-        brv_vehicle.creates(con, list_vehicle).setOnItemViewListener((position, o, v, layout) -> {
-            switch (layout) {
+        brv_vehicle.creates(con,list_vehicle).setOnItemViewListener((position, o, v, layout) -> {
+            switch (layout){
                 case R.layout.my_item_vehicle:
-                    CarListBean.DataDTO cd = (CarListBean.DataDTO) o;
-                    View br = v.findViewById(R.id.br);
-                    if (position == (clb.getData().size() - 1) && position != 2) {
-                        LinearLayout add_box = v.findViewById(R.id.add_box);
-                        TextView add_no = v.findViewById(R.id.add_no);
+                    CarListBean.DataDTO cd= (CarListBean.DataDTO) o;
+                    View br=v.findViewById(R.id.br);
+                    if(position==(clb.getData().size()-1) && position!=2){
+                        LinearLayout add_box=v.findViewById(R.id.add_box);
+                        TextView add_no=v.findViewById(R.id.add_no);
                         add_no.setVisibility(View.GONE);
                         add_box.setVisibility(View.VISIBLE);
                         br.setVisibility(View.GONE);
                         add_box.setOnClickListener(v1 -> {
-                            Intent in = new Intent(con, VehicleAuthActivity.class);
-                            in.putExtra("carId", "");
+                            Intent in=new Intent(con, VehicleAuthActivity.class);
+                            in.putExtra("carId","");
                             startActivity(in);
                         });
                     }
                     v.setOnClickListener(v1 -> {
-                        Intent in = new Intent(con, VehicleAuthActivity.class);
-                        in.putExtra("carId", cd.getCarId());
+                        Intent in=new Intent(con, VehicleAuthActivity.class);
+                        in.putExtra("carId",cd.getCarId());
                         startActivity(in);
                     });
                     break;
                 case R.layout.my_item_vehicle_null:
                     v.setOnClickListener(v12 -> {
-                        Intent in = new Intent(con, VehicleAuthActivity.class);
-                        in.putExtra("carId", "");
+                        Intent in=new Intent(con, VehicleAuthActivity.class);
+                        in.putExtra("carId","");
                         startActivity(in);
                     });
                     break;
-                default:
-                    break;
+                default:break;
             }
         });
     }
 
-    class Model {
-    }
+    class Model{ }
 
-    public void getRequest() {
-        sob = StartOrderParts.getStartOrder(con);
+    public void getRequest(){
+        sob= StartOrderParts.getStartOrder(con);
         ur.User();
         ur.vehicleList("1");
     }
 
-    private LinearLayout onGetUser, onAllOrder, onAuth, onDriverHome;
-    private ImageView onContact, onOpinion, onUpdate, onSetUp;
-    private TextView name, phone;
-    private ImageView dang_auth, no_auth, name_auth;
+    private LinearLayout onGetUser,onAllOrder,onAuth,onDriverHome;
+    private ImageView onContact,onOpinion,onUpdate,onSetUp;
+    private TextView name,phone;
+    private ImageView dang_auth,no_auth,name_auth;
     private LinearLayout auth_box;
     private ImageView img_head;
 
-    public void initId() {
+    public void initId(){
         //
-        name = root.findViewById(R.id.name);
-        phone = root.findViewById(R.id.phone);
-        dang_auth = root.findViewById(R.id.dang_auth);
-        no_auth = root.findViewById(R.id.no_auth);
-        name_auth = root.findViewById(R.id.name_auth);
-        auth_box = root.findViewById(R.id.auth_box);
+        name=root.findViewById(R.id.name);
+        phone=root.findViewById(R.id.phone);
+        dang_auth=root.findViewById(R.id.dang_auth);
+        no_auth=root.findViewById(R.id.no_auth);
+        name_auth=root.findViewById(R.id.name_auth);
+        auth_box=root.findViewById(R.id.auth_box);
         //
-        onGetUser = root.findViewById(R.id.onGetUser);
-        onAllOrder = root.findViewById(R.id.onAllOrder);
-        onAuth = root.findViewById(R.id.onAuth);
-        onDriverHome = root.findViewById(R.id.onDriverHome);
-        onContact = root.findViewById(R.id.onContact);
-        onOpinion = root.findViewById(R.id.onOpinion);
-        onUpdate = root.findViewById(R.id.onUpdate);
-        onSetUp = root.findViewById(R.id.onSetUp);
-        img_head = root.findViewById(R.id.img_head);
+        onGetUser=root.findViewById(R.id.onGetUser);
+        onAllOrder=root.findViewById(R.id.onAllOrder);
+        onAuth=root.findViewById(R.id.onAuth);
+        onDriverHome=root.findViewById(R.id.onDriverHome);
+        onContact=root.findViewById(R.id.onContact);
+        onOpinion=root.findViewById(R.id.onOpinion);
+        onUpdate=root.findViewById(R.id.onUpdate);
+        onSetUp=root.findViewById(R.id.onSetUp);
+        img_head=root.findViewById(R.id.img_head);
         //认证
         no_auth.setOnClickListener(v -> startActivity(new Intent(con, PersonalAuthActivity.class)));
         //用户信息
@@ -225,27 +222,27 @@ public class MyFragment extends BaseFragment {
                     .permissions(Manifest.permission.ACCESS_BACKGROUND_LOCATION)
                     .request((allGranted, grantedList, deniedList) -> {
                         if (allGranted) {
-                            Intent in = new Intent(con, BusinessActivity.class);
-                            in.putExtra("type", "餐饮");
+                            Intent in=new Intent(con, BusinessActivity.class);
+                            in.putExtra("type","餐饮");
                             startActivity(in);
                         } else {
-                            Toast.makeText(getContext(), "请先开启定位权限", Toast.LENGTH_LONG).show();
+                            Toast.makeText(getContext(),"请先开启定位权限",Toast.LENGTH_LONG).show();
                         }
                     });
         });
         //联系我们
         onContact.setOnClickListener(v -> {
-            String serviceMobile = "";
-            if (ConfigParts.getConfigParts(con) != null) {
-                serviceMobile = ConfigParts.getConfigParts(con).getData().getServiceMobile();
-                serviceMobile = StringUtil.isNull(serviceMobile, "");
+            String serviceMobile="";
+            if(ConfigParts.getConfigParts(con)!=null){
+                serviceMobile=ConfigParts.getConfigParts(con).getData().getServiceMobile();
+                serviceMobile=StringUtil.isNull(serviceMobile,"");
             }
-            String[] title = {"平台客服:" + serviceMobile};
-            String[] value = {serviceMobile};
+            String[] title={"平台客服:"+serviceMobile};
+            String[] value={serviceMobile};
             new XPopup.Builder(con)
                     .isDarkTheme(false)
                     .isDestroyOnDismiss(true) //对于只使用一次的弹窗，推荐设置这个
-                    .asCenterList("请选择", title,
+                    .asCenterList("请选择",title,
                             (position1, text) -> {
                                 Intent intent = new Intent(Intent.ACTION_DIAL);
                                 Uri data = Uri.parse("tel:" + value[position1]);
@@ -256,36 +253,36 @@ public class MyFragment extends BaseFragment {
         });
         //咨询建议
         onOpinion.setOnClickListener(v -> {
-            Intent in = new Intent(con, WebActivity.class);
-            in.putExtra("title", "咨询建议");
-            in.putExtra("url", "");
+            Intent in=new Intent(con, WebActivity.class);
+            in.putExtra("title","咨询建议");
+            in.putExtra("url","");
             startActivity(in);
         });
         //检查更新
-        onUpdate.setOnClickListener(v -> Toast.makeText(con, "当前已经是最新版本", Toast.LENGTH_LONG).show());
+        onUpdate.setOnClickListener(v -> Toast.makeText(con,"当前已经是最新版本",Toast.LENGTH_LONG).show());
         //系统设置
         onSetUp.setOnClickListener(v -> startActivity(new Intent(con, SetupActivity.class)));
     }
 
-    public void initAuth() {
-        if (userBean.getData() != null) {
-            name.setText(StringUtil.isNull(userBean.getData().getUname(), "未实名"));
-            phone.setText(StringUtil.isNull(userBean.getData().getRname(), ""));
-            if (2 == userBean.getData().getPartyMemberStatus()) {
+    public void initAuth(){
+        if(userBean.getData()!=null){
+            name.setText(StringUtil.isNull(userBean.getData().getUname(),"未实名"));
+            phone.setText(StringUtil.isNull(userBean.getData().getRname(),""));
+            if(2==userBean.getData().getPartyMemberStatus()){
 
             }
-            if ("1".equals(userBean.getData().getRealAuthentication())) {
+            if("1".equals(userBean.getData().getRealAuthentication())){
 
-            } else {
+            }else{
 
             }
-            if (!"".equals(userBean.getData().getHeadportraitUrl())) {
+            if (!"".equals(userBean.getData().getHeadportraitUrl())){
                 Glide.with(con).load(userBean.getData().getHeadportraitUrl()).into(img_head);
             }
-            if (userBean != null && 100003 == userBean.getData().getAuditStatus()) {
+            if(userBean!=null && 100003==userBean.getData().getAuditStatus()){
                 auth_box.setVisibility(View.GONE);
                 no_auth.setVisibility(View.GONE);
-            } else {
+            }else{
                 auth_box.setVisibility(View.GONE);
                 no_auth.setVisibility(View.VISIBLE);
             }
@@ -293,19 +290,12 @@ public class MyFragment extends BaseFragment {
     }
 
     @Subscribe
-    public void processResult(VehicleEvent event) {
-        Log.e("-msg-", event.getMessage());
-        if (!"挂".equals(event.getMessage())) {
+    public void  processResult(VehicleEvent event) {
+        Log.e("-msg-",event.getMessage());
+        if(!"挂".equals(event.getMessage())) {
             ur.vehicleList("1");
         }
     }
-
-    @Subscribe
-    public void refreshCarListEvent(RefreshCarListEvent event) {
-        Log.e("-msg-", event.getMessage());
-        ur.vehicleList("1");
-    }
-
     @Subscribe
     public void personResult(PersonEvent home) {
         Log.e("-res-", home.getMessage());

app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/my/SetupActivity.java

@@ -35,7 +35,7 @@ public class SetupActivity extends BaseActivity {
     String url2="";
     String url3="";
     String kefu="";
-    private RelativeLayout r1,r2,r3,r4,r5,r6,r7,r8;
+    private RelativeLayout r1,r2,r3,r4,r5,r6,r7;
 
     @Override
     public void msgMethod(Message m) {
@@ -73,9 +73,8 @@ public class SetupActivity extends BaseActivity {
         ConfigBean cb= ConfigParts.getConfigParts(con);
         if(cb!=null){
 //            url1=cb.getData().getUserUrl();
-            url1="http://agreement.dahehuoyun.com/rule/serviceAgreement/dist/index.html#/";
-//            url2=cb.getData().getPrivateUrl();
-            url2="http://agreement.dahehuoyun.com/currency/#/";
+            url1="https://agreement.dahehuoyun.com/huawei/#/private";
+            url2=cb.getData().getPrivateUrl();
             kefu=cb.getData().getServiceMobile();
             url3=cb.getData().getSecurityUrl();
         }
@@ -86,7 +85,6 @@ public class SetupActivity extends BaseActivity {
         r5=findViewById(R.id.r5);
         r6=findViewById(R.id.r6);
         r7=findViewById(R.id.r7);
-        r8=findViewById(R.id.r8);
         ur=new UserRequset(con,hd);
         initView(null);
     }
@@ -120,15 +118,9 @@ public class SetupActivity extends BaseActivity {
                 in.putExtra("url","https://smlt.esign.cn/hmfbZoeeGQqv");
                 startActivity(in);
             });
-            r8.setOnClickListener(v12 -> {
-                Intent in=new Intent(con,WebActivity.class);
-                in.putExtra("title","交易规则");
-                in.putExtra("url","http://agreement.dahehuoyun.com/rule/transactionRules/dist/index.html#/");
-                startActivity(in);
-            });
             r6.setOnClickListener(v12 -> {
-                String[] title={"平台客服:"+kefu};
-                String[] value={kefu};
+                String[] title={"平台客服:"+kefu,"银行客服:95528","技术咨询:13460042961"};
+                String[] value={kefu,"95528","13460042961"};
                 new XPopup.Builder(con)
                         .isDarkTheme(false)
                         .isDestroyOnDismiss(true) //对于只使用一次的弹窗，推荐设置这个

app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/wallet/UpBankActivity.java

@@ -5,7 +5,6 @@ import android.os.Bundle;
 import android.os.Message;
 import android.text.TextUtils;
 import android.util.Log;
-import android.view.View;
 import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.TextView;
@@ -13,8 +12,6 @@ import android.widget.Toast;
 
 import androidx.annotation.Nullable;
 
-import com.arpa.hndahesudintocctmsdriver.weight.OnLimitClickHelper;
-import com.arpa.hndahesudintocctmsdriver.weight.OnLimitClickListener;
 import com.bumptech.glide.Glide;
 import com.google.gson.Gson;
 import com.arpa.hndahesudintocctmsdriver.R;
@@ -43,13 +40,13 @@ import java.util.List;
  * @date 2021/8/26 19:06
  * @description:
  */
-public class UpBankActivity extends BaseAppCompatActivity implements OnLimitClickListener {
+public class UpBankActivity extends BaseAppCompatActivity {
 
     private ImageView up_bank_img;
-    private EditText bank_name, bank_number;
+    private EditText bank_name,bank_number;
     private TextView submit;
     private ImageView return_btn;
-    public GetImageAlert gia = new GetImageAlert();
+    public GetImageAlert gia=new GetImageAlert();
     String path;
     private OCRBankBean ib;
     private WalletRequest qr;
@@ -58,36 +55,35 @@ public class UpBankActivity extends BaseAppCompatActivity implements OnLimitClic
     @Override
     public void msgMethod(Message m) {
         super.msgMethod(m);
-        switch (m.what) {
+        switch (m.what){
             case RequsetCodeConstants.SUCCESS:
-                if (CacheGroup.cacheList.get("OCR_BANK") != null) {
-                    ib = new Gson().fromJson(CacheGroup.cacheList.get("OCR_BANK"), OCRBankBean.class);
-                    if (ib.getCode() == 200) {
+                if (CacheGroup.cacheList.get("OCR_BANK")!=null) {
+                    ib=new Gson().fromJson(CacheGroup.cacheList.get("OCR_BANK"),OCRBankBean.class);
+                    if(ib.getCode()==200){
                         initView(null);
                         customDialog.dismiss();
-                        WalletFragment.isInsBank = true;
-                    } else {
-                        Toast.makeText(con, ib.getMsg(), Toast.LENGTH_SHORT).show();
+                        WalletFragment.isInsBank=true;
+                    }else{
+                        Toast.makeText(con,ib.getMsg(),Toast.LENGTH_SHORT).show();
                     }
                     CacheGroup.cacheList.remove("OCR_BANK");
                 }
-                if (CacheGroup.cacheList.get("insBank") != null) {
-                    BaseBean bb = new Gson().fromJson(CacheGroup.cacheList.get("insBank"), BaseBean.class);
-                    if (bb.getCode() == 200) {
-                        customDialog.dismiss();
-                        Toast.makeText(con, "绑定成功", Toast.LENGTH_SHORT).show();
+                if(CacheGroup.cacheList.get("insBank")!=null){
+                    BaseBean bb=new Gson().fromJson(CacheGroup.cacheList.get("insBank"),BaseBean.class);
+                    if(bb.getCode()==200){
+                        Toast.makeText(con,"绑定成功",Toast.LENGTH_SHORT).show();
                         finish();
-                    } else {
-                        Toast.makeText(con, bb.getMsg(), Toast.LENGTH_SHORT).show();
+                    }else{
+                        Toast.makeText(con,bb.getMsg(),Toast.LENGTH_SHORT).show();
                     }
                     CacheGroup.cacheList.remove("insBank");
                 }
                 break;
             case ImageFileCompressUtil.COMPRESS_SUCCESS:
-                customDialog = new CustomDialog(con, "上传识别中...");
+                customDialog=new CustomDialog(con, "上传识别中...");
                 customDialog.show();
                 path = (String) m.obj;
-                new OCRRequest().ORCBank(con, hd, new File(path));
+                new OCRRequest().ORCBank(con,hd,new File(path));
                 break;
         }
     }
@@ -99,18 +95,24 @@ public class UpBankActivity extends BaseAppCompatActivity implements OnLimitClic
         super.onCreate(savedInstanceState);
         StateStyleUtil.stateTextColor(this);
         setContentView(R.layout.activity_bank_auth);
-        act = this;
-        con = this;
-        up_bank_img = findViewById(R.id.up_bank_img);
-        bank_name = findViewById(R.id.bank_name);
-        bank_number = findViewById(R.id.bank_number);
-        submit = findViewById(R.id.submit);
-        return_btn = findViewById(R.id.return_btn);
-        qr = new WalletRequest(con, hd);
+        act=this;
+        con=this;
+        up_bank_img=findViewById(R.id.up_bank_img);
+        bank_name=findViewById(R.id.bank_name);
+        bank_number=findViewById(R.id.bank_number);
+        submit=findViewById(R.id.submit);
+        return_btn=findViewById(R.id.return_btn);
+        qr=new WalletRequest(con,hd);
         up_bank_img.setOnClickListener(v -> {
             gia.showPopueWindow(this);
         });
-        submit.setOnClickListener(new OnLimitClickHelper(this));
+        submit.setOnClickListener(v -> {
+            if(ib!=null){
+                submit();
+            }else{
+                Toast.makeText(con,"请先上传图片",Toast.LENGTH_SHORT).show();
+            }
+        });
         return_btn.setOnClickListener(v -> {
             finish();
         });
@@ -127,11 +129,11 @@ public class UpBankActivity extends BaseAppCompatActivity implements OnLimitClic
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
-        if (requestCode == 12 && resultCode == RESULT_OK) {
-            path = gia.getFile().getPath();
-            Log.e("图片地址:", path);
+         if (requestCode == 12 && resultCode == RESULT_OK) {
+            path=gia.getFile().getPath();
+            Log.e("图片地址:",path);
             gia.dis();
-            ImageFileCompressUtil.imageFileCompress(con, new File(path), hd);
+            ImageFileCompressUtil.imageFileCompress(con,new File(path),hd);
         } else if (requestCode == PictureConfig.CHOOSE_REQUEST && resultCode == RESULT_OK) {
             List<LocalMedia> imgs = PictureSelector.obtainMultipleResult(data);
             if (imgs != null && imgs.size() > 0) {
@@ -141,43 +143,29 @@ public class UpBankActivity extends BaseAppCompatActivity implements OnLimitClic
                 if (TextUtils.isEmpty(paths)) {
                     paths = image.getPath();
                 }
-                path = paths;
-                Log.e("图片地址:", path);
+                path=paths;
+                Log.e("图片地址:",path);
                 gia.dis();
-                ImageFileCompressUtil.imageFileCompress(con, new File(path), hd);
+                ImageFileCompressUtil.imageFileCompress(con,new File(path),hd);
             }
         }
     }
 
-    public void submit() {
-        customDialog = new CustomDialog(con, "上传中,请稍后...");
-        customDialog.show();
-        String bankName = bank_name.getText().toString().trim();
-        String bankNumber = bank_number.getText().toString().trim();
-        if ("".equals(bankName) || "".equals(bankNumber)) {
-            Toast.makeText(con, "请先补充完整的银行卡信息", Toast.LENGTH_LONG).show();
+    public void submit(){
+        String bankName=bank_name.getText().toString().trim();
+        String bankNumber=bank_number.getText().toString().trim();
+        if("".equals(bankName) || "".equals(bankNumber)){
+            Toast.makeText(con,"请先补充完整的银行卡信息",Toast.LENGTH_LONG).show();
             return;
         }
-        InsBankInputBean ibib = new InsBankInputBean();
+        InsBankInputBean ibib =new InsBankInputBean();
         ibib.setCardNo(bankNumber);
         ibib.setCardType(Integer.parseInt(ib.getData().getBankCardType()));
         ibib.setBankName(bankName);
         ibib.setCardUserType(1);
         ibib.setImageId(ib.getData().getId());
-        Log.e("-res-", new Gson().toJson(ibib));
+        Log.e("-res-",new Gson().toJson(ibib));
         qr.insBankCard(ibib);
     }
 
-    @Override
-    public void onClick(View view) {
-        switch (view.getId()) {
-            case R.id.submit:
-                if (ib != null) {
-                    submit();
-                } else {
-                    Toast.makeText(con, "请先上传图片", Toast.LENGTH_SHORT).show();
-                }
-                break;
-        }
-    }
 }

app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/wallet/WalletFragment.java

@@ -231,7 +231,6 @@ public class WalletFragment extends BaseFragment{
             bank_remove.setVisibility(View.VISIBLE);
         } else{
             bank_number.setVisibility(View.GONE);
-            bank_title_1.setText("未添加银行卡");
             bank_add.setVisibility(View.VISIBLE);
             bank_remove.setVisibility(View.GONE);
         }

app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/web/WebActivity.java

@@ -5,12 +5,9 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.net.Uri;
-import android.net.http.SslError;
-import android.os.Build;
 import android.os.Bundle;
 import android.util.Log;
 import android.webkit.JavascriptInterface;
-import android.webkit.SslErrorHandler;
 import android.webkit.WebResourceRequest;
 import android.webkit.WebSettings;
 import android.webkit.WebView;
@@ -84,11 +81,6 @@ public class WebActivity extends BaseActivity {
         webSettings.setJavaScriptEnabled(true);
         webSettings.setDomStorageEnabled(true);
         webSettings.setDefaultTextEncodingName("utf-8");
-        // 特别注意：5.1以上默认禁止了https和http混用，以下方式是开启
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            webSettings.setMixedContentMode(WebSettings.MIXED_CONTENT_ALWAYS_ALLOW);
-        }
-
         wv.addJavascriptInterface(new JavaScriptObject(con), "webObj");
         //PaxWebChromeClient chromeClient=new PaxWebChromeClient();
         //WebView加载web资源
@@ -119,12 +111,6 @@ public class WebActivity extends BaseActivity {
                 wv.loadUrl(url);
                 return  true;
             }
-
-            @Override
-            public void onReceivedSslError(WebView view, SslErrorHandler handler, SslError error) {
-                super.onReceivedSslError(view, handler, error);
-                handler.proceed();
-            }
         });
         wv.setWebChromeClient(chromeClient);
         wv.loadUrl(url);
@@ -163,12 +149,6 @@ public class WebActivity extends BaseActivity {
                 view.loadUrl(url);
                 return true;
             }
-
-            @Override
-            public void onReceivedSslError(WebView view, SslErrorHandler handler, SslError error) {
-                super.onReceivedSslError(view, handler, error);
-                handler.proceed();
-            }
         });
     }
 

app/src/main/java/com/arpa/hndahesudintocctmsdriver/util/adapter/AdapterAlls.java

@@ -51,9 +51,6 @@ public class AdapterAlls extends RecyclerView.Adapter<AdapterAlls.ViewHolder> {
     }
 
     public void add(List<ManyBean> addMessageList) {
-        if (object==null){
-            return;
-        }
         //增加数据
         int position = object.size();
         object.addAll(position, addMessageList);

app/src/main/java/com/arpa/hndahesudintocctmsdriver/util/http/OkHttpUtil.java

@@ -3,7 +3,6 @@ package com.arpa.hndahesudintocctmsdriver.util.http;
 import android.content.Context;
 
 import com.arpa.hndahesudintocctmsdriver.util.app.VersionUtil;
-import com.dahe.mylibrary.utils.AppUtils;
 
 import java.io.File;
 
@@ -42,7 +41,6 @@ public class OkHttpUtil {
                 .post(body)
                 .headers(hb.build())
                 .addHeader("Version", VersionUtil.getVersion(con))
-                .addHeader("VersionCode",String.valueOf(AppUtils.getAppVersionCode()))
                 //.addHeader("sign",sign)
                 .removeHeader("User-Agent")
                 .addHeader("User-Agent",GetUtil.getUserAgent(con))
@@ -73,40 +71,6 @@ public class OkHttpUtil {
                 .addHeader("Authorization", token)
                 .addHeader("Content-Type", "application/json")
                 .addHeader("Version", VersionUtil.getVersion(con))
-                .addHeader("VersionCode",String.valueOf(AppUtils.getAppVersionCode()))
-                //.addHeader("sign",sign)
-                .removeHeader("User-Agent")
-                .addHeader("User-Agent",GetUtil.getUserAgent(con))
-                .build();
-        return request;
-    }
-
-    public static Request put(OkDate od, Context con){
-        MediaType  mediaType = MediaType.parse("application/json");
-        if(od.getMadiaType()!=null && od.getMadiaType().equals("")){
-            od.setMadiaType("{}");
-        }
-//        JSONObject jsonObject = JSON.parseObject(od.getMadiaType());
-//        jsonObject.put("timestamp", DateUtil.current());
-//        jsonObject.put("deviceId", GetUtil.getDeviceId(con));
-//        String sign = SecureUtil.signParamsSha1(jsonObject,SIGN_PASSWORD);
-//        Log.e("jsonObject",jsonObject.toString());
-//        Log.e("sign",sign);
-//        Map<String,Object> map=new HashMap<>();
-//        map.put("data",SecurityUtil.encrypt(jsonObject.toString()));
-//        Log.e("参数1",od.getMadiaType());
-//        Log.e("参数2",MapUtil.mapJson(map));
-        //MapUtil.mapJson(map)
-        RequestBody body = RequestBody.create(mediaType,od.getMadiaType());
-        Headers.Builder hb=new Headers.Builder();
-        hb.add("Content-Type","application/json");
-        hb.add("Cache-Control","no-cache");
-        Request request = new Request.Builder()
-                .url(od.getUrl())
-                .put(body)
-                .headers(hb.build())
-                .addHeader("Version", VersionUtil.getVersion(con))
-                .addHeader("VersionCode",String.valueOf(AppUtils.getAppVersionCode()))
                 //.addHeader("sign",sign)
                 .removeHeader("User-Agent")
                 .addHeader("User-Agent",GetUtil.getUserAgent(con))
@@ -122,7 +86,6 @@ public class OkHttpUtil {
                 .url(od.getUrl())
                 .get()
                 .headers(hb.build())
-                .addHeader("VersionCode",String.valueOf(AppUtils.getAppVersionCode()))
                 .build();
         return request;
     }
@@ -136,7 +99,6 @@ public class OkHttpUtil {
         Request request = new Request.Builder()
                 .url(od.getUrl())
                 .addHeader("Authorization", token)
-                .addHeader("VersionCode",String.valueOf(AppUtils.getAppVersionCode()))
                 .get()
                 .headers(hb.build())
                 .build();
@@ -167,7 +129,6 @@ public class OkHttpUtil {
                 .url(od.getUrl())
                 .method("POST", body)
                 .addHeader("Authorization", token)
-                .addHeader("VersionCode",String.valueOf(AppUtils.getAppVersionCode()))
                 .addHeader("Cookie", "JSESSIONID=NqpqKQstwceQurcNK5hjl4GnTgiF4eSzZSo5a1rz")
                 .build();
         return request;
@@ -184,26 +145,23 @@ public class OkHttpUtil {
                 .url(od.getUrl())
                 .method("POST", body)
                 .addHeader("Authorization", token)
-                .addHeader("VersionCode",String.valueOf(AppUtils.getAppVersionCode()))
                 .addHeader("Cookie", "JSESSIONID=NqpqKQstwceQurcNK5hjl4GnTgiF4eSzZSo5a1rz")
                 .build();
         return request;
     }
 
-    public static Request postFiles(OkDate od,File file,String token,String carId,String carNum,boolean isSave) {
+    public static Request postFiles(OkDate od,File file,String token,String carId,String carNum) {
         MediaType mediaType = MediaType.parse("text/plain");
         RequestBody body = new MultipartBody.Builder()
                 .setType(MultipartBody.FORM)
                 .addFormDataPart("file",file.getPath(),RequestBody.create(MediaType.parse("application/octet-stream"), file))
                 .addFormDataPart("carId",carId)
                 .addFormDataPart("carNum",carNum)
-                .addFormDataPart("isSave",isSave?"0":"1")
                 .build();
         Request request = new Request.Builder()
                 .url(od.getUrl())
                 .method("POST", body)
                 .addHeader("Authorization", token)
-                .addHeader("VersionCode",String.valueOf(AppUtils.getAppVersionCode()))
                 .addHeader("Cookie", "JSESSIONID=NqpqKQstwceQurcNK5hjl4GnTgiF4eSzZSo5a1rz")
                 .build();
         return request;

app/src/main/java/com/arpa/hndahesudintocctmsdriver/util/img/GetCarImageAlert.java

@@ -70,27 +70,13 @@ public class GetCarImageAlert {
                     .permissions(Manifest.permission.CAMERA)
                     .request((allGranted, grantedList, deniedList) -> {
                         if (allGranted) {
-                            openCam(act);
-//                            file=ImageGetUtil.createImageFile(act);
-//                            ImageGetUtil.cameraAlbumGetImage(act,file);
+                            file=ImageGetUtil.createImageFile(act);
+                            ImageGetUtil.cameraAlbumGetImage(act,file);
                         } else {
                             Toast.makeText(act.getBaseContext(), "开启权限失败,请手动开启权限", Toast.LENGTH_LONG).show();
                         }
                     });
         });
-        img.setOnClickListener(v -> {
-            if (!key){
-                PermissionX.init(act)
-                        .permissions(Manifest.permission.CAMERA)
-                        .request((allGranted, grantedList, deniedList) -> {
-                            if (allGranted) {
-                                openCam(act);
-                            } else {
-                                Toast.makeText(act.getBaseContext(), "开启权限失败,请手动开启权限", Toast.LENGTH_LONG).show();
-                            }
-                        });
-            }
-        });
         btn_quxiao.setOnClickListener(v -> popupWindow.dismiss());
         //popupWindow消失屏幕变为不透明
         popupWindow.setOnDismissListener(() -> {
@@ -113,13 +99,4 @@ public class GetCarImageAlert {
         popupWindow.dismiss();
     }
 
-    private void openCam(AppCompatActivity act){
-        file=ImageGetUtil.createImageFile(act);
-        if (file!=null){
-            ImageGetUtil.cameraAlbumGetImage(act,file);
-        }else{
-            Toast.makeText(act.getBaseContext(), "路径创建失败，请清除缓存后重试", Toast.LENGTH_LONG).show();
-        }
-    }
-
 }

app/src/main/java/com/arpa/hndahesudintocctmsdriver/util/img/ImageGetUtil.java

@@ -9,8 +9,6 @@ import android.provider.MediaStore;
 
 import androidx.core.content.FileProvider;
 
-import com.dahe.mylibrary.utils.AppUtils;
-
 import java.io.File;
 import java.io.IOException;
 import java.text.SimpleDateFormat;
@@ -41,7 +39,7 @@ public class ImageGetUtil {
             if(imageFile!=null){
                 if(Build.VERSION.SDK_INT>= Build.VERSION_CODES.N){
                     /*7.0以上要通过FileProvider将File转化为Uri*/
-                    uri = FileProvider.getUriForFile(act.getApplicationContext(), AppUtils.getAppPackageName()+".fileprovider",imageFile);
+                    uri = FileProvider.getUriForFile(act.getApplicationContext(),"com.arpa.hndahesudintocctmsdriver.fileprovider",imageFile);
                 }else {
                     /*7.0以下则直接使用Uri的fromFile方法将File转化为Uri*/
                     uri = Uri.fromFile(imageFile);

app/src/main/java/com/arpa/hndahesudintocctmsdriver/util/location/LocationManagerUtil.java

@@ -1,101 +0,0 @@
-package com.arpa.hndahesudintocctmsdriver.util.location;
-
-import static com.arpa.hndahesudintocctmsdriver.util.location.LocationGDUtil.RES;
-
-import android.Manifest;
-import android.content.Context;
-import android.content.pm.PackageManager;
-import android.location.Address;
-import android.location.Criteria;
-import android.location.Geocoder;
-import android.location.Location;
-import android.location.LocationListener;
-import android.location.LocationManager;
-import android.os.Handler;
-
-import androidx.annotation.NonNull;
-import androidx.core.app.ActivityCompat;
-
-import com.arpa.hndahesudintocctmsdriver.util.cache.CacheGroup;
-import com.arpa.hndahesudintocctmsdriver.util.msg.MsgUtil;
-import com.dahe.mylibrary.utils.ToastUtils;
-import com.google.gson.Gson;
-
-import java.util.List;
-import java.util.Locale;
-
-/**
- * @ClassName LocationManagerUtil
- * @Author john
- * @Date 2024/7/25 15:21
- * @Description LocationManager本地定位
- */
-public class LocationManagerUtil {
-
-    public static LocationManagerUtil mInstance = null;
-
-    public static LocationManagerUtil getInstance() {
-        if (null == mInstance) {
-            synchronized (LocationManagerUtil.class) {
-                if (null == mInstance) {
-                    mInstance = new LocationManagerUtil();
-                }
-            }
-        }
-        return mInstance;
-    }
-
-    private LocationManagerUtil() {
-    }
-
-    public void getLocation(Context ctx, Handler hd) {
-        LocationManager locationManager = (LocationManager) ctx.getSystemService(Context.LOCATION_SERVICE);
-
-        //创建定位条件器
-        Criteria criteria = new Criteria();
-        //设置精度，Criteria.ACCURACY_FINE表示精确，Criteria.ACCURACY_COARSE表示粗略
-        criteria.setAccuracy(Criteria.ACCURACY_FINE);
-        //设置是否需要海拔信息
-        criteria.setAltitudeRequired(true);
-        //设置是否需要方位信息
-        criteria.setBearingRequired(true);
-        //设置是否允许运营商扣费
-        criteria.setCostAllowed(true);
-        //设置对电源的需求
-        criteria.setPowerRequirement(Criteria.POWER_LOW);
-
-        String bestProvider = locationManager.getBestProvider(criteria, true);
-        if (bestProvider != null) {
-            if (ActivityCompat.checkSelfPermission(ctx, Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED && ActivityCompat.checkSelfPermission(ctx, Manifest.permission.ACCESS_COARSE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
-                ToastUtils.showToast(ctx, "请查看定位权限");
-                return;
-            }
-            locationManager.requestLocationUpdates(bestProvider, 300, 0, new LocationListener() {
-                @Override
-                public void onLocationChanged(@NonNull Location location) {
-                    try {
-                        Geocoder geocoder = new Geocoder(ctx, Locale.getDefault());
-                        List<Address> fromLocation = geocoder.getFromLocation(location.getLatitude(), location.getLongitude(), 1);
-                        if (fromLocation != null && !fromLocation.isEmpty()) {
-                            Address address = fromLocation.get(0);
-                            String addressLine = address.getAddressLine(0);
-                            String adminArea = address.getAdminArea();//省
-                            String locality = address.getLocality();//市
-                            String subLocality = address.getSubLocality();//县
-                            String featureName = address.getFeatureName();//详细地址
-                            CacheGroup.cacheList.put("getLocation", new Gson().toJson(address));
-                            MsgUtil.addHdMsgWat(hd, RES);
-                            locationManager.removeUpdates(this);
-                        }
-                    } catch (Exception e) {
-
-                    }
-
-                }
-            });
-        } else {
-            ToastUtils.showToast(ctx, "定位失败,请查看定位权限");
-        }
-
-    }
-}

app/src/main/java/com/arpa/hndahesudintocctmsdriver/weight/OnLimitClickHelper.java

@@ -1,38 +0,0 @@
-package com.arpa.hndahesudintocctmsdriver.weight;
-
-import android.view.View;
-import android.widget.Toast;
-
-import com.arpa.hndahesudintocctmsdriver.util.alert.ToastUtil;
-import com.dahe.mylibrary.utils.ToastUtils;
-
-import java.util.Calendar;
-
-/**
- * @ClassName OnLimitClickHelper
- * @Author john
- * @Date 2024/4/22 14:28
- * @Description TODO
- */
-public class OnLimitClickHelper implements View.OnClickListener {
-    public static final int LIMIT_TIME = 2000;
-    private long lastClickTime = 0;
-    private OnLimitClickListener onLimitClickListener = null;
-
-    public OnLimitClickHelper(OnLimitClickListener onLimitClickListener){
-        this.onLimitClickListener = onLimitClickListener;
-    }
-
-    @Override
-    public void onClick(View v) {
-        long curTime = Calendar.getInstance().getTimeInMillis();
-        if (curTime - lastClickTime > LIMIT_TIME) {
-            lastClickTime = curTime;
-            if(onLimitClickListener != null){
-                onLimitClickListener.onClick(v);
-            }
-        }else{
-            ToastUtils.showToast(v.getContext(),"点击速度过快,请稍后重试");
-        }
-    }
-}

app/src/main/java/com/arpa/hndahesudintocctmsdriver/weight/OnLimitClickListener.java

@@ -1,17 +0,0 @@
-package com.arpa.hndahesudintocctmsdriver.weight;
-
-import android.view.View;
-
-/**
- * @ClassName OnLimitClickListener
- * @Author john
- * @Date 2024/4/22 14:28
- * @Description TODO
- */
-public interface OnLimitClickListener {
-    /**
-     * 按钮点击事件
-     * @param view
-     */
-    void onClick(View view);
-}

app/src/main/res/drawable/select_eye.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/icon_eye_open" android:state_checked="true"></item>
-    <item android:drawable="@drawable/icon_eye_close" android:state_checked="false"></item>
-    <item android:drawable="@drawable/icon_eye_close"></item>
-</selector>

app/src/main/res/drawable/select_read.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/read_select" android:state_checked="true"></item>
-    <item android:drawable="@drawable/read_nor" android:state_checked="false"></item>
-    <item android:drawable="@drawable/read_nor"></item>
-</selector>

app/src/main/res/layout/activity_auth_qualification.xml

@@ -55,13 +55,13 @@
                     android:layout_width="@dimen/dp_90"
                     android:layout_height="@dimen/dp_90"
                     android:background="#EEEEEE">
-
                     <ImageView
                         android:layout_width="@dimen/dp_23"
                         android:layout_height="@dimen/dp_23"
-                        android:layout_centerInParent="true"
+                        android:layout_centerVertical="true"
+                        android:layout_centerHorizontal="true"
                         android:scaleType="fitXY"
-                        android:src="@mipmap/up_img" />
+                        android:src="@mipmap/up_img"/>
                 </RelativeLayout>
                 <RelativeLayout
                     android:layout_marginLeft="@dimen/dp_8"
@@ -118,7 +118,6 @@
             android:background="@drawable/bg_bai"
             android:elevation="@dimen/dp_1">
             <RelativeLayout
-                android:visibility="gone"
                 android:id="@+id/cow1"
                 android:layout_marginBottom="@dimen/dp_10"
                 android:layout_width="match_parent"
@@ -131,28 +130,28 @@
                     android:textColor="#ffc4c4ce"
                     android:textSize="@dimen/sp_13"
                     />
-
                 <EditText
                     android:id="@+id/value1"
+                    android:layout_alignParentRight="true"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_alignParentRight="true"
-                    android:layout_marginLeft="@dimen/dp_30"
-                    android:background="@null"
-                    android:ellipsize="end"
-                    android:gravity="right"
-                    android:hint="点击进行手动输入"
-                    android:maxLines="1"
                     android:textColor="#ff999999"
-                    android:textSize="@dimen/sp_13" />
+                    android:textSize="@dimen/sp_13"
+                    android:maxLines="1"
+                    android:hint="点击进行手动输入"
+                    android:ellipsize="end"
+                    android:layout_marginLeft="@dimen/dp_30"
+                    android:gravity="right"
+                    android:background="@null"
+                    />
             </RelativeLayout>
             <View
-                android:visibility="gone"
                 android:id="@+id/vs"
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/dp_1"
                 android:background="@drawable/bottom_xu"/>
             <RelativeLayout
+                android:layout_marginTop="@dimen/dp_10"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
                 <TextView
@@ -163,20 +162,20 @@
                     android:textColor="#ffc4c4ce"
                     android:textSize="@dimen/sp_13"
                     />
-
                 <TextView
                     android:id="@+id/value2"
+                    android:layout_alignParentRight="true"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_alignParentRight="true"
-                    android:layout_marginLeft="@dimen/dp_30"
-                    android:background="@null"
+                    android:textColor="#ff999999"
+                    android:textSize="@dimen/sp_13"
+                    android:maxLines="1"
+                    android:hint="点击进行手动输入"
                     android:ellipsize="end"
                     android:gravity="right"
-                    android:hint="点击进行手动输入"
-                    android:maxLines="1"
-                    android:textColor="#ff999999"
-                    android:textSize="@dimen/sp_13" />
+                    android:layout_marginLeft="@dimen/dp_30"
+                    android:background="@null"
+                    />
             </RelativeLayout>
         </LinearLayout>
         <TextView

app/src/main/res/layout/activity_che_data.xml

@@ -382,38 +382,5 @@
                 />
         </LinearLayout>
 
-        <RelativeLayout
-            android:id="@+id/r8"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-            <LinearLayout
-                android:layout_marginTop="@dimen/dp_20"
-                android:layout_marginBottom="@dimen/dp_20"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal">
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="交强险保单"
-                    android:textColor="#ff000000"
-                    android:textSize="@dimen/sp_15"
-                    />
-            </LinearLayout>
-            <ImageView
-                android:layout_width="@dimen/dp_6"
-                android:layout_height="@dimen/dp_10"
-                android:src="@mipmap/chevron"
-                android:scaleType="fitXY"
-                android:background="@null"
-                android:layout_alignParentRight="true"
-                android:layout_centerVertical="true"/>
-        </RelativeLayout>
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/dp_2"
-            android:background="#F6F6F9"/>
-
     </LinearLayout>
 </RelativeLayout>

app/src/main/res/layout/activity_login.xml

@@ -104,15 +104,35 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal">
-
-        <CheckBox
-            android:layout_marginTop="@dimen/dp_3"
-            android:id="@+id/cb"
-            android:layout_width="@dimen/dp_28"
-            android:layout_height="@dimen/dp_34"
-            android:button="@null"
-            android:checked="false"
-            android:drawableStart="@drawable/select_read"/>
+        <androidx.cardview.widget.CardView
+            android:padding="@dimen/dp_7"
+            android:layout_marginTop="@dimen/dp_2"
+            android:layout_width="@dimen/dp_14"
+            android:layout_height="@dimen/dp_14"
+            app:cardCornerRadius="@dimen/dp_7"
+            app:cardBackgroundColor="@color/theme_color"
+            app:cardElevation="@dimen/dp_0">
+        <androidx.cardview.widget.CardView
+            android:padding="@dimen/dp_7"
+            android:id="@+id/no_btn"
+            android:layout_width="@dimen/dp_12"
+            android:layout_height="@dimen/dp_12"
+            app:cardCornerRadius="@dimen/dp_6"
+            app:cardBackgroundColor="#fff"
+            android:layout_gravity="center"
+            app:cardElevation="@dimen/dp_0">
+        </androidx.cardview.widget.CardView>
+            <ImageButton
+                android:id="@+id/agree_btn"
+                android:layout_width="@dimen/dp_14"
+                android:layout_height="@dimen/dp_14"
+                android:src="@mipmap/choice"
+                android:scaleType="fitXY"
+                android:background="#fff"
+                android:layout_gravity="center"
+                android:visibility="gone"
+                />
+        </androidx.cardview.widget.CardView>
         <TextView
             android:id="@+id/tv_content"
             android:layout_width="wrap_content"

app/src/main/res/layout/activity_photo_car.xml

@@ -81,7 +81,7 @@
                         android:id="@+id/zjimg_name"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="@dimen/dp_16"
+                        android:layout_marginTop="@dimen/dp_19"
                         android:text="从业资格证照片"
                         android:textColor="#ff333333"
                         android:textSize="@dimen/sp_15" />
@@ -91,7 +91,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_alignParentBottom="true"
-                        android:layout_marginBottom="@dimen/dp_16"
+                        android:layout_marginBottom="@dimen/dp_19"
                         android:text="点击上传图片"
                         android:textColor="@color/theme_color"
                         android:textSize="@dimen/sp_15" />
@@ -100,7 +100,7 @@
         </androidx.cardview.widget.CardView>
 
         <LinearLayout
-
+            android:visibility="gone"
             android:id="@+id/llInfo"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -137,8 +137,6 @@
                 android:orientation="vertical"
                 android:padding="@dimen/dp_14">
 
-
-
                 <RelativeLayout
                     android:id="@+id/cow1"
 
@@ -164,55 +162,10 @@
                         android:gravity="right"
                         android:hint="点击进行手动输入"
                         android:maxLines="1"
-                        android:singleLine="true"
                         android:textColor="#ff999999"
                         android:textSize="@dimen/sp_13" />
                 </RelativeLayout>
 
-                <LinearLayout
-                    android:id="@+id/llDate"
-                    android:visibility="gone"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical"
-                    >
-                    <View
-                        android:layout_marginTop="@dimen/dp_10"
-                        android:layout_width="match_parent"
-                        android:layout_height="@dimen/dp_1"
-                        android:background="@drawable/bottom_xu"/>
-                    <RelativeLayout
-                        android:id="@+id/rlDate"
-                        android:layout_marginTop="@dimen/dp_10"
-
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content">
-                        <TextView
-                            android:id="@+id/name2"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="截止日期"
-                            android:textColor="#ffc4c4ce"
-                            android:textSize="@dimen/sp_13"
-                            />
-                        <TextView
-                            android:layout_toRightOf="@+id/name2"
-                            android:id="@+id/value2"
-                            android:layout_alignParentRight="true"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:textColor="#ff999999"
-                            android:textSize="@dimen/sp_13"
-                            android:maxLines="1"
-                            android:hint="请选择截止日期"
-                            android:gravity="right"
-                            android:ellipsize="end"
-                            android:layout_marginLeft="@dimen/dp_10"
-                            />
-                    </RelativeLayout>
-
-                </LinearLayout>
-
             </LinearLayout>
         </LinearLayout>
 

app/src/main/res/layout/activity_shangchuan_bc.xml

@@ -1,225 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/activity_shangchuan"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@drawable/bg_theme">
-
-    <ImageView
-        android:layout_width="@dimen/dp_300"
-        android:layout_height="@dimen/dp_207"
-        android:layout_centerHorizontal="true"
-        android:layout_marginTop="@dimen/dp_16"
-        android:src="@mipmap/top_creativity" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
-
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/dp_58">
-
-            <ImageView
-                android:id="@+id/return_btn"
-                android:layout_width="@dimen/dp_40"
-                android:layout_height="@dimen/dp_31"
-                android:layout_marginLeft="@dimen/dp_30"
-                android:padding="@dimen/dp_10"
-                android:scaleType="fitXY"
-                android:src="@mipmap/return_lefts" />
-
-            <TextView
-                android:id="@+id/tv_loaction"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentRight="true"
-                android:layout_centerVertical="true"
-                android:layout_marginRight="@dimen/dp_30"
-                android:padding="@dimen/dp_5"
-                android:text="定位成功"
-                android:textColor="@color/theme_color"
-                android:textSize="@dimen/sp_14" />
-
-        </RelativeLayout>
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/dp_38"
-            android:layout_marginTop="@dimen/dp_8"
-            android:text="补传"
-            android:textColor="#ff000000"
-            android:textSize="@dimen/sp_23" />
-
-        <TextView
-            android:id="@+id/tvDate"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/dp_50"
-            android:gravity="center_vertical"
-            android:hint="请选择时间"></TextView>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            >
-            <EditText
-                android:layout_weight="1"
-                android:id="@+id/etAddress"
-                android:layout_width="match_parent"
-                android:layout_height="@dimen/dp_50"
-                android:hint="请输入地址"></EditText>
-            <Button
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textColor="@color/red"
-                android:text="确定"
-                android:id="@+id/btnOk"
-                ></Button>
-        </LinearLayout>
-
-
-
-
-
-        <TextView
-            android:id="@+id/tvLocation"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center_vertical"
-            ></TextView>
-
-        <TextView
-            android:id="@+id/name_top"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/dp_38"
-            android:layout_marginTop="@dimen/dp_8"
-            android:text="上传卸货照片"
-            android:textColor="#ff000000"
-            android:textSize="@dimen/sp_23" />
-
-        <androidx.cardview.widget.CardView
-            android:id="@+id/getImg1"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/dp_38"
-            android:layout_marginTop="@dimen/dp_33"
-            android:layout_marginRight="@dimen/dp_38"
-            app:cardCornerRadius="@dimen/dp_8">
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal">
-
-                <RelativeLayout
-                    android:id="@+id/getImg"
-                    android:layout_width="@dimen/dp_90"
-                    android:layout_height="@dimen/dp_90"
-                    android:layout_marginLeft="@dimen/dp_11"
-                    android:layout_marginTop="@dimen/dp_13"
-                    android:layout_marginBottom="@dimen/dp_13"
-                    android:background="#EEEEEE">
-
-                    <ImageView
-                        android:id="@+id/res_img"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent" />
-
-                    <ImageView
-                        android:id="@+id/img_icon"
-                        android:layout_width="@dimen/dp_23"
-                        android:layout_height="@dimen/dp_23"
-                        android:layout_centerHorizontal="true"
-                        android:layout_centerVertical="true"
-                        android:src="@mipmap/up_img" />
-
-                    <ImageView
-                        android:id="@+id/img_delete"
-                        android:layout_width="@dimen/dp_25"
-                        android:layout_height="@dimen/dp_25"
-                        android:layout_alignParentRight="true"
-                        android:padding="@dimen/dp_3"
-                        android:src="@mipmap/icon_delete"
-                        android:visibility="gone" />
-                </RelativeLayout>
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginLeft="@dimen/dp_8"
-                    android:layout_marginTop="@dimen/dp_13"
-                    android:layout_marginRight="@dimen/dp_10"
-                    android:orientation="vertical">
-
-                    <TextView
-                        android:id="@+id/name_body"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="@dimen/dp_7"
-                        android:text="卸货照片"
-                        android:textColor="#ff000000"
-                        android:textSize="@dimen/sp_13" />
-
-                    <TextView
-                        android:id="@+id/address"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="@dimen/dp_13"
-                        android:text=""
-                        android:textColor="#ff999999"
-                        android:textSize="@dimen/sp_13" />
-                </LinearLayout>
-            </LinearLayout>
-        </androidx.cardview.widget.CardView>
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/dp_38"
-            android:layout_marginTop="@dimen/dp_10"
-            android:layout_marginRight="@dimen/dp_38">
-
-            <TextView
-                android:id="@+id/tips_x"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="*"
-                android:textColor="#E61829"
-                android:visibility="gone" />
-
-            <TextView
-                android:id="@+id/tips"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="卸货照片包含车牌号、三分之二车身或者卸货场景"
-                android:textColor="#E61829"
-                android:visibility="gone" />
-        </LinearLayout>
-
-        <androidx.cardview.widget.CardView
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/dp_42"
-            android:layout_marginLeft="@dimen/dp_38"
-            android:layout_marginTop="@dimen/dp_33"
-            android:layout_marginRight="@dimen/dp_38"
-            app:cardBackgroundColor="@color/red"
-            app:cardCornerRadius="@dimen/dp_21">
-
-            <TextView
-                android:id="@+id/submit"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_alignParentRight="true"
-                android:gravity="center"
-                android:text="提交"
-                android:textColor="#fff"
-                android:textSize="@dimen/sp_15" />
-        </androidx.cardview.widget.CardView>
-    </LinearLayout>
-</RelativeLayout>

app/src/main/res/layout/alert_up_app.xml

@@ -99,8 +99,6 @@
                 android:textSize="@dimen/sp_17"
                 android:background="@null"
                 android:layout_marginBottom="@dimen/dp_3"/>
-
-
         </LinearLayout>
         <LinearLayout
             android:layout_marginTop="@dimen/dp_8"
@@ -124,7 +122,6 @@
                 android:progressDrawable="@drawable/par_bg"
                 />
             <TextView
-                android:id="@+id/tvContent"
                 android:layout_marginTop="@dimen/dp_6"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -134,20 +131,6 @@
                 android:layout_gravity="center"
                 />
         </LinearLayout>
-
-        <Button
-            android:visibility="gone"
-            android:layout_marginLeft="@dimen/dp_18"
-            android:layout_marginRight="@dimen/dp_18"
-            android:id="@+id/tvOk"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:text="立即安装"
-            android:textColor="@color/theme_color"
-            android:textSize="@dimen/sp_17"
-            android:background="@null"
-            android:layout_marginBottom="@dimen/dp_13"/>
     </LinearLayout>
     <LinearLayout
         android:id="@+id/force_box"

app/src/main/res/layout/huoyuan_xq.xml

@@ -1,54 +1,47 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/huoyuan_xq"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="#fff"
-    android:orientation="vertical">
-
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:orientation="vertical"
+    android:id="@+id/huoyuan_xq"
+    android:background="#fff">
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@color/theme_color"
         android:orientation="vertical">
-
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
             android:paddingBottom="@dimen/dp_20">
-
             <RelativeLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_68">
-
                 <ImageButton
+                    android:layout_marginLeft="@dimen/dp_38"
                     android:id="@+id/return_btn"
                     android:layout_width="@dimen/dp_21"
                     android:layout_height="@dimen/dp_18"
-                    android:layout_marginLeft="@dimen/dp_38"
                     android:background="@null"
                     android:scaleType="fitXY"
                     android:src="@mipmap/return_btn" />
-
                 <ImageButton
+                    android:layout_marginRight="@dimen/dp_38"
                     android:layout_width="@dimen/dp_18"
                     android:layout_height="@dimen/dp_18"
-                    android:layout_alignParentRight="true"
-                    android:layout_marginRight="@dimen/dp_38"
-                    android:background="@null"
-                    android:scaleType="fitXY"
                     android:src="@mipmap/share2"
-                    android:visibility="gone" />
+                    android:layout_alignParentRight="true"
+                    android:scaleType="fitXY"
+                    android:background="@null"
+                    android:visibility="gone"/>
             </RelativeLayout>
-
             <RelativeLayout
+                android:layout_marginTop="@dimen/dp_8"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/dp_8">
-
+                android:layout_height="wrap_content">
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -56,102 +49,73 @@
                     android:text="货源详情"
                     android:textColor="#fff"
                     android:textSize="@dimen/sp_23" />
-
                 <TextView
+                    android:layout_marginTop="@dimen/dp_11"
+                    android:layout_marginRight="@dimen/dp_37"
+                    android:layout_alignParentRight="true"
                     android:id="@+id/huozhu"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_alignParentRight="true"
-                    android:layout_marginTop="@dimen/dp_11"
-                    android:layout_marginRight="@dimen/dp_37"
                     android:text="联系货主"
                     android:textColor="#fff"
                     android:textSize="@dimen/sp_13" />
-
                 <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentRight="true"
                     android:layout_marginTop="@dimen/dp_11"
                     android:layout_marginRight="@dimen/dp_37"
+                    android:layout_alignParentRight="true"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
                     android:text="拒绝"
                     android:textColor="#fff"
                     android:textSize="@dimen/sp_15"
-                    android:visibility="gone" />
+                    android:visibility="gone"/>
             </RelativeLayout>
-
             <LinearLayout
+                android:layout_marginTop="@dimen/dp_38"
+                android:layout_marginLeft="@dimen/dp_38"
+                android:layout_marginRight="@dimen/dp_38"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="@dimen/dp_38"
-                android:layout_marginTop="@dimen/dp_38"
-                android:layout_marginRight="@dimen/dp_38"
                 android:orientation="vertical">
 
-                <LinearLayout
-                    android:layout_gravity="center"
+                <TextView
+                    android:id="@+id/totalFreight"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:gravity="center"
-                    android:orientation="horizontal">
-
-                    <TextView
-                        android:id="@+id/totalFreight"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center"
-                        android:text="****"
-                        android:textColor="#ffffffff"
-                        android:textSize="@dimen/sp_40" />
-
-                    <CheckBox
-                        android:id="@+id/cb"
-                        android:layout_width="@dimen/dp_30"
-                        android:layout_height="@dimen/dp_30"
-                        android:layout_marginLeft="@dimen/dp_10"
-                        android:layout_marginTop="@dimen/dp_3"
-                        android:button="@null"
-                        android:checked="false"
-                        android:drawableStart="@drawable/select_eye"
-                        android:gravity="center">
-
-                    </CheckBox>
-
-
-                </LinearLayout>
-
+                    android:layout_gravity="center"
+                    android:text="0000"
+                    android:textColor="#ffffffff"
+                    android:textSize="@dimen/sp_40" />
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_gravity="center"
                     android:text="净赚运费(元)"
                     android:textColor="#ffffffff"
-                    android:textSize="@dimen/sp_13" />
-
+                    android:textSize="@dimen/sp_13"
+                    android:layout_gravity="center"
+                    />
                 <View
+                    android:layout_marginTop="@dimen/dp_16"
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/dp_1"
-                    android:layout_marginTop="@dimen/dp_16"
-                    android:background="#EFEFEF" />
-
+                    android:background="#EFEFEF"/>
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/dp_28"
                     android:orientation="horizontal">
-
                     <RelativeLayout
                         android:layout_width="@dimen/dp_0"
                         android:layout_height="match_parent"
                         android:layout_weight="1">
-
                         <TextView
+                            android:layout_marginLeft="@dimen/dp_5"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:layout_centerVertical="true"
-                            android:layout_marginLeft="@dimen/dp_5"
                             android:text="预估里程(km)"
                             android:textColor="#ffffffff"
-                            android:textSize="@dimen/sp_12" />
+                            android:textSize="@dimen/sp_12"
+                            android:layout_centerVertical="true"
+                            />
 
                         <TextView
                             android:id="@+id/distance"
@@ -164,12 +128,10 @@
                             android:textColor="#ffffffff"
                             android:textSize="@dimen/sp_12" />
                     </RelativeLayout>
-
                     <View
                         android:layout_width="@dimen/dp_1"
                         android:layout_height="wrap_content"
-                        android:background="#EFEFEF" />
-
+                        android:background="#EFEFEF"/>
                     <RelativeLayout
                         android:layout_width="@dimen/dp_0"
                         android:layout_height="match_parent"
@@ -196,17 +158,14 @@
                             android:textSize="@dimen/sp_12" />
                     </RelativeLayout>
                 </LinearLayout>
-
                 <View
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/dp_1"
-                    android:background="#EFEFEF" />
-
+                    android:background="#EFEFEF"/>
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/dp_28"
                     android:orientation="horizontal">
-
                     <RelativeLayout
                         android:layout_width="@dimen/dp_0"
                         android:layout_height="match_parent"
@@ -232,12 +191,10 @@
                             android:textColor="#ffffffff"
                             android:textSize="@dimen/sp_12" />
                     </RelativeLayout>
-
                     <View
                         android:layout_width="@dimen/dp_1"
                         android:layout_height="wrap_content"
-                        android:background="#EFEFEF" />
-
+                        android:background="#EFEFEF"/>
                     <RelativeLayout
                         android:layout_width="@dimen/dp_0"
                         android:layout_height="match_parent"
@@ -267,67 +224,59 @@
                             android:textSize="@dimen/sp_12" />
                     </RelativeLayout>
                 </LinearLayout>
-
                 <View
-                    android:layout_width="match_parent"
-                    android:layout_height="@dimen/dp_1"
-                    android:background="#EFEFEF" />
-
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/dp_1"
+                android:background="#EFEFEF"/>
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/dp_28"
                     android:orientation="horizontal">
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_centerVertical="true"
+                            android:layout_marginLeft="@dimen/dp_5"
+                            android:text="运输要求:"
+                            android:textColor="#ffffffff"
+                            android:textSize="@dimen/sp_12"
+                            android:layout_gravity="center"/>
 
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_centerVertical="true"
-                        android:layout_gravity="center"
-                        android:layout_marginLeft="@dimen/dp_5"
-                        android:text="运输要求:"
-                        android:textColor="#ffffffff"
-                        android:textSize="@dimen/sp_12" />
-
-                    <TextView
-                        android:id="@+id/requirement"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center"
-                        android:layout_marginLeft="@dimen/dp_7"
-                        android:layout_marginRight="@dimen/dp_5"
-                        android:text=""
-                        android:textColor="#ffffffff"
-                        android:textSize="@dimen/sp_12" />
+                        <TextView
+                            android:layout_marginLeft="@dimen/dp_7"
+                            android:id="@+id/requirement"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginRight="@dimen/dp_5"
+                            android:text=""
+                            android:textColor="#ffffffff"
+                            android:textSize="@dimen/sp_12"
+                            android:layout_gravity="center"/>
                 </LinearLayout>
-
                 <View
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/dp_1"
-                    android:background="#EFEFEF" />
+                    android:background="#EFEFEF"/>
             </LinearLayout>
-        </LinearLayout>
     </LinearLayout>
-
+    </LinearLayout>
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@drawable/bg_bai"
-        android:orientation="vertical">
-
+        android:orientation="vertical"
+        android:background="@drawable/bg_bai">
         <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
             android:layout_marginLeft="@dimen/dp_39"
             android:layout_marginTop="@dimen/dp_17"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
             android:orientation="horizontal">
-
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="货源单号:"
                 android:textColor="#333333"
                 android:textSize="@dimen/sp_13" />
-
             <TextView
                 android:id="@+id/orderNum"
                 android:layout_width="wrap_content"
@@ -336,48 +285,42 @@
                 android:textColor="#333333"
                 android:textSize="@dimen/sp_13" />
         </LinearLayout>
-
         <androidx.cardview.widget.CardView
+            android:layout_marginLeft="@dimen/dp_15"
+            android:layout_marginRight="@dimen/dp_15"
+            android:layout_marginTop="@dimen/dp_15"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/dp_15"
-            android:layout_marginTop="@dimen/dp_15"
-            android:layout_marginRight="@dimen/dp_15"
-            app:cardBackgroundColor="#fff"
             app:cardCornerRadius="@dimen/dp_14"
+            app:cardBackgroundColor="#fff"
             app:cardElevation="@dimen/dp_0">
-
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical">
-
                 <com.arpa.hndahesudintocctmsdriver.util.view.BaseRecyclerView
                     android:id="@+id/zhuang_rv1"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content" />
-
                 <com.arpa.hndahesudintocctmsdriver.util.view.BaseRecyclerView
                     android:id="@+id/zhuang_rv2"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content" />
             </LinearLayout>
         </androidx.cardview.widget.CardView>
-
         <RelativeLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/dp_17">
-
             <TextView
                 android:id="@+id/car"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_centerVertical="true"
                 android:layout_marginLeft="@dimen/dp_39"
                 android:text="选择车辆"
                 android:textColor="#ff000000"
-                android:textSize="@dimen/sp_13" />
+                android:textSize="@dimen/sp_13"
+                android:layout_centerVertical="true"/>
 
             <ImageButton
                 android:id="@+id/xuanze"
@@ -385,8 +328,8 @@
                 android:layout_height="@dimen/dp_29"
                 android:layout_alignParentRight="true"
                 android:layout_marginRight="@dimen/dp_38"
-                android:background="@null"
                 android:padding="@dimen/dp_5"
+                android:background="@null"
                 android:scaleType="fitXY"
                 android:src="@mipmap/add1" />
         </RelativeLayout>
@@ -403,37 +346,39 @@
                 android:layout_height="@dimen/dp_25"
                 android:layout_gravity="center"
                 android:layout_marginLeft="@dimen/dp_38"
-                android:background="@null"
                 android:padding="@dimen/dp_5"
+                android:background="@null"
                 android:scaleType="fitXY"
                 android:src="@mipmap/no_xuan" />
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center"
                 android:layout_marginLeft="@dimen/dp_7"
                 android:text="同意并签署"
                 android:textColor="#000000"
-                android:textSize="@dimen/sp_13" />
+                android:textSize="@dimen/sp_13"
+                android:layout_gravity="center"/>
 
             <TextView
                 android:id="@+id/check_contract"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center"
                 android:text="《运输合同》"
                 android:textColor="@color/theme_color_news"
-                android:textSize="@dimen/sp_13" />
+                android:textSize="@dimen/sp_13"
+                android:layout_gravity="center"/>
 
         </LinearLayout>
 
         <RelativeLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/dp_7">
+            android:layout_marginTop="@dimen/dp_7"
+            >
 
             <ImageButton
+                android:visibility="invisible"
                 android:id="@+id/btnFp"
                 android:layout_width="@dimen/dp_25"
                 android:layout_height="@dimen/dp_25"
@@ -442,39 +387,38 @@
                 android:background="@null"
                 android:padding="@dimen/dp_5"
                 android:scaleType="fitXY"
-                android:src="@mipmap/no_xuan"
-                android:visibility="invisible" />
+                android:src="@mipmap/no_xuan" />
 
             <TextView
+                android:layout_toRightOf="@+id/btnFp"
                 android:id="@+id/tvZzs"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center"
                 android:layout_marginLeft="@dimen/dp_7"
-                android:layout_toRightOf="@+id/btnFp"
                 android:text="同意在符合相关税务机关要求的情况下代开增值税发票"
                 android:textColor="#000000"
-                android:textSize="@dimen/sp_13" />
+                android:textSize="@dimen/sp_13"
+                android:layout_gravity="center"/>
 
             <TextView
+                android:visibility="gone"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center"
                 android:text="增值税发票"
                 android:textColor="@color/red"
                 android:textSize="@dimen/sp_13"
-                android:visibility="gone" />
+                android:layout_gravity="center"/>
 
         </RelativeLayout>
 
         <Button
+            android:layout_marginLeft="@dimen/dp_38"
+            android:layout_marginRight="@dimen/dp_38"
             android:id="@+id/confirm_btn"
             android:layout_width="match_parent"
             android:layout_height="@dimen/dp_38"
             android:layout_gravity="center"
-            android:layout_marginLeft="@dimen/dp_38"
             android:layout_marginTop="@dimen/dp_12"
-            android:layout_marginRight="@dimen/dp_38"
             android:layout_marginBottom="@dimen/dp_60"
             android:background="@drawable/bg_btn"
             android:text="确认接单"

app/src/main/res/layout/item_huoyuan.xml

@@ -99,7 +99,7 @@
 
                         <TextView
                             android:id="@+id/loadingAddress"
-                            android:layout_width="wrap_content"
+                            android:layout_width="@dimen/dp_120"
                             android:layout_height="wrap_content"
                             android:layout_gravity="center"
                             android:layout_marginLeft="@dimen/dp_5"
@@ -125,7 +125,7 @@
 
                         <TextView
                             android:id="@+id/receiverAddress"
-                            android:layout_width="wrap_content"
+                            android:layout_width="@dimen/dp_120"
                             android:layout_height="wrap_content"
                             android:layout_gravity="center"
                             android:layout_marginLeft="@dimen/dp_5"
@@ -140,7 +140,6 @@
                 </LinearLayout>
 
                 <LinearLayout
-                    android:visibility="gone"
                     android:layout_marginRight="@dimen/dp_10"
                     android:layout_alignParentRight="true"
                     android:layout_width="wrap_content"

app/src/main/res/layout/item_huoyuan_deal.xml

@@ -123,7 +123,6 @@
                     </LinearLayout>
                 </LinearLayout>
                 <LinearLayout
-                    android:visibility="gone"
                     android:layout_marginRight="@dimen/dp_10"
                     android:layout_alignParentRight="true"
                     android:layout_width="wrap_content"

app/src/main/res/layout/item_yundan_yunxing.xml

@@ -52,7 +52,6 @@
                         />
                 </LinearLayout>
                 <LinearLayout
-                    android:id="@+id/llMoney"
                     android:layout_marginTop="@dimen/dp_5"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"

app/src/main/res/layout/qianbao_tixian.xml

@@ -103,7 +103,6 @@
         </LinearLayout>
 
         <LinearLayout
-            android:visibility="gone"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginLeft="@dimen/dp_30"
@@ -132,7 +131,6 @@
         </LinearLayout>
 
         <LinearLayout
-            android:visibility="gone"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginLeft="@dimen/dp_30"

app/src/main/res/layout/setup.xml

@@ -146,35 +146,6 @@
                         android:src="@mipmap/chevron" />
                 </RelativeLayout>
 
-                <View
-                    android:layout_width="match_parent"
-                    android:layout_height="@dimen/dp_2"
-                    android:background="#F6F6F9" />
-
-                <RelativeLayout
-                    android:id="@+id/r8"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:paddingTop="@dimen/dp_20"
-                    android:paddingBottom="@dimen/dp_20">
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="交易规则"
-                        android:textColor="#ff000000"
-                        android:textSize="@dimen/sp_15" />
-
-                    <ImageView
-                        android:layout_width="@dimen/dp_4"
-                        android:layout_height="@dimen/dp_8"
-                        android:layout_alignParentRight="true"
-                        android:layout_centerVertical="true"
-                        android:background="@null"
-                        android:scaleType="fitXY"
-                        android:src="@mipmap/chevron" />
-                </RelativeLayout>
-
                 <View
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/dp_2"
@@ -304,19 +275,11 @@
                         android:scaleType="fitXY"
                         android:src="@mipmap/chevron" />
                 </RelativeLayout>
+
                 <View
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/dp_2"
                     android:background="#F6F6F9" />
-                <TextView
-                    android:layout_marginTop="@dimen/dp_20"
-                    android:gravity="center"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:text="ICP备案号:豫ICP备09025418号-24A"
-                    />
-
-
             </LinearLayout>
 
         </androidx.core.widget.NestedScrollView>

app/src/main/res/values-sw1540dp/dimens.xml

@@ -0,0 +1,424 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources>
+	<dimen name="common_margin">@dimen/dp_15</dimen>
+	<dimen name="dp_m_60">-256.6667dp</dimen>
+	<dimen name="dp_m_50">-213.8889dp</dimen>
+	<dimen name="dp_m_30">-128.3333dp</dimen>
+	<dimen name="dp_m_20">-85.5556dp</dimen>
+	<dimen name="dp_m_12">-51.3333dp</dimen>
+	<dimen name="dp_m_10">-42.7778dp</dimen>
+	<dimen name="dp_m_8">-34.2222dp</dimen>
+	<dimen name="dp_m_5">-21.3889dp</dimen>
+	<dimen name="dp_m_2">-8.5556dp</dimen>
+	<dimen name="dp_m_1">-4.2778dp</dimen>
+	<dimen name="dp_0">0.0000dp</dimen>
+	<dimen name="dp_0_1">0.4278dp</dimen>
+	<dimen name="dp_0_5">2.1389dp</dimen>
+	<dimen name="dp_1">4.2778dp</dimen>
+	<dimen name="dp_1_5">6.4167dp</dimen>
+	<dimen name="dp_2">8.5556dp</dimen>
+	<dimen name="dp_2_5">10.6944dp</dimen>
+	<dimen name="dp_3">12.8333dp</dimen>
+	<dimen name="dp_3_5">14.9722dp</dimen>
+	<dimen name="dp_4">17.1111dp</dimen>
+	<dimen name="dp_4_5">19.2500dp</dimen>
+	<dimen name="dp_5">21.3889dp</dimen>
+	<dimen name="dp_6">25.6667dp</dimen>
+	<dimen name="dp_7">29.9444dp</dimen>
+	<dimen name="dp_8">34.2222dp</dimen>
+	<dimen name="dp_9">38.5000dp</dimen>
+	<dimen name="dp_10">42.7778dp</dimen>
+	<dimen name="dp_11">47.0556dp</dimen>
+	<dimen name="dp_12">51.3333dp</dimen>
+	<dimen name="dp_13">55.6111dp</dimen>
+	<dimen name="dp_14">59.8889dp</dimen>
+	<dimen name="dp_15">64.1667dp</dimen>
+	<dimen name="dp_16">68.4444dp</dimen>
+	<dimen name="dp_17">72.7222dp</dimen>
+	<dimen name="dp_18">77.0000dp</dimen>
+	<dimen name="dp_19">81.2778dp</dimen>
+	<dimen name="dp_20">85.5556dp</dimen>
+	<dimen name="dp_21">89.8333dp</dimen>
+	<dimen name="dp_22">94.1111dp</dimen>
+	<dimen name="dp_23">98.3889dp</dimen>
+	<dimen name="dp_24">102.6667dp</dimen>
+	<dimen name="dp_25">106.9444dp</dimen>
+	<dimen name="dp_26">111.2222dp</dimen>
+	<dimen name="dp_27">115.5000dp</dimen>
+	<dimen name="dp_28">119.7778dp</dimen>
+	<dimen name="dp_29">124.0556dp</dimen>
+	<dimen name="dp_30">128.3333dp</dimen>
+	<dimen name="dp_31">132.6111dp</dimen>
+	<dimen name="dp_32">136.8889dp</dimen>
+	<dimen name="dp_33">141.1667dp</dimen>
+	<dimen name="dp_34">145.4444dp</dimen>
+	<dimen name="dp_35">149.7222dp</dimen>
+	<dimen name="dp_36">154.0000dp</dimen>
+	<dimen name="dp_37">158.2778dp</dimen>
+	<dimen name="dp_38">162.5556dp</dimen>
+	<dimen name="dp_39">166.8333dp</dimen>
+	<dimen name="dp_40">171.1111dp</dimen>
+	<dimen name="dp_41">175.3889dp</dimen>
+	<dimen name="dp_42">179.6667dp</dimen>
+	<dimen name="dp_43">183.9444dp</dimen>
+	<dimen name="dp_44">188.2222dp</dimen>
+	<dimen name="dp_45">192.5000dp</dimen>
+	<dimen name="dp_46">196.7778dp</dimen>
+	<dimen name="dp_47">201.0556dp</dimen>
+	<dimen name="dp_48">205.3333dp</dimen>
+	<dimen name="dp_49">209.6111dp</dimen>
+	<dimen name="dp_50">213.8889dp</dimen>
+	<dimen name="dp_51">218.1667dp</dimen>
+	<dimen name="dp_52">222.4444dp</dimen>
+	<dimen name="dp_53">226.7222dp</dimen>
+	<dimen name="dp_54">231.0000dp</dimen>
+	<dimen name="dp_55">235.2778dp</dimen>
+	<dimen name="dp_56">239.5556dp</dimen>
+	<dimen name="dp_57">243.8333dp</dimen>
+	<dimen name="dp_58">248.1111dp</dimen>
+	<dimen name="dp_59">252.3889dp</dimen>
+	<dimen name="dp_60">256.6667dp</dimen>
+	<dimen name="dp_61">260.9444dp</dimen>
+	<dimen name="dp_62">265.2222dp</dimen>
+	<dimen name="dp_63">269.5000dp</dimen>
+	<dimen name="dp_64">273.7778dp</dimen>
+	<dimen name="dp_65">278.0556dp</dimen>
+	<dimen name="dp_66">282.3333dp</dimen>
+	<dimen name="dp_67">286.6111dp</dimen>
+	<dimen name="dp_68">290.8889dp</dimen>
+	<dimen name="dp_69">295.1667dp</dimen>
+	<dimen name="dp_70">299.4444dp</dimen>
+	<dimen name="dp_71">303.7222dp</dimen>
+	<dimen name="dp_72">308.0000dp</dimen>
+	<dimen name="dp_73">312.2778dp</dimen>
+	<dimen name="dp_74">316.5556dp</dimen>
+	<dimen name="dp_75">320.8333dp</dimen>
+	<dimen name="dp_76">325.1111dp</dimen>
+	<dimen name="dp_77">329.3889dp</dimen>
+	<dimen name="dp_78">333.6667dp</dimen>
+	<dimen name="dp_79">337.9444dp</dimen>
+	<dimen name="dp_80">342.2222dp</dimen>
+	<dimen name="dp_81">346.5000dp</dimen>
+	<dimen name="dp_82">350.7778dp</dimen>
+	<dimen name="dp_83">355.0556dp</dimen>
+	<dimen name="dp_84">359.3333dp</dimen>
+	<dimen name="dp_85">363.6111dp</dimen>
+	<dimen name="dp_86">367.8889dp</dimen>
+	<dimen name="dp_87">372.1667dp</dimen>
+	<dimen name="dp_88">376.4444dp</dimen>
+	<dimen name="dp_89">380.7222dp</dimen>
+	<dimen name="dp_90">385.0000dp</dimen>
+	<dimen name="dp_91">389.2778dp</dimen>
+	<dimen name="dp_92">393.5556dp</dimen>
+	<dimen name="dp_93">397.8333dp</dimen>
+	<dimen name="dp_94">402.1111dp</dimen>
+	<dimen name="dp_95">406.3889dp</dimen>
+	<dimen name="dp_96">410.6667dp</dimen>
+	<dimen name="dp_97">414.9444dp</dimen>
+	<dimen name="dp_98">419.2222dp</dimen>
+	<dimen name="dp_99">423.5000dp</dimen>
+	<dimen name="dp_100">427.7778dp</dimen>
+	<dimen name="dp_101">432.0556dp</dimen>
+	<dimen name="dp_102">436.3333dp</dimen>
+	<dimen name="dp_103">440.6111dp</dimen>
+	<dimen name="dp_104">444.8889dp</dimen>
+	<dimen name="dp_105">449.1667dp</dimen>
+	<dimen name="dp_106">453.4444dp</dimen>
+	<dimen name="dp_107">457.7222dp</dimen>
+	<dimen name="dp_108">462.0000dp</dimen>
+	<dimen name="dp_109">466.2778dp</dimen>
+	<dimen name="dp_110">470.5556dp</dimen>
+	<dimen name="dp_111">474.8333dp</dimen>
+	<dimen name="dp_112">479.1111dp</dimen>
+	<dimen name="dp_113">483.3889dp</dimen>
+	<dimen name="dp_114">487.6667dp</dimen>
+	<dimen name="dp_115">491.9444dp</dimen>
+	<dimen name="dp_116">496.2222dp</dimen>
+	<dimen name="dp_117">500.5000dp</dimen>
+	<dimen name="dp_118">504.7778dp</dimen>
+	<dimen name="dp_119">509.0556dp</dimen>
+	<dimen name="dp_120">513.3333dp</dimen>
+	<dimen name="dp_121">517.6111dp</dimen>
+	<dimen name="dp_122">521.8889dp</dimen>
+	<dimen name="dp_123">526.1667dp</dimen>
+	<dimen name="dp_124">530.4444dp</dimen>
+	<dimen name="dp_125">534.7222dp</dimen>
+	<dimen name="dp_126">539.0000dp</dimen>
+	<dimen name="dp_127">543.2778dp</dimen>
+	<dimen name="dp_128">547.5556dp</dimen>
+	<dimen name="dp_129">551.8333dp</dimen>
+	<dimen name="dp_130">556.1111dp</dimen>
+	<dimen name="dp_131">560.3889dp</dimen>
+	<dimen name="dp_132">564.6667dp</dimen>
+	<dimen name="dp_133">568.9444dp</dimen>
+	<dimen name="dp_134">573.2222dp</dimen>
+	<dimen name="dp_135">577.5000dp</dimen>
+	<dimen name="dp_136">581.7778dp</dimen>
+	<dimen name="dp_137">586.0556dp</dimen>
+	<dimen name="dp_138">590.3333dp</dimen>
+	<dimen name="dp_139">594.6111dp</dimen>
+	<dimen name="dp_140">598.8889dp</dimen>
+	<dimen name="dp_141">603.1667dp</dimen>
+	<dimen name="dp_142">607.4444dp</dimen>
+	<dimen name="dp_143">611.7222dp</dimen>
+	<dimen name="dp_144">616.0000dp</dimen>
+	<dimen name="dp_145">620.2778dp</dimen>
+	<dimen name="dp_146">624.5556dp</dimen>
+	<dimen name="dp_147">628.8333dp</dimen>
+	<dimen name="dp_148">633.1111dp</dimen>
+	<dimen name="dp_149">637.3889dp</dimen>
+	<dimen name="dp_150">641.6667dp</dimen>
+	<dimen name="dp_151">645.9444dp</dimen>
+	<dimen name="dp_152">650.2222dp</dimen>
+	<dimen name="dp_153">654.5000dp</dimen>
+	<dimen name="dp_154">658.7778dp</dimen>
+	<dimen name="dp_155">663.0556dp</dimen>
+	<dimen name="dp_156">667.3333dp</dimen>
+	<dimen name="dp_157">671.6111dp</dimen>
+	<dimen name="dp_158">675.8889dp</dimen>
+	<dimen name="dp_159">680.1667dp</dimen>
+	<dimen name="dp_160">684.4444dp</dimen>
+	<dimen name="dp_161">688.7222dp</dimen>
+	<dimen name="dp_162">693.0000dp</dimen>
+	<dimen name="dp_163">697.2778dp</dimen>
+	<dimen name="dp_164">701.5556dp</dimen>
+	<dimen name="dp_165">705.8333dp</dimen>
+	<dimen name="dp_166">710.1111dp</dimen>
+	<dimen name="dp_167">714.3889dp</dimen>
+	<dimen name="dp_168">718.6667dp</dimen>
+	<dimen name="dp_169">722.9444dp</dimen>
+	<dimen name="dp_170">727.2222dp</dimen>
+	<dimen name="dp_171">731.5000dp</dimen>
+	<dimen name="dp_172">735.7778dp</dimen>
+	<dimen name="dp_173">740.0556dp</dimen>
+	<dimen name="dp_174">744.3333dp</dimen>
+	<dimen name="dp_175">748.6111dp</dimen>
+	<dimen name="dp_176">752.8889dp</dimen>
+	<dimen name="dp_177">757.1667dp</dimen>
+	<dimen name="dp_178">761.4444dp</dimen>
+	<dimen name="dp_179">765.7222dp</dimen>
+	<dimen name="dp_180">770.0000dp</dimen>
+	<dimen name="dp_181">774.2778dp</dimen>
+	<dimen name="dp_182">778.5556dp</dimen>
+	<dimen name="dp_183">782.8333dp</dimen>
+	<dimen name="dp_184">787.1111dp</dimen>
+	<dimen name="dp_185">791.3889dp</dimen>
+	<dimen name="dp_186">795.6667dp</dimen>
+	<dimen name="dp_187">799.9444dp</dimen>
+	<dimen name="dp_188">804.2222dp</dimen>
+	<dimen name="dp_189">808.5000dp</dimen>
+	<dimen name="dp_190">812.7778dp</dimen>
+	<dimen name="dp_191">817.0556dp</dimen>
+	<dimen name="dp_192">821.3333dp</dimen>
+	<dimen name="dp_193">825.6111dp</dimen>
+	<dimen name="dp_194">829.8889dp</dimen>
+	<dimen name="dp_195">834.1667dp</dimen>
+	<dimen name="dp_196">838.4444dp</dimen>
+	<dimen name="dp_197">842.7222dp</dimen>
+	<dimen name="dp_198">847.0000dp</dimen>
+	<dimen name="dp_199">851.2778dp</dimen>
+	<dimen name="dp_200">855.5556dp</dimen>
+	<dimen name="dp_201">859.8333dp</dimen>
+	<dimen name="dp_202">864.1111dp</dimen>
+	<dimen name="dp_203">868.3889dp</dimen>
+	<dimen name="dp_204">872.6667dp</dimen>
+	<dimen name="dp_205">876.9444dp</dimen>
+	<dimen name="dp_206">881.2222dp</dimen>
+	<dimen name="dp_207">885.5000dp</dimen>
+	<dimen name="dp_208">889.7778dp</dimen>
+	<dimen name="dp_209">894.0556dp</dimen>
+	<dimen name="dp_210">898.3333dp</dimen>
+	<dimen name="dp_211">902.6111dp</dimen>
+	<dimen name="dp_212">906.8889dp</dimen>
+	<dimen name="dp_213">911.1667dp</dimen>
+	<dimen name="dp_214">915.4444dp</dimen>
+	<dimen name="dp_215">919.7222dp</dimen>
+	<dimen name="dp_216">924.0000dp</dimen>
+	<dimen name="dp_217">928.2778dp</dimen>
+	<dimen name="dp_218">932.5556dp</dimen>
+	<dimen name="dp_219">936.8333dp</dimen>
+	<dimen name="dp_220">941.1111dp</dimen>
+	<dimen name="dp_221">945.3889dp</dimen>
+	<dimen name="dp_222">949.6667dp</dimen>
+	<dimen name="dp_223">953.9444dp</dimen>
+	<dimen name="dp_224">958.2222dp</dimen>
+	<dimen name="dp_225">962.5000dp</dimen>
+	<dimen name="dp_226">966.7778dp</dimen>
+	<dimen name="dp_227">971.0556dp</dimen>
+	<dimen name="dp_228">975.3333dp</dimen>
+	<dimen name="dp_229">979.6111dp</dimen>
+	<dimen name="dp_230">983.8889dp</dimen>
+	<dimen name="dp_231">988.1667dp</dimen>
+	<dimen name="dp_232">992.4444dp</dimen>
+	<dimen name="dp_233">996.7222dp</dimen>
+	<dimen name="dp_234">1001.0000dp</dimen>
+	<dimen name="dp_235">1005.2778dp</dimen>
+	<dimen name="dp_236">1009.5556dp</dimen>
+	<dimen name="dp_237">1013.8333dp</dimen>
+	<dimen name="dp_238">1018.1111dp</dimen>
+	<dimen name="dp_239">1022.3889dp</dimen>
+	<dimen name="dp_240">1026.6667dp</dimen>
+	<dimen name="dp_241">1030.9444dp</dimen>
+	<dimen name="dp_242">1035.2222dp</dimen>
+	<dimen name="dp_243">1039.5000dp</dimen>
+	<dimen name="dp_244">1043.7778dp</dimen>
+	<dimen name="dp_245">1048.0556dp</dimen>
+	<dimen name="dp_246">1052.3333dp</dimen>
+	<dimen name="dp_247">1056.6111dp</dimen>
+	<dimen name="dp_248">1060.8889dp</dimen>
+	<dimen name="dp_249">1065.1667dp</dimen>
+	<dimen name="dp_250">1069.4444dp</dimen>
+	<dimen name="dp_251">1073.7222dp</dimen>
+	<dimen name="dp_252">1078.0000dp</dimen>
+	<dimen name="dp_253">1082.2778dp</dimen>
+	<dimen name="dp_254">1086.5556dp</dimen>
+	<dimen name="dp_255">1090.8333dp</dimen>
+	<dimen name="dp_256">1095.1111dp</dimen>
+	<dimen name="dp_257">1099.3889dp</dimen>
+	<dimen name="dp_258">1103.6667dp</dimen>
+	<dimen name="dp_259">1107.9444dp</dimen>
+	<dimen name="dp_260">1112.2222dp</dimen>
+	<dimen name="dp_261">1116.5000dp</dimen>
+	<dimen name="dp_262">1120.7778dp</dimen>
+	<dimen name="dp_263">1125.0556dp</dimen>
+	<dimen name="dp_264">1129.3333dp</dimen>
+	<dimen name="dp_265">1133.6111dp</dimen>
+	<dimen name="dp_266">1137.8889dp</dimen>
+	<dimen name="dp_267">1142.1667dp</dimen>
+	<dimen name="dp_268">1146.4444dp</dimen>
+	<dimen name="dp_269">1150.7222dp</dimen>
+	<dimen name="dp_270">1155.0000dp</dimen>
+	<dimen name="dp_271">1159.2778dp</dimen>
+	<dimen name="dp_272">1163.5556dp</dimen>
+	<dimen name="dp_273">1167.8333dp</dimen>
+	<dimen name="dp_274">1172.1111dp</dimen>
+	<dimen name="dp_275">1176.3889dp</dimen>
+	<dimen name="dp_276">1180.6667dp</dimen>
+	<dimen name="dp_277">1184.9444dp</dimen>
+	<dimen name="dp_278">1189.2222dp</dimen>
+	<dimen name="dp_279">1193.5000dp</dimen>
+	<dimen name="dp_280">1197.7778dp</dimen>
+	<dimen name="dp_281">1202.0556dp</dimen>
+	<dimen name="dp_282">1206.3333dp</dimen>
+	<dimen name="dp_283">1210.6111dp</dimen>
+	<dimen name="dp_284">1214.8889dp</dimen>
+	<dimen name="dp_285">1219.1667dp</dimen>
+	<dimen name="dp_286">1223.4444dp</dimen>
+	<dimen name="dp_287">1227.7222dp</dimen>
+	<dimen name="dp_288">1232.0000dp</dimen>
+	<dimen name="dp_289">1236.2778dp</dimen>
+	<dimen name="dp_290">1240.5556dp</dimen>
+	<dimen name="dp_291">1244.8333dp</dimen>
+	<dimen name="dp_292">1249.1111dp</dimen>
+	<dimen name="dp_293">1253.3889dp</dimen>
+	<dimen name="dp_294">1257.6667dp</dimen>
+	<dimen name="dp_295">1261.9444dp</dimen>
+	<dimen name="dp_296">1266.2222dp</dimen>
+	<dimen name="dp_297">1270.5000dp</dimen>
+	<dimen name="dp_298">1274.7778dp</dimen>
+	<dimen name="dp_299">1279.0556dp</dimen>
+	<dimen name="dp_300">1283.3333dp</dimen>
+	<dimen name="dp_301">1287.6111dp</dimen>
+	<dimen name="dp_302">1291.8889dp</dimen>
+	<dimen name="dp_303">1296.1667dp</dimen>
+	<dimen name="dp_304">1300.4444dp</dimen>
+	<dimen name="dp_305">1304.7222dp</dimen>
+	<dimen name="dp_306">1309.0000dp</dimen>
+	<dimen name="dp_307">1313.2778dp</dimen>
+	<dimen name="dp_308">1317.5556dp</dimen>
+	<dimen name="dp_309">1321.8333dp</dimen>
+	<dimen name="dp_310">1326.1111dp</dimen>
+	<dimen name="dp_311">1330.3889dp</dimen>
+	<dimen name="dp_312">1334.6667dp</dimen>
+	<dimen name="dp_313">1338.9444dp</dimen>
+	<dimen name="dp_314">1343.2222dp</dimen>
+	<dimen name="dp_315">1347.5000dp</dimen>
+	<dimen name="dp_316">1351.7778dp</dimen>
+	<dimen name="dp_317">1356.0556dp</dimen>
+	<dimen name="dp_318">1360.3333dp</dimen>
+	<dimen name="dp_319">1364.6111dp</dimen>
+	<dimen name="dp_320">1368.8889dp</dimen>
+	<dimen name="dp_321">1373.1667dp</dimen>
+	<dimen name="dp_322">1377.4444dp</dimen>
+	<dimen name="dp_323">1381.7222dp</dimen>
+	<dimen name="dp_324">1386.0000dp</dimen>
+	<dimen name="dp_325">1390.2778dp</dimen>
+	<dimen name="dp_326">1394.5556dp</dimen>
+	<dimen name="dp_327">1398.8333dp</dimen>
+	<dimen name="dp_328">1403.1111dp</dimen>
+	<dimen name="dp_329">1407.3889dp</dimen>
+	<dimen name="dp_330">1411.6667dp</dimen>
+	<dimen name="dp_331">1415.9444dp</dimen>
+	<dimen name="dp_332">1420.2222dp</dimen>
+	<dimen name="dp_333">1424.5000dp</dimen>
+	<dimen name="dp_334">1428.7778dp</dimen>
+	<dimen name="dp_335">1433.0556dp</dimen>
+	<dimen name="dp_336">1437.3333dp</dimen>
+	<dimen name="dp_337">1441.6111dp</dimen>
+	<dimen name="dp_338">1445.8889dp</dimen>
+	<dimen name="dp_339">1450.1667dp</dimen>
+	<dimen name="dp_340">1454.4444dp</dimen>
+	<dimen name="dp_341">1458.7222dp</dimen>
+	<dimen name="dp_342">1463.0000dp</dimen>
+	<dimen name="dp_343">1467.2778dp</dimen>
+	<dimen name="dp_344">1471.5556dp</dimen>
+	<dimen name="dp_345">1475.8333dp</dimen>
+	<dimen name="dp_346">1480.1111dp</dimen>
+	<dimen name="dp_347">1484.3889dp</dimen>
+	<dimen name="dp_348">1488.6667dp</dimen>
+	<dimen name="dp_349">1492.9444dp</dimen>
+	<dimen name="dp_350">1497.2222dp</dimen>
+	<dimen name="dp_351">1501.5000dp</dimen>
+	<dimen name="dp_352">1505.7778dp</dimen>
+	<dimen name="dp_353">1510.0556dp</dimen>
+	<dimen name="dp_354">1514.3333dp</dimen>
+	<dimen name="dp_355">1518.6111dp</dimen>
+	<dimen name="dp_356">1522.8889dp</dimen>
+	<dimen name="dp_357">1527.1667dp</dimen>
+	<dimen name="dp_358">1531.4444dp</dimen>
+	<dimen name="dp_359">1535.7222dp</dimen>
+	<dimen name="dp_360">1540.0000dp</dimen>
+	<dimen name="dp_365">1561.3889dp</dimen>
+	<dimen name="dp_370">1582.7778dp</dimen>
+	<dimen name="dp_380">1625.5556dp</dimen>
+	<dimen name="dp_385">1646.9444dp</dimen>
+	<dimen name="dp_400">1711.1111dp</dimen>
+	<dimen name="dp_410">1753.8889dp</dimen>
+	<dimen name="dp_422">1805.2222dp</dimen>
+	<dimen name="dp_472">2019.1111dp</dimen>
+	<dimen name="dp_500">2138.8889dp</dimen>
+	<dimen name="dp_600">2566.6667dp</dimen>
+	<dimen name="dp_640">2737.7778dp</dimen>
+	<dimen name="dp_720">3080.0000dp</dimen>
+	<dimen name="sp_6">25.6667dp</dimen>
+	<dimen name="sp_7">29.9444dp</dimen>
+	<dimen name="sp_8">34.2222dp</dimen>
+	<dimen name="sp_9">38.5000dp</dimen>
+	<dimen name="sp_10">42.7778dp</dimen>
+	<dimen name="sp_11">47.0556dp</dimen>
+	<dimen name="sp_12">51.3333dp</dimen>
+	<dimen name="sp_13">55.6111dp</dimen>
+	<dimen name="sp_14">59.8889dp</dimen>
+	<dimen name="sp_15">64.1667dp</dimen>
+	<dimen name="sp_16">68.4444dp</dimen>
+	<dimen name="sp_17">72.7222dp</dimen>
+	<dimen name="sp_18">77.0000dp</dimen>
+	<dimen name="sp_19">81.2778dp</dimen>
+	<dimen name="sp_20">85.5556dp</dimen>
+	<dimen name="sp_21">89.8333dp</dimen>
+	<dimen name="sp_22">94.1111dp</dimen>
+	<dimen name="sp_23">98.3889dp</dimen>
+	<dimen name="sp_24">102.6667dp</dimen>
+	<dimen name="sp_25">106.9444dp</dimen>
+	<dimen name="sp_28">119.7778dp</dimen>
+	<dimen name="sp_30">128.3333dp</dimen>
+	<dimen name="sp_32">136.8889dp</dimen>
+	<dimen name="sp_34">145.4444dp</dimen>
+	<dimen name="sp_36">154.0000dp</dimen>
+	<dimen name="sp_38">162.5556dp</dimen>
+	<dimen name="sp_40">171.1111dp</dimen>
+	<dimen name="sp_42">179.6667dp</dimen>
+	<dimen name="sp_48">205.3333dp</dimen>
+	<dimen name="sp_58">248.1111dp</dimen>
+	<dimen name="sp_115">491.9444dp</dimen>
+</resources>

build.gradle

@@ -1,8 +1,8 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 apply from: "compile.gradle"
 buildscript {
-//    ext.kotlin_version = "1.5.0"
-    ext.kotlin_version = "1.6.10"
+    ext.kotlin_version = "1.5.0"
+//    ext.kotlin_version = "1.6.10"
     repositories {
         google()
         jcenter() // 这个

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Mon Jul 12 10:16:49 CST 2021
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://mirrors.cloud.tencent.com/gradle/gradle-6.7.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

mylibrary/build.gradle

@@ -66,7 +66,7 @@ dependencies {
     api rootProject.ext.dependencies["Xpopup"]
     api rootProject.ext.dependencies["Countdownview"]
 //    api rootProject.ext.dependencies["CheckVersionLib"]
-    api rootProject.ext.dependencies["Bugly"]
+//    api rootProject.ext.dependencies["Bugly"]
 //    api rootProject.ext.dependencies["Zxing"]
     api rootProject.ext.dependencies["Multidex"]
 //    api rootProject.ext.dependencies["FlycoTabLayout"]

mylibrary/src/main/java/com/dahe/mylibrary/utils/ToastUtils.java

@@ -29,24 +29,6 @@ public class ToastUtils {
         }
     }
 
-    public static void showLongToast(Context mContext, String message) {
-        if (!TextUtils.isEmpty(message)) {
-
-//            if ( mToast != null) {
-//                mToast.cancel();
-//            }
-//            mToast = Toast.makeText(mContext, message, Toast.LENGTH_SHORT);
-//            mToast.show();
-
-            if (mToast == null) {
-                mToast = Toast.makeText(mContext, message, Toast.LENGTH_LONG);
-            } else {
-                mToast.setText(message);
-            }
-            mToast.show();
-        }
-    }
-
     public static void cancelToast(){
         if (mToast!=null)
             mToast.cancel();

ocr_ui/.gitignore

@@ -0,0 +1 @@
+/build

ocr_ui/build.gradle

@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2017 Baidu, Inc. All Rights Reserved.
+ */
+apply plugin: 'com.android.library'
+
+android {
+
+    compileSdkVersion 30
+    buildToolsVersion "30.0.3"
+    defaultConfig {
+        minSdkVersion 23
+        targetSdkVersion 30
+        versionCode 1
+        versionName "1.0"
+
+        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+}
+
+dependencies {
+    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
+        exclude group: 'com.android.support', module: 'support-annotations'
+    })
+    compile 'com.android.support:appcompat-v7:27.1.1'
+    testCompile 'junit:junit:4.12'
+    compile files('libs/license.jar')
+}

ocr_ui/proguard-rules.pro

@@ -0,0 +1,18 @@
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in /Users/baidu/IDE/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the proguardFiles
+# directive in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+-dontwarn com.baidu.ocr.**

ocr_ui/src/main/AndroidManifest.xml

@@ -0,0 +1,32 @@
+<!--
+  ~ Copyright (C) 2017 Baidu, Inc. All Rights Reserved.
+  -->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    package="com.baidu.ocr.ui">
+
+    <uses-permission android:name="android.permission.CAMERA" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+
+    <uses-feature android:name="android.hardware.camera2.full" />
+    <uses-feature android:name="android.hardware.camera" />
+    <uses-feature android:name="android.hardware.camera.autofocus" />
+
+    <application
+        android:allowBackup="true"
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/app_name"
+        android:supportsRtl="true"
+        android:theme="@style/AppTheme"
+        android:vmSafeMode="true"
+        tools:replace="android:allowBackup,android:icon">
+
+        <activity
+            android:name="com.baidu.ocr.ui.camera.CameraActivity"
+            android:configChanges="screenSize|orientation"
+            android:theme="@android:style/Theme.Holo.NoActionBar.Fullscreen" />
+
+    </application>
+
+</manifest>

ocr_ui/src/main/java/com/baidu/idcardquality/IDcardQualityProcess.java

@@ -0,0 +1,128 @@
+/*
+ * Copyright (C) 2017 Baidu, Inc. All Rights Reserved.
+ */
+package com.baidu.idcardquality;
+
+import android.content.res.AssetManager;
+import android.graphics.Bitmap;
+
+import com.baidu.idl.authority.AlgorithmOnMainThreadException;
+import com.baidu.idl.authority.IDLAuthorityException;
+import com.baidu.idl.license.License;
+import com.baidu.idl.util.UIThread;
+
+import java.util.concurrent.locks.ReentrantReadWriteLock;
+
+public class IDcardQualityProcess {
+    final ReentrantReadWriteLock nativeModelLock = new ReentrantReadWriteLock();
+    private static IDcardQualityProcess mInstance;
+    private static String tokenString;
+    private static int mAuthorityStatus;
+    private static Throwable loadNativeException = null;
+    private static volatile boolean hasReleased;
+
+    public IDcardQualityProcess() {
+    }
+
+    public static synchronized IDcardQualityProcess getInstance() {
+        if (null == mInstance) {
+            mInstance = new IDcardQualityProcess();
+        }
+
+        return mInstance;
+    }
+
+    public native byte[] convertRGBImage(int[] colors, int width, int height);
+
+    public native int idcardQualityModelInit(AssetManager var1, String var2);
+
+    public native int idcardQualityCaptchaRelease();
+
+    public native int idcardQualityProcess(byte[] var1, int var2, int var3, boolean var4, int var5);
+
+    public static synchronized int init(String token) throws AlgorithmOnMainThreadException, IDLAuthorityException {
+        if (UIThread.isUITread()) {
+            throw new AlgorithmOnMainThreadException();
+        } else {
+            tokenString = token;
+
+            try {
+                mAuthorityStatus = License.getInstance().init(tokenString);
+            } catch (Exception var2) {
+                var2.printStackTrace();
+            }
+
+            return mAuthorityStatus;
+        }
+    }
+
+    public int idcardQualityInit(AssetManager assetManager, String modelPath) {
+        if (mAuthorityStatus == 0) {
+            hasReleased = false;
+            nativeModelLock.writeLock().lock();
+            int status = this.idcardQualityModelInit(assetManager, modelPath);
+            nativeModelLock.writeLock().unlock();
+            return status;
+        } else {
+            return mAuthorityStatus;
+        }
+    }
+
+    public int idcardQualityRelease() {
+        if (mAuthorityStatus == 0) {
+            hasReleased = true;
+            nativeModelLock.writeLock().lock();
+            this.idcardQualityCaptchaRelease();
+            nativeModelLock.writeLock().unlock();
+            return 0;
+        } else {
+            return mAuthorityStatus;
+        }
+    }
+
+    public int idcardQualityDetectionImg(Bitmap img, boolean isfont) {
+        int status;
+        if (mAuthorityStatus == 0) {
+            if (hasReleased) {
+                return -1;
+            }
+            int imgHeight = img.getHeight();
+            int imgWidth = img.getWidth();
+            byte[] imageData = this.getRGBImageData(img);
+            nativeModelLock.readLock().lock();
+            status = this.idcardQualityProcess(imageData, imgHeight, imgWidth, isfont, 3);
+            nativeModelLock.readLock().unlock();
+            return status;
+        } else {
+            return mAuthorityStatus;
+        }
+    }
+
+    public static Throwable getLoadSoException() {
+        return loadNativeException;
+    }
+
+    public byte[] getRGBImageData(Bitmap img) {
+        int imgWidth = img.getWidth();
+        int imgHeight = img.getHeight();
+        int[] pixels = new int[imgWidth * imgHeight];
+        img.getPixels(pixels, 0, imgWidth, 0, 0, imgWidth, imgHeight);
+        byte[] imageData = convertRGBImage(pixels, imgWidth, imgHeight);
+        return imageData;
+    }
+
+    public void releaseModel() {
+        this.idcardQualityRelease();
+    }
+
+    static {
+        try {
+            System.loadLibrary("idl_license");
+            System.loadLibrary("idcard_quality.1.1.1");
+        } catch (Throwable e) {
+            loadNativeException = e;
+        }
+        mInstance = null;
+        mAuthorityStatus = 256;
+    }
+}

ocr_ui/src/main/java/com/baidu/ocr/ui/camera/Camera1Control.java

@@ -0,0 +1,573 @@
+/*
+ * Copyright (C) 2017 Baidu, Inc. All Rights Reserved.
+ */
+package com.baidu.ocr.ui.camera;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import android.Manifest;
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.graphics.ImageFormat;
+import android.graphics.Rect;
+import android.graphics.SurfaceTexture;
+import android.graphics.YuvImage;
+import android.hardware.Camera;
+import android.view.TextureView;
+import android.view.View;
+import android.widget.FrameLayout;
+
+import androidx.core.app.ActivityCompat;
+
+/**
+ * 5.0以下相机API的封装。
+ */
+@SuppressWarnings("deprecation")
+public class Camera1Control implements ICameraControl {
+
+    private int displayOrientation = 0;
+    private int cameraId = 0;
+    private int flashMode;
+    private AtomicBoolean takingPicture = new AtomicBoolean(false);
+    private AtomicBoolean abortingScan = new AtomicBoolean(false);
+    private Context context;
+    private Camera camera;
+
+    private Camera.Parameters parameters;
+    private PermissionCallback permissionCallback;
+    private Rect previewFrame = new Rect();
+
+    private PreviewView previewView;
+    private View displayView;
+    private int rotation = 0;
+    private OnDetectPictureCallback detectCallback;
+    private int previewFrameCount = 0;
+    private Camera.Size optSize;
+
+    /*
+     * 非扫描模式
+     */
+    private final int MODEL_NOSCAN = 0;
+
+    /*
+     * 本地质量控制扫描模式
+     */
+    private final int MODEL_SCAN = 1;
+
+    private int detectType = MODEL_NOSCAN;
+
+    public int getCameraRotation() {
+        return rotation;
+    }
+
+    public AtomicBoolean getAbortingScan() {
+        return abortingScan;
+    }
+
+    @Override
+    public void setDetectCallback(OnDetectPictureCallback callback) {
+        detectType = MODEL_SCAN;
+        detectCallback = callback;
+    }
+
+    private void onRequestDetect(byte[] data) {
+        // 相机已经关闭
+        if (camera == null || data == null || optSize == null) {
+            return;
+        }
+
+        YuvImage img = new YuvImage(data, ImageFormat.NV21, optSize.width, optSize.height, null);
+        ByteArrayOutputStream os = null;
+        try {
+            os = new ByteArrayOutputStream(data.length);
+            img.compressToJpeg(new Rect(0, 0, optSize.width, optSize.height), 80, os);
+            byte[] jpeg = os.toByteArray();
+        int status = detectCallback.onDetect(jpeg, getCameraRotation());
+
+        if (status == 0) {
+            clearPreviewCallback();
+        }
+        } catch (OutOfMemoryError e) {
+            // 内存溢出则取消当次操作
+        } finally {
+            try {
+                os.close();
+            } catch (Throwable e) {
+                e.printStackTrace();
+            }
+        }
+
+    }
+
+    @Override
+    public void setDisplayOrientation(@CameraView.Orientation int displayOrientation) {
+        this.displayOrientation = displayOrientation;
+        switch (displayOrientation) {
+            case CameraView.ORIENTATION_PORTRAIT:
+                rotation = 90;
+                break;
+            case CameraView.ORIENTATION_HORIZONTAL:
+                rotation = 0;
+                break;
+            case CameraView.ORIENTATION_INVERT:
+                rotation = 180;
+                break;
+            default:
+                rotation = 0;
+        }
+        previewView.requestLayout();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void refreshPermission() {
+        startPreview(true);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void setFlashMode(@FlashMode int flashMode) {
+        if (this.flashMode == flashMode) {
+            return;
+        }
+        this.flashMode = flashMode;
+        updateFlashMode(flashMode);
+    }
+
+    @Override
+    public int getFlashMode() {
+        return flashMode;
+    }
+
+    @Override
+    public void start() {
+        startPreview(false);
+    }
+
+    @Override
+    public void stop() {
+        if (camera != null) {
+            camera.setPreviewCallback(null);
+            stopPreview();
+            // 避免同步代码，为了先设置null后release
+            Camera tempC = camera;
+            camera = null;
+            tempC.release();
+            camera = null;
+            buffer = null;
+        }
+    }
+
+    private void stopPreview() {
+        if (camera != null) {
+            camera.stopPreview();
+        }
+    }
+
+    @Override
+    public void pause() {
+        if (camera != null) {
+            stopPreview();
+        }
+        setFlashMode(FLASH_MODE_OFF);
+    }
+
+    @Override
+    public void resume() {
+        takingPicture.set(false);
+        if (camera == null) {
+            openCamera();
+        } else {
+            previewView.textureView.setSurfaceTextureListener(surfaceTextureListener);
+            if (previewView.textureView.isAvailable()) {
+                startPreview(false);
+            }
+        }
+    }
+
+    @Override
+    public View getDisplayView() {
+        return displayView;
+    }
+
+    @Override
+    public void takePicture(final OnTakePictureCallback onTakePictureCallback) {
+        if (takingPicture.get()) {
+            return;
+        }
+        switch (displayOrientation) {
+            case CameraView.ORIENTATION_PORTRAIT:
+                parameters.setRotation(90);
+                break;
+            case CameraView.ORIENTATION_HORIZONTAL:
+                parameters.setRotation(0);
+                break;
+            case CameraView.ORIENTATION_INVERT:
+                parameters.setRotation(180);
+                break;
+        }
+        try {
+            Camera.Size picSize = getOptimalSize(camera.getParameters().getSupportedPictureSizes());
+            parameters.setPictureSize(picSize.width, picSize.height);
+            camera.setParameters(parameters);
+            takingPicture.set(true);
+            cancelAutoFocus();
+            CameraThreadPool.execute(new Runnable() {
+                @Override
+                public void run() {
+                    camera.takePicture(null, null, new Camera.PictureCallback() {
+                        @Override
+                        public void onPictureTaken(byte[] data, Camera camera) {
+                            startPreview(false);
+                            takingPicture.set(false);
+                            if (onTakePictureCallback != null) {
+                                onTakePictureCallback.onPictureTaken(data);
+                            }
+                        }
+                    });
+                }
+            });
+
+        } catch (RuntimeException e) {
+            e.printStackTrace();
+            startPreview(false);;
+            takingPicture.set(false);
+        }
+    }
+
+    @Override
+    public void setPermissionCallback(PermissionCallback callback) {
+        this.permissionCallback = callback;
+    }
+
+    public Camera1Control(Context context) {
+        this.context = context;
+        previewView = new PreviewView(context);
+        openCamera();
+    }
+
+    private void openCamera() {
+        setupDisplayView();
+    }
+
+    private void setupDisplayView() {
+        final TextureView textureView = new TextureView(context);
+        previewView.textureView = textureView;
+        previewView.setTextureView(textureView);
+        displayView = previewView;
+        textureView.setSurfaceTextureListener(surfaceTextureListener);
+    }
+
+    private SurfaceTexture surfaceCache;
+
+    private byte[] buffer = null;
+
+    private void setPreviewCallbackImpl() {
+        if (buffer == null) {
+            buffer = new byte[displayView.getWidth()
+                    * displayView.getHeight() * ImageFormat.getBitsPerPixel(ImageFormat.NV21) / 8];
+        }
+        if (camera != null && detectType == MODEL_SCAN) {
+            camera.addCallbackBuffer(buffer);
+            camera.setPreviewCallback(previewCallback);
+        }
+    }
+
+    private void clearPreviewCallback() {
+        if (camera != null && detectType == MODEL_SCAN) {
+            camera.setPreviewCallback(null);
+            stopPreview();
+        }
+    }
+
+    Camera.PreviewCallback previewCallback = new Camera.PreviewCallback() {
+        @Override
+        public void onPreviewFrame(final byte[] data, Camera camera) {
+            // 扫描成功阻止打开新线程处理
+            if (abortingScan.get()) {
+                return;
+            }
+            // 节流
+            if (previewFrameCount++ % 5 != 0) {
+                return;
+            }
+
+            // 在某些机型和某项项目中，某些帧的data的数据不符合nv21的格式，需要过滤，否则后续处理会导致crash
+            if (data.length != parameters.getPreviewSize().width * parameters.getPreviewSize().height * 1.5) {
+                return;
+            }
+
+            camera.addCallbackBuffer(buffer);
+
+            CameraThreadPool.execute(new Runnable() {
+                @Override
+                public void run() {
+                    Camera1Control.this.onRequestDetect(data);
+                }
+            });
+        }
+    };
+
+
+    private void initCamera() {
+        try {
+            if (camera == null) {
+                Camera.CameraInfo cameraInfo = new Camera.CameraInfo();
+                for (int i = 0; i < Camera.getNumberOfCameras(); i++) {
+                    Camera.getCameraInfo(i, cameraInfo);
+                    if (cameraInfo.facing == Camera.CameraInfo.CAMERA_FACING_BACK) {
+                        cameraId = i;
+                    }
+                }
+                try {
+                    camera = Camera.open(cameraId);
+                } catch (Throwable e) {
+                    e.printStackTrace();
+                    startPreview(true);
+                    return;
+                }
+
+            }
+            if (parameters == null) {
+                parameters = camera.getParameters();
+                parameters.setPreviewFormat(ImageFormat.NV21);
+            }
+            opPreviewSize(previewView.getWidth(), previewView.getHeight());
+            camera.setPreviewTexture(surfaceCache);
+            setPreviewCallbackImpl();
+            startPreview(false);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    private TextureView.SurfaceTextureListener surfaceTextureListener = new TextureView.SurfaceTextureListener() {
+        @Override
+        public void onSurfaceTextureAvailable(SurfaceTexture surface, int width, int height) {
+            surfaceCache = surface;
+            initCamera();
+        }
+
+        @Override
+        public void onSurfaceTextureSizeChanged(SurfaceTexture surface, int width, int height) {
+            opPreviewSize(previewView.getWidth(), previewView.getHeight());
+            startPreview(false);
+            setPreviewCallbackImpl();
+        }
+
+        @Override
+        public boolean onSurfaceTextureDestroyed(SurfaceTexture surface) {
+            return false;
+        }
+
+        @Override
+        public void onSurfaceTextureUpdated(SurfaceTexture surface) {
+            setPreviewCallbackImpl();
+        }
+    };
+
+    // 开启预览
+    private void startPreview(boolean checkPermission) {
+        if (ActivityCompat.checkSelfPermission(context, Manifest.permission.CAMERA)
+                != PackageManager.PERMISSION_GRANTED) {
+            if (checkPermission && permissionCallback != null) {
+                permissionCallback.onRequestPermission();
+            }
+            return;
+        }
+        if (camera == null) {
+            initCamera();
+        } else {
+            camera.startPreview();
+            startAutoFocus();
+        }
+    }
+
+    private void cancelAutoFocus() {
+        camera.cancelAutoFocus();
+        CameraThreadPool.cancelAutoFocusTimer();
+    }
+
+    private void startAutoFocus() {
+        CameraThreadPool.createAutoFocusTimerTask(new Runnable() {
+            @Override
+            public void run() {
+                synchronized (Camera1Control.this) {
+                    if (camera != null && !takingPicture.get()) {
+                        try {
+                            camera.autoFocus(new Camera.AutoFocusCallback() {
+                                @Override
+                                public void onAutoFocus(boolean success, Camera camera) {
+                                }
+                            });
+                        } catch (Throwable e) {
+                            // startPreview是异步实现，可能在某些机器上前几次调用会autofocus failß
+                        }
+                    }
+                }
+            }
+        });
+    }
+
+    private void opPreviewSize(int width, @SuppressWarnings("unused") int height) {
+
+        if (parameters != null && camera != null && width > 0) {
+            optSize = getOptimalSize(camera.getParameters().getSupportedPreviewSizes());
+            parameters.setPreviewSize(optSize.width, optSize.height);
+            previewView.setRatio(1.0f * optSize.width / optSize.height);
+
+            camera.setDisplayOrientation(getSurfaceOrientation());
+            stopPreview();
+            try {
+                camera.setParameters(parameters);
+            } catch (RuntimeException e) {
+                e.printStackTrace();
+
+            }
+        }
+    }
+
+    private Camera.Size getOptimalSize(List<Camera.Size> sizes) {
+        int width = previewView.textureView.getWidth();
+        int height = previewView.textureView.getHeight();
+        Camera.Size pictureSize = sizes.get(0);
+
+        List<Camera.Size> candidates = new ArrayList<>();
+
+        for (Camera.Size size : sizes) {
+            if (size.width >= width && size.height >= height && size.width * height == size.height * width) {
+                // 比例相同
+                candidates.add(size);
+            } else if (size.height >= width && size.width >= height && size.width * width == size.height * height) {
+                // 反比例
+                candidates.add(size);
+            }
+        }
+        if (!candidates.isEmpty()) {
+            return Collections.min(candidates, sizeComparator);
+        }
+
+        for (Camera.Size size : sizes) {
+            if (size.width > width && size.height > height) {
+                return size;
+            }
+        }
+
+        return pictureSize;
+    }
+
+    private Comparator<Camera.Size> sizeComparator = new Comparator<Camera.Size>() {
+        @Override
+        public int compare(Camera.Size lhs, Camera.Size rhs) {
+            return Long.signum((long) lhs.width * lhs.height - (long) rhs.width * rhs.height);
+        }
+    };
+
+    private void updateFlashMode(int flashMode) {
+        switch (flashMode) {
+            case FLASH_MODE_TORCH:
+                parameters.setFlashMode(Camera.Parameters.FLASH_MODE_TORCH);
+                break;
+            case FLASH_MODE_OFF:
+                parameters.setFlashMode(Camera.Parameters.FLASH_MODE_OFF);
+                break;
+            case ICameraControl.FLASH_MODE_AUTO:
+                parameters.setFlashMode(Camera.Parameters.FLASH_MODE_AUTO);
+                break;
+            default:
+                parameters.setFlashMode(Camera.Parameters.FLASH_MODE_AUTO);
+                break;
+        }
+        camera.setParameters(parameters);
+    }
+
+    private int getSurfaceOrientation() {
+        @CameraView.Orientation
+        int orientation = displayOrientation;
+        switch (orientation) {
+            case CameraView.ORIENTATION_PORTRAIT:
+                return 90;
+            case CameraView.ORIENTATION_HORIZONTAL:
+                return 0;
+            case CameraView.ORIENTATION_INVERT:
+                return 180;
+            default:
+                return 90;
+        }
+    }
+
+    /**
+     * 有些相机匹配不到完美的比例。比如。我们的layout是4:3的。预览只有16:9
+     * 的，如果直接显示图片会拉伸，变形。缩放的话，又有黑边。所以我们采取的策略
+     * 是，等比例放大。这样预览的有一部分会超出屏幕。拍照后再进行裁剪处理。
+     */
+    private class PreviewView extends FrameLayout {
+
+        private TextureView textureView;
+
+        private float ratio = 0.75f;
+
+        void setTextureView(TextureView textureView) {
+            this.textureView = textureView;
+            removeAllViews();
+            addView(textureView);
+        }
+
+        void setRatio(float ratio) {
+            this.ratio = ratio;
+            requestLayout();
+            relayout(getWidth(), getHeight());
+        }
+
+        public PreviewView(Context context) {
+            super(context);
+        }
+
+        @Override
+        protected void onSizeChanged(int w, int h, int oldw, int oldh) {
+            super.onSizeChanged(w, h, oldw, oldh);
+            relayout(w, h);
+        }
+
+        private void relayout(int w, int h) {
+            int width = w;
+            int height = h;
+            if (w < h) {
+                // 垂直模式，高度固定。
+                height = (int) (width * ratio);
+            } else {
+                // 水平模式，宽度固定。
+                width = (int) (height * ratio);
+            }
+
+            int l = (getWidth() - width) / 2;
+            int t = (getHeight() - height) / 2;
+
+            previewFrame.left = l;
+            previewFrame.top = t;
+            previewFrame.right = l + width;
+            previewFrame.bottom = t + height;
+        }
+
+        @Override
+        protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
+            super.onLayout(changed, left, top, right, bottom);
+            textureView.layout(previewFrame.left, previewFrame.top, previewFrame.right, previewFrame.bottom);
+        }
+    }
+
+    @Override
+    public Rect getPreviewFrame() {
+        return previewFrame;
+    }
+}

ocr_ui/src/main/java/com/baidu/ocr/ui/camera/Camera2Control.java

@@ -0,0 +1,697 @@
+/*
+ * Copyright (C) 2017 Baidu, Inc. All Rights Reserved.
+ */
+
+package com.baidu.ocr.ui.camera;
+
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+import java.util.concurrent.Semaphore;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import android.Manifest;
+import android.annotation.TargetApi;
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.graphics.ImageFormat;
+import android.graphics.Matrix;
+import android.graphics.Point;
+import android.graphics.Rect;
+import android.graphics.RectF;
+import android.graphics.SurfaceTexture;
+import android.hardware.camera2.CameraAccessException;
+import android.hardware.camera2.CameraCaptureSession;
+import android.hardware.camera2.CameraCharacteristics;
+import android.hardware.camera2.CameraDevice;
+import android.hardware.camera2.CameraManager;
+import android.hardware.camera2.CameraMetadata;
+import android.hardware.camera2.CaptureFailure;
+import android.hardware.camera2.CaptureRequest;
+import android.hardware.camera2.CaptureResult;
+import android.hardware.camera2.TotalCaptureResult;
+import android.hardware.camera2.params.StreamConfigurationMap;
+import android.media.Image;
+import android.media.ImageReader;
+import android.os.Build;
+import android.os.Handler;
+import android.os.HandlerThread;
+import android.util.Size;
+import android.util.SparseIntArray;
+import android.view.Surface;
+import android.view.TextureView;
+import android.view.View;
+import android.view.WindowManager;
+
+import androidx.annotation.NonNull;
+import androidx.core.content.ContextCompat;
+
+@TargetApi(Build.VERSION_CODES.LOLLIPOP)
+public class Camera2Control implements ICameraControl {
+    @Override
+    public void setDetectCallback(OnDetectPictureCallback callback) {
+        // TODO 暂时只用camera
+    }
+
+    @Override
+    public AtomicBoolean getAbortingScan() {
+        // TODO 暂时只用camera
+        return null;
+    }
+
+    /**
+     * Conversion from screen rotation to JPEG orientation.
+     */
+    private static final SparseIntArray ORIENTATIONS = new SparseIntArray();
+    private static final int MAX_PREVIEW_SIZE = 2048;
+
+    static {
+        ORIENTATIONS.append(Surface.ROTATION_0, 90);
+        ORIENTATIONS.append(Surface.ROTATION_90, 0);
+        ORIENTATIONS.append(Surface.ROTATION_180, 270);
+        ORIENTATIONS.append(Surface.ROTATION_270, 180);
+    }
+
+    private static final int STATE_PREVIEW = 0;
+    private static final int STATE_WAITING_FOR_LOCK = 1;
+    private static final int STATE_WAITING_FOR_CAPTURE = 2;
+    private static final int STATE_CAPTURING = 3;
+    private static final int STATE_PICTURE_TAKEN = 4;
+
+    private static final int MAX_PREVIEW_WIDTH = 1920;
+    private static final int MAX_PREVIEW_HEIGHT = 1080;
+
+    private int flashMode;
+    private int orientation = 0;
+    private int state = STATE_PREVIEW;
+
+    private Context context;
+    private OnTakePictureCallback onTakePictureCallback;
+    private PermissionCallback permissionCallback;
+
+    private String cameraId;
+    private TextureView textureView;
+    private Size previewSize;
+    private Rect previewFrame = new Rect();
+
+    private HandlerThread backgroundThread;
+    private Handler backgroundHandler;
+    private ImageReader imageReader;
+    private CameraCaptureSession captureSession;
+    private CameraDevice cameraDevice;
+
+    private CaptureRequest.Builder previewRequestBuilder;
+    private CaptureRequest previewRequest;
+
+    private Semaphore cameraLock = new Semaphore(1);
+    private int sensorOrientation;
+
+    @Override
+    public void start() {
+        startBackgroundThread();
+        if (textureView.isAvailable()) {
+            openCamera(textureView.getWidth(), textureView.getHeight());
+            textureView.setSurfaceTextureListener(surfaceTextureListener);
+        } else {
+            textureView.setSurfaceTextureListener(surfaceTextureListener);
+        }
+    }
+
+    @Override
+    public void stop() {
+        textureView.setSurfaceTextureListener(null);
+        closeCamera();
+        stopBackgroundThread();
+    }
+
+    @Override
+    public void pause() {
+        setFlashMode(FLASH_MODE_OFF);
+    }
+
+    @Override
+    public void resume() {
+        state = STATE_PREVIEW;
+    }
+
+    @Override
+    public View getDisplayView() {
+        return textureView;
+    }
+
+    @Override
+    public Rect getPreviewFrame() {
+        return previewFrame;
+    }
+
+    @Override
+    public void takePicture(OnTakePictureCallback callback) {
+        this.onTakePictureCallback = callback;
+        // 拍照第一步，对焦
+        lockFocus();
+    }
+
+    @Override
+    public void setPermissionCallback(PermissionCallback callback) {
+        this.permissionCallback = callback;
+    }
+
+    @Override
+    public void setDisplayOrientation(@CameraView.Orientation int displayOrientation) {
+        this.orientation = displayOrientation / 90;
+    }
+
+    @Override
+    public void refreshPermission() {
+        openCamera(textureView.getWidth(), textureView.getHeight());
+    }
+
+    @Override
+    public void setFlashMode(@FlashMode int flashMode) {
+        if (this.flashMode == flashMode) {
+            return;
+        }
+        this.flashMode = flashMode;
+        try {
+            previewRequestBuilder.set(CaptureRequest.CONTROL_AF_MODE,
+                    CaptureRequest.CONTROL_AF_MODE_CONTINUOUS_PICTURE);
+            updateFlashMode(flashMode, previewRequestBuilder);
+            previewRequest = previewRequestBuilder.build();
+            captureSession.setRepeatingRequest(previewRequest, captureCallback, backgroundHandler);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    @Override
+    public int getFlashMode() {
+        return flashMode;
+    }
+
+    public Camera2Control(Context activity) {
+        this.context = activity;
+        textureView = new TextureView(activity);
+    }
+
+    private final TextureView.SurfaceTextureListener surfaceTextureListener =
+            new TextureView.SurfaceTextureListener() {
+                @Override
+                public void onSurfaceTextureAvailable(SurfaceTexture texture, int width, int height) {
+                    openCamera(width, height);
+                }
+
+                @Override
+                public void onSurfaceTextureSizeChanged(SurfaceTexture texture, int width, int height) {
+                    configureTransform(width, height);
+                    previewFrame.left = 0;
+                    previewFrame.top = 0;
+                    previewFrame.right = width;
+                    previewFrame.bottom = height;
+                }
+
+                @Override
+                public boolean onSurfaceTextureDestroyed(SurfaceTexture texture) {
+                    stop();
+                    return true;
+                }
+
+                @Override
+                public void onSurfaceTextureUpdated(SurfaceTexture texture) {
+                }
+            };
+
+    private void openCamera(int width, int height) {
+        // 6.0+的系统需要检查系统权限 。
+        if (ContextCompat.checkSelfPermission(context, Manifest.permission.CAMERA)
+                != PackageManager.PERMISSION_GRANTED) {
+            requestCameraPermission();
+            return;
+        }
+        setUpCameraOutputs(width, height);
+        configureTransform(width, height);
+        CameraManager manager = (CameraManager) context.getSystemService(Context.CAMERA_SERVICE);
+        try {
+            if (!cameraLock.tryAcquire(2500, TimeUnit.MILLISECONDS)) {
+                throw new RuntimeException("Time out waiting to lock camera opening.");
+            }
+            manager.openCamera(cameraId, deviceStateCallback, backgroundHandler);
+        } catch (CameraAccessException e) {
+            e.printStackTrace();
+        } catch (InterruptedException e) {
+            throw new RuntimeException("Interrupted while trying to lock camera opening.", e);
+        }
+    }
+
+    private final CameraDevice.StateCallback deviceStateCallback = new CameraDevice.StateCallback() {
+        @Override
+        public void onOpened(@NonNull CameraDevice cameraDevice) {
+            cameraLock.release();
+            Camera2Control.this.cameraDevice = cameraDevice;
+            createCameraPreviewSession();
+        }
+
+        @Override
+        public void onDisconnected(@NonNull CameraDevice cameraDevice) {
+            cameraLock.release();
+            cameraDevice.close();
+            Camera2Control.this.cameraDevice = null;
+        }
+
+        @Override
+        public void onError(@NonNull CameraDevice cameraDevice, int error) {
+            cameraLock.release();
+            cameraDevice.close();
+            Camera2Control.this.cameraDevice = null;
+        }
+    };
+
+    private void createCameraPreviewSession() {
+        try {
+            SurfaceTexture texture = textureView.getSurfaceTexture();
+            assert texture != null;
+            texture.setDefaultBufferSize(previewSize.getWidth(), previewSize.getHeight());
+            Surface surface = new Surface(texture);
+            previewRequestBuilder = cameraDevice.createCaptureRequest(CameraDevice.TEMPLATE_PREVIEW);
+            previewRequestBuilder.addTarget(surface);
+            updateFlashMode(this.flashMode, previewRequestBuilder);
+            cameraDevice.createCaptureSession(Arrays.asList(surface, imageReader.getSurface()),
+                    new CameraCaptureSession.StateCallback() {
+
+                        @Override
+                        public void onConfigured(@NonNull CameraCaptureSession cameraCaptureSession) {
+                            // The camera is already closed
+                            if (null == cameraDevice) {
+                                return;
+                            }
+                            captureSession = cameraCaptureSession;
+                            try {
+                                previewRequestBuilder.set(CaptureRequest.CONTROL_AF_MODE,
+                                        CaptureRequest.CONTROL_AF_MODE_CONTINUOUS_PICTURE);
+                                previewRequest = previewRequestBuilder.build();
+                                captureSession.setRepeatingRequest(previewRequest,
+                                        captureCallback, backgroundHandler);
+                            } catch (CameraAccessException e) {
+                                e.printStackTrace();
+                            }
+                        }
+
+                        @Override
+                        public void onConfigureFailed(
+                                @NonNull CameraCaptureSession cameraCaptureSession) {
+                            // TODO
+                        }
+                    }, null
+            );
+        } catch (CameraAccessException e) {
+            e.printStackTrace();
+        }
+    }
+
+    private final ImageReader.OnImageAvailableListener onImageAvailableListener =
+            new ImageReader.OnImageAvailableListener() {
+                @Override
+                public void onImageAvailable(ImageReader reader) {
+                    if (onTakePictureCallback != null) {
+                        Image image = reader.acquireNextImage();
+                        ByteBuffer buffer = image.getPlanes()[0].getBuffer();
+                        byte[] bytes = new byte[buffer.remaining()];
+                        buffer.get(bytes);
+
+                        image.close();
+                        onTakePictureCallback.onPictureTaken(bytes);
+                    }
+                }
+            };
+
+    private CameraCaptureSession.CaptureCallback captureCallback =
+            new CameraCaptureSession.CaptureCallback() {
+                private void process(CaptureResult result) {
+                    switch (state) {
+                        case STATE_PREVIEW: {
+                            break;
+                        }
+                        case STATE_WAITING_FOR_LOCK: {
+                            Integer afState = result.get(CaptureResult.CONTROL_AF_STATE);
+                            if (afState == null) {
+                                captureStillPicture();
+                                return;
+                            }
+                            switch (afState) {
+                                case CaptureResult.CONTROL_AF_STATE_FOCUSED_LOCKED:
+                                case CaptureResult.CONTROL_AF_STATE_NOT_FOCUSED_LOCKED:
+                                case CaptureResult.CONTROL_AF_STATE_PASSIVE_FOCUSED: {
+                                    Integer aeState = result.get(CaptureResult.CONTROL_AE_STATE);
+                                    if (aeState == null
+                                            || aeState == CaptureResult.CONTROL_AE_STATE_CONVERGED) {
+                                        captureStillPicture();
+                                    } else {
+                                        runPreCaptureSequence();
+                                    }
+                                    break;
+                                }
+                                default:
+                                    captureStillPicture();
+                            }
+                            break;
+                        }
+                        case STATE_WAITING_FOR_CAPTURE: {
+                            Integer aeState = result.get(CaptureResult.CONTROL_AE_STATE);
+                            if (aeState == null
+                                    || aeState == CaptureResult.CONTROL_AE_STATE_PRECAPTURE
+                                    || aeState == CaptureRequest.CONTROL_AE_STATE_FLASH_REQUIRED) {
+                                state = STATE_CAPTURING;
+                            } else {
+                                if (aeState == CaptureResult.CONTROL_AE_STATE_CONVERGED) {
+                                    captureStillPicture();
+                                }
+                            }
+                            break;
+                        }
+                        case STATE_CAPTURING: {
+                            Integer aeState = result.get(CaptureResult.CONTROL_AE_STATE);
+                            if (aeState == null || aeState != CaptureResult.CONTROL_AE_STATE_PRECAPTURE) {
+                                captureStillPicture();
+                            }
+                            break;
+                        }
+                        default:
+                            break;
+                    }
+                }
+
+                @Override
+                public void onCaptureProgressed(@NonNull CameraCaptureSession session,
+                                                @NonNull CaptureRequest request,
+                                                @NonNull CaptureResult partialResult) {
+                    process(partialResult);
+                }
+
+                @Override
+                public void onCaptureCompleted(@NonNull CameraCaptureSession session,
+                                               @NonNull CaptureRequest request,
+                                               @NonNull TotalCaptureResult result) {
+                    process(result);
+                }
+
+            };
+
+    private Size getOptimalSize(Size[] choices, int textureViewWidth,
+                                int textureViewHeight, int maxWidth, int maxHeight, Size aspectRatio) {
+        List<Size> bigEnough = new ArrayList<>();
+        List<Size> notBigEnough = new ArrayList<>();
+        int w = aspectRatio.getWidth();
+        int h = aspectRatio.getHeight();
+        for (Size option : choices) {
+            if (option.getWidth() <= maxWidth && option.getHeight() <= maxHeight
+                    && option.getHeight() == option.getWidth() * h / w) {
+                if (option.getWidth() >= textureViewWidth
+                        && option.getHeight() >= textureViewHeight) {
+                    bigEnough.add(option);
+                } else {
+                    notBigEnough.add(option);
+                }
+            }
+        }
+
+        // Pick the smallest of those big enough. If there is no one big enough, pick the
+        // largest of those not big enough.
+        if (bigEnough.size() > 0) {
+            return Collections.min(bigEnough, sizeComparator);
+        }
+
+        for (Size option : choices) {
+            if (option.getWidth() >= maxWidth && option.getHeight() >= maxHeight) {
+                return option;
+            }
+        }
+
+        if (notBigEnough.size() > 0) {
+            return Collections.max(notBigEnough, sizeComparator);
+        }
+
+        return choices[0];
+    }
+
+    private Comparator<Size> sizeComparator = new Comparator<Size>() {
+        @Override
+        public int compare(Size lhs, Size rhs) {
+            return Long.signum((long) lhs.getWidth() * lhs.getHeight() - (long) rhs.getWidth() * rhs.getHeight());
+        }
+    };
+
+    private void requestCameraPermission() {
+        if (permissionCallback != null) {
+            permissionCallback.onRequestPermission();
+        }
+    }
+
+    @SuppressWarnings("SuspiciousNameCombination")
+    private void setUpCameraOutputs(int width, int height) {
+        CameraManager manager = (CameraManager) context.getSystemService(Context.CAMERA_SERVICE);
+        try {
+            for (String cameraId : manager.getCameraIdList()) {
+                CameraCharacteristics characteristics =
+                        manager.getCameraCharacteristics(cameraId);
+
+                Integer facing = characteristics.get(CameraCharacteristics.LENS_FACING);
+                if (facing != null && facing == CameraCharacteristics.LENS_FACING_FRONT) {
+                    continue;
+                }
+
+                StreamConfigurationMap map = characteristics.get(
+                        CameraCharacteristics.SCALER_STREAM_CONFIGURATION_MAP);
+                if (map == null) {
+                    continue;
+                }
+
+                //                int preferredPictureSize = (int) (Math.max(textureView.getWidth(), textureView
+                // .getHeight()) * 1.5);
+                //                preferredPictureSize = Math.min(preferredPictureSize, 2560);
+
+                WindowManager windowManager = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE);
+                Point screenSize = new Point();
+                windowManager.getDefaultDisplay().getSize(screenSize);
+                int maxImageSize = Math.max(MAX_PREVIEW_SIZE, screenSize.y * 3 / 2);
+
+                Size size = getOptimalSize(map.getOutputSizes(ImageFormat.JPEG), textureView.getWidth(),
+                        textureView.getHeight(), maxImageSize, maxImageSize, new Size(4, 3));
+
+                imageReader = ImageReader.newInstance(size.getWidth(), size.getHeight(),
+                        ImageFormat.JPEG, 1);
+                imageReader.setOnImageAvailableListener(
+                        onImageAvailableListener, backgroundHandler);
+
+                int displayRotation = orientation;
+                // noinspection ConstantConditions
+                sensorOrientation = characteristics.get(CameraCharacteristics.SENSOR_ORIENTATION);
+                boolean swappedDimensions = false;
+                switch (displayRotation) {
+                    case Surface.ROTATION_0:
+                    case Surface.ROTATION_180:
+                        if (sensorOrientation == 90 || sensorOrientation == 270) {
+                            swappedDimensions = true;
+                        }
+                        break;
+                    case Surface.ROTATION_90:
+                    case Surface.ROTATION_270:
+                        if (sensorOrientation == 0 || sensorOrientation == 180) {
+                            swappedDimensions = true;
+                        }
+                        break;
+                    default:
+                }
+
+                int rotatedPreviewWidth = width;
+                int rotatedPreviewHeight = height;
+                int maxPreviewWidth = screenSize.x;
+                int maxPreviewHeight = screenSize.y;
+
+                if (swappedDimensions) {
+                    rotatedPreviewWidth = height;
+                    rotatedPreviewHeight = width;
+                    maxPreviewWidth = screenSize.y;
+                    maxPreviewHeight = screenSize.x;
+                }
+
+                maxPreviewWidth = Math.min(maxPreviewWidth, MAX_PREVIEW_WIDTH);
+                maxPreviewHeight = Math.min(maxPreviewHeight, MAX_PREVIEW_HEIGHT);
+
+                previewSize = getOptimalSize(map.getOutputSizes(SurfaceTexture.class),
+                        rotatedPreviewWidth, rotatedPreviewHeight, maxPreviewWidth,
+                        maxPreviewHeight, size);
+                this.cameraId = cameraId;
+                return;
+            }
+        } catch (CameraAccessException | NullPointerException e) {
+            e.printStackTrace();
+        }
+    }
+
+    private void closeCamera() {
+        try {
+            cameraLock.acquire();
+            if (null != captureSession) {
+                captureSession.close();
+                captureSession = null;
+            }
+            if (null != cameraDevice) {
+                cameraDevice.close();
+                cameraDevice = null;
+            }
+            if (null != imageReader) {
+                imageReader.close();
+                imageReader = null;
+            }
+        } catch (InterruptedException e) {
+            throw new RuntimeException("Interrupted while trying to lock camera closing.", e);
+        } finally {
+            cameraLock.release();
+        }
+    }
+
+    private void startBackgroundThread() {
+        backgroundThread = new HandlerThread("ocr_camera");
+        backgroundThread.start();
+        backgroundHandler = new Handler(backgroundThread.getLooper());
+    }
+
+    private void stopBackgroundThread() {
+        if (backgroundThread != null) {
+            backgroundThread.quitSafely();
+            backgroundThread = null;
+            backgroundHandler = null;
+        }
+    }
+
+    private void configureTransform(int viewWidth, int viewHeight) {
+        if (null == textureView || null == previewSize || null == context) {
+            return;
+        }
+        int rotation = orientation;
+        Matrix matrix = new Matrix();
+        RectF viewRect = new RectF(0, 0, viewWidth, viewHeight);
+        RectF bufferRect = new RectF(0, 0, previewSize.getHeight(), previewSize.getWidth());
+        float centerX = viewRect.centerX();
+        float centerY = viewRect.centerY();
+        if (Surface.ROTATION_90 == rotation || Surface.ROTATION_270 == rotation) {
+            bufferRect.offset(centerX - bufferRect.centerX(), centerY - bufferRect.centerY());
+            matrix.setRectToRect(viewRect, bufferRect, Matrix.ScaleToFit.FILL);
+            float scale = Math.max(
+                    (float) viewHeight / previewSize.getHeight(),
+                    (float) viewWidth / previewSize.getWidth());
+            matrix.postScale(scale, scale, centerX, centerY);
+            matrix.postRotate(90 * (rotation - 2), centerX, centerY);
+        } else if (Surface.ROTATION_180 == rotation) {
+            matrix.postRotate(180, centerX, centerY);
+        }
+        textureView.setTransform(matrix);
+    }
+
+    // 拍照前，先对焦
+    private void lockFocus() {
+        if (captureSession != null && state == STATE_PREVIEW) {
+            try {
+                previewRequestBuilder.set(CaptureRequest.CONTROL_AF_TRIGGER,
+                        CameraMetadata.CONTROL_AF_TRIGGER_START);
+                state = STATE_WAITING_FOR_LOCK;
+                captureSession.capture(previewRequestBuilder.build(), captureCallback,
+                        backgroundHandler);
+            } catch (CameraAccessException e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
+    private void runPreCaptureSequence() {
+        try {
+            previewRequestBuilder.set(CaptureRequest.CONTROL_AE_PRECAPTURE_TRIGGER,
+                    CaptureRequest.CONTROL_AE_PRECAPTURE_TRIGGER_START);
+            state = STATE_WAITING_FOR_CAPTURE;
+            captureSession.capture(previewRequestBuilder.build(), captureCallback,
+                    backgroundHandler);
+        } catch (CameraAccessException e) {
+            e.printStackTrace();
+        }
+    }
+
+    // 拍照session
+    private void captureStillPicture() {
+        try {
+            if (null == context || null == cameraDevice) {
+                return;
+            }
+            final CaptureRequest.Builder captureBuilder =
+                    cameraDevice.createCaptureRequest(CameraDevice.TEMPLATE_STILL_CAPTURE);
+            captureBuilder.addTarget(imageReader.getSurface());
+            captureBuilder.set(CaptureRequest.CONTROL_AF_MODE,
+                    CaptureRequest.CONTROL_AF_MODE_CONTINUOUS_PICTURE);
+
+            captureBuilder.set(CaptureRequest.JPEG_ORIENTATION, getOrientation(orientation));
+            updateFlashMode(this.flashMode, captureBuilder);
+            CameraCaptureSession.CaptureCallback captureCallback =
+                    new CameraCaptureSession.CaptureCallback() {
+                        @Override
+                        public void onCaptureCompleted(@NonNull CameraCaptureSession session,
+                                                       @NonNull CaptureRequest request,
+                                                       @NonNull TotalCaptureResult result) {
+                            unlockFocus();
+                        }
+
+                        @Override
+                        public void onCaptureFailed(@NonNull CameraCaptureSession session,
+                                                    @NonNull CaptureRequest request,
+                                                    @NonNull CaptureFailure failure) {
+                            super.onCaptureFailed(session, request, failure);
+                        }
+                    };
+
+            // 停止预览
+            captureSession.stopRepeating();
+            captureSession.capture(captureBuilder.build(), captureCallback, backgroundHandler);
+            state = STATE_PICTURE_TAKEN;
+            //            unlockFocus();
+        } catch (CameraAccessException e) {
+            e.printStackTrace();
+        }
+    }
+
+    private int getOrientation(int rotation) {
+        return (ORIENTATIONS.get(rotation) + sensorOrientation + 270) % 360;
+    }
+
+    // 停止对焦
+    private void unlockFocus() {
+        try {
+            previewRequestBuilder.set(CaptureRequest.CONTROL_AF_TRIGGER,
+                    CameraMetadata.CONTROL_AF_TRIGGER_CANCEL);
+            captureSession.capture(previewRequestBuilder.build(), captureCallback,
+                    backgroundHandler);
+            state = STATE_PREVIEW;
+            // 预览
+            captureSession.setRepeatingRequest(previewRequest, captureCallback,
+                    backgroundHandler);
+            textureView.setSurfaceTextureListener(surfaceTextureListener);
+        } catch (CameraAccessException e) {
+            e.printStackTrace();
+        }
+    }
+
+    private void updateFlashMode(@FlashMode int flashMode, CaptureRequest.Builder builder) {
+        switch (flashMode) {
+            case FLASH_MODE_TORCH:
+                builder.set(CaptureRequest.FLASH_MODE, CameraMetadata.FLASH_MODE_TORCH);
+                break;
+            case FLASH_MODE_OFF:
+                builder.set(CaptureRequest.FLASH_MODE, CameraMetadata.FLASH_MODE_OFF);
+                break;
+            case ICameraControl.FLASH_MODE_AUTO:
+            default:
+                builder.set(CaptureRequest.FLASH_MODE, CameraMetadata.FLASH_MODE_SINGLE);
+                break;
+        }
+    }
+}

ocr_ui/src/main/java/com/baidu/ocr/ui/camera/CameraActivity.java

@@ -0,0 +1,516 @@
+/*
+ * Copyright (C) 2017 Baidu, Inc. All Rights Reserved.
+ */
+package com.baidu.ocr.ui.camera;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+
+import com.baidu.idcardquality.IDcardQualityProcess;
+import com.baidu.ocr.ui.R;
+import com.baidu.ocr.ui.crop.CropView;
+import com.baidu.ocr.ui.crop.FrameOverlayView;
+
+import android.Manifest;
+import android.app.Activity;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.content.res.Configuration;
+import android.database.Cursor;
+import android.graphics.Bitmap;
+import android.graphics.Rect;
+import android.graphics.drawable.BitmapDrawable;
+import android.net.Uri;
+import android.os.Build;
+import android.os.Bundle;
+import android.os.Handler;
+import android.provider.MediaStore;
+import android.view.Surface;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.Toast;
+
+import androidx.annotation.NonNull;
+import androidx.core.app.ActivityCompat;
+
+public class CameraActivity extends Activity {
+
+    public static final String KEY_OUTPUT_FILE_PATH = "outputFilePath";
+    public static final String KEY_CONTENT_TYPE = "contentType";
+    public static final String KEY_NATIVE_TOKEN = "nativeToken";
+    public static final String KEY_NATIVE_ENABLE = "nativeEnable";
+    public static final String KEY_NATIVE_MANUAL = "nativeEnableManual";
+
+    public static final String CONTENT_TYPE_GENERAL = "general";
+    public static final String CONTENT_TYPE_ID_CARD_FRONT = "IDCardFront";
+    public static final String CONTENT_TYPE_ID_CARD_BACK = "IDCardBack";
+    public static final String CONTENT_TYPE_BANK_CARD = "bankCard";
+    public static final String CONTENT_TYPE_PASSPORT = "passport";
+
+    private static final int REQUEST_CODE_PICK_IMAGE = 100;
+    private static final int PERMISSIONS_REQUEST_CAMERA = 800;
+    private static final int PERMISSIONS_EXTERNAL_STORAGE = 801;
+
+    private File outputFile;
+    private String contentType;
+    private Handler handler = new Handler();
+
+    private boolean isNativeEnable;
+    private boolean isNativeManual;
+
+    private OCRCameraLayout takePictureContainer;
+    private OCRCameraLayout cropContainer;
+    private OCRCameraLayout confirmResultContainer;
+    private ImageView lightButton;
+    private CameraView cameraView;
+    private ImageView displayImageView;
+    private CropView cropView;
+    private FrameOverlayView overlayView;
+    private MaskView cropMaskView;
+    private ImageView takePhotoBtn;
+    private PermissionCallback permissionCallback = new PermissionCallback() {
+        @Override
+        public boolean onRequestPermission() {
+            ActivityCompat.requestPermissions(CameraActivity.this,
+                    new String[] {Manifest.permission.CAMERA},
+                    PERMISSIONS_REQUEST_CAMERA);
+            return false;
+        }
+    };
+
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.bd_ocr_activity_camera);
+
+        takePictureContainer = (OCRCameraLayout) findViewById(R.id.take_picture_container);
+        confirmResultContainer = (OCRCameraLayout) findViewById(R.id.confirm_result_container);
+
+        cameraView = (CameraView) findViewById(R.id.camera_view);
+        cameraView.getCameraControl().setPermissionCallback(permissionCallback);
+        lightButton = (ImageView) findViewById(R.id.light_button);
+        lightButton.setOnClickListener(lightButtonOnClickListener);
+        takePhotoBtn = (ImageView) findViewById(R.id.take_photo_button);
+        findViewById(R.id.album_button).setOnClickListener(albumButtonOnClickListener);
+        takePhotoBtn.setOnClickListener(takeButtonOnClickListener);
+
+        // confirm result;
+        displayImageView = (ImageView) findViewById(R.id.display_image_view);
+        confirmResultContainer.findViewById(R.id.confirm_button).setOnClickListener(confirmButtonOnClickListener);
+        confirmResultContainer.findViewById(R.id.cancel_button).setOnClickListener(confirmCancelButtonOnClickListener);
+        findViewById(R.id.rotate_button).setOnClickListener(rotateButtonOnClickListener);
+
+        cropView = (CropView) findViewById(R.id.crop_view);
+        cropContainer = (OCRCameraLayout) findViewById(R.id.crop_container);
+        overlayView = (FrameOverlayView) findViewById(R.id.overlay_view);
+        cropContainer.findViewById(R.id.confirm_button).setOnClickListener(cropConfirmButtonListener);
+        cropMaskView = (MaskView) cropContainer.findViewById(R.id.crop_mask_view);
+        cropContainer.findViewById(R.id.cancel_button).setOnClickListener(cropCancelButtonListener);
+
+        setOrientation(getResources().getConfiguration());
+        initParams();
+
+        cameraView.setAutoPictureCallback(autoTakePictureCallback);
+    }
+
+    @Override
+    protected void onStart() {
+        super.onStart();
+
+    }
+
+    @Override
+    protected void onStop() {
+        super.onStop();
+
+    }
+
+    @Override
+    protected void onPause() {
+        super.onPause();
+        cameraView.stop();
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        cameraView.start();
+    }
+
+    private void initParams() {
+        String outputPath = getIntent().getStringExtra(KEY_OUTPUT_FILE_PATH);
+        final String token = getIntent().getStringExtra(KEY_NATIVE_TOKEN);
+        isNativeEnable = getIntent().getBooleanExtra(KEY_NATIVE_ENABLE, true);
+        isNativeManual = getIntent().getBooleanExtra(KEY_NATIVE_MANUAL, false);
+
+        if (token == null && !isNativeManual) {
+            isNativeEnable = false;
+        }
+
+        if (outputPath != null) {
+            outputFile = new File(outputPath);
+        }
+
+        contentType = getIntent().getStringExtra(KEY_CONTENT_TYPE);
+        if (contentType == null) {
+            contentType = CONTENT_TYPE_GENERAL;
+        }
+        int maskType;
+        switch (contentType) {
+            case CONTENT_TYPE_ID_CARD_FRONT:
+                maskType = MaskView.MASK_TYPE_ID_CARD_FRONT;
+                overlayView.setVisibility(View.INVISIBLE);
+                if (isNativeEnable) {
+                    takePhotoBtn.setVisibility(View.INVISIBLE);
+                }
+                break;
+            case CONTENT_TYPE_ID_CARD_BACK:
+                maskType = MaskView.MASK_TYPE_ID_CARD_BACK;
+                overlayView.setVisibility(View.INVISIBLE);
+                if (isNativeEnable) {
+                    takePhotoBtn.setVisibility(View.INVISIBLE);
+                }
+                break;
+            case CONTENT_TYPE_BANK_CARD:
+                maskType = MaskView.MASK_TYPE_BANK_CARD;
+                overlayView.setVisibility(View.INVISIBLE);
+                break;
+            case CONTENT_TYPE_PASSPORT:
+                maskType = MaskView.MASK_TYPE_PASSPORT;
+                overlayView.setVisibility(View.INVISIBLE);
+                break;
+            case CONTENT_TYPE_GENERAL:
+            default:
+                maskType = MaskView.MASK_TYPE_NONE;
+                cropMaskView.setVisibility(View.INVISIBLE);
+                break;
+        }
+
+        // 身份证本地能力初始化
+        if (maskType == MaskView.MASK_TYPE_ID_CARD_FRONT || maskType == MaskView.MASK_TYPE_ID_CARD_BACK) {
+            if (isNativeEnable && !isNativeManual) {
+                initNative(token);
+            }
+        }
+        cameraView.setEnableScan(isNativeEnable);
+        cameraView.setMaskType(maskType, this);
+        cropMaskView.setMaskType(maskType);
+    }
+
+    private void initNative(final String token) {
+        CameraNativeHelper.init(CameraActivity.this, token,
+                new CameraNativeHelper.CameraNativeInitCallback() {
+            @Override
+            public void onError(int errorCode, Throwable e) {
+                cameraView.setInitNativeStatus(errorCode);
+            }
+        });
+    }
+
+    private void showTakePicture() {
+        cameraView.getCameraControl().resume();
+        updateFlashMode();
+        takePictureContainer.setVisibility(View.VISIBLE);
+        confirmResultContainer.setVisibility(View.INVISIBLE);
+        cropContainer.setVisibility(View.INVISIBLE);
+    }
+
+    private void showCrop() {
+        cameraView.getCameraControl().pause();
+        updateFlashMode();
+        takePictureContainer.setVisibility(View.INVISIBLE);
+        confirmResultContainer.setVisibility(View.INVISIBLE);
+        cropContainer.setVisibility(View.VISIBLE);
+    }
+
+    private void showResultConfirm() {
+        cameraView.getCameraControl().pause();
+        updateFlashMode();
+        takePictureContainer.setVisibility(View.INVISIBLE);
+        confirmResultContainer.setVisibility(View.VISIBLE);
+        cropContainer.setVisibility(View.INVISIBLE);
+    }
+
+    // take photo;
+    private void updateFlashMode() {
+        int flashMode = cameraView.getCameraControl().getFlashMode();
+        if (flashMode == ICameraControl.FLASH_MODE_TORCH) {
+            lightButton.setImageResource(R.drawable.bd_ocr_light_on);
+        } else {
+            lightButton.setImageResource(R.drawable.bd_ocr_light_off);
+        }
+    }
+
+    private View.OnClickListener albumButtonOnClickListener = new View.OnClickListener() {
+        @Override
+        public void onClick(View v) {
+
+            if (ActivityCompat.checkSelfPermission(getApplicationContext(), Manifest.permission.READ_EXTERNAL_STORAGE)
+                    != PackageManager.PERMISSION_GRANTED) {
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
+                    ActivityCompat.requestPermissions(CameraActivity.this,
+                            new String[] {Manifest.permission.READ_EXTERNAL_STORAGE},
+                            PERMISSIONS_EXTERNAL_STORAGE);
+                    return;
+                }
+            }
+            Intent intent = new Intent(Intent.ACTION_PICK);
+            intent.setType("image/*");
+            startActivityForResult(intent, REQUEST_CODE_PICK_IMAGE);
+        }
+    };
+
+    private View.OnClickListener lightButtonOnClickListener = new View.OnClickListener() {
+        @Override
+        public void onClick(View v) {
+            if (cameraView.getCameraControl().getFlashMode() == ICameraControl.FLASH_MODE_OFF) {
+                cameraView.getCameraControl().setFlashMode(ICameraControl.FLASH_MODE_TORCH);
+            } else {
+                cameraView.getCameraControl().setFlashMode(ICameraControl.FLASH_MODE_OFF);
+            }
+            updateFlashMode();
+        }
+    };
+
+    private View.OnClickListener takeButtonOnClickListener = new View.OnClickListener() {
+        @Override
+        public void onClick(View v) {
+            cameraView.takePicture(outputFile, takePictureCallback);
+        }
+    };
+
+    private CameraView.OnTakePictureCallback autoTakePictureCallback = new CameraView.OnTakePictureCallback() {
+        @Override
+        public void onPictureTaken(final Bitmap bitmap) {
+            CameraThreadPool.execute(new Runnable() {
+                @Override
+                public void run() {
+                    try {
+                        FileOutputStream fileOutputStream = new FileOutputStream(outputFile);
+                        bitmap.compress(Bitmap.CompressFormat.JPEG, 100, fileOutputStream);
+                        bitmap.recycle();
+                        fileOutputStream.close();
+                    } catch (IOException e) {
+                        e.printStackTrace();
+                    }
+                    Intent intent = new Intent();
+                    intent.putExtra(CameraActivity.KEY_CONTENT_TYPE, contentType);
+                    setResult(Activity.RESULT_OK, intent);
+                    finish();
+                }
+            });
+        }
+    };
+
+    private CameraView.OnTakePictureCallback takePictureCallback = new CameraView.OnTakePictureCallback() {
+        @Override
+        public void onPictureTaken(final Bitmap bitmap) {
+            handler.post(new Runnable() {
+                @Override
+                public void run() {
+                    takePictureContainer.setVisibility(View.INVISIBLE);
+                    if (cropMaskView.getMaskType() == MaskView.MASK_TYPE_NONE) {
+                        cropView.setFilePath(outputFile.getAbsolutePath());
+                        showCrop();
+                    } else if (cropMaskView.getMaskType() == MaskView.MASK_TYPE_BANK_CARD) {
+                        cropView.setFilePath(outputFile.getAbsolutePath());
+                        cropMaskView.setVisibility(View.INVISIBLE);
+                        overlayView.setVisibility(View.VISIBLE);
+                        overlayView.setTypeWide();
+                        showCrop();
+                    } else {
+                        displayImageView.setImageBitmap(bitmap);
+                        showResultConfirm();
+                    }
+                }
+            });
+        }
+    };
+
+    private View.OnClickListener cropCancelButtonListener = new View.OnClickListener() {
+        @Override
+        public void onClick(View v) {
+            // 释放 cropView中的bitmap;
+            cropView.setFilePath(null);
+            showTakePicture();
+        }
+    };
+
+    private View.OnClickListener cropConfirmButtonListener = new View.OnClickListener() {
+        @Override
+        public void onClick(View v) {
+            int maskType = cropMaskView.getMaskType();
+            Rect rect;
+            switch (maskType) {
+                case MaskView.MASK_TYPE_BANK_CARD:
+                case MaskView.MASK_TYPE_ID_CARD_BACK:
+                case MaskView.MASK_TYPE_ID_CARD_FRONT:
+                    rect = cropMaskView.getFrameRect();
+                    break;
+                case MaskView.MASK_TYPE_NONE:
+                default:
+                    rect = overlayView.getFrameRect();
+                    break;
+            }
+            Bitmap cropped = cropView.crop(rect);
+            displayImageView.setImageBitmap(cropped);
+            cropAndConfirm();
+        }
+    };
+
+    private void cropAndConfirm() {
+        cameraView.getCameraControl().pause();
+        updateFlashMode();
+        doConfirmResult();
+    }
+
+    private void doConfirmResult() {
+        CameraThreadPool.execute(new Runnable() {
+            @Override
+            public void run() {
+                try {
+                    FileOutputStream fileOutputStream = new FileOutputStream(outputFile);
+                    Bitmap bitmap = ((BitmapDrawable) displayImageView.getDrawable()).getBitmap();
+                    bitmap.compress(Bitmap.CompressFormat.JPEG, 100, fileOutputStream);
+                    fileOutputStream.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+                Intent intent = new Intent();
+                intent.putExtra(CameraActivity.KEY_CONTENT_TYPE, contentType);
+                setResult(Activity.RESULT_OK, intent);
+                finish();
+            }
+        });
+    }
+
+    private View.OnClickListener confirmButtonOnClickListener = new View.OnClickListener() {
+        @Override
+        public void onClick(View v) {
+            doConfirmResult();
+        }
+    };
+
+    private View.OnClickListener confirmCancelButtonOnClickListener = new View.OnClickListener() {
+        @Override
+        public void onClick(View v) {
+            displayImageView.setImageBitmap(null);
+            showTakePicture();
+        }
+    };
+
+    private View.OnClickListener rotateButtonOnClickListener = new View.OnClickListener() {
+        @Override
+        public void onClick(View v) {
+            cropView.rotate(90);
+        }
+    };
+
+    private String getRealPathFromURI(Uri contentURI) {
+        String result;
+        Cursor cursor = null;
+        try {
+            cursor = getContentResolver().query(contentURI, null, null, null, null);
+        } catch (Throwable e) {
+            e.printStackTrace();
+        }
+        if (cursor == null) {
+            result = contentURI.getPath();
+        } else {
+            cursor.moveToFirst();
+            int idx = cursor.getColumnIndex(MediaStore.Images.ImageColumns.DATA);
+            result = cursor.getString(idx);
+            cursor.close();
+        }
+        return result;
+    }
+    
+    @Override
+    public void onConfigurationChanged(Configuration newConfig) {
+        super.onConfigurationChanged(newConfig);
+        setOrientation(newConfig);
+    }
+
+    private void setOrientation(Configuration newConfig) {
+        int rotation = getWindowManager().getDefaultDisplay().getRotation();
+        int orientation;
+        int cameraViewOrientation = CameraView.ORIENTATION_PORTRAIT;
+        switch (newConfig.orientation) {
+            case Configuration.ORIENTATION_PORTRAIT:
+                cameraViewOrientation = CameraView.ORIENTATION_PORTRAIT;
+                orientation = OCRCameraLayout.ORIENTATION_PORTRAIT;
+                break;
+            case Configuration.ORIENTATION_LANDSCAPE:
+                orientation = OCRCameraLayout.ORIENTATION_HORIZONTAL;
+                if (rotation == Surface.ROTATION_0 || rotation == Surface.ROTATION_90) {
+                    cameraViewOrientation = CameraView.ORIENTATION_HORIZONTAL;
+                } else {
+                    cameraViewOrientation = CameraView.ORIENTATION_INVERT;
+                }
+                break;
+            default:
+                orientation = OCRCameraLayout.ORIENTATION_PORTRAIT;
+                cameraView.setOrientation(CameraView.ORIENTATION_PORTRAIT);
+                break;
+        }
+        takePictureContainer.setOrientation(orientation);
+        cameraView.setOrientation(cameraViewOrientation);
+        cropContainer.setOrientation(orientation);
+        confirmResultContainer.setOrientation(orientation);
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (requestCode == REQUEST_CODE_PICK_IMAGE) {
+            if (resultCode == Activity.RESULT_OK) {
+                Uri uri = data.getData();
+                cropView.setFilePath(getRealPathFromURI(uri));
+                showCrop();
+            } else {
+                cameraView.getCameraControl().resume();
+            }
+        }
+    }
+
+    @Override
+    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions,
+                                           @NonNull int[] grantResults) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
+        switch (requestCode) {
+            case PERMISSIONS_REQUEST_CAMERA: {
+                if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
+                    cameraView.getCameraControl().refreshPermission();
+                } else {
+                    Toast.makeText(getApplicationContext(), R.string.camera_permission_required, Toast.LENGTH_LONG)
+                            .show();
+                }
+                break;
+            }
+            case PERMISSIONS_EXTERNAL_STORAGE:
+            default:
+                break;
+        }
+    }
+
+    /**
+     * 做一些收尾工作
+     *
+     */
+    private void doClear() {
+        CameraThreadPool.cancelAutoFocusTimer();
+        if (isNativeEnable && !isNativeManual) {
+            IDcardQualityProcess.getInstance().releaseModel();
+        }
+    }
+
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        this.doClear();
+    }
+}

ocr_ui/src/main/java/com/baidu/ocr/ui/camera/CameraNativeHelper.java

@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2018 Baidu, Inc. All Rights Reserved.
+ */
+package com.baidu.ocr.ui.camera;
+
+import android.content.Context;
+
+import com.baidu.idcardquality.IDcardQualityProcess;
+
+/**
+ * Created by ruanshimin on 2018/1/23.
+ */
+
+public class CameraNativeHelper {
+
+    public interface CameraNativeInitCallback {
+        /**
+         * 加载本地库异常回调
+         *
+         * @param errorCode 错误代码
+         * @param e 如果加载so异常则会有异常对象传入
+         */
+        void onError(int errorCode, Throwable e);
+    }
+
+    public static void init(final Context ctx, final String token, final CameraNativeInitCallback cb) {
+        CameraThreadPool.execute(new Runnable() {
+            @Override
+            public void run() {
+                int status;
+                // 加载本地so失败, 异常返回getloadSoException
+                if (IDcardQualityProcess.getLoadSoException() != null) {
+                    status = CameraView.NATIVE_SOLOAD_FAIL;
+                    cb.onError(status, IDcardQualityProcess.getLoadSoException());
+                    return;
+                }
+                // 授权状态
+                int authStatus = IDcardQualityProcess.init(token);
+                if (authStatus != 0) {
+                    cb.onError(CameraView.NATIVE_AUTH_FAIL, null);
+                    return;
+                }
+
+                // 加载模型状态
+                int initModelStatus = IDcardQualityProcess.getInstance()
+                        .idcardQualityInit(ctx.getAssets(),
+                                "models");
+
+                if (initModelStatus != 0) {
+                    cb.onError(CameraView.NATIVE_INIT_FAIL, null);
+                }
+            }
+        });
+    }
+
+    public static void release() {
+        IDcardQualityProcess.getInstance().releaseModel();
+    }
+}

ocr_ui/src/main/java/com/baidu/ocr/ui/camera/CameraThreadPool.java

@@ -0,0 +1,66 @@
+/*
+ * Copyright (C) 2017 Baidu, Inc. All Rights Reserved.
+ */
+package com.baidu.ocr.ui.camera;
+
+import java.util.Timer;
+import java.util.TimerTask;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+public class CameraThreadPool {
+
+    static Timer timerFocus = null;
+
+    /*
+     * 对焦频率
+     */
+    static final long cameraScanInterval = 2000;
+
+    /*
+     * 线程池大小
+     */
+    private static int poolCount = Runtime.getRuntime().availableProcessors();
+
+    private static ExecutorService fixedThreadPool = Executors.newFixedThreadPool(poolCount);
+
+    /**
+     * 给线程池添加任务
+     * @param runnable 任务
+     */
+    public static void execute(Runnable runnable) {
+        fixedThreadPool.execute(runnable);
+    }
+
+    /**
+     * 创建一个定时对焦的timer任务
+     * @param runnable 对焦代码
+     * @return Timer Timer对象，用来终止自动对焦
+     */
+    public static Timer createAutoFocusTimerTask(final Runnable runnable) {
+        if (timerFocus != null) {
+            return timerFocus;
+        }
+        timerFocus = new Timer();
+        TimerTask task = new TimerTask() {
+            @Override
+            public void run() {
+                runnable.run();
+            }
+        };
+        timerFocus.scheduleAtFixedRate(task, 0, cameraScanInterval);
+        return timerFocus;
+    }
+
+    /**
+     * 终止自动对焦任务，实际调用了cancel方法并且清空对象
+     * 但是无法终止执行中的任务，需额外处理
+     *
+     */
+    public static void cancelAutoFocusTimer() {
+        if (timerFocus != null) {
+            timerFocus.cancel();
+            timerFocus = null;
+        }
+    }
+}

ocr_ui/src/main/java/com/baidu/ocr/ui/camera/CameraView.java

@@ -0,0 +1,650 @@
+/*
+ * Copyright (C) 2017 Baidu, Inc. All Rights Reserved.
+ */
+package com.baidu.ocr.ui.camera;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+
+import com.baidu.idcardquality.IDcardQualityProcess;
+import com.baidu.ocr.ui.R;
+import com.baidu.ocr.ui.util.DimensionUtil;
+import com.baidu.ocr.ui.util.ImageUtil;
+
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.BitmapRegionDecoder;
+import android.graphics.Color;
+import android.graphics.ImageFormat;
+import android.graphics.Matrix;
+import android.graphics.Rect;
+import android.media.ImageReader;
+import android.os.Handler;
+import android.os.Looper;
+import android.util.AttributeSet;
+import android.util.TypedValue;
+import android.view.Gravity;
+import android.view.View;
+import android.widget.FrameLayout;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import androidx.annotation.IntDef;
+
+/**
+ * 负责，相机的管理。同时提供，裁剪遮罩功能。
+ */
+public class CameraView extends FrameLayout {
+
+    private int maskType;
+
+    /**
+     * 照相回调
+     */
+    interface OnTakePictureCallback {
+        void onPictureTaken(Bitmap bitmap);
+    }
+
+    /**
+     * 垂直方向 {@link #setOrientation(int)}
+     */
+    public static final int ORIENTATION_PORTRAIT = 0;
+    /**
+     * 水平方向 {@link #setOrientation(int)}
+     */
+    public static final int ORIENTATION_HORIZONTAL = 90;
+    /**
+     * 水平翻转方向 {@link #setOrientation(int)}
+     */
+    public static final int ORIENTATION_INVERT = 270;
+
+    /**
+     * 本地模型授权，加载成功
+     */
+    public static final int NATIVE_AUTH_INIT_SUCCESS = 0;
+
+    /**
+     * 本地模型授权，缺少SO
+     */
+    public static final int NATIVE_SOLOAD_FAIL = 10;
+
+    /**
+     * 本地模型授权，授权失败，token异常
+     */
+    public static final int NATIVE_AUTH_FAIL = 11;
+
+    /**
+     * 本地模型授权，模型加载失败
+     */
+    public static final int NATIVE_INIT_FAIL = 12;
+
+
+    /**
+     * 是否已经通过本地质量控制扫描
+     */
+    private final int SCAN_SUCCESS = 0;
+
+    public void setInitNativeStatus(int initNativeStatus) {
+        this.initNativeStatus = initNativeStatus;
+    }
+
+    /**
+     *  本地检测初始化，模型加载标识
+     */
+    private int initNativeStatus  = NATIVE_AUTH_INIT_SUCCESS;
+
+    @IntDef({ORIENTATION_PORTRAIT, ORIENTATION_HORIZONTAL, ORIENTATION_INVERT})
+    public @interface Orientation {
+
+    }
+
+    private CameraViewTakePictureCallback cameraViewTakePictureCallback = new CameraViewTakePictureCallback();
+
+    private ICameraControl cameraControl;
+
+    /**
+     * 相机预览View
+     */
+    private View displayView;
+    /**
+     * 身份证，银行卡，等裁剪用的遮罩
+     */
+    private MaskView maskView;
+
+    /**
+     * 用于显示提示证 "请对齐身份证正面" 之类的背景
+     */
+    private ImageView hintView;
+
+    /**
+     * 用于显示提示证 "请对齐身份证正面" 之类的文字
+     */
+    private TextView hintViewText;
+
+    /**
+     * 提示文案容器
+     */
+    private LinearLayout hintViewTextWrapper;
+
+    /**
+     * 是否是本地质量控制扫描
+     */
+    private boolean isEnableScan;
+
+    public void setEnableScan(boolean enableScan) {
+        isEnableScan = enableScan;
+    }
+
+    /**
+     * UI线程的handler
+     */
+    Handler uiHandler = new Handler(Looper.getMainLooper());
+
+    public ICameraControl getCameraControl() {
+        return cameraControl;
+    }
+
+    public void setOrientation(@Orientation int orientation) {
+        cameraControl.setDisplayOrientation(orientation);
+    }
+    public CameraView(Context context) {
+        super(context);
+        init();
+    }
+
+    public CameraView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        init();
+    }
+
+    public CameraView(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        init();
+    }
+
+    public void start() {
+        cameraControl.start();
+        setKeepScreenOn(true);
+    }
+
+    public void stop() {
+        cameraControl.stop();
+        setKeepScreenOn(false);
+    }
+
+    public void takePicture(final File file, final OnTakePictureCallback callback) {
+        cameraViewTakePictureCallback.file = file;
+        cameraViewTakePictureCallback.callback = callback;
+        cameraControl.takePicture(cameraViewTakePictureCallback);
+    }
+
+    private OnTakePictureCallback autoPictureCallback;
+
+    public void setAutoPictureCallback(OnTakePictureCallback callback) {
+        autoPictureCallback = callback;
+    }
+
+    public void setMaskType(@MaskView.MaskType int maskType, final Context ctx) {
+        maskView.setMaskType(maskType);
+
+        maskView.setVisibility(VISIBLE);
+        hintView.setVisibility(VISIBLE);
+
+        int hintResourceId = R.drawable.bd_ocr_hint_align_id_card;
+        this.maskType = maskType;
+        boolean isNeedSetImage = true;
+        switch (maskType) {
+            case MaskView.MASK_TYPE_ID_CARD_FRONT:
+                hintResourceId = R.drawable.bd_ocr_round_corner;
+                isNeedSetImage = false;
+                break;
+            case MaskView.MASK_TYPE_ID_CARD_BACK:
+                isNeedSetImage = false;
+                hintResourceId = R.drawable.bd_ocr_round_corner;
+                break;
+            case MaskView.MASK_TYPE_BANK_CARD:
+                hintResourceId = R.drawable.bd_ocr_hint_align_bank_card;
+                break;
+            case MaskView.MASK_TYPE_PASSPORT:
+                hintView.setVisibility(INVISIBLE);
+                break;
+            case MaskView.MASK_TYPE_NONE:
+            default:
+                maskView.setVisibility(INVISIBLE);
+                hintView.setVisibility(INVISIBLE);
+                break;
+        }
+
+        if (isNeedSetImage) {
+            hintView.setImageResource(hintResourceId);
+            hintViewTextWrapper.setVisibility(INVISIBLE);
+        }
+
+        if (maskType == MaskView.MASK_TYPE_ID_CARD_FRONT && isEnableScan) {
+            cameraControl.setDetectCallback(new ICameraControl.OnDetectPictureCallback() {
+                @Override
+                public int onDetect(byte[] data, int rotation) {
+                    return detect(data, rotation);
+                }
+            });
+        }
+
+        if (maskType == MaskView.MASK_TYPE_ID_CARD_BACK && isEnableScan) {
+            cameraControl.setDetectCallback(new ICameraControl.OnDetectPictureCallback() {
+                @Override
+                public int onDetect(byte[] data, int rotation) {
+                    return detect(data, rotation);
+                }
+            });
+        }
+    }
+
+    private int detect(byte[] data, final int rotation) {
+        if (initNativeStatus != NATIVE_AUTH_INIT_SUCCESS) {
+            showTipMessage(initNativeStatus);
+            return 1;
+        }
+        // 扫描成功阻止多余的操作
+        if (cameraControl.getAbortingScan().get()) {
+            return 0;
+        }
+
+        Rect previewFrame = cameraControl.getPreviewFrame();
+
+        if (maskView.getWidth() == 0 || maskView.getHeight() == 0
+                || previewFrame.width() == 0 || previewFrame.height() == 0) {
+            return 0;
+        }
+
+        // BitmapRegionDecoder不会将整个图片加载到内存。
+        BitmapRegionDecoder decoder = null;
+        try {
+            decoder = BitmapRegionDecoder.newInstance(data, 0, data.length, true);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+
+        int width = rotation % 180 == 0 ? decoder.getWidth() : decoder.getHeight();
+        int height = rotation % 180 == 0 ? decoder.getHeight() : decoder.getWidth();
+
+        Rect frameRect = maskView.getFrameRectExtend();
+
+        int left =  width * frameRect.left / maskView.getWidth();
+        int top = height * frameRect.top / maskView.getHeight();
+        int right = width * frameRect.right / maskView.getWidth();
+        int bottom = height * frameRect.bottom / maskView.getHeight();
+
+        // 高度大于图片
+        if (previewFrame.top < 0) {
+            // 宽度对齐。
+            int adjustedPreviewHeight = previewFrame.height() * getWidth() / previewFrame.width();
+            int topInFrame = ((adjustedPreviewHeight - frameRect.height()) / 2)
+                    * getWidth() / previewFrame.width();
+            int bottomInFrame = ((adjustedPreviewHeight + frameRect.height()) / 2) * getWidth()
+                    / previewFrame.width();
+
+            // 等比例投射到照片当中。
+            top = topInFrame * height / previewFrame.height();
+            bottom = bottomInFrame * height / previewFrame.height();
+        } else {
+            // 宽度大于图片
+            if (previewFrame.left < 0) {
+                // 高度对齐
+                int adjustedPreviewWidth = previewFrame.width() * getHeight() / previewFrame.height();
+                int leftInFrame = ((adjustedPreviewWidth - maskView.getFrameRect().width()) / 2) * getHeight()
+                        / previewFrame.height();
+                int rightInFrame = ((adjustedPreviewWidth + maskView.getFrameRect().width()) / 2) * getHeight()
+                        / previewFrame.height();
+
+                // 等比例投射到照片当中。
+                left = leftInFrame * width / previewFrame.width();
+                right = rightInFrame * width / previewFrame.width();
+            }
+        }
+
+        Rect region = new Rect();
+        region.left = left;
+        region.top = top;
+        region.right = right;
+        region.bottom = bottom;
+
+        // 90度或者270度旋转
+        if (rotation % 180 == 90) {
+            int x = decoder.getWidth() / 2;
+            int y = decoder.getHeight() / 2;
+
+            int rotatedWidth = region.height();
+            int rotated = region.width();
+
+            // 计算，裁剪框旋转后的坐标
+            region.left = x - rotatedWidth / 2;
+            region.top = y - rotated / 2;
+            region.right = x + rotatedWidth / 2;
+            region.bottom = y + rotated / 2;
+            region.sort();
+        }
+
+        BitmapFactory.Options options = new BitmapFactory.Options();
+
+        // 最大图片大小。
+        int maxPreviewImageSize = 2560;
+        int size = Math.min(decoder.getWidth(), decoder.getHeight());
+        size = Math.min(size, maxPreviewImageSize);
+
+        options.inSampleSize = ImageUtil.calculateInSampleSize(options, size, size);
+        options.inScaled = true;
+        options.inDensity = Math.max(options.outWidth, options.outHeight);
+        options.inTargetDensity = size;
+        options.inPreferredConfig = Bitmap.Config.RGB_565;
+        Bitmap bitmap = decoder.decodeRegion(region, options);
+        if (rotation != 0) {
+            // 只能是裁剪完之后再旋转了。有没有别的更好的方案呢？
+            Matrix matrix = new Matrix();
+            matrix.postRotate(rotation);
+            Bitmap rotatedBitmap = Bitmap.createBitmap(
+                    bitmap, 0, 0, bitmap.getWidth(), bitmap.getHeight(), matrix, false);
+            if (bitmap != rotatedBitmap) {
+                // 有时候 createBitmap会复用对象
+                bitmap.recycle();
+            }
+            bitmap = rotatedBitmap;
+        }
+
+        final int status;
+
+        // 调用本地质量控制请求
+        switch (maskType) {
+            case MaskView.MASK_TYPE_ID_CARD_FRONT:
+                status = IDcardQualityProcess.getInstance().idcardQualityDetectionImg(bitmap, true);
+                break;
+            case MaskView.MASK_TYPE_ID_CARD_BACK:
+                status = IDcardQualityProcess.getInstance().idcardQualityDetectionImg(bitmap, false);
+                break;
+            default:
+                status = 1;
+        }
+
+        // 当有某个扫描处理线程调用成功后，阻止其他线程继续调用本地控制代码
+        if (status == SCAN_SUCCESS) {
+            // 扫描成功阻止多线程同时回调
+            if (!cameraControl.getAbortingScan().compareAndSet(false, true)) {
+                bitmap.recycle();
+                return 0;
+            }
+            autoPictureCallback.onPictureTaken(bitmap);
+        }
+
+        showTipMessage(status);
+
+        return status;
+    }
+
+    private void showTipMessage(final int status) {
+        // 提示tip文字变化
+        uiHandler.post(new Runnable() {
+            @Override
+            public void run() {
+                if (status == 0) {
+                    hintViewText.setVisibility(View.INVISIBLE);
+                } else if (!cameraControl.getAbortingScan().get()) {
+                    hintViewText.setVisibility(View.VISIBLE);
+                    hintViewText.setText(getScanMessage(status));
+                }
+            }
+        });
+    }
+
+    private String getScanMessage(int status) {
+        String message;
+        switch (status) {
+            case 0:
+                message = "";
+                break;
+            case 2:
+                message = "身份证模糊，请重新尝试";
+                break;
+            case 3:
+                message = "身份证反光，请重新尝试";
+                break;
+            case 4:
+                message = "请将身份证前后反转再进行识别";
+                break;
+            case 5:
+                message = "请拿稳镜头和身份证";
+                break;
+            case 6:
+                message = "请将镜头靠近身份证";
+                break;
+            case 7:
+                message = "请将身份证完整置于取景框内";
+                break;
+            case NATIVE_AUTH_FAIL:
+                message = "本地质量控制授权失败";
+                break;
+            case NATIVE_INIT_FAIL:
+                message = "本地模型加载失败";
+                break;
+            case NATIVE_SOLOAD_FAIL:
+                message = "本地SO库加载失败";
+                break;
+            case 1:
+            default:
+                message = "请将身份证置于取景框内";
+        }
+
+
+        return message;
+    }
+
+    private void init() {
+//        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+//            cameraControl = new Camera2Control(getContext());
+//        } else {
+//
+//        }
+        cameraControl = new Camera1Control(getContext());
+
+        displayView = cameraControl.getDisplayView();
+        addView(displayView);
+
+        maskView = new MaskView(getContext());
+        addView(maskView);
+
+        hintView = new ImageView(getContext());
+        addView(hintView);
+
+        hintViewTextWrapper = new LinearLayout(getContext());
+        hintViewTextWrapper.setOrientation(LinearLayout.VERTICAL);
+        LinearLayout.LayoutParams lp = new LinearLayout.LayoutParams(LayoutParams.WRAP_CONTENT,
+                DimensionUtil.dpToPx(25));
+
+        lp.gravity = Gravity.CENTER;
+        hintViewText = new TextView(getContext());
+        hintViewText.setBackgroundResource(R.drawable.bd_ocr_round_corner);
+        hintViewText.setAlpha(0.5f);
+        hintViewText.setPadding(DimensionUtil.dpToPx(10), 0, DimensionUtil.dpToPx(10), 0);
+        hintViewTextWrapper.addView(hintViewText, lp);
+
+
+        hintViewText.setGravity(Gravity.CENTER);
+        hintViewText.setTextColor(Color.WHITE);
+        hintViewText.setTextSize(TypedValue.COMPLEX_UNIT_SP, 14);
+        hintViewText.setText(getScanMessage(-1));
+
+
+        addView(hintViewTextWrapper, lp);
+    }
+
+    @Override
+    protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
+        displayView.layout(left, 0, right, bottom - top);
+        maskView.layout(left, 0, right, bottom - top);
+
+        int hintViewWidth = DimensionUtil.dpToPx(250);
+        int hintViewHeight = DimensionUtil.dpToPx(25);
+
+        int hintViewLeft = (getWidth() - hintViewWidth) / 2;
+        int hintViewTop = maskView.getFrameRect().bottom + DimensionUtil.dpToPx(16);
+
+        hintViewTextWrapper.layout(hintViewLeft, hintViewTop,
+                hintViewLeft + hintViewWidth, hintViewTop + hintViewHeight);
+
+        hintView.layout(hintViewLeft, hintViewTop,
+                hintViewLeft + hintViewWidth, hintViewTop + hintViewHeight);
+    }
+
+    /**
+     * 拍摄后的照片。需要进行裁剪。有些手机（比如三星）不会对照片数据进行旋转，而是将旋转角度写入EXIF信息当中，
+     * 所以需要做旋转处理。
+     *
+     * @param outputFile 写入照片的文件。
+     * @param data  原始照片数据。
+     * @param rotation   照片exif中的旋转角度。
+     *
+     * @return 裁剪好的bitmap。
+     */
+    @SuppressWarnings("ResultOfMethodCallIgnored")
+    private Bitmap crop(File outputFile, byte[] data, int rotation) {
+        try {
+            Rect previewFrame = cameraControl.getPreviewFrame();
+
+            if (maskView.getWidth() == 0 || maskView.getHeight() == 0
+                    || previewFrame.width() == 0 || previewFrame.height() == 0) {
+                return null;
+            }
+
+            // BitmapRegionDecoder不会将整个图片加载到内存。
+            BitmapRegionDecoder decoder = BitmapRegionDecoder.newInstance(data, 0, data.length, true);
+
+
+
+            int width = rotation % 180 == 0 ? decoder.getWidth() : decoder.getHeight();
+            int height = rotation % 180 == 0 ? decoder.getHeight() : decoder.getWidth();
+
+            Rect frameRect = maskView.getFrameRect();
+
+            int left = width * frameRect.left / maskView.getWidth();
+            int top = height * frameRect.top / maskView.getHeight();
+            int right = width * frameRect.right / maskView.getWidth();
+            int bottom = height * frameRect.bottom / maskView.getHeight();
+
+            // 高度大于图片
+            if (previewFrame.top < 0) {
+                // 宽度对齐。
+                int adjustedPreviewHeight = previewFrame.height() * getWidth() / previewFrame.width();
+                int topInFrame = ((adjustedPreviewHeight - frameRect.height()) / 2)
+                        * getWidth() / previewFrame.width();
+                int bottomInFrame = ((adjustedPreviewHeight + frameRect.height()) / 2) * getWidth()
+                        / previewFrame.width();
+
+                // 等比例投射到照片当中。
+                top = topInFrame * height / previewFrame.height();
+                bottom = bottomInFrame * height / previewFrame.height();
+            } else {
+                // 宽度大于图片
+                if (previewFrame.left < 0) {
+                    // 高度对齐
+                    int adjustedPreviewWidth = previewFrame.width() * getHeight() / previewFrame.height();
+                    int leftInFrame = ((adjustedPreviewWidth - maskView.getFrameRect().width()) / 2) * getHeight()
+                            / previewFrame.height();
+                    int rightInFrame = ((adjustedPreviewWidth + maskView.getFrameRect().width()) / 2) * getHeight()
+                            / previewFrame.height();
+
+                    // 等比例投射到照片当中。
+                    left = leftInFrame * width / previewFrame.width();
+                    right = rightInFrame * width / previewFrame.width();
+                }
+            }
+
+            Rect region = new Rect();
+            region.left = left;
+            region.top = top;
+            region.right = right;
+            region.bottom = bottom;
+
+            // 90度或者270度旋转
+            if (rotation % 180 == 90) {
+                int x = decoder.getWidth() / 2;
+                int y = decoder.getHeight() / 2;
+
+                int rotatedWidth = region.height();
+                int rotated = region.width();
+
+                // 计算，裁剪框旋转后的坐标
+                region.left = x - rotatedWidth / 2;
+                region.top = y - rotated / 2;
+                region.right = x + rotatedWidth / 2;
+                region.bottom = y + rotated / 2;
+                region.sort();
+            }
+
+            BitmapFactory.Options options = new BitmapFactory.Options();
+
+            // 最大图片大小。
+            int maxPreviewImageSize = 2560;
+            int size = Math.min(decoder.getWidth(), decoder.getHeight());
+            size = Math.min(size, maxPreviewImageSize);
+
+            options.inSampleSize = ImageUtil.calculateInSampleSize(options, size, size);
+            options.inScaled = true;
+            options.inDensity = Math.max(options.outWidth, options.outHeight);
+            options.inTargetDensity = size;
+            options.inPreferredConfig = Bitmap.Config.RGB_565;
+            Bitmap bitmap = decoder.decodeRegion(region, options);
+
+            if (rotation != 0) {
+                // 只能是裁剪完之后再旋转了。有没有别的更好的方案呢？
+                Matrix matrix = new Matrix();
+                matrix.postRotate(rotation);
+                Bitmap rotatedBitmap = Bitmap.createBitmap(
+                        bitmap, 0, 0, bitmap.getWidth(), bitmap.getHeight(), matrix, false);
+                if (bitmap != rotatedBitmap) {
+                    // 有时候 createBitmap会复用对象
+                    bitmap.recycle();
+                }
+                bitmap = rotatedBitmap;
+            }
+
+            try {
+                if (!outputFile.exists()) {
+                    outputFile.createNewFile();
+                }
+                FileOutputStream fileOutputStream = new FileOutputStream(outputFile);
+                bitmap.compress(Bitmap.CompressFormat.JPEG, 90, fileOutputStream);
+                fileOutputStream.flush();
+                fileOutputStream.close();
+                return bitmap;
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    public void release() {
+        IDcardQualityProcess.getInstance().releaseModel();
+    }
+
+    private class CameraViewTakePictureCallback implements ICameraControl.OnTakePictureCallback {
+
+        private File file;
+        private OnTakePictureCallback callback;
+
+        @Override
+        public void onPictureTaken(final byte[] data) {
+            CameraThreadPool.execute(new Runnable() {
+                @Override
+                public void run() {
+                    final int rotation = ImageUtil.getOrientation(data);
+                    Bitmap bitmap = crop(file, data, rotation);
+                    callback.onPictureTaken(bitmap);
+                }
+            });
+        }
+    }
+}

ocr_ui/src/main/java/com/baidu/ocr/ui/camera/ICameraControl.java

@@ -0,0 +1,121 @@
+/*
+ * Copyright (C) 2017 Baidu, Inc. All Rights Reserved.
+ */
+package com.baidu.ocr.ui.camera;
+
+import android.graphics.Rect;
+import android.view.View;
+
+import androidx.annotation.IntDef;
+
+import java.util.concurrent.atomic.AtomicBoolean;
+
+/**
+ * Android 5.0 相机的API发生很大的变化。些类屏蔽掉了 api的变化。相机的操作和功能，抽象剥离出来。
+ */
+public interface ICameraControl {
+
+    /**
+     * 闪光灯关 {@link #setFlashMode(int)}
+     */
+    int FLASH_MODE_OFF = 0;
+    /**
+     * 闪光灯开 {@link #setFlashMode(int)}
+     */
+    int FLASH_MODE_TORCH = 1;
+    /**
+     * 闪光灯自动 {@link #setFlashMode(int)}
+     */
+    int FLASH_MODE_AUTO = 2;
+
+    @IntDef({FLASH_MODE_TORCH, FLASH_MODE_OFF, FLASH_MODE_AUTO})
+    @interface FlashMode {
+
+    }
+
+    /**
+     * 照相回调。
+     */
+    interface OnTakePictureCallback {
+        void onPictureTaken(byte[] data);
+    }
+
+    /**
+     * 设置本地质量控制回调，如果不设置则视为不扫描调用本地质量控制代码。
+     */
+    void setDetectCallback(OnDetectPictureCallback callback);
+
+    /**
+     * 预览回调
+     */
+    interface OnDetectPictureCallback {
+        int onDetect(byte[] data, int rotation);
+    }
+
+    /**
+     * 打开相机。
+     */
+    void start();
+
+    /**
+     * 关闭相机
+     */
+    void stop();
+
+    void pause();
+
+    void resume();
+
+    /**
+     * 相机对应的预览视图。
+     * @return 预览视图
+     */
+    View getDisplayView();
+
+    /**
+     * 看到的预览可能不是照片的全部。返回预览视图的全貌。
+     * @return 预览视图frame;
+     */
+    Rect getPreviewFrame();
+
+    /**
+     * 拍照。结果在回调中获取。
+     * @param callback 拍照结果回调
+     */
+    void takePicture(OnTakePictureCallback callback);
+
+    /**
+     * 设置权限回调，当手机没有拍照权限时，可在回调中获取。
+     * @param callback 权限回调
+     */
+    void setPermissionCallback(PermissionCallback callback);
+
+    /**
+     * 设置水平方向
+     * @param displayOrientation 参数值见 {@link com.baidu.ocr.ui.camera.CameraView.Orientation}
+     */
+    void setDisplayOrientation(@CameraView.Orientation int displayOrientation);
+
+    /**
+     * 获取到拍照权限时，调用些函数以继续。
+     */
+    void refreshPermission();
+
+    /**
+     * 获取已经扫描成功，处理中
+     */
+    AtomicBoolean getAbortingScan();
+
+    /**
+     *  设置闪光灯状态。
+     * @param flashMode {@link #FLASH_MODE_TORCH,#FLASH_MODE_OFF,#FLASH_MODE_AUTO}
+     */
+    void setFlashMode(@FlashMode int flashMode);
+
+    /**
+     * 获取当前闪光灯状态
+     * @return 当前闪光灯状态 参见 {@link #setFlashMode(int)}
+     */
+    @FlashMode
+    int getFlashMode();
+}

ocr_ui/src/main/java/com/baidu/ocr/ui/camera/MaskView.java

@@ -0,0 +1,279 @@
+/*
+ * Copyright (C) 2017 Baidu, Inc. All Rights Reserved.
+ */
+package com.baidu.ocr.ui.camera;
+
+import java.io.File;
+
+import com.baidu.ocr.ui.R;
+
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Paint;
+import android.graphics.Path;
+import android.graphics.PorterDuff;
+import android.graphics.PorterDuffXfermode;
+import android.graphics.Rect;
+import android.graphics.drawable.Drawable;
+import android.os.Build;
+import android.util.AttributeSet;
+import android.view.View;
+
+import androidx.annotation.IntDef;
+import androidx.annotation.RequiresApi;
+import androidx.core.content.res.ResourcesCompat;
+
+@SuppressWarnings("unused")
+public class MaskView extends View {
+
+    public static final int MASK_TYPE_NONE = 0;
+    public static final int MASK_TYPE_ID_CARD_FRONT = 1;
+    public static final int MASK_TYPE_ID_CARD_BACK = 2;
+    public static final int MASK_TYPE_BANK_CARD = 11;
+    public static final int MASK_TYPE_PASSPORT = 21;
+
+    @IntDef({MASK_TYPE_NONE, MASK_TYPE_ID_CARD_FRONT, MASK_TYPE_ID_CARD_BACK, MASK_TYPE_BANK_CARD,
+            MASK_TYPE_PASSPORT})
+    @interface MaskType {
+
+    }
+
+    public void setLineColor(int lineColor) {
+        this.lineColor = lineColor;
+    }
+
+    public void setMaskColor(int maskColor) {
+        this.maskColor = maskColor;
+    }
+
+    private int lineColor = Color.WHITE;
+
+    private int maskType = MASK_TYPE_ID_CARD_FRONT;
+
+    private int maskColor = Color.argb(100, 0, 0, 0);
+
+    private Paint eraser = new Paint(Paint.ANTI_ALIAS_FLAG);
+    private Paint pen = new Paint(Paint.ANTI_ALIAS_FLAG);
+
+    private Rect frame = new Rect();
+
+    private Rect framePassport = new Rect();
+
+    private Drawable locatorDrawable;
+
+    public Rect getFrameRect() {
+        if (maskType == MASK_TYPE_NONE) {
+            return new Rect(0, 0, getWidth(), getHeight());
+        } else if (maskType == MASK_TYPE_PASSPORT) {
+            return new Rect(framePassport);
+        } else {
+            return new Rect(frame);
+        }
+
+    }
+
+    public Rect getFrameRectExtend() {
+        Rect rc = new Rect(frame);
+        int widthExtend = (int) ((frame.right - frame.left) * 0.02f);
+        int heightExtend = (int) ((frame.bottom - frame.top) * 0.02f);
+        rc.left -= widthExtend;
+        rc.right += widthExtend;
+        rc.top -= heightExtend;
+        rc.bottom += heightExtend;
+        return rc;
+    }
+
+    public void setMaskType(@MaskType int maskType) {
+        this.maskType = maskType;
+        switch (maskType) {
+            case MASK_TYPE_ID_CARD_FRONT:
+                locatorDrawable = ResourcesCompat.getDrawable(getResources(),
+                        R.drawable.bd_ocr_id_card_locator_front, null);
+                break;
+            case MASK_TYPE_ID_CARD_BACK:
+                locatorDrawable = ResourcesCompat.getDrawable(getResources(),
+                        R.drawable.bd_ocr_id_card_locator_back, null);
+                break;
+            case MASK_TYPE_PASSPORT:
+                locatorDrawable = ResourcesCompat.getDrawable(getResources(),
+                        R.drawable.bd_ocr_passport_locator, null);
+                break;
+            case MASK_TYPE_BANK_CARD:
+                break;
+            case MASK_TYPE_NONE:
+            default:
+                break;
+        }
+        invalidate();
+    }
+
+    public int getMaskType() {
+        return maskType;
+    }
+
+    public void setOrientation(@CameraView.Orientation int orientation) {
+    }
+
+    public MaskView(Context context) {
+        super(context);
+        init();
+    }
+
+    public MaskView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        init();
+    }
+
+    public MaskView(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        init();
+    }
+
+    private void init() {
+        locatorDrawable = ResourcesCompat.getDrawable(getResources(), R.drawable.bd_ocr_id_card_locator_front, null);
+    }
+
+    @Override
+    protected void onSizeChanged(int w, int h, int oldw, int oldh) {
+        super.onSizeChanged(w, h, oldw, oldh);
+        if (w > 0 && h > 0) {
+            if (maskType != MASK_TYPE_PASSPORT) {
+                float ratio = h > w ? 0.9f : 0.72f;
+
+                int width = (int) (w * ratio);
+                int height = width * 400 / 620;
+
+                int left = (w - width) / 2;
+                int top = (h - height) / 2;
+                int right = width + left;
+                int bottom = height + top;
+
+                frame.left = left;
+                frame.top = top;
+                frame.right = right;
+                frame.bottom = bottom;
+            } else {
+                float ratio = 0.9f;
+
+                int width = (int) (w * ratio);
+                int height = width * 330 / 470;
+
+                int left = (w - width) / 2;
+                int top = (h - height) / 2;
+                int right = width + left;
+                int bottom = height + top;
+
+                framePassport.left = left;
+                framePassport.top = top;
+                framePassport.right = right;
+                framePassport.bottom = bottom;
+            }
+        }
+    }
+
+    @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
+    @Override
+    protected void onDraw(Canvas canvas) {
+        super.onDraw(canvas);
+        Rect frame = this.frame;
+        if (maskType == MASK_TYPE_PASSPORT) {
+            frame = framePassport;
+        }
+
+        int width = frame.width();
+        int height = frame.height();
+
+        int left = frame.left;
+        int top = frame.top;
+        int right = frame.right;
+        int bottom = frame.bottom;
+
+        canvas.drawColor(maskColor);
+        fillRectRound(left, top, right, bottom, 30, 30, false);
+        canvas.drawPath(path, pen);
+        canvas.drawPath(path, eraser);
+
+        if (maskType == MASK_TYPE_ID_CARD_FRONT) {
+            locatorDrawable.setBounds(
+                    (int) (left + 601f / 1006 * width),
+                    (int) (top + (110f / 632) * height),
+                    (int) (left + (963f / 1006) * width),
+                    (int) (top + (476f / 632) * height));
+        } else if (maskType == MASK_TYPE_ID_CARD_BACK) {
+            locatorDrawable.setBounds(
+                    (int) (left + 51f / 1006 * width),
+                    (int) (top + (48f / 632) * height),
+                    (int) (left + (250f / 1006) * width),
+                    (int) (top + (262f / 632) * height));
+        } else if (maskType == MASK_TYPE_PASSPORT) {
+            locatorDrawable.setBounds(
+                    (int) (left + 30f / 1006 * width),
+                    (int) (top + (20f / 632) * height),
+                    (int) (left + (303f / 1006) * width),
+                    (int) (top + (416f / 632) * height));
+        }
+        if (locatorDrawable != null) {
+            locatorDrawable.draw(canvas);
+        }
+    }
+
+    private Path path = new Path();
+
+    private Path fillRectRound(float left, float top, float right, float bottom, float rx, float ry, boolean
+            conformToOriginalPost) {
+
+        path.reset();
+        if (rx < 0) {
+            rx = 0;
+        }
+        if (ry < 0) {
+            ry = 0;
+        }
+        float width = right - left;
+        float height = bottom - top;
+        if (rx > width / 2) {
+            rx = width / 2;
+        }
+        if (ry > height / 2) {
+            ry = height / 2;
+        }
+        float widthMinusCorners = (width - (2 * rx));
+        float heightMinusCorners = (height - (2 * ry));
+
+        path.moveTo(right, top + ry);
+        path.rQuadTo(0, -ry, -rx, -ry);
+        path.rLineTo(-widthMinusCorners, 0);
+        path.rQuadTo(-rx, 0, -rx, ry);
+        path.rLineTo(0, heightMinusCorners);
+
+        if (conformToOriginalPost) {
+            path.rLineTo(0, ry);
+            path.rLineTo(width, 0);
+            path.rLineTo(0, -ry);
+        } else {
+            path.rQuadTo(0, ry, rx, ry);
+            path.rLineTo(widthMinusCorners, 0);
+            path.rQuadTo(rx, 0, rx, -ry);
+        }
+
+        path.rLineTo(0, -heightMinusCorners);
+        path.close();
+        return path;
+    }
+
+    {
+        // 硬件加速不支持，图层混合。
+        setLayerType(View.LAYER_TYPE_SOFTWARE, null);
+
+        pen.setColor(Color.WHITE);
+        pen.setStyle(Paint.Style.STROKE);
+        pen.setStrokeWidth(6);
+
+        eraser.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.CLEAR));
+    }
+
+    private void capture(File file) {
+
+    }
+}

ocr_ui/src/main/java/com/baidu/ocr/ui/camera/OCRCameraLayout.java

@@ -0,0 +1,166 @@
+/*
+ * Copyright (C) 2017 Baidu, Inc. All Rights Reserved.
+ */
+package com.baidu.ocr.ui.camera;
+
+import com.baidu.ocr.ui.R;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Paint;
+import android.graphics.Rect;
+import android.util.AttributeSet;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.FrameLayout;
+
+public class OCRCameraLayout extends FrameLayout {
+
+    public static int ORIENTATION_PORTRAIT = 0;
+    public static int ORIENTATION_HORIZONTAL = 1;
+
+    private int orientation = ORIENTATION_PORTRAIT;
+    private View contentView;
+    private View centerView;
+    private View leftDownView;
+    private View rightUpView;
+
+    private int contentViewId;
+    private int centerViewId;
+    private int leftDownViewId;
+    private int rightUpViewId;
+
+    public void setOrientation(int orientation) {
+        if (this.orientation == orientation) {
+            return;
+        }
+        this.orientation = orientation;
+        requestLayout();
+    }
+
+    public OCRCameraLayout(Context context) {
+        super(context);
+    }
+
+    public OCRCameraLayout(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        parseAttrs(attrs);
+    }
+
+    public OCRCameraLayout(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        parseAttrs(attrs);
+    }
+
+    {
+        setWillNotDraw(false);
+    }
+
+    private void parseAttrs(AttributeSet attrs) {
+        TypedArray a = getContext().getTheme().obtainStyledAttributes(
+                attrs,
+                R.styleable.OCRCameraLayout,
+                0, 0);
+        try {
+            contentViewId = a.getResourceId(R.styleable.OCRCameraLayout_contentView, -1);
+            centerViewId = a.getResourceId(R.styleable.OCRCameraLayout_centerView, -1);
+            leftDownViewId = a.getResourceId(R.styleable.OCRCameraLayout_leftDownView, -1);
+            rightUpViewId = a.getResourceId(R.styleable.OCRCameraLayout_rightUpView, -1);
+        } finally {
+            a.recycle();
+        }
+    }
+
+    @Override
+    protected void onAttachedToWindow() {
+        super.onAttachedToWindow();
+        contentView = findViewById(contentViewId);
+        if (centerViewId != -1) {
+            centerView = findViewById(centerViewId);
+        }
+        leftDownView = findViewById(leftDownViewId);
+        rightUpView = findViewById(rightUpViewId);
+    }
+
+    private Rect backgroundRect = new Rect();
+    private Paint paint = new Paint();
+
+    {
+        paint.setStyle(Paint.Style.FILL);
+        paint.setColor(Color.argb(83, 0, 0, 0));
+    }
+
+    @Override
+    protected void onLayout(boolean changed, int l, int t, int r, int b) {
+        int width = getWidth();
+        int height = getHeight();
+        int left;
+        int top;
+
+        ViewGroup.MarginLayoutParams leftDownViewLayoutParams = (MarginLayoutParams) leftDownView.getLayoutParams();
+        ViewGroup.MarginLayoutParams rightUpViewLayoutParams = (MarginLayoutParams) rightUpView.getLayoutParams();
+        if (r < b) {
+            int contentHeight = width * 4 / 3;
+            int heightLeft = height - contentHeight;
+            contentView.layout(l, t, r, contentHeight);
+
+            backgroundRect.left = 0;
+            backgroundRect.top = contentHeight;
+            backgroundRect.right = width;
+            backgroundRect.bottom = height;
+
+            // layout centerView;
+            if (centerView != null) {
+                left = (width - centerView.getMeasuredWidth()) / 2;
+                top = contentHeight + (heightLeft - centerView.getMeasuredHeight()) / 2;
+                centerView
+                        .layout(left, top, left + centerView.getMeasuredWidth(), top + centerView.getMeasuredHeight());
+            }
+            // layout leftDownView
+
+            left = leftDownViewLayoutParams.leftMargin;
+            top = contentHeight + (heightLeft - leftDownView.getMeasuredHeight()) / 2;
+            leftDownView
+                    .layout(left, top, left + leftDownView.getMeasuredWidth(), top + leftDownView.getMeasuredHeight());
+            // layout rightUpView
+            left = width - rightUpView.getMeasuredWidth() - rightUpViewLayoutParams.rightMargin;
+            top = contentHeight + (heightLeft - rightUpView.getMeasuredHeight()) / 2;
+            rightUpView.layout(left, top, left + rightUpView.getMeasuredWidth(), top + rightUpView.getMeasuredHeight());
+        } else {
+            int contentWidth = height * 4 / 3;
+            int widthLeft = width - contentWidth;
+            contentView.layout(l, t, contentWidth, height);
+
+            backgroundRect.left = contentWidth;
+            backgroundRect.top = 0;
+            backgroundRect.right = width;
+            backgroundRect.bottom = height;
+
+            // layout centerView
+            if (centerView != null) {
+                left = contentWidth + (widthLeft - centerView.getMeasuredWidth()) / 2;
+                top = (height - centerView.getMeasuredHeight()) / 2;
+                centerView
+                        .layout(left, top, left + centerView.getMeasuredWidth(), top + centerView.getMeasuredHeight());
+            }
+            // layout leftDownView
+            left = contentWidth + (widthLeft - leftDownView.getMeasuredWidth()) / 2;
+            top = height - leftDownView.getMeasuredHeight() - leftDownViewLayoutParams.bottomMargin;
+            leftDownView
+                    .layout(left, top, left + leftDownView.getMeasuredWidth(), top + leftDownView.getMeasuredHeight());
+            // layout rightUpView
+            left = contentWidth + (widthLeft - rightUpView.getMeasuredWidth()) / 2;
+
+            top = rightUpViewLayoutParams.topMargin;
+            rightUpView.layout(left, top, left + rightUpView.getMeasuredWidth(), top + rightUpView.getMeasuredHeight());
+        }
+    }
+
+    @Override
+    protected void onDraw(Canvas canvas) {
+        super.onDraw(canvas);
+        canvas.drawRect(backgroundRect, paint);
+    }
+}

ocr_ui/src/main/java/com/baidu/ocr/ui/camera/OCRFrameLayout.java

@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2017 Baidu, Inc. All Rights Reserved.
+ */
+package com.baidu.ocr.ui.camera;
+
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.View;
+import android.view.ViewGroup;
+
+public class OCRFrameLayout extends ViewGroup {
+
+    public OCRFrameLayout(Context context) {
+        super(context);
+    }
+
+    public OCRFrameLayout(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        parseAttrs(attrs);
+    }
+
+    public OCRFrameLayout(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        parseAttrs(attrs);
+    }
+
+    private void parseAttrs(AttributeSet attrs) {
+    }
+
+    @Override
+    protected void onLayout(boolean changed, int l, int t, int r, int b) {
+        int childCount = getChildCount();
+        for (int i = 0; i < childCount; i++) {
+            View view = getChildAt(i);
+            view.layout(l, t, r, b);
+        }
+    }
+
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+        int width;
+        int height;
+        int childCount = getChildCount();
+
+        width = MeasureSpec.getSize(widthMeasureSpec);
+        height = MeasureSpec.getSize(heightMeasureSpec);
+        for (int i = 0; i < childCount; i++) {
+            View view = getChildAt(i);
+            measureChild(view, MeasureSpec.makeMeasureSpec(width, MeasureSpec.EXACTLY), MeasureSpec.makeMeasureSpec
+                    (height, MeasureSpec.EXACTLY));
+        }
+        setMeasuredDimension(resolveSize(width, widthMeasureSpec), resolveSize(height, heightMeasureSpec));
+    }
+}

ocr_ui/src/main/java/com/baidu/ocr/ui/camera/PermissionCallback.java

@@ -0,0 +1,8 @@
+/*
+ * Copyright (C) 2017 Baidu, Inc. All Rights Reserved.
+ */
+package com.baidu.ocr.ui.camera;
+
+public interface PermissionCallback {
+    boolean onRequestPermission();
+}

ocr_ui/src/main/java/com/baidu/ocr/ui/crop/CropView.java

@@ -0,0 +1,325 @@
+/*
+ * Copyright (C) 2017 Baidu, Inc. All Rights Reserved.
+ */
+package com.baidu.ocr.ui.crop;
+
+import java.io.IOException;
+
+import com.baidu.ocr.ui.util.ImageUtil;
+
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.Canvas;
+import android.graphics.Matrix;
+import android.graphics.Point;
+import android.graphics.Rect;
+import android.media.ExifInterface;
+import android.util.AttributeSet;
+import android.view.GestureDetector;
+import android.view.MotionEvent;
+import android.view.ScaleGestureDetector;
+import android.view.View;
+import android.view.WindowManager;
+
+public class CropView extends View {
+
+    public CropView(Context context) {
+        super(context);
+        init();
+    }
+
+    public CropView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        init();
+    }
+
+    public CropView(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        init();
+    }
+
+    public void setFilePath(String path) {
+
+        if (this.bitmap != null && !this.bitmap.isRecycled()) {
+            this.bitmap.recycle();
+        }
+
+        if (path == null) {
+            return;
+        }
+
+        BitmapFactory.Options options = new BitmapFactory.Options();
+        options.inJustDecodeBounds = true;
+        Bitmap original = BitmapFactory.decodeFile(path, options);
+
+        try {
+            ExifInterface exif = new ExifInterface(path);
+            int rotation = exif.getAttributeInt(ExifInterface.TAG_ORIENTATION, ExifInterface.ORIENTATION_NORMAL);
+            Matrix matrix = new Matrix();
+            int rotationInDegrees = ImageUtil.exifToDegrees(rotation);
+            if (rotation != 0f) {
+                matrix.preRotate(rotationInDegrees);
+            }
+
+            // 图片太大会导致内存泄露，所以在显示前对图片进行裁剪。
+            int maxPreviewImageSize = 2560;
+
+            int min = Math.min(options.outWidth, options.outHeight);
+            min = Math.min(min, maxPreviewImageSize);
+
+            WindowManager windowManager = (WindowManager) getContext().getSystemService(Context.WINDOW_SERVICE);
+            Point screenSize = new Point();
+            windowManager.getDefaultDisplay().getSize(screenSize);
+            min = Math.min(min, screenSize.x * 2 / 3);
+
+            options.inSampleSize = ImageUtil.calculateInSampleSize(options, min, min);
+            options.inScaled = true;
+            options.inDensity = options.outWidth;
+            options.inTargetDensity = min * options.inSampleSize;
+            options.inPreferredConfig = Bitmap.Config.RGB_565;
+
+            options.inJustDecodeBounds = false;
+            this.bitmap = BitmapFactory.decodeFile(path, options);
+        } catch (IOException e) {
+            e.printStackTrace();
+            this.bitmap = original;
+        } catch (NullPointerException e) {
+            e.printStackTrace();
+        }
+        setBitmap(this.bitmap);
+    }
+
+    private void setBitmap(Bitmap bitmap) {
+        this.bitmap = bitmap;
+        matrix.reset();
+        centerImage(getWidth(), getHeight());
+        rotation = 0;
+        invalidate();
+    }
+
+    @Override
+    protected void onSizeChanged(int w, int h, int oldw, int oldh) {
+        super.onSizeChanged(w, h, oldw, oldh);
+        centerImage(w, h);
+        invalidate();
+    }
+
+    public Bitmap crop(Rect frame) {
+        float scale = getScale();
+
+        float[] src = new float[] {frame.left, frame.top};
+        float[] desc = new float[] {0, 0};
+
+        Matrix invertedMatrix = new Matrix();
+        this.matrix.invert(invertedMatrix);
+        invertedMatrix.mapPoints(desc, src);
+
+        Matrix matrix = new Matrix();
+
+        int width = (int) (frame.width() / scale);
+        int height = (int) (frame.height() / scale);
+        Bitmap bitmap = Bitmap.createBitmap(width, height, Bitmap.Config.RGB_565);
+        Canvas canvas = new Canvas(bitmap);
+
+        Bitmap originalBitmap = this.bitmap;
+        matrix.postTranslate(-desc[0], -desc[1]);
+        canvas.drawBitmap(originalBitmap, matrix, null);
+        return bitmap;
+    }
+
+    public void setMinimumScale(float setMinimumScale) {
+        this.setMinimumScale = setMinimumScale;
+    }
+
+    public void setMaximumScale(float maximumScale) {
+        this.maximumScale = maximumScale;
+    }
+
+    private float setMinimumScale = 0.2f;
+    private float maximumScale = 4.0f;
+
+    private float[] matrixArray = new float[9];
+    private Matrix matrix = new Matrix();
+    private Bitmap bitmap;
+
+    private GestureDetector gestureDetector;
+
+    private ScaleGestureDetector scaleGestureDetector;
+    private ScaleGestureDetector.OnScaleGestureListener onScaleGestureListener =
+            new ScaleGestureDetector.OnScaleGestureListener() {
+                @Override
+                public boolean onScale(ScaleGestureDetector detector) {
+                    scale(detector);
+                    return true;
+                }
+
+                @Override
+                public boolean onScaleBegin(ScaleGestureDetector detector) {
+                    return true;
+                }
+
+                @Override
+                public void onScaleEnd(ScaleGestureDetector detector) {
+                    float scale = detector.getScaleFactor();
+                    matrix.postScale(scale, scale);
+                    invalidate();
+                }
+            };
+
+    private void init() {
+        scaleGestureDetector = new ScaleGestureDetector(getContext(), onScaleGestureListener);
+        gestureDetector = new GestureDetector(getContext(), new GestureDetector.OnGestureListener() {
+            @Override
+            public boolean onDown(MotionEvent e) {
+                return true;
+            }
+
+            @Override
+            public void onShowPress(MotionEvent e) {
+            }
+
+            @Override
+            public boolean onSingleTapUp(MotionEvent e) {
+                return false;
+            }
+
+            @Override
+            public boolean onScroll(MotionEvent e1, MotionEvent e2, float distanceX, float distanceY) {
+                translate(distanceX, distanceY);
+                return true;
+            }
+
+            @Override
+            public void onLongPress(MotionEvent e) {
+            }
+
+            @Override
+            public boolean onFling(MotionEvent e1, MotionEvent e2, float velocityX, float velocityY) {
+                return false;
+            }
+        });
+    }
+
+    int rotation = 0;
+
+    public void rotate(int degrees) {
+        if (this.bitmap == null) {
+            return;
+        }
+        Matrix matrix = new Matrix();
+
+        int dx = this.bitmap.getWidth() / 2;
+        int dy = this.bitmap.getHeight() / 2;
+
+        matrix.postTranslate(-dx, -dy);
+        matrix.postRotate(degrees);
+        matrix.postTranslate(dy, dx);
+        Bitmap scaledBitmap = this.bitmap;
+        Bitmap rotatedBitmap = Bitmap.createBitmap(scaledBitmap.getHeight(), scaledBitmap.getWidth(),
+                Bitmap.Config.RGB_565);
+        Canvas canvas = new Canvas(rotatedBitmap);
+        canvas.drawBitmap(this.bitmap, matrix, null);
+        this.bitmap.recycle();
+        this.bitmap = rotatedBitmap;
+        centerImage(getWidth(), getHeight());
+        invalidate();
+    }
+
+    private void translate(float distanceX, float distanceY) {
+        matrix.getValues(matrixArray);
+        float left = matrixArray[Matrix.MTRANS_X];
+        float top = matrixArray[Matrix.MTRANS_Y];
+
+        Rect bound = getRestrictedBound();
+        if (bound != null) {
+            float scale = getScale();
+            float right = left + (int) (bitmap.getWidth() / scale);
+            float bottom = top + (int) (bitmap.getHeight() / scale);
+
+            if (left - distanceX > bound.left) {
+                distanceX = left - bound.left;
+            }
+            if (top - distanceY > bound.top) {
+                distanceY = top - bound.top;
+            }
+
+            if (distanceX > 0) {
+                if (right - distanceX < bound.right) {
+                    distanceX = right - bound.right;
+                }
+            }
+            if (distanceY > 0) {
+                if (bottom - distanceY < bound.bottom) {
+                    distanceY = bottom - bound.bottom;
+                }
+            }
+        }
+        matrix.postTranslate(-distanceX, -distanceY);
+        invalidate();
+    }
+
+    private void scale(ScaleGestureDetector detector) {
+        float scale = detector.getScaleFactor();
+        float currentScale = getScale();
+        if (currentScale * scale < setMinimumScale) {
+            scale = setMinimumScale / currentScale;
+        }
+        if (currentScale * scale > maximumScale) {
+            scale = maximumScale / currentScale;
+        }
+        matrix.postScale(scale, scale, detector.getFocusX(), detector.getFocusY());
+        invalidate();
+    }
+
+    private void centerImage(int width, int height) {
+        if (width <= 0 || height <= 0 || bitmap == null) {
+            return;
+        }
+        float widthRatio = 1.0f * height / this.bitmap.getHeight();
+        float heightRatio = 1.0f * width / this.bitmap.getWidth();
+
+        float ratio = Math.min(widthRatio, heightRatio);
+
+        float dx = (width - this.bitmap.getWidth()) / 2;
+        float dy = (height - this.bitmap.getHeight()) / 2;
+        matrix.setTranslate(0, 0);
+        matrix.setScale(ratio, ratio, bitmap.getWidth() / 2, bitmap.getHeight() / 2);
+        matrix.postTranslate(dx, dy);
+        invalidate();
+    }
+
+    private float getScale() {
+        matrix.getValues(matrixArray);
+        float scale = matrixArray[Matrix.MSCALE_X];
+        if (Math.abs(scale) <= 0.1) {
+            scale = matrixArray[Matrix.MSKEW_X];
+        }
+        return Math.abs(scale);
+    }
+
+    @Override
+    protected void onDraw(Canvas canvas) {
+        super.onDraw(canvas);
+        if (bitmap != null) {
+            canvas.drawBitmap(bitmap, matrix, null);
+        }
+    }
+
+    @Override
+    public boolean onTouchEvent(MotionEvent event) {
+        boolean result = scaleGestureDetector.onTouchEvent(event);
+        result = gestureDetector.onTouchEvent(event) || result;
+        return result || super.onTouchEvent(event);
+    }
+
+    private Rect restrictBound;
+
+    private Rect getRestrictedBound() {
+        return restrictBound;
+    }
+
+    public void setRestrictBound(Rect rect) {
+        this.restrictBound = rect;
+    }
+}

ocr_ui/src/main/java/com/baidu/ocr/ui/crop/FrameOverlayView.java

@@ -0,0 +1,290 @@
+/*
+ * Copyright (C) 2017 Baidu, Inc. All Rights Reserved.
+ */
+package com.baidu.ocr.ui.crop;
+
+
+import com.baidu.ocr.ui.util.DimensionUtil;
+
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Paint;
+import android.graphics.PorterDuff;
+import android.graphics.PorterDuffXfermode;
+import android.graphics.Rect;
+import android.graphics.RectF;
+import android.util.AttributeSet;
+import android.view.GestureDetector;
+import android.view.MotionEvent;
+import android.view.View;
+
+public class FrameOverlayView extends View {
+
+    interface OnFrameChangeListener {
+        void onFrameChange(RectF newFrame);
+    }
+
+    public Rect getFrameRect() {
+        Rect rect = new Rect();
+        rect.left = (int) frameRect.left;
+        rect.top = (int) frameRect.top;
+        rect.right = (int) frameRect.right;
+        rect.bottom = (int) frameRect.bottom;
+        return rect;
+    }
+
+    public FrameOverlayView(Context context) {
+        super(context);
+        init();
+    }
+
+    public FrameOverlayView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        init();
+    }
+
+    public FrameOverlayView(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        init();
+    }
+
+    private GestureDetector.SimpleOnGestureListener onGestureListener = new GestureDetector.SimpleOnGestureListener() {
+        @Override
+        public boolean onScroll(MotionEvent e1, MotionEvent e2, float distanceX, float distanceY) {
+            translate(distanceX, distanceY);
+            return true;
+        }
+
+    };
+
+    private static final int CORNER_LEFT_TOP = 1;
+    private static final int CORNER_RIGHT_TOP = 2;
+    private static final int CORNER_RIGHT_BOTTOM = 3;
+    private static final int CORNER_LEFT_BOTTOM = 4;
+
+    private int currentCorner = -1;
+    int margin = 20;
+    int cornerLength = 100;
+    int cornerLineWidth = 6;
+
+    private int maskColor = Color.argb(180, 0, 0, 0);
+
+    private Paint paint = new Paint(Paint.ANTI_ALIAS_FLAG);
+    private Paint eraser = new Paint(Paint.ANTI_ALIAS_FLAG);
+    private GestureDetector gestureDetector;
+    private RectF touchRect = new RectF();
+    private RectF frameRect = new RectF();
+
+    private OnFrameChangeListener onFrameChangeListener;
+
+    {
+        setLayerType(View.LAYER_TYPE_SOFTWARE, null);
+        paint.setColor(Color.WHITE);
+        paint.setStyle(Paint.Style.STROKE);
+        paint.setStrokeWidth(6);
+
+        eraser.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.CLEAR));
+    }
+
+    public void setOnFrameChangeListener(OnFrameChangeListener onFrameChangeListener) {
+        this.onFrameChangeListener = onFrameChangeListener;
+    }
+
+    private void init() {
+        gestureDetector = new GestureDetector(getContext(), onGestureListener);
+        cornerLength = DimensionUtil.dpToPx(18);
+        cornerLineWidth = DimensionUtil.dpToPx(3);
+    }
+
+    @Override
+    protected void onSizeChanged(int w, int h, int oldw, int oldh) {
+        super.onSizeChanged(w, h, oldw, oldh);
+        resetFrameRect(w, h);
+    }
+
+    private void resetFrameRect(int w, int h) {
+        if (shapeType == 1) {
+            frameRect.left = (int) (w * 0.05);
+            frameRect.top = (int) (h * 0.25);
+        } else {
+            frameRect.left = (int) (w * 0.2);
+            frameRect.top = (int) (h * 0.2);
+        }
+        frameRect.right = w - frameRect.left;
+        frameRect.bottom = h - frameRect.top;
+    }
+
+    private int shapeType = 0;
+
+    public void setTypeWide() {
+        shapeType = 1;
+    }
+
+
+
+    private void translate(float x, float y) {
+        if (x > 0) {
+            // moving left;
+            if (frameRect.left - x < margin) {
+                x = frameRect.left - margin;
+            }
+        } else {
+            if (frameRect.right - x > getWidth() - margin) {
+                x = frameRect.right - getWidth() + margin;
+            }
+        }
+
+        if (y > 0) {
+            if (frameRect.top - y < margin) {
+                y = frameRect.top - margin;
+            }
+        } else {
+            if (frameRect.bottom - y > getHeight() - margin) {
+                y = frameRect.bottom - getHeight() + margin;
+            }
+        }
+        frameRect.offset(-x, -y);
+        invalidate();
+    }
+
+    @Override
+    protected void onDraw(Canvas canvas) {
+        super.onDraw(canvas);
+
+        canvas.drawColor(maskColor);
+
+        paint.setStrokeWidth(DimensionUtil.dpToPx(1));
+        canvas.drawRect(frameRect, paint);
+        canvas.drawRect(frameRect, eraser);
+        drawCorners(canvas);
+    }
+
+    private void drawCorners(Canvas canvas) {
+        paint.setStrokeWidth(cornerLineWidth);
+        // left top
+        drawLine(canvas, frameRect.left - cornerLineWidth / 2, frameRect.top, cornerLength, 0);
+        drawLine(canvas, frameRect.left, frameRect.top, 0, cornerLength);
+
+        // right top
+        drawLine(canvas, frameRect.right + cornerLineWidth / 2, frameRect.top, -cornerLength, 0);
+        drawLine(canvas, frameRect.right, frameRect.top, 0, cornerLength);
+
+        // right bottom
+        drawLine(canvas, frameRect.right, frameRect.bottom, 0, -cornerLength);
+        drawLine(canvas, frameRect.right + cornerLineWidth / 2, frameRect.bottom, -cornerLength, 0);
+
+        // left bottom
+        drawLine(canvas, frameRect.left - cornerLineWidth / 2, frameRect.bottom, cornerLength, 0);
+        drawLine(canvas, frameRect.left, frameRect.bottom, 0, -cornerLength);
+    }
+
+    private void drawLine(Canvas canvas, float x, float y, int dx, int dy) {
+        canvas.drawLine(x, y, x + dx, y + dy, paint);
+    }
+
+    @Override
+    public boolean onTouchEvent(MotionEvent event) {
+        boolean result = handleDown(event);
+        float ex = 60;
+        RectF rectExtend = new RectF(frameRect.left - ex, frameRect.top - ex,
+                frameRect.right + ex, frameRect.bottom + ex);
+        if (!result) {
+            if (rectExtend.contains(event.getX(), event.getY())) {
+                gestureDetector.onTouchEvent(event);
+                return true;
+            }
+        }
+        return result;
+    }
+
+    private boolean handleDown(MotionEvent event) {
+        switch (event.getAction()) {
+            case MotionEvent.ACTION_CANCEL:
+            case MotionEvent.ACTION_UP:
+                currentCorner = -1;
+                break;
+            case MotionEvent.ACTION_DOWN: {
+                float radius = cornerLength;
+                touchRect.set(event.getX() - radius, event.getY() - radius, event.getX() + radius,
+                        event.getY() + radius);
+                if (touchRect.contains(frameRect.left, frameRect.top)) {
+                    currentCorner = CORNER_LEFT_TOP;
+                    return true;
+                }
+
+                if (touchRect.contains(frameRect.right, frameRect.top)) {
+                    currentCorner = CORNER_RIGHT_TOP;
+                    return true;
+                }
+
+                if (touchRect.contains(frameRect.right, frameRect.bottom)) {
+                    currentCorner = CORNER_RIGHT_BOTTOM;
+                    return true;
+                }
+
+                if (touchRect.contains(frameRect.left, frameRect.bottom)) {
+                    currentCorner = CORNER_LEFT_BOTTOM;
+                    return true;
+                }
+                return false;
+            }
+            case MotionEvent.ACTION_MOVE:
+                return handleScale(event);
+            default:
+
+        }
+        return false;
+    }
+
+    private boolean handleScale(MotionEvent event) {
+        switch (currentCorner) {
+            case CORNER_LEFT_TOP:
+                scaleTo(event.getX(), event.getY(), frameRect.right, frameRect.bottom);
+                return true;
+            case CORNER_RIGHT_TOP:
+                scaleTo(frameRect.left, event.getY(), event.getX(), frameRect.bottom);
+                return true;
+            case CORNER_RIGHT_BOTTOM:
+                scaleTo(frameRect.left, frameRect.top, event.getX(), event.getY());
+                return true;
+            case CORNER_LEFT_BOTTOM:
+                scaleTo(event.getX(), frameRect.top, frameRect.right, event.getY());
+                return true;
+            default:
+                return false;
+        }
+    }
+
+    private void scaleTo(float left, float top, float right, float bottom) {
+        if (bottom - top < getMinimumFrameHeight()) {
+            top = frameRect.top;
+            bottom = frameRect.bottom;
+        }
+        if (right - left < getMinimumFrameWidth()) {
+            left = frameRect.left;
+            right = frameRect.right;
+        }
+        left = Math.max(margin, left);
+        top = Math.max(margin, top);
+        right = Math.min(getWidth() - margin, right);
+        bottom = Math.min(getHeight() - margin, bottom);
+
+        frameRect.set(left, top, right, bottom);
+        invalidate();
+    }
+
+    private void notifyFrameChange() {
+        if (onFrameChangeListener != null) {
+            onFrameChangeListener.onFrameChange(frameRect);
+        }
+    }
+
+    private float getMinimumFrameWidth() {
+        return 2.4f * cornerLength;
+    }
+
+    private float getMinimumFrameHeight() {
+        return 2.4f * cornerLength;
+    }
+}

ocr_ui/src/main/java/com/baidu/ocr/ui/util/DimensionUtil.java

@@ -0,0 +1,14 @@
+/*
+ * Copyright (C) 2017 Baidu, Inc. All Rights Reserved.
+ */
+package com.baidu.ocr.ui.util;
+
+import android.content.res.Resources;
+
+public class DimensionUtil {
+
+    public static int dpToPx(int dp) {
+        return (int) (dp * Resources.getSystem().getDisplayMetrics().density);
+    }
+
+}

ocr_ui/src/main/java/com/baidu/ocr/ui/util/ImageUtil.java

@@ -0,0 +1,159 @@
+/*
+ * Copyright (C) 2017 Baidu, Inc. All Rights Reserved.
+ */
+package com.baidu.ocr.ui.util;
+
+import android.graphics.BitmapFactory;
+import android.media.ExifInterface;
+import android.util.Log;
+
+public class ImageUtil {
+    private static final String TAG = "CameraExif";
+
+    public static int exifToDegrees(int exifOrientation) {
+        if (exifOrientation == ExifInterface.ORIENTATION_ROTATE_90) {
+            return 90;
+        } else if (exifOrientation == ExifInterface.ORIENTATION_ROTATE_180) {
+            return 180;
+        } else if (exifOrientation == ExifInterface.ORIENTATION_ROTATE_270) {
+            return 270;
+        }
+        return 0;
+    }
+
+    // Returns the degrees in clockwise. Values are 0, 90, 180, or 270.
+    public static int getOrientation(byte[] jpeg) {
+        if (jpeg == null) {
+            return 0;
+        }
+
+        int offset = 0;
+        int length = 0;
+
+        // ISO/IEC 10918-1:1993(E)
+        while (offset + 3 < jpeg.length && (jpeg[offset++] & 0xFF) == 0xFF) {
+            int marker = jpeg[offset] & 0xFF;
+
+            // Check if the marker is a padding.
+            if (marker == 0xFF) {
+                continue;
+            }
+            offset++;
+
+            // Check if the marker is SOI or TEM.
+            if (marker == 0xD8 || marker == 0x01) {
+                continue;
+            }
+            // Check if the marker is EOI or SOS.
+            if (marker == 0xD9 || marker == 0xDA) {
+                break;
+            }
+
+            // Get the length and check if it is reasonable.
+            length = pack(jpeg, offset, 2, false);
+            if (length < 2 || offset + length > jpeg.length) {
+                Log.e(TAG, "Invalid length");
+                return 0;
+            }
+
+            // Break if the marker is EXIF in APP1.
+            if (marker == 0xE1 && length >= 8
+                    && pack(jpeg, offset + 2, 4, false) == 0x45786966
+                    && pack(jpeg, offset + 6, 2, false) == 0) {
+                offset += 8;
+                length -= 8;
+                break;
+            }
+
+            // Skip other markers.
+            offset += length;
+            length = 0;
+        }
+
+        // JEITA CP-3451 Exif Version 2.2
+        if (length > 8) {
+            // Identify the byte order.
+            int tag = pack(jpeg, offset, 4, false);
+            if (tag != 0x49492A00 && tag != 0x4D4D002A) {
+                Log.e(TAG, "Invalid byte order");
+                return 0;
+            }
+            boolean littleEndian = (tag == 0x49492A00);
+
+            // Get the offset and check if it is reasonable.
+            int count = pack(jpeg, offset + 4, 4, littleEndian) + 2;
+            if (count < 10 || count > length) {
+                Log.e(TAG, "Invalid offset");
+                return 0;
+            }
+            offset += count;
+            length -= count;
+
+            // Get the count and go through all the elements.
+            count = pack(jpeg, offset - 2, 2, littleEndian);
+            while (count-- > 0 && length >= 12) {
+                // Get the tag and check if it is orientation.
+                tag = pack(jpeg, offset, 2, littleEndian);
+                if (tag == 0x0112) {
+                    // We do not really care about type and count, do we?
+                    int orientation = pack(jpeg, offset + 8, 2, littleEndian);
+                    switch (orientation) {
+                        case 1:
+                            return 0;
+                        case 3:
+                            return 180;
+                        case 6:
+                            return 90;
+                        case 8:
+                            return 270;
+                        default:
+                            return 0;
+                    }
+                }
+                offset += 12;
+                length -= 12;
+            }
+        }
+
+        Log.i(TAG, "Orientation not found");
+        return 0;
+    }
+
+    private static int pack(byte[] bytes, int offset, int length,
+                            boolean littleEndian) {
+        int step = 1;
+        if (littleEndian) {
+            offset += length - 1;
+            step = -1;
+        }
+
+        int value = 0;
+        while (length-- > 0) {
+            value = (value << 8) | (bytes[offset] & 0xFF);
+            offset += step;
+        }
+        return value;
+    }
+
+    public static int calculateInSampleSize(
+            BitmapFactory.Options options, int reqWidth, int reqHeight) {
+        // Raw height and width of image
+        final int height = options.outHeight;
+        final int width = options.outWidth;
+        int inSampleSize = 1;
+
+        if (height > reqHeight || width > reqWidth) {
+
+            final int halfHeight = height / 2;
+            final int halfWidth = width / 2;
+            // Calculate the largest inSampleSize value that is a power of 2 and keeps both
+            // height and width larger than the requested height and width.
+            while ((halfHeight / inSampleSize) >= reqHeight
+                    && (halfWidth / inSampleSize) >= reqWidth) {
+                inSampleSize *= 2;
+            }
+        }
+
+        return inSampleSize;
+    }
+}