From 32f1fab3ce19db6539030c5e574212552a3f3abc Mon Sep 17 00:00:00 2001
From: weimingfei <fei_gaming@sina.com>
Date: 星期五, 31 十月 2025 12:07:57 +0800
Subject: [PATCH] 钥匙柜
---
keyCabinet-android/app/src/main/res/layout/main_activity.xml | 30 +++---
keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/utils/update/UpdateDialog.java | 2
keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/keyCabinet/KeyCabinetActivity.java | 39 ++++-----
keyCabinet-android/app/src/main/res/layout/face_activity.xml | 12 +-
keyCabinet-android/app/src/main/res/layout/manage_login_activity.xml | 4
keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/main/MainVM.java | 10 --
keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/utils/update/UpdateUtil.java | 6
keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/keyCabinet/ManageCabinetActivity.java | 7 -
keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/utils/CrashHandler.java | 37 +++++---
keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/utils/face/FaceSDKManager.java | 2
keyCabinet-android/app/src/main/AndroidManifest.xml | 10 +-
keyCabinet-android/lib_coremodel/src/main/java/com/doumee/lib_coremodel/util/SpUtil.java | 10 ++
keyCabinet-android/app/build.gradle | 4
keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/main/MainActivity.java | 41 +++++-----
14 files changed, 109 insertions(+), 105 deletions(-)
diff --git a/keyCabinet-android/app/build.gradle b/keyCabinet-android/app/build.gradle
index 903c1df..ff276e1 100644
--- a/keyCabinet-android/app/build.gradle
+++ b/keyCabinet-android/app/build.gradle
@@ -10,8 +10,8 @@
applicationId "com.doumee.keyCabinet"
minSdkVersion build_versions.min_sdk
targetSdkVersion build_versions.target_sdk
- versionCode 1
- versionName "1.0.0"
+ versionCode 2
+ versionName "1.0.1"
//鏀寔vectorDrawables鐭㈤噺鍥�
vectorDrawables.useSupportLibrary = true
diff --git a/keyCabinet-android/app/src/main/AndroidManifest.xml b/keyCabinet-android/app/src/main/AndroidManifest.xml
index 31877b1..9b7b0e1 100644
--- a/keyCabinet-android/app/src/main/AndroidManifest.xml
+++ b/keyCabinet-android/app/src/main/AndroidManifest.xml
@@ -76,19 +76,19 @@
android:resource="@xml/provider_paths" />
</provider>
- <receiver
+ <!--<receiver
android:name="com.doumee.keyCabinet.ui.service.BootCompleteReceiver"
android:enabled="true"
android:exported="true">
- <!-- 鎺ユ敹鍚姩瀹屾垚鐨勫箍鎾� -->
+ <!– 鎺ユ敹鍚姩瀹屾垚鐨勫箍鎾� –>
<intent-filter android:priority="1000">
<action android:name="android.intent.action.BOOT_COMPLETED" />
</intent-filter>
- </receiver>
+ </receiver>-->
- <service android:name="com.doumee.keyCabinet.ui.service.HeartbeatService" />
- <service android:name="com.doumee.keyCabinet.ui.service.FaceUpdateService" />
+ <!--<service android:name="com.doumee.keyCabinet.ui.service.HeartbeatService" />
+ <service android:name="com.doumee.keyCabinet.ui.service.FaceUpdateService" />-->
<uses-library
android:name="org.apache.http.legacy"
diff --git a/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/keyCabinet/KeyCabinetActivity.java b/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/keyCabinet/KeyCabinetActivity.java
index 77415dc..2377446 100644
--- a/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/keyCabinet/KeyCabinetActivity.java
+++ b/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/keyCabinet/KeyCabinetActivity.java
@@ -169,7 +169,7 @@
downTime = 60;
break;
case 2:
- getDB().clTip1.setVisibility(View.GONE);
+ //getDB().clTip1.setVisibility(View.GONE);
if(status==0) {
//閲嶆柊寮�闂�
openTime = StringUtil.DateToStr(new Date());
@@ -321,8 +321,7 @@
return;
}
isOpened = true;
- Toast.makeText(mContext, "鎿嶄綔4", Toast.LENGTH_LONG).show();
- doRegister(4, null);
+ getVM().doAction(4);
} else {
//澶辫触
//濡傛灉鏄挜鍖欎笉瀵圭户缁紑闂�
@@ -335,12 +334,12 @@
}
if (!gridDo.getCurKeyCode().equals(selectBean.getKeyCode())) {
//閽ュ寵涓嶅尮閰�
- doRegister(10,null);
+ getVM().doAction(10,null);
EventBus.getDefault().post(new OpenGridEvent(selectBean.getChannelCode(), selectBean.getBoardCode()));
return;
}
}
- doRegister(3, null);
+ getVM().doAction(3);
}
}
}
@@ -385,18 +384,17 @@
if (gridDo.getCurKeyCode().equals(selectBean.getKeyCode())) {
//棰嗗彇澶辫触
isOpened = false;
- doRegister(6, null);
+ getVM().doAction(6);
getVM().closeGrid(gridDo);
}else {
//閽ュ寵涓嶅尮閰�
- //Toast.makeText(mContext, "鎿嶄綔10", Toast.LENGTH_LONG).show();
- doRegister(10,null);
+ getVM().doAction(10,null);
EventBus.getDefault().post(new OpenGridEvent(selectBean.getChannelCode(), selectBean.getBoardCode()));
}
} else {
//閽ュ寵鎷胯蛋浜�
isOpened = false;
- doRegister(5, null);
+ getVM().doAction(5);
getVM().closeGrid(gridDo);
}
}else {
@@ -422,17 +420,17 @@
if (gridDo.getCurKeyCode().equals(selectBean.getKeyCode())) {
//鐩稿悓褰掕繕鎴愬姛
isOpened = false;
- doRegister(8, null);
+ getVM().doAction(8);
getVM().closeGrid(gridDo);
}else {
//閽ュ寵涓嶅尮閰�
- doRegister(10,null);
+ getVM().doAction(10,null);
EventBus.getDefault().post(new OpenGridEvent(selectBean.getChannelCode(), selectBean.getBoardCode()));
}
} else {
//閽ュ寵鏈綊杩�
isOpened = false;
- doRegister(9, null);
+ getVM().doAction(9);
getVM().closeGrid(gridDo);
}
}else {
@@ -488,25 +486,24 @@
if (gridDo.getCurKeyCode().equals(selectBean.getKeyCode())) {
//棰嗗彇澶辫触
isOpened = false;
- doRegister(6, null);
+ getVM().doAction(6);
getVM().closeGrid(gridDo);
}else {
//閽ュ寵涓嶅尮閰�
- //Toast.makeText(mContext, "鎿嶄綔10", Toast.LENGTH_LONG).show();
- doRegister(10,null);
+ getVM().doAction(10);
EventBus.getDefault().post(new OpenGridEvent(selectBean.getChannelCode(), selectBean.getBoardCode()));
}
} else {
//閽ュ寵鎷胯蛋浜�
isOpened = false;
- doRegister(5, null);
+ getVM().doAction(5);
getVM().closeGrid(gridDo);
}
}else {
//娌″叧闂�
if(TextUtils.isEmpty(gridDo.getCurKeyCode())){
//绌轰簡
- doRegister(7,null);
+ getVM().doAction(7);
}
}
}else {
@@ -522,24 +519,24 @@
if (gridDo.getCurKeyCode().equals(selectBean.getKeyCode())) {
//鐩稿悓褰掕繕鎴愬姛
isOpened = false;
- doRegister(8, null);
+ getVM().doAction(8);
getVM().closeGrid(gridDo);
}else {
//閽ュ寵涓嶅尮閰�
- doRegister(10,null);
+ getVM().doAction(10);
EventBus.getDefault().post(new OpenGridEvent(selectBean.getChannelCode(), selectBean.getBoardCode()));
}
} else {
//閽ュ寵鏈綊杩�
isOpened = false;
- doRegister(9, null);
+ getVM().doAction(9);
getVM().closeGrid(gridDo);
}
}else {
//娌″叧闂�
if(!TextUtils.isEmpty(gridDo.getCurKeyCode())){
//鏈夐挜鍖欎簡
- doRegister(7,null);
+ getVM().doAction(7);
}
}
} else {
diff --git a/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/keyCabinet/ManageCabinetActivity.java b/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/keyCabinet/ManageCabinetActivity.java
index 3ffcd14..7ab3232 100644
--- a/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/keyCabinet/ManageCabinetActivity.java
+++ b/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/keyCabinet/ManageCabinetActivity.java
@@ -184,11 +184,6 @@
for(int i=0;i<updateList.size();i++){
upList[i] = updateList.get(i);
}
- //todo 鍘绘帀
- CabinetGridDo gridDo = oldMap.get("0101");
- if(gridDo!=null){
- EventBus.getDefault().post(new HttpEvent(StringUtil.DateToStrSS(new Date())+"=================>鏇存柊鏁版嵁褰撳墠閽ュ寵2锛�"+gridDo.getCurKeyCode()));
- }
DaoManager.getCabinetGridDao().update(upList);
}
@@ -359,7 +354,7 @@
}
if(isShowOpenTip){
if(openTipDownCount==0){
- doRegister(9,null);
+ getVM().doAction(9);
}else {
openTipDownCount--;
getDB().tvClKmClose.setText(openTipDownCount+"s 鑷姩鍏抽棴");
diff --git a/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/main/MainActivity.java b/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/main/MainActivity.java
index 91128eb..2584140 100644
--- a/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/main/MainActivity.java
+++ b/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/main/MainActivity.java
@@ -10,6 +10,7 @@
import android.graphics.drawable.BitmapDrawable;
import android.hardware.Camera;
import android.opengl.Visibility;
+import android.os.Build;
import android.os.Bundle;
import android.os.Handler;
import android.os.Message;
@@ -210,12 +211,12 @@
getDB().setModel(getVM());
initRGBCheck();
handler.sendEmptyMessageDelayed(0, 1000);
- //鍚姩蹇冭烦
+ /*//鍚姩蹇冭烦
Intent intent = new Intent(MainActivity.this, HeartbeatService.class);
startService(intent);
//鍚姩鏇存柊浜鸿劯
Intent intent2 = new Intent(MainActivity.this, FaceUpdateService.class);
- startService(intent2);
+ startService(intent2);*/
getPermission();
Timber.tag("====>").d(LMobileInfo.getDeviceUniqueId());
}
@@ -229,10 +230,10 @@
long availableMemory = memoryInfo.availMem/(1024*1024);
long usedMemory = totalMemory - availableMemory;
//getDB().tvM.setText("鎬诲唴瀛橈細"+totalMemory+",浣跨敤鍐呭瓨锛�"+usedMemory+",鍙敤鍐呭瓨锛�"+availableMemory);
- if((availableMemory<400&&showTime!=null&&(System.currentTimeMillis()-showTime>5000))||
+ if((availableMemory<100&&showTime!=null&&(System.currentTimeMillis()-showTime>5000))||
("02:00:00".equals(StringUtil.getHM()))){
//鍙敤鍐呭瓨灏忎簬400M,鎴栬�呮瘡澶╁噷鏅�2鐐癸紝閲嶅惎app
- //restartApp();
+ restartApp();
}
}
@@ -316,14 +317,15 @@
getDB().imgLeft.setOnClickListener(new View.OnClickListener() {
@Override
- public void onClick(View v) {
+ public void onClick(View v1) {
//todo 涓存椂浠ｇ爜
if (getDB().nsv.getVisibility()== View.VISIBLE) {
getDB().nsv.setVisibility(View.GONE);
}else {
getDB().nsv.setVisibility(View.VISIBLE);
}
-
+ YNHAPI mAPI = YNHAPI.getInstance();
+ mAPI.setNavigationBarVisibility(YNHAPI.NavigationBarVisibility.VISIBLE);
}
});
upErrInfo();
@@ -470,6 +472,7 @@
isShowing = true;
YNHAPI mAPI = YNHAPI.getInstance();
mAPI.setNavigationBarVisibility(YNHAPI.NavigationBarVisibility.ALWAYS_INVISIBLE);
+ mAPI.setBootLaunchApk("com.doumee.keyCabinet", true);
showTime = System.currentTimeMillis();
if(!isFaceOk) {
initLicense();
@@ -1174,6 +1177,8 @@
//瀹氭椂鎷夊彇鍩烘湰淇℃伅
getVM().devLogin();
getPermission();
+ getVM().devHeart();
+ EventBus.getDefault().post(new GetFacesEvent());
}else {
loopDownCount--;
}
@@ -1375,7 +1380,7 @@
EventBus.getDefault().post(new CloseGridOneResultEvent(key,"00".equals(open)?1:0));
if(isShowing&&isShowTip){
//淇敼鏄剧ず鎻愰啋
- doRegister(5,null);
+ getVM().doAction(5);
}
}else if(data.startsWith("80")){
//鏌ヨ鎵�鏈夐棬鐘舵��
@@ -1470,7 +1475,7 @@
keyPreviousData = data;
}else if(data.startsWith("CC02")){
runOnUiThread(() -> {
- //getVM().addInfo("鑾峰彇鍒伴挜鍖欐暟鎹�:" + data);
+ getVM().addInfo("鑾峰彇鍒伴挜鍖欐暟鎹�:" + data);
jxKey(data);
});
keyPreviousData = null;
@@ -1478,7 +1483,7 @@
if(!TextUtils.isEmpty(keyPreviousData)){
String data2 = keyPreviousData+data;
runOnUiThread(() -> {
- //getVM().addInfo("鑾峰彇鍒伴挜鍖欐暟鎹�:" + data2);
+ getVM().addInfo("鑾峰彇鍒伴挜鍖欐暟鎹�:" + data2);
if(data2.contains("CC01")&&data2.contains("CC02")){
String[] sp = data2.split("CC02");
if(sp.length==2){
@@ -1538,12 +1543,6 @@
updateList.add(gridDo);
}
}
- }
- //todo 鍘绘帀
- CabinetGridDo gridDo = oldMap.get("0101");
- if(gridDo!=null) {
- EventBus.getDefault().post(new HttpEvent(StringUtil.DateToStrSS(new Date())+
- "=================>鏇存柊鏁版嵁褰撳墠閽ュ寵7锛�" + gridDo.getCurKeyCode()));
}
getVM().updateGrids(updateList);
@@ -1748,15 +1747,15 @@
private boolean isInitPort;
//鍒濆鍖栦覆鍙�
private void initPort(){
- SpUtil.setString("port_grid","/dev/ttyS7");
- SpUtil.setString("port_key","/dev/ttyS1");
- SpUtil.setString("port_jiu","/dev/ttyS2");
+ //SpUtil.setString("port_grid","/dev/ttyS7");
+ //SpUtil.setString("port_key","/dev/ttyS1");
+ //SpUtil.setString("port_jiu","/dev/ttyS2");
gridPath = SpUtil.getString("port_grid");
- //getVM().addInfo("闂ㄤ覆鍙ｉ摼鎺ワ細"+gridPath);
+ getVM().addInfo("闂ㄤ覆鍙ｉ摼鎺ワ細"+gridPath);
keyPath = SpUtil.getString("port_key");
- //getVM().addInfo("閽ュ寵涓插彛閾炬帴锛�"+keyPath);
+ getVM().addInfo("閽ュ寵涓插彛閾炬帴锛�"+keyPath);
jiuPath = SpUtil.getString("port_jiu");
- //getVM().addInfo("閰掔簿涓插彛閾炬帴锛�"+jiuPath);
+ getVM().addInfo("閰掔簿涓插彛閾炬帴锛�"+jiuPath);
if(!TextUtils.isEmpty(SpUtil.getString("port_grid"))&&
!TextUtils.isEmpty(SpUtil.getString("port_key"))&&
!TextUtils.isEmpty(SpUtil.getString("port_jiu"))){
diff --git a/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/main/MainVM.java b/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/main/MainVM.java
index b9c2d26..40f82bc 100644
--- a/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/main/MainVM.java
+++ b/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/main/MainVM.java
@@ -71,7 +71,6 @@
public void devLogin(){
//娓呴櫎鐧诲綍淇℃伅
- MApplication.saveConfigBean(new DevConfigBean());
EventBus.getDefault().post(new HttpEvent("鑾峰彇閽ュ寵鏌滃熀鏈俊鎭�-璇锋眰"));
getRetrofitService(Apis.class).getCabinetInfoForDriver(LMobileInfo.getDeviceUniqueId())
.compose(RxUtils.schedulersTransformer())
@@ -89,6 +88,7 @@
toast(MApplication.mContext.getString(R.string.guide_toast_1));
}
}else {
+ MApplication.saveConfigBean(new DevConfigBean());
toast(response.getMessage());
}
}
@@ -156,12 +156,6 @@
}
if(addList.size()>0){
DaoManager.getCabinetGridDao().insert(addList);
- }
-
- //todo 鍘绘帀
- CabinetGridDo gridDo = oldMap.get("0101");
- if(gridDo!=null){
- EventBus.getDefault().post(new HttpEvent(StringUtil.DateToStrSS(new Date())+"=================>鏇存柊鏁版嵁褰撳墠閽ュ寵1锛�"+gridDo.getCurKeyCode()));
}
if(updateList.size()>0){
@@ -330,7 +324,7 @@
.subscribe(new SimpleObserver<BaseResponse>(rxJavaGcManager) {
@Override
public void onNext(@NonNull BaseResponse response) {
- toast("鍏抽棬鎺ュ彛璋冪敤鎴愬姛");
+
}
@Override
diff --git a/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/utils/CrashHandler.java b/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/utils/CrashHandler.java
index 56a801a..2eb455d 100644
--- a/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/utils/CrashHandler.java
+++ b/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/utils/CrashHandler.java
@@ -14,6 +14,7 @@
import com.doumee.keyCabinet.ui.guide.GuideActivity;
import com.doumee.keyCabinet.ui.main.MainActivity;
import com.doumee.lib_coremodel.util.SpUtil;
+import com.innohi.YNHAPI;
import java.io.BufferedWriter;
import java.io.ByteArrayOutputStream;
@@ -86,22 +87,30 @@
public void uncaughtException(Thread thread, Throwable ex) {
try {
//瀵煎嚭寮傚父淇℃伅鍒癝D鍗′腑
+ YNHAPI mAPI = YNHAPI.getInstance();
+ mAPI.setNavigationBarVisibility(YNHAPI.NavigationBarVisibility.VISIBLE);
dumpExceptionToSDCard(ex);
- //System.out.println("閲嶅惎搴旂敤");
- // 鍒涘缓涓�涓柊鐨勫惎鍔ㄦ剰鍥�
- /*Intent intent = new Intent(mContext, MainActivity.class);
- // 璁剧疆FLAG_ACTIVITY_CLEAR_TASK鏍囧織浣�
- intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
- // 浣跨敤PendingIntent鍖呰鍚姩鎰忓浘
- PendingIntent pendingIntent = PendingIntent.getActivity(mContext, 0, intent, PendingIntent.FLAG_ONE_SHOT);
- // 鑾峰彇AlarmManager瀹炰緥
- AlarmManager alarmManager = (AlarmManager) mContext.getSystemService(Context.ALARM_SERVICE);
- // 鍦�500姣鍚庤Е鍙戦噸鍚搷浣�
- alarmManager.set(AlarmManager.RTC, System.currentTimeMillis() + 10, pendingIntent);
+ long time = SpUtil.getLong("err_app");
+ SpUtil.saveLong("err_app",System.currentTimeMillis());
+ if(System.currentTimeMillis()-time>60000){
+ //鎶ラ敊闂撮殧60绉掞紝鎵嶉噸鍚�
+ //System.out.println("閲嶅惎搴旂敤");
+ // 鍒涘缓涓�涓柊鐨勫惎鍔ㄦ剰鍥�
+ Intent intent = new Intent(mContext, MainActivity.class);
+ // 璁剧疆FLAG_ACTIVITY_CLEAR_TASK鏍囧織浣�
+ intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
+ // 浣跨敤PendingIntent鍖呰鍚姩鎰忓浘
+ PendingIntent pendingIntent = PendingIntent.getActivity(mContext, 0, intent, PendingIntent.FLAG_ONE_SHOT);
+ // 鑾峰彇AlarmManager瀹炰緥
+ AlarmManager alarmManager = (AlarmManager) mContext.getSystemService(Context.ALARM_SERVICE);
+ // 鍦�500姣鍚庤Е鍙戦噸鍚搷浣�
+ alarmManager.set(AlarmManager.RTC, System.currentTimeMillis() + 10, pendingIntent);
- android.os.Process.killProcess(android.os.Process.myPid());
- System.exit(1);*/
+ android.os.Process.killProcess(android.os.Process.myPid());
+ System.exit(1);
+ }
//杩欓噷鍙互閫氳繃缃戠粶涓婁紶寮傚父淇℃伅鍒版湇鍔″櫒锛屼究浜庡紑鍙戜汉鍛樺垎鏋愭棩蹇椾粠鑰岃В鍐砨ug
+
} catch (IOException e) {
e.printStackTrace();
System.out.println("閿欒鏃ュ織1"+e.getMessage());
@@ -263,7 +272,7 @@
dumpPhoneInfo(print);
print.println();
ex.printStackTrace(print);
- SpUtil.saveString(FILE_NAME+time,new String(out.toByteArray()));
+ //SpUtil.saveString(FILE_NAME+time,new String(out.toByteArray()));
print.close();
} catch (Exception e) {
e.printStackTrace();
diff --git a/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/utils/face/FaceSDKManager.java b/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/utils/face/FaceSDKManager.java
index 1849b2c..ae6dbef 100644
--- a/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/utils/face/FaceSDKManager.java
+++ b/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/utils/face/FaceSDKManager.java
@@ -66,7 +66,7 @@
}
return;
}
- // todo 澧炲姞鍒ょ┖澶勭悊
+
if (listener != null) {
listener.initStart();
}
diff --git a/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/utils/update/UpdateDialog.java b/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/utils/update/UpdateDialog.java
index 3f6aba7..7ae003d 100644
--- a/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/utils/update/UpdateDialog.java
+++ b/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/utils/update/UpdateDialog.java
@@ -55,7 +55,7 @@
}
}
});
- getWritePermision();
+ //getWritePermision();
}
public void setOnOtemListener(UpdialogListener lister) {
diff --git a/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/utils/update/UpdateUtil.java b/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/utils/update/UpdateUtil.java
index 91cc7d3..3ee3621 100644
--- a/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/utils/update/UpdateUtil.java
+++ b/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/utils/update/UpdateUtil.java
@@ -153,8 +153,8 @@
@Override
public void setOnclickUpdate() {
- //updateDialog.hide();
- /*downloadDialog = new DownloadDialog(activity, upgradeurl);
+ updateDialog.hide();
+ downloadDialog = new DownloadDialog(activity, upgradeurl);
downloadDialog.show();
downloadDialog.setCanceledOnTouchOutside(false);
downloadDialog.setUpdateDialog(updateDialog);
@@ -171,7 +171,7 @@
}
return false;
}
- });*/
+ });
}
@Override
diff --git a/keyCabinet-android/app/src/main/res/layout/face_activity.xml b/keyCabinet-android/app/src/main/res/layout/face_activity.xml
index e01bded..bd91c0e 100644
--- a/keyCabinet-android/app/src/main/res/layout/face_activity.xml
+++ b/keyCabinet-android/app/src/main/res/layout/face_activity.xml
@@ -702,10 +702,10 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/shape_jiujin_ok"
- android:paddingLeft="80dp"
- android:paddingRight="80dp"
- android:paddingTop="50dp"
- android:paddingBottom="50dp"
+ android:paddingLeft="60dp"
+ android:paddingRight="60dp"
+ android:paddingTop="40dp"
+ android:paddingBottom="40dp"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -714,8 +714,8 @@
<pl.droidsonroids.gif.GifImageView
android:id="@+id/img_progress"
- android:layout_width="150dp"
- android:layout_height="150dp"
+ android:layout_width="90dp"
+ android:layout_height="90dp"
android:src="@mipmap/zhuanquan"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
diff --git a/keyCabinet-android/app/src/main/res/layout/main_activity.xml b/keyCabinet-android/app/src/main/res/layout/main_activity.xml
index 36f24dc..4b4fc50 100644
--- a/keyCabinet-android/app/src/main/res/layout/main_activity.xml
+++ b/keyCabinet-android/app/src/main/res/layout/main_activity.xml
@@ -22,21 +22,6 @@
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"/>
- <TextView
- android:id="@+id/tv_m"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="鍐呭瓨"
- android:textSize="30sp"
- android:textColor="@color/white"
- android:gravity="center"
- app:layout_constraintTop_toTopOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- android:paddingLeft="0dp"
- android:paddingRight="10dp"
- android:visibility="gone"
- />
-
<com.facebook.drawee.view.SimpleDraweeView
android:id="@+id/img1"
android:layout_width="match_parent"
@@ -420,5 +405,20 @@
app:layout_constraintStart_toStartOf="parent"
/>
+ <TextView
+ android:id="@+id/tv_m"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text=""
+ android:textSize="30sp"
+ android:textColor="@color/black"
+ android:gravity="center"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ android:paddingLeft="0dp"
+ android:paddingRight="10dp"
+ android:visibility="gone"
+ />
+
</androidx.constraintlayout.widget.ConstraintLayout>
</layout>
\ No newline at end of file
diff --git a/keyCabinet-android/app/src/main/res/layout/manage_login_activity.xml b/keyCabinet-android/app/src/main/res/layout/manage_login_activity.xml
index c40e433..12b356e 100644
--- a/keyCabinet-android/app/src/main/res/layout/manage_login_activity.xml
+++ b/keyCabinet-android/app/src/main/res/layout/manage_login_activity.xml
@@ -88,7 +88,7 @@
android:layout_width="0dp"
android:layout_height="75dp"
android:background="@null"
- android:text="18656077929"
+ android:text=""
android:textColor="#111111"
android:hint="璇疯緭鍏ョ櫥褰曡处鍙�"
android:textColorHint="#999999"
@@ -138,7 +138,7 @@
android:layout_width="0dp"
android:layout_height="75dp"
android:background="@null"
- android:text="Whyc2025"
+ android:text=""
android:hint="璇疯緭鍏ヨ处鍙峰瘑鐮�"
android:textColorHint="#999999"
android:textSize="24sp"
diff --git a/keyCabinet-android/lib_coremodel/src/main/java/com/doumee/lib_coremodel/util/SpUtil.java b/keyCabinet-android/lib_coremodel/src/main/java/com/doumee/lib_coremodel/util/SpUtil.java
index d3eeb11..c071a81 100644
--- a/keyCabinet-android/lib_coremodel/src/main/java/com/doumee/lib_coremodel/util/SpUtil.java
+++ b/keyCabinet-android/lib_coremodel/src/main/java/com/doumee/lib_coremodel/util/SpUtil.java
@@ -104,6 +104,16 @@
return getSharedPreferences().getInt(key, 0);
}
+ public static void saveLong(String key, Long value){
+ SharedPreferences.Editor editor = getSharedPreferences().edit();
+ editor.putLong(key, value);
+ editor.commit();
+ }
+
+ public static Long getLong(String key){
+ return getSharedPreferences().getLong(key, 0L);
+ }
+
public static boolean getBoolean(String key){
return getSharedPreferences().getBoolean(key, false);
}
--
Gitblit v1.9.3