From 7be66bc9663c1106ebc78748dc22f394680ac86b Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期二, 29 十二月 2020 09:57:09 +0800
Subject: [PATCH] 1. 修复场景地图界面选择场景点时可能由于列表下标越界导致崩溃问题； 2. 修复自定义PagerAdapter时，没有重写destroyItem可能会导致的崩溃问题； 3. 修改数据库实体类MediaTypeAlias的主键id类型从龙变更为Long，否则无法自增； 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