Browse Source

Merge branch 'dev' into feature-showserver_upgrade_20220826

# Conflicts:
#	.gitignore
赖骏劼 2 years ago
parent
commit
67a8d075d0

+ 2 - 0
show-client/app/build.gradle

@ -111,6 +111,8 @@ dependencies {
111 111
    implementation(rootProject.ext.ipuPlugin.ipu_jpush)
112 112
    implementation(rootProject.ext.ipuPlugin.ipu_video_compressor)
113 113
    implementation(rootProject.ext.ipuPlugin.ipu_share)
114
    implementation(rootProject.ext.ipuPlugin.ipu_asr)
115
    implementation(rootProject.ext.ipuPlugin.ipu_file_picker)
114 116
    implementation(name: rootProject.ext.localAar.ipu_mobile_rn,ext:'aar'){
115 117
        exclude module:'ipu-plugin-extend'
116 118
    }

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

@ -212,6 +212,7 @@
212 212
	<action name="saveImageToAlbum" class="com.ai.ipu.mobile.plugin.ImageCache" method="saveImageToAlbum"></action>
213 213
	
214 214
	<action name="getIdentifyPhoto" class="com.ai.ipu.ipucustomcamera.IpuCustomCamera" method="getIdentifyPhoto" permissions="camera"/>
215
	<action name="makeShortVideo" class="com.ai.ipu.ipucustomcamera.IpuShortVideo" method="makeShortVideo" permissions="camera,record_audio"/>
215 216
	
216 217
	<!-- 打开外部app -->
217 218
	<action name="openOuterApp" class="com.ai.ipu.func.MobileOpenOuterApp" method="openOuterApp"/>

+ 27 - 2
superapp-client/app/build.gradle

@ -30,16 +30,41 @@ android {
30 30
            storePassword 'showshow'
31 31
        }
32 32
    }
33
    
33
34 34
    buildTypes {
35 35
        release {
36 36
            minifyEnabled true
37 37
            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
38 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 68
dependencies {
44 69
    implementation fileTree(dir: 'libs', include: ['*.jar'])
45 70
    /**
@ -51,7 +76,7 @@ dependencies {
51 76
    implementation (rootProject.ext.ipu.ipu_mobile_framework){
52 77
        changing = true
53 78
    }
54
79
    implementation(rootProject.ext.ipuPlugin.ipu_customcamera)
55 80
56 81
    implementation rootProject.ext.androidX.appcompat
57 82