Commit 4249d8f8 by pye52

更新第三方库版本

parent 4ef0b502
...@@ -15,20 +15,6 @@ android { ...@@ -15,20 +15,6 @@ android {
} }
buildConfigField "int", "DaemonVersion", String.valueOf(rootProject.ext.daemon_verson_code) buildConfigField "int", "DaemonVersion", String.valueOf(rootProject.ext.daemon_verson_code)
} }
signingConfigs {
debug {
keyAlias 'town'
keyPassword 'maxrocky'
storeFile file('canteen.jks')
storePassword 'maxrocky'
}
release {
keyAlias 'town'
keyPassword 'maxrocky'
storeFile file('canteen.jks')
storePassword 'maxrocky'
}
}
buildTypes { buildTypes {
debug { debug {
minifyEnabled false minifyEnabled false
...@@ -67,6 +53,11 @@ android { ...@@ -67,6 +53,11 @@ android {
buildConfigField "String", "MainWebSocketServerUrl", '"wss://diningservice.bgy.com.cn/websocket/%s/V%s"' buildConfigField "String", "MainWebSocketServerUrl", '"wss://diningservice.bgy.com.cn/websocket/%s/V%s"'
buildConfigField "String", "MainHttpServerHost", '"https://diningback.bgy.com.cn"' buildConfigField "String", "MainHttpServerHost", '"https://diningback.bgy.com.cn"'
} }
pro_cloud {
dimension "smart_canteen"
buildConfigField "String", "MainWebSocketServerUrl", '"wss://diningservice-cloud.bgy.com.cn/websocket/%s/V%s"'
buildConfigField "String", "MainHttpServerHost", '"https://diningback-cloud.bgy.com.cn"'
}
} }
signingConfigs { signingConfigs {
canteen { canteen {
...@@ -123,8 +114,8 @@ dependencies { ...@@ -123,8 +114,8 @@ dependencies {
androidTestImplementation 'androidx.test.ext:junit:1.1.1' androidTestImplementation 'androidx.test.ext:junit:1.1.1'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
implementation "org.java-websocket:Java-WebSocket:1.4.0" implementation "org.java-websocket:Java-WebSocket:1.4.0"
implementation 'com.blankj:utilcodex:1.26.0' implementation 'com.blankj:utilcodex:1.28.3'
def okhttp_version = "4.3.1" def okhttp_version = "4.5.0"
implementation "com.squareup.okhttp3:okhttp:$okhttp_version" implementation "com.squareup.okhttp3:okhttp:$okhttp_version"
implementation "com.squareup.okhttp3:logging-interceptor:$okhttp_version" implementation "com.squareup.okhttp3:logging-interceptor:$okhttp_version"
def retrofit_version = "2.7.1" def retrofit_version = "2.7.1"
......
...@@ -16,7 +16,7 @@ public class RootApp extends Application { ...@@ -16,7 +16,7 @@ public class RootApp extends Application {
@Override @Override
public void onCreate() { public void onCreate() {
super.onCreate(); super.onCreate();
Utils.init(getApplicationContext()); Utils.init(this);
String logDir = PathUtils.getExternalStoragePath() + File.separator + LOG_DIR; String logDir = PathUtils.getExternalStoragePath() + File.separator + LOG_DIR;
CrashUtils.init(logDir); CrashUtils.init(logDir);
LogUtils.getConfig() LogUtils.getConfig()
......
...@@ -9,7 +9,7 @@ buildscript { ...@@ -9,7 +9,7 @@ buildscript {
jcenter() jcenter()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:3.6.1' classpath 'com.android.tools.build:gradle:3.6.3'
} }
} }
......
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 sign in to comment