@修复：冲突处理

.gitignore

@@ -5,3 +5,5 @@ bin/
gen/
.idea/
.gradle/
target/
logs/

show-client/app/build.gradle

@@ -13,7 +13,7 @@ android {
        versionName rootProject.ext.appVersion.versionName
        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
        //         RN没有64位so
        // RN没有64位so
        ndk{
            abiFilters "armeabi-v7a","x86","mips","armeabi"
        }
@@ -23,6 +23,24 @@ android {
        multiDexEnabled true
        // 依赖 ipuPlugin.ipu_video_player 用到
        packagingOptions {
            pickFirst 'lib/arm64-v8a/libijkplayer.so'
            pickFirst 'lib/armeabi-v7a/libijkplayer.so'
            pickFirst 'lib/x86/libijkplayer.so'
            pickFirst 'lib/x86_64/libijkplayer.so'
            pickFirst 'lib/arm64-v8a/libijkffmpeg.so'
            pickFirst 'lib/armeabi-v7a/libijkffmpeg.so'
            pickFirst 'lib/x86/libijkffmpeg.so'
            pickFirst 'lib/x86_64/libijkffmpeg.so'
            pickFirst 'lib/arm64-v8a/libijksdl.so'
            pickFirst 'lib/armeabi-v7a/libijksdl.so'
            pickFirst 'lib/x86/libijksdl.so'
            pickFirst 'lib/x86_64/libijksdl.so'
        }
    }
@@ -113,6 +131,10 @@ dependencies {
    implementation(rootProject.ext.ipuPlugin.ipu_share)
    implementation(rootProject.ext.ipuPlugin.ipu_asr)
    implementation(rootProject.ext.ipuPlugin.ipu_file_picker)
    implementation(rootProject.ext.ipuPlugin.ipu_ocr)
    implementation(rootProject.ext.ipuPlugin.ipu_video_recorder)
    implementation(rootProject.ext.ipuPlugin.ipu_video_player)
    implementation(rootProject.ext.ipuPlugin.ipu_facerecognize)
    implementation(name: rootProject.ext.localAar.ipu_mobile_rn,ext:'aar'){
        exclude module:'ipu-plugin-extend'
    }

show-client/app/src/main/AndroidManifest.xml

@@ -23,7 +23,6 @@
    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
    <uses-permission android:name="android.permission.CALL_PHONE" />
    <uses-permission android:name="android.permission.SEND_SMS" />
    <uses-permission android:name="android.permission.READ_SMS" />
    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
    <uses-permission android:name="android.permission.VIBRATE" /> <!-- 震动权限 -->
    <uses-feature android:name="android.hardware.camera" /> <!-- 使用照相机权限 -->

show-client/app/src/main/assets/mobile-action.xml

@@ -3,7 +3,7 @@
    <!-- MobileBasic -->
	<action name="call" class="com.ai.ipu.mobile.plugin.MobileBasic" method="call" permissions="call_phone"/>
	<action name="beep" class="com.ai.ipu.mobile.plugin.MobileBasic" method="beep"/>
	<action name="sms" class="com.ai.ipu.mobile.plugin.MobileBasic" method = "sms" permissions="send_sms,read_sms"/>
	<action name="sms" class="com.ai.ipu.mobile.plugin.MobileBasic" method = "sms" permissions="send_sms"/>
	<action name="shock" class="com.ai.ipu.mobile.plugin.MobileBasic" method="shock"/>
	<!-- MobileApp -->
	<action name="close" class="com.ai.ipu.mobile.plugin.MobileApp" method="close"/>
@@ -102,7 +102,7 @@
	
	<!-- video -->
	<action name="recordVideo" class="com.ai.ipu.mobile.plugin.MobileVideo" method="recordVideo" permissions="camera"/>
	<action name="playVideo" class="com.ai.ipu.mobile.plugin.MobileVideo" method="playVideo"/>
	<action name="playVideo" class="com.ai.ipu.mobile.plugin.MobileVideo" method="playVideo" permissions="read_external_storage" />
	
	<action name="openApp" class="com.ai.mobile.func.OpenOtherApp" method="openApp"></action>
	
@@ -261,8 +261,19 @@
	<!--检测软件-->
	<action name="detectApps" class="com.ai.ipu.mobile.plugin.InstalledApps" method="detectApps" />
	<!--人脸识别-->
	<action name="faceRegister" class="com.ai.ipu.faceRecognize.func.FacePlugin" method="faceRegister" />
	<action name="faceCheck" class="com.ai.ipu.faceRecognize.func.FacePlugin" method="faceCheck" />
	<!--OCR-->
	<action name="getFloCardInfoBD" class="com.ai.ipu.ocr.func.IpuOcrRecognize" method="getFloCardInfoBD" />
	<action name="getIdCardInfo" class="com.ai.ipu.ocr.func.IpuOcrRecognize" method="getIdCardInfo" />
	<!--视频-->
	<action name="ipuRecordVideo" class="com.ai.ipu.watermarkrecord.func.CommonRecord" method="ipuRecordVideo" permissions="camera,record_audio"/>
	<action name="recordWithWatermark" class="com.ai.ipu.watermarkrecord.func.WaterMarkRecord" method="recordWithWatermark" permissions="camera,record_audio"/>
	<!--音视频-->
	<action name="openVideoPlayer" class="com.ai.ipu.mobile.video.MobileVideoPlayer" method="openVideoPlayer" />
</actions>

show-client/build.gradle

@@ -38,6 +38,9 @@ allprojects {
            url "http://114.215.100.48:9090/nexus/content/groups/public/"}
        maven {
            allowInsecureProtocol = true
            url "http://114.215.100.48:18080/nexus/content/repositories/ipu-mobile-3rdparty/"}
        maven {
            allowInsecureProtocol = true
            url "http://114.215.100.48:9090/nexus/content/repositories/ipu-snapshots/"}
        maven { url 'https://jitpack.io' }
        maven{ url 'https://maven.aliyun.com/repository/central'}

show-client/config.gradle

@@ -76,7 +76,12 @@ ext{
            ipu_bluetooth : "com.ai.ipu.plugin:ipu-bluetooth:${ipu_mobile_snapshot_version}",
            ipu_jpush : "com.ai.ipu.plugin.push:ipu-push-jpush:${ipu_mobile_snapshot_version}",
            ipu_video_compressor : "com.ai.ipu.plugin:ipu-video-compressor:${ipu_mobile_snapshot_version}",
            ipu_share : "com.ai.ipu.plugin.share:ipu-share:${ipu_mobile_snapshot_version}"
            ipu_share : "com.ai.ipu.plugin.share:ipu-share:${ipu_mobile_snapshot_version}",
            ipu_ocr : "com.ai.ipu.plugin:ipu-ocr:${ipu_mobile_snapshot_version}",
            ipu_qrcode : "com.ai.ipu.plugin:ipu-qrcode:${ipu_mobile_snapshot_version}",
            ipu_video_recorder : "com.ai.ipu.plugin:ipu-video-recorder:${ipu_mobile_snapshot_version}",
            ipu_video_player : "com.ai.ipu.plugin:ipu-video-player:${ipu_mobile_snapshot_version}",
            ipu_facerecognize : "com.ai.ipu.plugin:ipu-facerecognize:${ipu_mobile_snapshot_version}"
    ]
    //RN 依赖包
@@ -125,7 +130,10 @@ ext{
            glide : "com.github.bumptech.glide:glide:4.12.0",
            android_lite_http : "android:android-lite-http:1.0",
            silicompressor : 'com.iceteck.silicompressorr:silicompressor:2.2.1'
            silicompressor : 'com.iceteck.silicompressorr:silicompressor:2.2.1',
            // lib_cameraview: ipu-facerecognize 用到
            lib_cameraview :'com.google.android:lib-cameraview:1.0'
    ]
    //测试依赖包

superapp-client/app/build.gradle

@@ -36,10 +36,35 @@ android {
            minifyEnabled true
            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
            signingConfig signingConfigs.release
            // 修改输出 apk 名称，如：超级客户端_v1.0_202209011022_release.apk
            applicationVariants.all { variant ->
                def suffix
                if (variant.buildType.name == 'release') {
                    suffix = 'release'
                } else {
                    suffix = 'debug'
                }
                variant.outputs.all { output ->
                    def outputFile = output.outputFile
                    if (outputFile != null && outputFile.name.endsWith('.apk')) {
                        def fileName = "超级客户端_v${defaultConfig.versionName}_${releaseTime()}_${suffix}.apk"
                        outputFileName = fileName
                    }
                }
            }
        }
        debug{
            signingConfig signingConfigs.debug
        }
    }
}
// 定义打包时间
static def releaseTime() {
    return new Date().format("yyyyMMddHHmm")
}
dependencies {
    implementation fileTree(dir: 'libs', include: ['*.jar'])
    /**