From a5d862051462a5fcc2717b405896a6d424002e54 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期二, 22 十二月 2020 15:43:06 +0800
Subject: [PATCH] 1. 调整了数控实体的存储位置； 2. 新增数据表“媒体文件类型别名表”； 3. 修改任意拍模块，将图片分类改为根据场景类型动态生成，同时新增修改分类别名功能； 4. 优化子任务选择界面的任务排序方式，按照“待开始”、“执行中”、“未执行”的顺序进行排序；
---
app/src/main/java/cn/flightfeather/thirdapp/CommonApplication.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 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..5eb080e 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/CommonApplication.java
+++ b/app/src/main/java/cn/flightfeather/thirdapp/CommonApplication.java
@@ -14,7 +14,7 @@
import java.io.File;
-import cn.flightfeather.thirdapp.bean.Userinfo;
+import cn.flightfeather.thirdapp.bean.entity.Userinfo;
import cn.flightfeather.thirdapp.common.net.RetrofitFactory;
import cn.flightfeather.thirdapp.util.crashreport.MyCrashHandler;
import retrofit2.Retrofit;
@@ -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