data

483bb067 · 王涛55 · 4c19be06 · 483bb067 · 483bb067 · 483bb067
Commit 483bb067 authored Sep 20, 2019 by 王涛55
22 changed files
--- a/ModuleProject/app/build.gradle
+++ b/ModuleProject/app/build.gradle
@@ -96,6 +96,7 @@ dependencies {
    implementation fileTree(dir: 'libs', include: ['*.jar'])
    if (build_module == build_module_app) {
        api project(':lib_app_common')
+        api project(':app_common')
        api project(':app_login')
        api project(':app_passport')
    }

--- a/ModuleProject/app/src/main/AndroidManifest.xml
+++ b/ModuleProject/app/src/main/AndroidManifest.xml
@@ -5,13 +5,13 @@
    <application
        android:roundIcon="@mipmap/ic_launcher"
        android:allowBackup="false"
-        android:theme="@android:style/Theme.NoTitleBar"
+        android:theme="@style/Theme.AppCompat.Light.NoActionBar"
        android:icon="@mipmap/ic_launcher"
        android:label="@string/app_name"
        tools:ignore="GoogleAppIndexingWarning,HardcodedDebugMode"
        tools:replace="android:icon,android:roundIcon,android:theme,android:label,android:allowBackup">
-    <activity android:name="com.passport.testActivity">
+    <activity android:name="com.main.testActivity">
            <intent-filter>
                <action android:name="android.intent.action.MAIN" />
                <category android:name="android.intent.category.LAUNCHER" />

--- a/ModuleProject/app/src/main/java/com/passport/testActivity.java
+++ b/ModuleProject/app/src/main/java/com/passport/testActivity.java
-package com.passport;
+package com.main;
-import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
+import android.support.v4.app.FragmentTransaction;
+import android.support.v7.app.AppCompatActivity;
 import com.module.hikcreate.R;
+import com.passport.TestFragment;
 /**
 * 类说明
@@ -12,20 +14,22 @@ import com.module.hikcreate.R;
 * @date 2019/9/18
 * @mail wangtao55@hikcreate.com
 */
-public class testActivity extends Activity {
+public class testActivity extends AppCompatActivity {
    @Override
    protected void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
        setContentView(R.layout.app_test);
        findViewById(R.id.mBtnLogin).setOnClickListener(v -> {
-//            Intent mIntent = new Intent(testActivity.this,testLoginActivity.class);
+            Intent mIntent = new Intent(testActivity.this,testLoginActivity.class);
-//            startActivity(mIntent);
+            startActivity(mIntent);
        });
        findViewById(R.id.mBtnPassport).setOnClickListener(v -> {
-//            Intent mIntent = new Intent(testActivity.this,testLoginActivity.class);
+            Intent mIntent = new Intent(testActivity.this,testLoginActivity.class);
-//            startActivity(mIntent);
+            startActivity(mIntent);
        });
-//        getFragmentManager().beginTransaction().add(R.id.test_passport,);
+        FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
+        transaction.add(R.id.test_passport,new TestFragment());
+        transaction.commit();
    }
 }
--- a/ModuleProject/app/src/main/res/layout/app_test.xml
+++ b/ModuleProject/app/src/main/res/layout/app_test.xml
@@ -27,7 +27,7 @@
    <FrameLayout
        android:layout_width="match_parent"
        android:id="@+id/test_passport"
-        android:layout_height="300dp"/>
+        android:layout_height="600dp"/>

--- a/ModuleProject/app_login/src/main/AndroidManifest.xml
+++ b/ModuleProject/app_login/src/main/AndroidManifest.xml
@@ -4,7 +4,7 @@
    <application>
        <activity
-            android:name="com.passport.testLoginActivity"
+            android:name="com.main.testLoginActivity"
            android:launchMode="singleTop"
            android:screenOrientation="portrait" />

--- a/ModuleProject/app_login/src/main/java/com/passport/testLoginActivity.java
+++ b/ModuleProject/app_login/src/main/java/com/passport/testLoginActivity.java
-package com.passport;
+package com.main;
 import android.app.Activity;
 import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
 import com.app.login.R;
 /**
@@ -11,7 +13,7 @@ import com.app.login.R;
 * @date 2019/9/18
 * @mail wangtao55@hikcreate.com
 */
-public class testLoginActivity extends Activity {
+public class testLoginActivity extends AppCompatActivity {
    @Override
    protected void onCreate(Bundle savedInstanceState) {

--- a/ModuleProject/app_login/src/main/module/AndroidManifest.xml
+++ b/ModuleProject/app_login/src/main/module/AndroidManifest.xml
@@ -12,7 +12,7 @@
        tools:ignore="GoogleAppIndexingWarning"
        tools:replace="android:icon,android:roundIcon,android:theme,android:label,android:allowBackup">
-        <activity android:name="com.passport.testLoginActivity">
+        <activity android:name="com.main.testLoginActivity">
            <intent-filter>
                <action android:name="android.intent.action.MAIN" />
                <category android:name="android.intent.category.LAUNCHER" />

--- a/ModuleProject/app_passport/src/main/java/com/passport/TestFragment.java
+++ b/ModuleProject/app_passport/src/main/java/com/passport/TestFragment.java
@@ -25,8 +25,7 @@ public class TestFragment extends Fragment {
    @Override
    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
        //通过参数中的布局填充获取对应布局
-        View view =inflater.inflate(R.layout.passport_test_fragment,container,false);
+        return inflater.inflate(R.layout.passport_test_fragment,container,false);
-        return view;
    }
    @Override

--- a/ModuleProject/app_passport/src/main/module/AndroidManifest.xml
+++ b/ModuleProject/app_passport/src/main/module/AndroidManifest.xml
@@ -12,7 +12,7 @@
        tools:ignore="GoogleAppIndexingWarning"
        tools:replace="android:icon,android:roundIcon,android:theme,android:label,android:allowBackup">
-        <activity android:name="com.passport.testLoginActivity">
+        <activity android:name="com.main.testLoginActivity">
            <intent-filter>
                <action android:name="android.intent.action.MAIN" />
                <category android:name="android.intent.category.LAUNCHER" />

--- a/ModuleProject/config/app_config.gradle
+++ b/ModuleProject/config/app_config.gradle
@@ -62,6 +62,7 @@ versions.bugly_crashreport ='1.3.8'
 versions.bugly_native_crashreport ='latest.release'
 versions.meituanWalle = '1.1.3'
 versions.eventbus = "3.1.1"
+versions.gson = "2.8.0"
 ext.versions = versions
 //deps依赖库
@@ -92,5 +93,6 @@ deps.glide_compiler = "com.github.bumptech.glide:compiler:$versions.gliderVersio
 deps.jsbridge = "com.github.lzyzsd:jsbridge:$versions.jsbridge"//JsBridge
 deps.otto = 'com.squareup:otto:1.3.5'//otto消息总线
 deps.eventbus  = "org.greenrobot:eventbus:$versions.eventbus"
+deps.gson  = "com.google.code.gson:gson:$versions.gson"
 ext.deps = deps
--- a/ModuleProject/lib_app_common/build.gradle
+++ b/ModuleProject/lib_app_common/build.gradle
@@ -29,6 +29,15 @@ android {
 dependencies {
    api fileTree(dir: 'libs', include: ['*.jar'])
+    api project(':lib_baidu_audiodect')
+    api project(':lib_baidu_facedect')
+    api project(':lib_baidu_textdect')
+    api project(':lib_common_ui')
+    api project(':lib_data_drive')
+    api project(':lib_network')
    // App's support dependencies
    api ([
            deps.appcompat,
@@ -49,6 +58,7 @@ dependencies {
            deps.rxandroid2
    ])
+    api deps.gson
    api deps.androidsvg_aar
    api deps.constraint_layout
    api deps.glide

--- a/ModuleProject/lib_baidu_facedect/build.gradle
+++ b/ModuleProject/lib_baidu_facedect/build.gradle
@@ -6,8 +6,8 @@ android {
        minSdkVersion build_config.min_sdk
        targetSdkVersion build_config.target_sdk
        resourcePrefix build_modele_baidu_resourcePrefix
-        versionCode 1
+        versionCode build_config.version_code
-        versionName "1.0"
+        versionName build_config.version_name
    }
    buildTypes {
@@ -25,15 +25,17 @@ android {
    dataBinding {
        enabled = true
    }
    repositories {
        flatDir {
            dirs 'libs', 'aars'
        }
    }
 }
 dependencies {
    implementation fileTree(dir: 'libs', include: ['*.jar'])
    implementation deps.support_v4
-    api deps.constraint_layout
+    implementation deps.constraint_layout
 }
--- a/ModuleProject/lib_baidu_facedect/src/main/java/com/hikcreate/baidufacedect/ui/BaseDetectFragment.java
+++ b/ModuleProject/lib_baidu_facedect/src/main/java/com/hikcreate/baidufacedect/ui/BaseDetectFragment.java
@@ -2,7 +2,6 @@ package com.hikcreate.baidufacedect.ui;
 import android.content.BroadcastReceiver;
 import android.content.Context;
-import android.databinding.DataBindingUtil;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.PixelFormat;
@@ -29,7 +28,6 @@ import android.view.WindowManager;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import com.baidu.idl.face.platform.FaceConfig;
 import com.baidu.idl.face.platform.FaceSDKManager;
 import com.baidu.idl.face.platform.FaceStatusEnum;
@@ -40,7 +38,6 @@ import com.baidu.idl.face.platform.utils.APIUtils;
 import com.baidu.idl.face.platform.utils.Base64Utils;
 import com.baidu.idl.face.platform.utils.CameraPreviewUtils;
 import com.hikcreate.baidufacedect.R;
-import com.hikcreate.baidufacedect.databinding.FragmentFaceDetectV3100Binding;
 import com.hikcreate.baidufacedect.ui.widget.FaceDetectRoundView;
 import java.util.HashMap;
@@ -62,7 +59,6 @@ public abstract class BaseDetectFragment extends Fragment implements
    public static final String TAG = BaseDetectFragment.class.getSimpleName();
    // View
-    protected FragmentFaceDetectV3100Binding mBinding;
    protected View mRootView;
    protected FrameLayout mFrameLayout;
    protected SurfaceView mSurfaceView;
@@ -92,6 +88,7 @@ public abstract class BaseDetectFragment extends Fragment implements
    protected int mPreviewWidth;
    protected int mPreviewHight;
    protected int mPreviewDegree;
+    private ViewGroup contentView;
    // 监听系统音量广播
    protected BroadcastReceiver mVolumeReceiver;
    protected IFaceDetectTipCallback mDetectTipCallback;
@@ -100,8 +97,9 @@ public abstract class BaseDetectFragment extends Fragment implements
    @Nullable
    @Override
    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        mBinding = DataBindingUtil.inflate(LayoutInflater.from(getActivity()), R.layout.baidu_fragment_face_detect_v3100, null, false);
-        return mBinding.getRoot();
+      contentView = (ViewGroup) inflater.inflate(R.layout.baidu_fragment_face_detect_version_v3100,container,false);
+        return contentView;
    }
    @Override
@@ -121,8 +119,8 @@ public abstract class BaseDetectFragment extends Fragment implements
        int vol = am.getStreamVolume(AudioManager.STREAM_MUSIC);
        mIsEnableSound = vol > 0 ? mFaceConfig.isSound : false;
-        mRootView = mBinding.getRoot();
+        mRootView = contentView;
-        mFrameLayout = mBinding.detectSurfaceLayout;
+        mFrameLayout = contentView.findViewById(R.id.detect_surface_layout);
        mSurfaceView = new SurfaceView(getContext());
        mSurfaceHolder = mSurfaceView.getHolder();
@@ -140,8 +138,8 @@ public abstract class BaseDetectFragment extends Fragment implements
        mSurfaceView.setLayoutParams(cameraFL);
        mFrameLayout.addView(mSurfaceView);
-        mFaceDetectRoundView = mBinding.detectFaceRound;
+        mFaceDetectRoundView = contentView.findViewById(R.id.detect_face_round);
-        mImageLayout = mBinding.detectResultImageLayout;
+        mImageLayout = contentView.findViewById(R.id.detect_result_image_layout);
        if (mBase64ImageMap != null) {
            mBase64ImageMap.clear();
        }

--- a/ModuleProject/lib_baidu_facedect/src/main/res/layout/baidu_activity_face_detect_v3100.xml
+++ b/ModuleProject/lib_baidu_facedect/src/main/res/layout/baidu_activity_face_detect_v3100.xml
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
    android:id="@+id/detect_root_layout"
    android:layout_width="match_parent"
    android:layout_height="match_parent">
@@ -8,7 +7,7 @@
    <FrameLayout
        android:id="@+id/detect_surface_layout"
        android:layout_width="match_parent"
-        android:layout_height="match_parent"></FrameLayout>
+        android:layout_height="match_parent"/>
    <com.baidu.idl.face.platform.ui.widget.FaceDetectRoundView
        android:id="@+id/detect_face_round"
@@ -89,6 +88,6 @@
            android:id="@+id/detect_result_image_layout"
            android:layout_width="match_parent"
            android:layout_height="match_parent"
-            android:orientation="horizontal"></LinearLayout>
+            android:orientation="horizontal"/>
    </HorizontalScrollView>
 </RelativeLayout>
\ No newline at end of file
--- a/ModuleProject/lib_baidu_facedect/src/main/res/layout/baidu_activity_face_liveness_v3100.xml
+++ b/ModuleProject/lib_baidu_facedect/src/main/res/layout/baidu_activity_face_liveness_v3100.xml
@@ -8,7 +8,7 @@
    <FrameLayout
        android:id="@+id/liveness_surface_layout"
        android:layout_width="match_parent"
-        android:layout_height="match_parent"></FrameLayout>
+        android:layout_height="match_parent"/>
    <com.baidu.idl.face.platform.ui.widget.FaceDetectRoundView
        android:id="@+id/liveness_face_round"
@@ -89,6 +89,6 @@
            android:id="@+id/liveness_result_image_layout"
            android:layout_width="match_parent"
            android:layout_height="match_parent"
-            android:orientation="horizontal"></LinearLayout>
+            android:orientation="horizontal"/>
    </HorizontalScrollView>
 </RelativeLayout>
\ No newline at end of file
--- a/ModuleProject/lib_baidu_facedect/src/main/res/layout/baidu_fragment_face_detect_v3100.xml
+++ b/ModuleProject/lib_baidu_facedect/src/main/res/layout/baidu_fragment_face_detect_v3100.xml
 <?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/detect_root_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
-    <data>
+    <FrameLayout
+        android:id="@+id/detect_surface_layout"
-    </data>
-    <android.support.constraint.ConstraintLayout
-        android:id="@+id/detect_root_layout"
        android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent" />
-        <FrameLayout
+    <com.hikcreate.baidufacedect.ui.widget.FaceDetectRoundView
-            android:id="@+id/detect_surface_layout"
+        android:id="@+id/detect_face_round"
-            android:layout_width="match_parent"
+        android:layout_width="match_parent"
-            android:layout_height="match_parent" />
+        android:layout_height="match_parent" />
-        <com.hikcreate.baidufacedect.ui.widget.FaceDetectRoundView
+    <HorizontalScrollView
-            android:id="@+id/detect_face_round"
+        android:id="@+id/detect_image_list"
-            android:layout_width="match_parent"
+        android:layout_width="match_parent"
-            android:layout_height="match_parent" />
+        android:layout_height="wrap_content"
+        app:layout_constraintBottom_toBottomOf="parent">
-        <HorizontalScrollView
+        <LinearLayout
-            android:id="@+id/detect_image_list"
+            android:id="@+id/detect_result_image_layout"
            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            android:layout_height="match_parent"
-            app:layout_constraintBottom_toBottomOf="parent">
+            android:orientation="horizontal" />
+    </HorizontalScrollView>
-            <LinearLayout
+</android.support.constraint.ConstraintLayout>
-                android:id="@+id/detect_result_image_layout"
\ No newline at end of file
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:orientation="horizontal"></LinearLayout>
-        </HorizontalScrollView>
-    </android.support.constraint.ConstraintLayout>
-</layout>
\ No newline at end of file
--- a/ModuleProject/lib_baidu_textdect/build.gradle
+++ b/ModuleProject/lib_baidu_textdect/build.gradle
@@ -29,9 +29,11 @@ android {
 }
 dependencies {
    implementation fileTree(dir: 'libs', include: ['*.jar'])
    implementation files('libs/ocr-sdk.jar')
    implementation files('libs/license.jar')
    implementation deps.appcompat
-//    implementation deps.retrofit2_converter_gson
+    implementation  deps.rxandroid2
+    implementation deps.gson
 }
--- a/ModuleProject/lib_baidu_textdect/libs/astudio-v2.1.160401.jar
+++ b/ModuleProject/lib_baidu_textdect/libs/astudio-v2.1.160401.jar
--- a/ModuleProject/lib_baidu_textdect/src/main/java/com/hikcreate/baidutextdect/util/TextDecTools.java
+++ b/ModuleProject/lib_baidu_textdect/src/main/java/com/hikcreate/baidutextdect/util/TextDecTools.java
 package com.hikcreate.baidutextdect.util;
+import android.annotation.SuppressLint;
 import android.studio.plugins.GsonUtils;
 import android.view.ViewTreeObserver;
 import android.webkit.URLUtil;
 import android.widget.TextView;
+import com.baidu.ocr.sdk.utils.LogUtil;
 import com.google.gson.Gson;
 import com.google.gson.JsonSyntaxException;
-import com.hikcreate.library.plugin.netbase.scheduler.SchedulerProvider;
 import java.io.File;
 import io.reactivex.Observable;
 import io.reactivex.ObservableOnSubscribe;
+import io.reactivex.ObservableTransformer;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.schedulers.Schedulers;
 /**
 * 常用工具方法
 *
@@ -67,7 +70,7 @@ public class TextDecTools {
                //这个回调会调用多次，获取完行数记得注销监听
                textView.getViewTreeObserver().removeOnPreDrawListener(this);
                int lines = textView.getLineCount();
-                LogCat.e("xwm", textView.getText() + "--" + lines);
+                LogUtil.e("xwm", textView.getText() + "--" + lines);
                if (lines > maxLines) {
                    callBack.overFlowed(true);
                } else {
@@ -116,6 +119,7 @@ public class TextDecTools {
     * @param obj2
     * @return
     */
+    @SuppressLint("CheckResult")
    public static void objectEquals(Object obj1, Object obj2, ObjectEqualsCallBack callBack) {
        Observable.create((ObservableOnSubscribe<Boolean>) e -> {
            if (obj1 == obj2) {
@@ -125,7 +129,7 @@ public class TextDecTools {
                String json2 = GsonUtils.jsonSerializer(obj2);
                e.onNext(json1.equals(json2));
            }
-        }).compose(SchedulerProvider.applySchedulers())
+        }).compose(applySchedulers())
                .subscribe(equals -> {
                    if (callBack != null) {
                        callBack.result(equals);
@@ -137,6 +141,11 @@ public class TextDecTools {
                });
    }
+    private static  <T> ObservableTransformer<T, T> applySchedulers() {
+        return observable -> observable.subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread());
+    }
    public interface ObjectEqualsCallBack {
        void result(boolean equals);
    }

--- a/ModuleProject/lib_baidu_textdect/src/main/res/layout/baidu_bd_ocr_confirm_result.xml
+++ b/ModuleProject/lib_baidu_textdect/src/main/res/layout/baidu_bd_ocr_confirm_result.xml
@@ -5,16 +5,16 @@
    xmlns:app="http://schemas.android.com/apk/res-auto"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
-    app:contentView="@+id/display_image_view"
+    app:baidu_contentView="@+id/display_image_view"
-    app:leftDownView="@+id/cancel_button"
+    app:baidu_leftDownView="@+id/cancel_button"
-    app:rightUpView="@+id/confirm_button">
+    app:baidu_rightUpView="@+id/confirm_button">
    <ImageView
        android:id="@+id/display_image_view"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:layout_gravity="center"
-        app:srcCompat="@drawable/bd_ocr_id_card_locator_front" />
+        app:srcCompat="@drawable/baidu_bd_ocr_id_card_locator_front" />
    <ImageView
        android:id="@+id/cancel_button"

--- a/ModuleProject/lib_baidu_textdect/src/main/res/layout/baidu_bd_ocr_crop.xml
+++ b/ModuleProject/lib_baidu_textdect/src/main/res/layout/baidu_bd_ocr_crop.xml
@@ -5,10 +5,10 @@
    xmlns:app="http://schemas.android.com/apk/res-auto"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
-    app:centerView="@+id/rotate_button"
+    app:baidu_centerView="@+id/rotate_button"
-    app:contentView="@+id/crop_view_container"
+    app:baidu_contentView="@+id/crop_view_container"
-    app:leftDownView="@+id/cancel_button"
+    app:baidu_leftDownView="@+id/cancel_button"
-    app:rightUpView="@+id/confirm_button">
+    app:baidu_rightUpView="@+id/confirm_button">
    <com.baidu.ocr.ui.camera.OCRFrameLayout
        android:id="@+id/crop_view_container"

--- a/ModuleProject/lib_baidu_textdect/src/main/res/layout/baidu_bd_ocr_take_picture.xml
+++ b/ModuleProject/lib_baidu_textdect/src/main/res/layout/baidu_bd_ocr_take_picture.xml
@@ -5,10 +5,10 @@
    xmlns:app="http://schemas.android.com/apk/res-auto"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
-    app:centerView="@+id/take_photo_button"
+    app:baidu_centerView="@+id/take_photo_button"
-    app:contentView="@+id/camera_view"
+    app:baidu_contentView="@+id/camera_view"
-    app:leftDownView="@+id/album_button"
+    app:baidu_leftDownView="@+id/album_button"
-    app:rightUpView="@+id/light_button">
+    app:baidu_rightUpView="@+id/light_button">
    <com.baidu.ocr.ui.camera.CameraView
        android:id="@+id/camera_view"