diff --git a/build.gradle b/build.gradle index a987541..46e53c7 100644 --- a/build.gradle +++ b/build.gradle @@ -1,8 +1,19 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { repositories { - jcenter() - google() + // aliyun maven + maven { url 'https://maven.aliyun.com/repository/public' } + // gradle-plugin + maven { url 'https://maven.aliyun.com/repository/gradle-plugin' } + // google() + maven { url 'https://maven.aliyun.com/repository/google' } + // jcenter() + maven { url 'https://maven.aliyun.com/repository/jcenter' } + // central() + maven { url 'https://maven.aliyun.com/repository/central' } + + // google() + // jcenter() maven { url 'https://dl.bintray.com/umsdk/release' } maven { url "https://jitpack.io" @@ -12,7 +23,7 @@ buildscript { // url 'https://oss.sonatype.org/content/repositories/snapshots/' // } - maven { url "https://jitpack.io" } + // maven { url "https://jitpack.io" } } dependencies { classpath 'com.android.tools.build:gradle:4.2.2' @@ -30,8 +41,20 @@ allprojects { // } // } repositories { - google() - jcenter() + + // aliyun maven + maven { url 'https://maven.aliyun.com/repository/public' } + // gradle-plugin + maven { url 'https://maven.aliyun.com/repository/gradle-plugin' } + // google() + maven { url 'https://maven.aliyun.com/repository/google' } + // jcenter() + maven { url 'https://maven.aliyun.com/repository/jcenter' } + // central() + maven { url 'https://maven.aliyun.com/repository/central' } + + // google() + // jcenter() /* maven { url "https://raw.githubusercontent.com/umeng/mvn-repo-umeng/master/repository" }*/ diff --git a/mykeystore.jks b/mykeystore.jks new file mode 100644 index 0000000..f206e54 Binary files /dev/null and b/mykeystore.jks differ diff --git a/zhuike/build.gradle b/zhuike/build.gradle index f3427e0..38f9eed 100644 --- a/zhuike/build.gradle +++ b/zhuike/build.gradle @@ -23,8 +23,8 @@ android { applicationId "com.deiniu.wms" minSdkVersion 19 //target 19 Android 4.4 以下版本仅占比4.1% targetSdkVersion 33 - versionCode 94 - versionName "v1.94" + versionCode 99 + versionName "v1.99" // testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" @@ -37,7 +37,7 @@ android { renderscriptSupportModeEnabled true //blurkit multiDexEnabled true //突破65535 - // flavorDimensions "default" //debug时注销, 不然没有debug信息输出 + flavorDimensions "default" //debug时注销, 不然没有debug信息输出 } tasks.withType(JavaExec){ maxHeapSize="2g"; @@ -48,7 +48,7 @@ android { buildConfigField "boolean", "LOG_DEBUG", "true" // buildConfigField "boolean", "canWeightEdit", "true" // buildConfigField "String", "MAIN_HOST", '" http://192.168.1.6:10002/android.svc/"' - // buildConfigField "String", "MAIN_HOST", '" http://192.168.2.7:10002/android.svc/"' + // buildConfigField "String", "MAIN_HOST", '" http://192.168.2.9:10002/android.svc/"' // buildConfigField "String", "MAIN_HOST", '" http://192.168..212:9998/dnlight/"' //buildConfigField "String", "MAIN_HOST", '""' buildConfigField "String", "MAIN_HOST", '"http://175.24.179.109:10002/android.svc/"' @@ -165,12 +165,13 @@ dependencies { implementation 'com.timqi.collapsibletextview:library:1.1.2' implementation 'com.github.chengzipi:Searchbox:v1.0.0' - implementation 'com.github.ixiaow:multilayout:1.0.0' + // implementation 'com.github.ixiaow:multilayout:1.0.0' implementation 'q.rorbin:VerticalTabLayout:1.2.5' implementation 'pl.droidsonroids.gif:android-gif-drawable:1.2.16' implementation(name: 'autoreplyprint', ext: 'aar') implementation 'com.blankj:utilcode:1.9.8' + implementation 'com.google.zxing:core:3.3.3' //implementation "androidx.fragment:fragment:1.3.3" }