Commit 92c77812 authored by shiyl's avatar shiyl

依赖库远程改本地

parent abd0b4fb
...@@ -58,6 +58,8 @@ android { ...@@ -58,6 +58,8 @@ android {
dependencies { dependencies {
// 注意高德地图jar引入需要其他组件可以使用,故而api // 注意高德地图jar引入需要其他组件可以使用,故而api
api fileTree(dir: 'libs', include: ['*.jar', '*.aar']) api fileTree(dir: 'libs', include: ['*.jar', '*.aar'])
// api(name: 'yac-core-0.0.6', ext: 'aar')
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
// kotlin实现MVVM框架之使用DataBinding之unresolved reference: BR解决办法 // kotlin实现MVVM框架之使用DataBinding之unresolved reference: BR解决办法
kapt "com.android.databinding:compiler:4.0.1" kapt "com.android.databinding:compiler:4.0.1"
...@@ -66,7 +68,7 @@ dependencies { ...@@ -66,7 +68,7 @@ dependencies {
compileOnly rootProject.ext.dependencies.privateImplementation compileOnly rootProject.ext.dependencies.privateImplementation
testImplementation rootProject.ext.dependencies.testImplementation testImplementation rootProject.ext.dependencies.testImplementation
androidTestImplementation rootProject.ext.dependencies.androidTestImplementation androidTestImplementation rootProject.ext.dependencies.androidTestImplementation
api('com.yidian.android:CommonComponent:0.0.88') { // api('com.yidian.android:CommonComponent:0.0.88') {
exclude(group: 'com.yidian.android', module: 'NetworkImageLib') // exclude(group: 'com.yidian.android', module: 'NetworkImageLib')
} // }
} }
\ No newline at end of file
...@@ -13,7 +13,6 @@ import com.yidian.bcommon.extensions.clickAntiShake ...@@ -13,7 +13,6 @@ import com.yidian.bcommon.extensions.clickAntiShake
import com.yidian.bcommon.extensions.initTitleBar import com.yidian.bcommon.extensions.initTitleBar
import com.yidian.bcommon.utils.AuthUtils import com.yidian.bcommon.utils.AuthUtils
import com.yidian.bcommon.utils.CheckApkExistUtil import com.yidian.bcommon.utils.CheckApkExistUtil
import com.yidian.news.util.LogUtils
import com.yidian.shenghuoquan.bmanagercenter.R import com.yidian.shenghuoquan.bmanagercenter.R
import com.yidian.shenghuoquan.bmanagercenter.databinding.ActivityWechatAuthBinding import com.yidian.shenghuoquan.bmanagercenter.databinding.ActivityWechatAuthBinding
import com.yidian.utils.ToastUtil import com.yidian.utils.ToastUtil
...@@ -57,7 +56,6 @@ class WeChatAuthActivity : BaseActivity<ActivityWechatAuthBinding>() { ...@@ -57,7 +56,6 @@ class WeChatAuthActivity : BaseActivity<ActivityWechatAuthBinding>() {
} }
val authMap = AuthUtils.toAuthorize(this, SHARE_MEDIA.WEIXIN) val authMap = AuthUtils.toAuthorize(this, SHARE_MEDIA.WEIXIN)
val accessToken = authMap["accessToken"] val accessToken = authMap["accessToken"]
LogUtils.e("auth", "微信授权结果$accessToken")
ToastUtil.showToast(this, "微信授权结果$accessToken") ToastUtil.showToast(this, "微信授权结果$accessToken")
if (accessToken.isNullOrBlank()) { if (accessToken.isNullOrBlank()) {
ToastUtil.showToast(this, "微信授权失败") ToastUtil.showToast(this, "微信授权失败")
......
// Top-level build file where you can add configuration options common to all sub-projects/modules. // Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript { buildscript {
apply from: "https://git.yidian-inc.com:8021/arc-android/config/raw/master/version.gradle"
apply from: "config/config.gradle" apply from: "config/config.gradle"
addRepos(repositories) ext.kotlin_version = "1.4.32"
ext.kotlin_version = build_versions.kotlin_version
repositories { repositories {
maven { url 'https://maven.aliyun.com/repository/public/' } maven { url 'https://maven.aliyun.com/repository/public/' }
google() google()
mavenCentral() mavenCentral()
maven { url 'https://jitpack.io' }
maven { url uri("repo") }
maven { url "../repo"}
} }
dependencies { dependencies {
classpath deps.gradle.plugin classpath "com.android.tools.build:gradle:4.0.1"
classpath deps.kotlin.plugin
classpath deps.yac.engine
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath "com.yidian.yac:yac-engine:0.0.6"
// classpath files('CommonLib/BCommon/libs/yac-engine-0.0.6.jar')
// NOTE: Do not place your application dependencies here; they belong // NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files // in the individual module build.gradle files
} }
...@@ -22,11 +23,12 @@ buildscript { ...@@ -22,11 +23,12 @@ buildscript {
allprojects { allprojects {
repositories { repositories {
maven { url 'https://maven.aliyun.com/repository/public/' } maven { url 'https://maven.aliyun.com/repository/public/' }
maven { url "http://dailybuild2.yidian-inc.com:8088/repository/maven-public/" }
google() google()
mavenCentral() mavenCentral()
maven { url 'https://jitpack.io' }
maven { url uri("repo") }
maven { url "../repo"}
} }
addRepos(repositories)
} }
/** /**
...@@ -38,6 +40,14 @@ ext { ...@@ -38,6 +40,14 @@ ext {
version_name = '0.0.31-SNAPSHOT' version_name = '0.0.31-SNAPSHOT'
} }
ext.build_versions = [
"minSdkVersion" : 21,
"targetSdkVersion" : 29,
"compileSdkVersion": 29,
"build_tools" : "27.0.2",
"kotlin_version" : "1.4.32"
]
task clean(type: Delete) { task clean(type: Delete) {
delete rootProject.buildDir delete rootProject.buildDir
} }
\ No newline at end of file
...@@ -37,26 +37,26 @@ ext.dependencies = [ ...@@ -37,26 +37,26 @@ ext.dependencies = [
'androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.0', 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.0',
"androidx.recyclerview:recyclerview:1.1.0", "androidx.recyclerview:recyclerview:1.1.0",
// 一点内部SDK // // 一点内部SDK
'com.yidian.android:CommonUtil:0.0.88', // 'com.yidian.android:CommonUtil:0.0.88',
'com.yidian.android:nightmode:0.0.88', // 'com.yidian.android:nightmode:0.0.88',
// 风控SDK // // 风控SDK
'com.yidian.ftcomponents:ftdevicefinger:0.0.14', // 'com.yidian.ftcomponents:ftdevicefinger:0.0.14',
// http框架 // // http框架
'com.yidian.framework.mobile:ydhttp:1.1.3-SNAPSHOT', // 'com.yidian.framework.mobile:ydhttp:1.1.3-SNAPSHOT',
'com.yidian.framework.mobile:ydutils:1.0.1-SNAPSHOT', // 'com.yidian.framework.mobile:ydutils:1.0.1-SNAPSHOT',
// 磐石 // // 磐石
'com.yidian.framework.mobile:xdiamond:1.1.1', // 'com.yidian.framework.mobile:xdiamond:1.1.1',
// 慧眼 // // 慧眼
'com.yidian.framework.mobile.xinsight:xinsight:1.1.7', // 'com.yidian.framework.mobile.xinsight:xinsight:1.1.7',
// NA页面栈 // // NA页面栈
'com.yidian.xpage:xpagenative:0.0.1', // 'com.yidian.xpage:xpagenative:0.0.1',
// 组件化架构 // // 组件化架构
deps.yac.core, // deps.yac.core,
deps.xarc.xbrid, // deps.xarc.xbrid,
deps.xarc.xbase, // deps.xarc.xbase,
deps.xarc.xrouter, // deps.xarc.xrouter,
deps.xarc.xevent, // deps.xarc.xevent,
// 第三方SDK // 第三方SDK
// 屏幕适配 https://github.com/JessYanCoding/AndroidAutoSize // 屏幕适配 https://github.com/JessYanCoding/AndroidAutoSize
...@@ -81,12 +81,19 @@ ext.dependencies = [ ...@@ -81,12 +81,19 @@ ext.dependencies = [
'io.reactivex.rxjava3:rxandroid:3.0.0', 'io.reactivex.rxjava3:rxandroid:3.0.0',
// RxJava https://github.com/ReactiveX/RxJava // RxJava https://github.com/ReactiveX/RxJava
'io.reactivex.rxjava3:rxjava:3.0.9', 'io.reactivex.rxjava3:rxjava:3.0.9',
// 以下为新增的关联依赖库
'com.google.code.gson:gson:2.8.8',
'com.orhanobut:hawk:2.0.1',
'com.squareup.okhttp3:okhttp:4.9.2',
'com.squareup.retrofit2:retrofit:2.9.0',
'org.greenrobot:eventbus:3.0.0',
'com.loopj.android:android-async-http:1.4.9',
], ],
// 私有依赖 B端自己使用的依赖(不输出给C端)只在B端使用的组件以implementation依赖 需要输出给C端的组件以compileOnly依赖 // 私有依赖 B端自己使用的依赖(不输出给C端)只在B端使用的组件以implementation依赖 需要输出给C端的组件以compileOnly依赖
privateImplementation : [ privateImplementation : [
// 一点内部SDK // 一点内部SDK
// 应用升级SDK // 应用升级SDK
'com.yidian.pmcomponents:appupdate:0.0.8', // 'com.yidian.pmcomponents:appupdate:0.0.8',
// 第三方SDK // 第三方SDK
// 友盟基础组件(必选) // 友盟基础组件(必选)
......
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