From 5771916ffb24807dd57c1969baa6371611c334da Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期六, 10 十月 2020 16:45:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'supervision/master'
---
app/src/main/java/cn/flightfeather/thirdapp/CommonApplication.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/CommonApplication.java b/app/src/main/java/cn/flightfeather/thirdapp/CommonApplication.java
index ab64c82..64f6ced 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/CommonApplication.java
+++ b/app/src/main/java/cn/flightfeather/thirdapp/CommonApplication.java
@@ -27,10 +27,10 @@
public class CommonApplication extends Application {
// private final String ROOTURL="http://106.14.187.51:8801/supervision/";
- private final String ROOTURL="http://192.168.0.200:8080/";
- private final String ROOTURL_IMAGE="http://192.168.0.200:8080/images/";
- private final String ROOTURL_REALEASE = "http://47.100.191.150:9005/";
- public final String ROOTURL_REALEASE_IMAGE = "http://47.100.191.150:9005/images/";
+ public final String ROOT_URL ="http://192.168.0.200:8080/";
+ public final String ROOT_URL_IMAGE ="http://192.168.0.200:8080/images/";
+ public final String ROOT_URL_RELEASE = "http://47.100.191.150:9005/";
+ public final String ROOT_URL_RELEASE_IMAGE = "http://47.100.191.150:9005/images/";
private Retrofit retrofit;
private Retrofit retrofitImage;
private DaoSession daoSession;
@@ -74,13 +74,13 @@
if (released){
retrofit = new Retrofit.Builder()
- .baseUrl(ROOTURL_REALEASE)
+ .baseUrl(ROOT_URL_RELEASE)
.addConverterFactory(GsonConverterFactory.create(gson))
.addCallAdapterFactory(RxJava2CallAdapterFactory.create())
.build();
}else {
retrofit = new Retrofit.Builder()
- .baseUrl(ROOTURL)
+ .baseUrl(ROOT_URL)
.addConverterFactory(GsonConverterFactory.create(gson))
.addCallAdapterFactory(RxJava2CallAdapterFactory.create())
.build();
@@ -102,12 +102,12 @@
.create();
if (released){
retrofitImage = new Retrofit.Builder()
- .baseUrl(ROOTURL_REALEASE_IMAGE)
+ .baseUrl(ROOT_URL_RELEASE_IMAGE)
.addConverterFactory(GsonConverterFactory.create(gson))
.build();
}else {
retrofitImage = new Retrofit.Builder()
- .baseUrl(ROOTURL_IMAGE)
+ .baseUrl(ROOT_URL_IMAGE)
.addConverterFactory(GsonConverterFactory.create(gson))
.build();
}
--
Gitblit v1.9.3