From e27f54aa7e10836e2741dc590559e1039fbade78 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期五, 23 七月 2021 15:06:41 +0800
Subject: [PATCH] 1. 创建子任务时，执行用户默认为当前登录用户或执行组中的第一人 2. 修复部分企业类型问题图标错误 3. 新增场景账户自动生成功能
---
app/src/main/java/cn/flightfeather/thirdapp/CommonApplication.java | 67 +++++++++++++++++++--------------
1 files changed, 38 insertions(+), 29 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..e91af83 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/CommonApplication.java
+++ b/app/src/main/java/cn/flightfeather/thirdapp/CommonApplication.java
@@ -14,9 +14,13 @@
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.GlobalConfig;
import cn.flightfeather.thirdapp.util.crashreport.MyCrashHandler;
+import cn.flightfeather.thirdapp.util.notification.MyNotificationChannel;
+import cn.flightfeather.thirdapp.util.push.PushService;
+import cn.flightfeather.thirdapp.util.tbs.Tbs;
import retrofit2.Retrofit;
import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory;
import retrofit2.converter.gson.GsonConverterFactory;
@@ -26,18 +30,17 @@
*/
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 ="http://192.168.0.146:8080/";
+ public final String ROOT_URL_IMAGE ="http://192.168.0.146: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;
private Userinfo currentUser;
- private boolean debugMode = false;
- private boolean released = true;
- private UserinfoDao userinfoDao;
+ private final boolean released = true;
//鍦ㄧ▼搴忔墦寮�鏃惰仈缃戣幏鍙栭缃暟鎹�
private boolean loadPreDataWhenOpen = true;
@@ -52,6 +55,15 @@
//鍒濆鍖栫綉缁滆姹�
RetrofitFactory.init(this);
+ //x5鍐呮牳鍒濆鍖�
+ Tbs.Companion.init(this);
+
+ //Android8.0鍚庢敞鍐岄�氱煡閫氶亾
+ MyNotificationChannel.Companion.init(this);
+
+ //鍒濆鍖栫Щ鍔ㄦ帹閫�
+ PushService.Companion.init(this);
+
if (instance == null) {
instance = this;
}
@@ -62,8 +74,7 @@
}
/**
- * 2018.11.07 by riku 鑾峰彇鏁版嵁浼犺緭鎺ュ彛璋冪敤鐨勬牴鍦板潃
- * @return
+ * 鑾峰彇鏁版嵁浼犺緭鎺ュ彛璋冪敤鐨勬牴鍦板潃
*/
public Retrofit getRetrofit(){
@@ -74,13 +85,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();
@@ -91,8 +102,7 @@
}
/**
- * 2018.11.07 by riku 鑾峰彇鍥剧墖浼犺緭鎺ュ彛璋冪敤鐨勬牴鍦板潃
- * @return
+ * 鑾峰彇鍥剧墖浼犺緭鎺ュ彛璋冪敤鐨勬牴鍦板潃
*/
public Retrofit getRetrofitImage(){
@@ -102,12 +112,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();
}
@@ -117,13 +127,13 @@
/**
* 鑾峰彇鏁版嵁搴揝ession
- * @return
*/
public DaoSession getDaoSession() {
if (daoSession ==null) {
File path = new File(Environment.getExternalStorageDirectory(), "FlightFeather/third_new.db");
if(!path.exists())
path.getParentFile().mkdirs();
+
//鍒涘缓鏁版嵁搴搒hop.db"
DaoMaster.DevOpenHelper helper = new DaoMaster.DevOpenHelper(getApplicationContext(), path.getAbsolutePath(), null);
//鑾峰彇鍙啓鏁版嵁搴�
@@ -139,30 +149,29 @@
return daoSession;
}
- public boolean isDebugMode() {
- return debugMode;
- }
-
-
/**
- * 2018.11.07 by riku 鑾峰彇褰撳墠鐢ㄦ埛瀵硅薄
- * @return
+ * 鑾峰彇褰撳墠鐢ㄦ埛瀵硅薄
*/
public Userinfo getCurrentUser() {
if (currentUser ==null){
- userinfoDao = this.getDaoSession().getUserinfoDao();
- currentUser = userinfoDao.queryBuilder().unique();
+ UserinfoDao userinfoDao = this.getDaoSession().getUserinfoDao();
+ String userId = GlobalConfig.getInstance().getUserId();
+ if (userId.equals(GlobalConfig.DEFAULT_USER)) {
+ currentUser = userinfoDao.queryBuilder().unique();
+ } else {
+ currentUser = userinfoDao.queryBuilder().where(UserinfoDao.Properties.Guid.eq(userId)).unique();
+ }
}
return currentUser;
}
public void setCurrentUser(Userinfo currentUser) {
+ GlobalConfig.getInstance().setUserId(currentUser.getGuid());
this.currentUser = currentUser;
}
/**
- * 2018.11.07 by riku app鍚姩鏃跺垽鏂槸鍚﹀姞杞藉垵濮嬪寲鏁版嵁瀹屾垚
- * @return
+ * app鍚姩鏃跺垽鏂槸鍚﹀姞杞藉垵濮嬪寲鏁版嵁瀹屾垚
*/
public boolean isLoadPreDataWhenOpen() {
return loadPreDataWhenOpen;
--
Gitblit v1.9.3