Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
ShenghuoquanBusiness
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
bp
ShenghuoquanBusiness
Commits
1999220e
Commit
1999220e
authored
Jun 17, 2021
by
shiyuelong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add 配置全局的file_provider,支持测试和正式包同时安装
parent
cf65a605
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
39 additions
and
11 deletions
+39
-11
build.gradle
CommonLib/Common/build.gradle
+10
-0
AppConfig.kt
...onLib/Common/src/main/java/com/yidian/common/AppConfig.kt
+0
-1
GlobalConstants.kt
...c/main/java/com/yidian/common/constant/GlobalConstants.kt
+17
-0
LifeAccountEnterpriseCertificationActivity.kt
...scontent/ui/LifeAccountEnterpriseCertificationActivity.kt
+3
-2
LifeAccountBusinessLicenseAuthFragment.kt
...content/ui/auth/LifeAccountBusinessLicenseAuthFragment.kt
+2
-1
AndroidManifest.xml
app/src/main/AndroidManifest.xml
+6
-6
config.gradle
config/config.gradle
+1
-1
No files found.
CommonLib/Common/build.gradle
View file @
1999220e
...
...
@@ -31,9 +31,19 @@ android {
buildTypes
{
debug
{
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
{
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
{
...
...
CommonLib/Common/src/main/java/com/yidian/common/AppConfig.kt
View file @
1999220e
...
...
@@ -31,7 +31,6 @@ class AppConfig {
const
val
SinaAppKey
=
"4157874278"
const
val
SinaAppSecret
=
"85c422bc0a1e0553e6a6a075701422a7"
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
userProtocol
=
"https://www.appgc.cn/plugins/privacy/content?type=mp&appId=1080334&ver=210601"
...
...
CommonLib/Common/src/main/java/com/yidian/common/constant/GlobalConstants.kt
0 → 100644
View file @
1999220e
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
}
}
Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/LifeAccountEnterpriseCertificationActivity.kt
View file @
1999220e
...
...
@@ -14,6 +14,7 @@ import android.util.Log
import
androidx.core.content.FileProvider
import
com.yidian.common.XRouterPathConstants
import
com.yidian.common.base.BaseActivity
import
com.yidian.common.constant.GlobalConstants
import
com.yidian.common.utils.YdFileUtils
import
com.yidian.shenghuoquan.newscontent.databinding.ActivityLifeAccountEnterpriseCertificationBinding
import
com.yidian.shenghuoquan.newscontent.http.ApiService
...
...
@@ -83,7 +84,7 @@ class LifeAccountEnterpriseCertificationActivity :
}
photoUri
=
if
(
Build
.
VERSION
.
SDK_INT
>=
Build
.
VERSION_CODES
.
N
)
{
//适配Android 7.0文件权限,通过FileProvider创建一个content类型的Uri
FileProvider
.
getUriForFile
(
this
,
"$packageName.provider"
,
file
)
FileProvider
.
getUriForFile
(
this
,
GlobalConstants
.
AUTHORITY
,
file
)
}
else
{
Uri
.
fromFile
(
file
)
}
...
...
@@ -233,4 +234,4 @@ class LifeAccountEnterpriseCertificationActivity :
}
}
}
\ No newline at end of file
}
Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/auth/LifeAccountBusinessLicenseAuthFragment.kt
View file @
1999220e
...
...
@@ -15,6 +15,7 @@ import androidx.core.content.FileProvider
import
androidx.core.view.isVisible
import
com.bumptech.glide.Glide
import
com.yidian.common.base.BaseFragment
import
com.yidian.common.constant.GlobalConstants
import
com.yidian.shenghuoquan.newscontent.R
import
com.yidian.shenghuoquan.newscontent.adapter.BottomSelectAdapter
import
com.yidian.shenghuoquan.newscontent.bean.BottomSelectBean
...
...
@@ -144,7 +145,7 @@ class LifeAccountBusinessLicenseAuthFragment :
activity
?.
let
{
FileProvider
.
getUriForFile
(
it
,
"${activity?.packageName}.provider"
,
GlobalConstants
.
AUTHORITY
,
file
)
}
...
...
app/src/main/AndroidManifest.xml
View file @
1999220e
...
...
@@ -229,12 +229,12 @@
android:permission=
"android.permission.BIND_JOB_SERVICE"
/>
<!--此处注意下包名💊-->
<provider
android:name=
"com.umeng.message.provider.MessageProvider"
android:authorities=
"com.shenghuoquan.business.umeng.message"
android:exported=
"false"
>
<grant-uri-permission
android:pathPattern=
".*"
/
>
</provider
>
<!-- <provider-->
<!-- android:name="com.umeng.message.provider.MessageProvider"-->
<!-- android:authorities="${application_id}.umeng.message"-->
<!-- android:exported="false">--
>
<!-- <grant-uri-permission android:pathPattern=".*" />--
>
<!-- </provider>--
>
<!-- 以上为友盟推送基本配置信息 end-->
</application>
...
...
config/config.gradle
View file @
1999220e
...
...
@@ -13,7 +13,7 @@ ext {
API_URL:
'"http://bp-test.go2yd.com"'
,
],
release:
[
API_URL:
'"http://bp-
dev
.go2yd.com"'
,
API_URL:
'"http://bp-
test
.go2yd.com"'
,
]
]
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment