Merge branch 'dev' of http://10.1.235.20:3000/ipu/android-share into dev

.gitignore

@@ -3,4 +3,5 @@
build/
bin/
gen/
.idea/
.gradle/

show-client/app/build.gradle

@@ -77,6 +77,8 @@ dependencies {
    implementation(rootProject.ext.ipuPlugin.ipu_scan)
    implementation(rootProject.ext.ipuPlugin.ipu_map_gd)
    implementation(rootProject.ext.ipuPlugin.ipu_plugin_extend)
    implementation(rootProject.ext.ipuPlugin.ipu_map_bd)
    implementation(rootProject.ext.ipuPlugin.ipu_bluetooth)
    implementation(name: rootProject.ext.localAar.ipu_mobile_rn,ext:'aar'){
        exclude module:'ipu-plugin-extend'
    }
@@ -107,7 +109,6 @@ dependencies {
     * 依赖模块（可选：本地依赖）
     */
    // 本地依赖jar包
    implementation project(':ipu-mobile-common')
    implementation fileTree(include: ['*.jar'], dir: '../ipu-mobile-common/libs')
    implementation fileTree(include: ['*.jar'], dir: 'libs')
    //

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

@@ -230,4 +230,5 @@
	<action name="startListen" class="com.ai.ipu.mobile.asr.func.IpuVoice" method="startListen" permissions="record_audio" />
	<action name="endListen" class="com.ai.ipu.mobile.asr.func.IpuVoice" method="endListen" />
	<action name="chooseFile" class="com.ai.ipu.mobile.file.picker.MobileFilePicker" method="chooseFile" />
</actions>

show-client/config.gradle

@@ -37,7 +37,8 @@ ext{
            exifinterface : 'androidx.exifinterface:exifinterface:1.0.0',
            v4 : 'androidx.legacy:legacy-support-v4:1.0.0',
            annotations : 'androidx.annotation:annotation:1.2.0',
            core : 'androidx.core:core:1.1.0'
            core : 'androidx.core:core:1.1.0',
            recyclerview : 'androidx.recyclerview:recyclerview:1.1.0'
    ]
    //AndroidSupport依赖包
@@ -65,7 +66,12 @@ ext{
            ipu_map_gd : "com.ai.ipu.plugin.map:ipu-map-gd:" + "${ipu_mobile_snapshot_version}",
            ipu_asr : "com.ai.ipu.plugin.asr:ipu-asr:${ipu_mobile_snapshot_version}",
            ipu_customcamera : "com.ai.ipu.plugin:ipu-customcamera:${ipu_mobile_snapshot_version}",
            ipu_plugin_extend : "com.ai.ipu.plugin:ipu-plugin-extend:${ipu_mobile_snapshot_version}"
            ipu_plugin_extend : "com.ai.ipu.plugin:ipu-plugin-extend:${ipu_mobile_snapshot_version}",
            ipu_map_bd : "com.ai.ipu.plugin.map:ipu-map-bd:" + "${ipu_mobile_snapshot_version}",
            ipu_file_picker : "com.ai.ipu.plugin:ipu-file-picker:${ipu_mobile_snapshot_version}",
            ipu_dialog : "com.ai.ipu.plugin:ipu-dialog:${ipu_mobile_snapshot_version}",
            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}"
    ]
    //RN 依赖包

show-client/settings.gradle

@@ -8,3 +8,5 @@ include ':ipu-scan'
project(':ipu-scan').projectDir = new File(rootProject.projectDir,'../../android-plugin/ipu-scan')
include ':ipu-mobile-basic'
project(':ipu-mobile-basic').projectDir = new File(rootProject.projectDir,'../../android/ipu-mobile-basic')
include':ipu-map-bd'
project(':ipu-map-bd').projectDir = new File(rootProject.projectDir,'../../android-plugin/ipu-map-bd')