diff --git a/app/release/app-release.apk b/app/release/app-release.apk index 455dd7d..41a4304 100644 Binary files a/app/release/app-release.apk and b/app/release/app-release.apk differ diff --git a/app/src/main/java/com/zcshou/gogogo/MainActivity.java b/app/src/main/java/com/zcshou/gogogo/MainActivity.java index b2d3f72..21c9bab 100644 --- a/app/src/main/java/com/zcshou/gogogo/MainActivity.java +++ b/app/src/main/java/com/zcshou/gogogo/MainActivity.java @@ -184,7 +184,9 @@ public class MainActivity extends AppCompatActivity private boolean isSubmit; private SuggestionSearch mSuggestionSearch; - Date mDate; + // 时间 + private Date mDate; + private long mWelDT; //log debug private static final Logger log = Logger.getLogger(MainActivity.class); @@ -305,6 +307,8 @@ public class MainActivity extends AppCompatActivity setUserLimitInfo(); + mWelDT = getIntent().getLongExtra("DT", 0); + TimeTask timeTask = new TimeTask(); ExecutorService threadExecutor = Executors.newSingleThreadExecutor(); diff --git a/app/src/main/java/com/zcshou/gogogo/WelcomeActivity.java b/app/src/main/java/com/zcshou/gogogo/WelcomeActivity.java index a15b3ab..95edc53 100644 --- a/app/src/main/java/com/zcshou/gogogo/WelcomeActivity.java +++ b/app/src/main/java/com/zcshou/gogogo/WelcomeActivity.java @@ -22,6 +22,7 @@ import android.widget.Button; import com.zcshou.service.GoSntpClient; import java.util.ArrayList; +import java.util.Date; import java.util.Locale; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; @@ -35,6 +36,7 @@ public class WelcomeActivity extends AppCompatActivity { boolean isLimit; static final int SDK_PERMISSION_REQUEST = 127; ArrayList ReqPermissions = new ArrayList<>(); + private Date mDate; @Override protected void onCreate(Bundle savedInstanceState) { @@ -124,13 +126,16 @@ public class WelcomeActivity extends AppCompatActivity { } private void startMainActivity() { - if (isPermission && isLimit) { + if (isPermission && !isLimit) { Intent intent = new Intent(WelcomeActivity.this, MainActivity.class); + if (mDate == null) { + intent.putExtra("DT", 0); + } else { + intent.putExtra("DT", mDate.getTime() / 1000); + } startActivity(intent); - WelcomeActivity.this.finish(); - } else { - WelcomeActivity.this.finish(); } + WelcomeActivity.this.finish(); } @TargetApi(23) @@ -229,8 +234,9 @@ public class WelcomeActivity extends AppCompatActivity { for (i = 0; i < ntpServerPool.length; i++) { if (GoSntpClient.requestTime(ntpServerPool[i], 30000)) { long now = GoSntpClient.getNtpTime() + SystemClock.elapsedRealtime() - GoSntpClient.getNtpTimeReference(); + mDate = new Date(now); if (now /1000 < mTS) { - isLimit = true; + isLimit = false; } break; }