Browse Source

@修复:冲突处理

liuyf23 2 years ago
parent
commit
4b2cbbef0e

+ 2 - 0
.gitignore

5
gen/
5
gen/
6
.idea/
6
.idea/
7
.gradle/
7
.gradle/
8
target/
9
logs/

+ 23 - 1
show-client/app/build.gradle

13
        versionName rootProject.ext.appVersion.versionName
13
        versionName rootProject.ext.appVersion.versionName
14
        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
14
        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
15
15
16
        //         RN没有64位so
16
        // RN没有64位so
17
        ndk{
17
        ndk{
18
            abiFilters "armeabi-v7a","x86","mips","armeabi"
18
            abiFilters "armeabi-v7a","x86","mips","armeabi"
19
        }
19
        }
23
23
24
        multiDexEnabled true
24
        multiDexEnabled true
25
25
26
        // 依赖 ipuPlugin.ipu_video_player 用到
27
        packagingOptions {
28
            pickFirst 'lib/arm64-v8a/libijkplayer.so'
29
            pickFirst 'lib/armeabi-v7a/libijkplayer.so'
30
            pickFirst 'lib/x86/libijkplayer.so'
31
            pickFirst 'lib/x86_64/libijkplayer.so'
32
33
            pickFirst 'lib/arm64-v8a/libijkffmpeg.so'
34
            pickFirst 'lib/armeabi-v7a/libijkffmpeg.so'
35
            pickFirst 'lib/x86/libijkffmpeg.so'
36
            pickFirst 'lib/x86_64/libijkffmpeg.so'
37
38
            pickFirst 'lib/arm64-v8a/libijksdl.so'
39
            pickFirst 'lib/armeabi-v7a/libijksdl.so'
40
            pickFirst 'lib/x86/libijksdl.so'
41
            pickFirst 'lib/x86_64/libijksdl.so'
42
        }
43
26
    }
44
    }
27
45
28
46
113
    implementation(rootProject.ext.ipuPlugin.ipu_share)
131
    implementation(rootProject.ext.ipuPlugin.ipu_share)
114
    implementation(rootProject.ext.ipuPlugin.ipu_asr)
132
    implementation(rootProject.ext.ipuPlugin.ipu_asr)
115
    implementation(rootProject.ext.ipuPlugin.ipu_file_picker)
133
    implementation(rootProject.ext.ipuPlugin.ipu_file_picker)
134
    implementation(rootProject.ext.ipuPlugin.ipu_ocr)
135
    implementation(rootProject.ext.ipuPlugin.ipu_video_recorder)
136
    implementation(rootProject.ext.ipuPlugin.ipu_video_player)
137
    implementation(rootProject.ext.ipuPlugin.ipu_facerecognize)
116
    implementation(name: rootProject.ext.localAar.ipu_mobile_rn,ext:'aar'){
138
    implementation(name: rootProject.ext.localAar.ipu_mobile_rn,ext:'aar'){
117
        exclude module:'ipu-plugin-extend'
139
        exclude module:'ipu-plugin-extend'
118
    }
140
    }

+ 0 - 1
show-client/app/src/main/AndroidManifest.xml

23
    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
23
    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
24
    <uses-permission android:name="android.permission.CALL_PHONE" />
24
    <uses-permission android:name="android.permission.CALL_PHONE" />
25
    <uses-permission android:name="android.permission.SEND_SMS" />
25
    <uses-permission android:name="android.permission.SEND_SMS" />
26
    <uses-permission android:name="android.permission.READ_SMS" />
27
    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
26
    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
28
    <uses-permission android:name="android.permission.VIBRATE" /> <!-- 震动权限 -->
27
    <uses-permission android:name="android.permission.VIBRATE" /> <!-- 震动权限 -->
29
    <uses-feature android:name="android.hardware.camera" /> <!-- 使用照相机权限 -->
28
    <uses-feature android:name="android.hardware.camera" /> <!-- 使用照相机权限 -->

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

3
    <!-- MobileBasic -->
3
    <!-- MobileBasic -->
4
	<action name="call" class="com.ai.ipu.mobile.plugin.MobileBasic" method="call" permissions="call_phone"/>
4
	<action name="call" class="com.ai.ipu.mobile.plugin.MobileBasic" method="call" permissions="call_phone"/>
5
	<action name="beep" class="com.ai.ipu.mobile.plugin.MobileBasic" method="beep"/>
5
	<action name="beep" class="com.ai.ipu.mobile.plugin.MobileBasic" method="beep"/>
6
	<action name="sms" class="com.ai.ipu.mobile.plugin.MobileBasic" method = "sms" permissions="send_sms,read_sms"/>
6
	<action name="sms" class="com.ai.ipu.mobile.plugin.MobileBasic" method = "sms" permissions="send_sms"/>
7
	<action name="shock" class="com.ai.ipu.mobile.plugin.MobileBasic" method="shock"/>
7
	<action name="shock" class="com.ai.ipu.mobile.plugin.MobileBasic" method="shock"/>
8
	<!-- MobileApp -->
8
	<!-- MobileApp -->
9
	<action name="close" class="com.ai.ipu.mobile.plugin.MobileApp" method="close"/>
9
	<action name="close" class="com.ai.ipu.mobile.plugin.MobileApp" method="close"/>
102
	
102
	
103
	<!-- video -->
103
	<!-- video -->
104
	<action name="recordVideo" class="com.ai.ipu.mobile.plugin.MobileVideo" method="recordVideo" permissions="camera"/>
104
	<action name="recordVideo" class="com.ai.ipu.mobile.plugin.MobileVideo" method="recordVideo" permissions="camera"/>
105
	<action name="playVideo" class="com.ai.ipu.mobile.plugin.MobileVideo" method="playVideo"/>
105
	<action name="playVideo" class="com.ai.ipu.mobile.plugin.MobileVideo" method="playVideo" permissions="read_external_storage" />
106
	
106
	
107
	<action name="openApp" class="com.ai.mobile.func.OpenOtherApp" method="openApp"></action>
107
	<action name="openApp" class="com.ai.mobile.func.OpenOtherApp" method="openApp"></action>
108
	
108
	
261
	<!--检测软件-->
261
	<!--检测软件-->
262
	<action name="detectApps" class="com.ai.ipu.mobile.plugin.InstalledApps" method="detectApps" />
262
	<action name="detectApps" class="com.ai.ipu.mobile.plugin.InstalledApps" method="detectApps" />
263
263
264
	<!--人脸识别-->
265
	<action name="faceRegister" class="com.ai.ipu.faceRecognize.func.FacePlugin" method="faceRegister" />
266
	<action name="faceCheck" class="com.ai.ipu.faceRecognize.func.FacePlugin" method="faceCheck" />
267
264
	<!--OCR-->
268
	<!--OCR-->
265
	<action name="getFloCardInfoBD" class="com.ai.ipu.ocr.func.IpuOcrRecognize" method="getFloCardInfoBD" />
269
	<action name="getFloCardInfoBD" class="com.ai.ipu.ocr.func.IpuOcrRecognize" method="getFloCardInfoBD" />
266
	<action name="getIdCardInfo" class="com.ai.ipu.ocr.func.IpuOcrRecognize" method="getIdCardInfo" />
270
	<action name="getIdCardInfo" class="com.ai.ipu.ocr.func.IpuOcrRecognize" method="getIdCardInfo" />
267
271
272
	<!--视频-->
273
	<action name="ipuRecordVideo" class="com.ai.ipu.watermarkrecord.func.CommonRecord" method="ipuRecordVideo" permissions="camera,record_audio"/>
274
	<action name="recordWithWatermark" class="com.ai.ipu.watermarkrecord.func.WaterMarkRecord" method="recordWithWatermark" permissions="camera,record_audio"/>
275
276
	<!--音视频-->
277
	<action name="openVideoPlayer" class="com.ai.ipu.mobile.video.MobileVideoPlayer" method="openVideoPlayer" />
278
268
</actions>
279
</actions>

+ 3 - 0
show-client/build.gradle

38
            url "http://114.215.100.48:9090/nexus/content/groups/public/"}
38
            url "http://114.215.100.48:9090/nexus/content/groups/public/"}
39
        maven {
39
        maven {
40
            allowInsecureProtocol = true
40
            allowInsecureProtocol = true
41
            url "http://114.215.100.48:18080/nexus/content/repositories/ipu-mobile-3rdparty/"}
42
        maven {
43
            allowInsecureProtocol = true
41
            url "http://114.215.100.48:9090/nexus/content/repositories/ipu-snapshots/"}
44
            url "http://114.215.100.48:9090/nexus/content/repositories/ipu-snapshots/"}
42
        maven { url 'https://jitpack.io' }
45
        maven { url 'https://jitpack.io' }
43
        maven{ url 'https://maven.aliyun.com/repository/central'}
46
        maven{ url 'https://maven.aliyun.com/repository/central'}

+ 10 - 2
show-client/config.gradle

76
            ipu_bluetooth : "com.ai.ipu.plugin:ipu-bluetooth:${ipu_mobile_snapshot_version}",
76
            ipu_bluetooth : "com.ai.ipu.plugin:ipu-bluetooth:${ipu_mobile_snapshot_version}",
77
            ipu_jpush : "com.ai.ipu.plugin.push:ipu-push-jpush:${ipu_mobile_snapshot_version}",
77
            ipu_jpush : "com.ai.ipu.plugin.push:ipu-push-jpush:${ipu_mobile_snapshot_version}",
78
            ipu_video_compressor : "com.ai.ipu.plugin:ipu-video-compressor:${ipu_mobile_snapshot_version}",
78
            ipu_video_compressor : "com.ai.ipu.plugin:ipu-video-compressor:${ipu_mobile_snapshot_version}",
79
            ipu_share : "com.ai.ipu.plugin.share:ipu-share:${ipu_mobile_snapshot_version}"
79
            ipu_share : "com.ai.ipu.plugin.share:ipu-share:${ipu_mobile_snapshot_version}",
80
            ipu_ocr : "com.ai.ipu.plugin:ipu-ocr:${ipu_mobile_snapshot_version}",
81
            ipu_qrcode : "com.ai.ipu.plugin:ipu-qrcode:${ipu_mobile_snapshot_version}",
82
            ipu_video_recorder : "com.ai.ipu.plugin:ipu-video-recorder:${ipu_mobile_snapshot_version}",
83
            ipu_video_player : "com.ai.ipu.plugin:ipu-video-player:${ipu_mobile_snapshot_version}",
84
            ipu_facerecognize : "com.ai.ipu.plugin:ipu-facerecognize:${ipu_mobile_snapshot_version}"
80
    ]
85
    ]
81
86
82
    //RN 依赖包
87
    //RN 依赖包
125
            glide : "com.github.bumptech.glide:glide:4.12.0",
130
            glide : "com.github.bumptech.glide:glide:4.12.0",
126
131
127
            android_lite_http : "android:android-lite-http:1.0",
132
            android_lite_http : "android:android-lite-http:1.0",
128
            silicompressor : 'com.iceteck.silicompressorr:silicompressor:2.2.1'
133
            silicompressor : 'com.iceteck.silicompressorr:silicompressor:2.2.1',
134
135
            // lib_cameraview: ipu-facerecognize 用到
136
            lib_cameraview :'com.google.android:lib-cameraview:1.0'
129
    ]
137
    ]
130
138
131
    //测试依赖包
139
    //测试依赖包

+ 25 - 0
superapp-client/app/build.gradle

36
            minifyEnabled true
36
            minifyEnabled true
37
            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
37
            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
38
            signingConfig signingConfigs.release
38
            signingConfig signingConfigs.release
39
40
            // 修改输出 apk 名称,如:超级客户端_v1.0_202209011022_release.apk
41
            applicationVariants.all { variant ->
42
                def suffix
43
                if (variant.buildType.name == 'release') {
44
                    suffix = 'release'
45
                } else {
46
                    suffix = 'debug'
47
                }
48
                variant.outputs.all { output ->
49
                    def outputFile = output.outputFile
50
                    if (outputFile != null && outputFile.name.endsWith('.apk')) {
51
                        def fileName = "超级客户端_v${defaultConfig.versionName}_${releaseTime()}_${suffix}.apk"
52
                        outputFileName = fileName
53
                    }
54
                }
55
            }
56
        }
57
        debug{
58
            signingConfig signingConfigs.debug
39
        }
59
        }
40
    }
60
    }
41
}
61
}
42
62
63
// 定义打包时间
64
static def releaseTime() {
65
    return new Date().format("yyyyMMddHHmm")
66
}
67
43
dependencies {
68
dependencies {
44
    implementation fileTree(dir: 'libs', include: ['*.jar'])
69
    implementation fileTree(dir: 'libs', include: ['*.jar'])
45
    /**
70
    /**