Commit 1999220e authored by shiyuelong's avatar shiyuelong

add 配置全局的file_provider,支持测试和正式包同时安装

parent cf65a605
...@@ -31,9 +31,19 @@ android { ...@@ -31,9 +31,19 @@ android {
buildTypes { buildTypes {
debug { debug {
buildConfigField "boolean", "ENV_DEBUG", "true" buildConfigField "boolean", "ENV_DEBUG", "true"
buildConfigField("String", "PROVIDER_NAME", '\"' + rootProject.ext.android.applicationId + ".debug.fileprovider" + '\"')
manifestPlaceholders = [
app_name : "B端测试",
file_provider: rootProject.ext.android.applicationId + ".debug.fileprovider",
]
} }
release { release {
buildConfigField "boolean", "ENV_DEBUG", "false" buildConfigField "boolean", "ENV_DEBUG", "false"
buildConfigField("String", "PROVIDER_NAME", '\"' + rootProject.ext.android.applicationId + ".fileprovider" + '\"')
manifestPlaceholders = [
app_name : "B端",
file_provider: rootProject.ext.android.applicationId + ".fileprovider",
]
} }
} }
compileOptions { compileOptions {
......
...@@ -31,7 +31,6 @@ class AppConfig { ...@@ -31,7 +31,6 @@ class AppConfig {
const val SinaAppKey = "4157874278" const val SinaAppKey = "4157874278"
const val SinaAppSecret = "85c422bc0a1e0553e6a6a075701422a7" const val SinaAppSecret = "85c422bc0a1e0553e6a6a075701422a7"
const val SinaCallBackUrl = "https://api.weibo.com/oauth2/default.html" const val SinaCallBackUrl = "https://api.weibo.com/oauth2/default.html"
const val FileProvider = "com.shenghuoquan.business.provider"
const val privacyPolicyStatement = "https://www.appgc.cn/plugins/privacy/content?type=privacy&appId=1080334&ver=210601" const val privacyPolicyStatement = "https://www.appgc.cn/plugins/privacy/content?type=privacy&appId=1080334&ver=210601"
const val userProtocol = "https://www.appgc.cn/plugins/privacy/content?type=mp&appId=1080334&ver=210601" const val userProtocol = "https://www.appgc.cn/plugins/privacy/content?type=mp&appId=1080334&ver=210601"
......
package com.yidian.common.constant
import com.yidian.common.BuildConfig
/**
* 全局的常量
*/
interface GlobalConstants {
companion object {
// 下载的安装包名称
const val APK_NAME = "merchant-b.apk"
// 清单文件中FileProvider的authorities
const val AUTHORITY = BuildConfig.PROVIDER_NAME
}
}
...@@ -14,6 +14,7 @@ import android.util.Log ...@@ -14,6 +14,7 @@ import android.util.Log
import androidx.core.content.FileProvider import androidx.core.content.FileProvider
import com.yidian.common.XRouterPathConstants import com.yidian.common.XRouterPathConstants
import com.yidian.common.base.BaseActivity import com.yidian.common.base.BaseActivity
import com.yidian.common.constant.GlobalConstants
import com.yidian.common.utils.YdFileUtils import com.yidian.common.utils.YdFileUtils
import com.yidian.shenghuoquan.newscontent.databinding.ActivityLifeAccountEnterpriseCertificationBinding import com.yidian.shenghuoquan.newscontent.databinding.ActivityLifeAccountEnterpriseCertificationBinding
import com.yidian.shenghuoquan.newscontent.http.ApiService import com.yidian.shenghuoquan.newscontent.http.ApiService
...@@ -83,7 +84,7 @@ class LifeAccountEnterpriseCertificationActivity : ...@@ -83,7 +84,7 @@ class LifeAccountEnterpriseCertificationActivity :
} }
photoUri = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { photoUri = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
//适配Android 7.0文件权限,通过FileProvider创建一个content类型的Uri //适配Android 7.0文件权限,通过FileProvider创建一个content类型的Uri
FileProvider.getUriForFile(this, "$packageName.provider", file) FileProvider.getUriForFile(this, GlobalConstants.AUTHORITY, file)
} else { } else {
Uri.fromFile(file) Uri.fromFile(file)
} }
......
...@@ -15,6 +15,7 @@ import androidx.core.content.FileProvider ...@@ -15,6 +15,7 @@ import androidx.core.content.FileProvider
import androidx.core.view.isVisible import androidx.core.view.isVisible
import com.bumptech.glide.Glide import com.bumptech.glide.Glide
import com.yidian.common.base.BaseFragment import com.yidian.common.base.BaseFragment
import com.yidian.common.constant.GlobalConstants
import com.yidian.shenghuoquan.newscontent.R import com.yidian.shenghuoquan.newscontent.R
import com.yidian.shenghuoquan.newscontent.adapter.BottomSelectAdapter import com.yidian.shenghuoquan.newscontent.adapter.BottomSelectAdapter
import com.yidian.shenghuoquan.newscontent.bean.BottomSelectBean import com.yidian.shenghuoquan.newscontent.bean.BottomSelectBean
...@@ -144,7 +145,7 @@ class LifeAccountBusinessLicenseAuthFragment : ...@@ -144,7 +145,7 @@ class LifeAccountBusinessLicenseAuthFragment :
activity?.let { activity?.let {
FileProvider.getUriForFile( FileProvider.getUriForFile(
it, it,
"${activity?.packageName}.provider", GlobalConstants.AUTHORITY,
file file
) )
} }
......
...@@ -229,12 +229,12 @@ ...@@ -229,12 +229,12 @@
android:permission="android.permission.BIND_JOB_SERVICE" /> android:permission="android.permission.BIND_JOB_SERVICE" />
<!--此处注意下包名💊--> <!--此处注意下包名💊-->
<provider <!-- <provider-->
android:name="com.umeng.message.provider.MessageProvider" <!-- android:name="com.umeng.message.provider.MessageProvider"-->
android:authorities="com.shenghuoquan.business.umeng.message" <!-- android:authorities="${application_id}.umeng.message"-->
android:exported="false"> <!-- android:exported="false">-->
<grant-uri-permission android:pathPattern=".*" /> <!-- <grant-uri-permission android:pathPattern=".*" />-->
</provider> <!-- </provider>-->
<!-- 以上为友盟推送基本配置信息 end--> <!-- 以上为友盟推送基本配置信息 end-->
</application> </application>
......
...@@ -13,7 +13,7 @@ ext { ...@@ -13,7 +13,7 @@ ext {
API_URL: '"http://bp-test.go2yd.com"', API_URL: '"http://bp-test.go2yd.com"',
], ],
release: [ release: [
API_URL: '"http://bp-dev.go2yd.com"', API_URL: '"http://bp-test.go2yd.com"',
] ]
] ]
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment