From 0cc81c61f36d0072b6252737e3d106ba0d4518a3 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 31 十月 2025 10:10:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao

---
 keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/MApplication.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/MApplication.java b/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/MApplication.java
index fb4269e..dd5309b 100644
--- a/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/MApplication.java
+++ b/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/MApplication.java
@@ -143,7 +143,7 @@
     }
 
     private static CountTimerCallBack timerCallBack;
-    public static void initCountTimer(boolean isToGuild,CountTimerCallBack callBack){
+    public static void initCountTimer(long time,CountTimerCallBack callBack){
         if(countTimer!=null){
             countTimer.cancel();
         }
@@ -154,7 +154,7 @@
             return;
         }
         timerCallBack = callBack;
-        countTimer = new CountDownTimer(60*1000, 1*1000) {
+        countTimer = new CountDownTimer(time, 1*1000) {
             @Override
             public void onTick(long millisUntilFinished) {
                 //Timber.tag("CountTimer==>").d(millisUntilFinished+"");

--
Gitblit v1.9.3