diff --git a/app/src/main/java/com/gh/gamecenter/GameDetailActivity.java b/app/src/main/java/com/gh/gamecenter/GameDetailActivity.java index 4ba3dc28dd..272fc48405 100644 --- a/app/src/main/java/com/gh/gamecenter/GameDetailActivity.java +++ b/app/src/main/java/com/gh/gamecenter/GameDetailActivity.java @@ -97,8 +97,8 @@ public class GameDetailActivity extends BaseActivity { private String downloadAddWord; private String downloadOffText; - private String name; - private String title; // TODO wtf? 没有赋值？ + private String name; // 页面位置 + private String title; // 页面标题 private String shareCode; private DataWatcher dataWatcher = new DataWatcher() { @@ -157,7 +157,7 @@ public class GameDetailActivity extends BaseActivity { if (mGameEntity != null) { mGameId = mGameEntity.getId(); mTitle.setText(mGameEntity.getName()); - name = mGameEntity.getName(); + title = mGameEntity.getName(); } } if (mGameEntity != null) { @@ -264,7 +264,7 @@ public class GameDetailActivity extends BaseActivity { mTitle.setText(mGameEntity.getName()); mGameId = response.getId(); - name = mGameEntity.getName(); + title = mGameEntity.getName(); getGameDetail(); } diff --git a/app/src/main/java/com/gh/gamecenter/LibaoActivity.java b/app/src/main/java/com/gh/gamecenter/LibaoActivity.java index 18075fd104..d531c989f3 100644 --- a/app/src/main/java/com/gh/gamecenter/LibaoActivity.java +++ b/app/src/main/java/com/gh/gamecenter/LibaoActivity.java @@ -178,7 +178,7 @@ public class LibaoActivity extends BaseActivity implements View.OnClickListener, // 页面切换事件（查看历史礼包的页面） public void onEventMainThread(EBReuse reuse) { - if ("openPage".equals(reuse.getType())) { //TODO 设置新的TAB + if ("openPage".equals(reuse.getType())) { mLibaoTopLl.setVisibility(View.GONE); mLibaoLine.setVisibility(View.GONE); mHistoryTitle.setVisibility(View.VISIBLE); diff --git a/app/src/main/java/com/gh/gamecenter/LibaoDetailActivity.java b/app/src/main/java/com/gh/gamecenter/LibaoDetailActivity.java index d3d9ddc039..57f4bd9bb6 100644 --- a/app/src/main/java/com/gh/gamecenter/LibaoDetailActivity.java +++ b/app/src/main/java/com/gh/gamecenter/LibaoDetailActivity.java @@ -9,6 +9,7 @@ import com.gh.base.BaseDetailActivity; import com.gh.common.util.*; import com.gh.common.view.VerticalItemDecoration; import com.gh.gamecenter.adapter.LibaoDetailAdapter; +import com.gh.gamecenter.db.LibaoDao; import com.gh.gamecenter.entity.GameEntity; import com.gh.gamecenter.entity.LibaoEntity; import com.gh.gamecenter.eventbus.EBUISwitch; @@ -18,7 +19,10 @@ import retrofit2.HttpException; import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; +import java.text.SimpleDateFormat; import java.util.Calendar; +import java.util.Date; +import java.util.Locale; /** * Created by khy on 2016/12/13. @@ -36,13 +40,21 @@ public class LibaoDetailActivity extends BaseDetailActivity implements LibaoDeta public void handleMessage(Message msg) { super.handleMessage(msg); if (msg.what == 0) { + long time = Utils.getTime(LibaoDetailActivity.this) - 5; // -5 防止获取服务器时间延迟发生的计算错误（） Calendar calendar = Calendar.getInstance(); + Date date = new Date(time*1000); + calendar.setTime(date); calendar.set(Calendar.HOUR_OF_DAY, 24); calendar.set(Calendar.SECOND, 0); calendar.set(Calendar.MINUTE, 0); calendar.set(Calendar.MILLISECOND, 0); - long targetTime = calendar.getTimeInMillis() / 1000; - long delayedTime = (targetTime - Utils.getTime(LibaoDetailActivity.this)) * 1000; + + long targetTime = calendar.getTimeInMillis(); + long delayedTime = targetTime - time*1000; + Utils.log("=========delayedTime::" + delayedTime); + if (BuildConfig.DEBUG) { + toast("领取时间剩余： " + (delayedTime/1000) + " 秒"); + } handler.sendEmptyMessageDelayed(1, delayedTime); } else if (msg.what == 1) { mLibaoEntity.setStatus(mLibaoEntity.getBeforeStatus()); @@ -110,8 +122,13 @@ public class LibaoDetailActivity extends BaseDetailActivity implements LibaoDeta getGameDigest(); String status = mLibaoEntity.getStatus(); if (mLibaoEntity.getRepeat() > 0 && (status.equals("linged") || status.equals("taoed"))) { - TokenUtils.getTime(LibaoDetailActivity.this); - handler.sendEmptyMessageDelayed(0, 5000); + LibaoDao libaoDao = new LibaoDao(this); + if (libaoDao.isCanLing(mLibaoEntity.getLibaoId(), this)) { // 再次检查重复重复领取条件，防止再礼包列表逗留时间过长，导致到了可领取时间 + handler.sendEmptyMessage(1); + } else { + TokenUtils.getTime(LibaoDetailActivity.this); + handler.sendEmptyMessageDelayed(0, 5000); + } } } } diff --git a/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java b/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java index d485c688e5..25f36f85ea 100644 --- a/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java +++ b/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java @@ -5,6 +5,7 @@ import android.app.ActionBar.LayoutParams; import android.content.*; import android.content.SharedPreferences.Editor; import android.net.Uri; +import android.os.Build; import android.os.Bundle; import android.support.v4.content.ContextCompat; import android.support.v4.view.PagerAdapter; @@ -21,6 +22,8 @@ import com.gh.gamecenter.manager.DataCollectionManager; import com.gh.gamecenter.manager.FilterManager; import com.gh.gamecenter.retrofit.JSONObjectResponse; import com.gh.gamecenter.retrofit.RetrofitManager; +import com.readystatesoftware.systembartint.SystemBarTintManager; + import de.greenrobot.event.EventBus; import org.json.JSONException; import org.json.JSONObject; @@ -102,8 +105,11 @@ public class SplashScreenActivity extends BaseActivity { if (isNewFirstLaunch) { ViewPager guideLayout = (ViewPager) findViewById(R.id.splash_intro_vp_guide); guideLayout.setAdapter(new GuidePagerAdapter()); - } else { - getTintManager().setStatusBarTintColor(ContextCompat.getColor(getApplicationContext(), R.color.theme)); + } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT){ + SystemBarTintManager tintManager = getTintManager(); + if (tintManager != null) { + tintManager.setStatusBarTintColor(ContextCompat.getColor(getApplicationContext(), R.color.theme)); + } } } diff --git a/app/src/main/java/com/gh/gamecenter/db/LibaoDao.java b/app/src/main/java/com/gh/gamecenter/db/LibaoDao.java index 7f14bb33aa..5ca2489ada 100644 --- a/app/src/main/java/com/gh/gamecenter/db/LibaoDao.java +++ b/app/src/main/java/com/gh/gamecenter/db/LibaoDao.java @@ -122,6 +122,9 @@ public class LibaoDao { return false; } + /** + * 领取次数 + */ public int repeatedLingedCount(String libaoId) { try { List query = dao.queryBuilder().where().eq("libaoId", libaoId).and().eq("status", "linged").query(); @@ -132,6 +135,9 @@ public class LibaoDao { return 100; } + /** + * 淘号次数 + */ public int repeatedTaoedCount(String libaoId) { try { List query = dao.queryBuilder().where().eq("libaoId", libaoId).and().eq("status", "taoed").query(); @@ -171,4 +177,20 @@ public class LibaoDao { } return false; } + + /** + * 最后礼包领取/淘号的时间 + */ +// public long lastLingTime(String libaoId) { +// try { +// List infos = dao.queryBuilder().orderBy("time", false).where().eq("libaoId", libaoId).query(); +// if (infos.size() > 0) { +// LibaoInfo libaoInfo = infos.get(0); +// return libaoInfo.getTime(); +// } +// } catch (SQLException e) { +// e.printStackTrace(); +// } +// return 0; +// } } diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/FuLiAdapter.java b/app/src/main/java/com/gh/gamecenter/gamedetail/FuLiAdapter.java index dd43ba65b3..3816dcfed9 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/FuLiAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/FuLiAdapter.java @@ -142,7 +142,7 @@ public class FuLiAdapter extends BaseRecyclerAdapter { if (repeat > 0 && libaoDao.isCanLing(libaoEntity.getId(), mContext) && ("ling".equals(beforeStatus) || "tao".equals(beforeStatus))) { // 判断是否可以重复领取 - if ("ling".equals(libaoStatusEntity.getBeforeStatus())) { + if ("ling".equals(beforeStatus)) { if (libaoDao.repeatedLingedCount(libaoStatusEntity.getId()) >= repeat) { libaoEntity.setStatus(libaoStatusEntity.getStatus()); } else { diff --git a/app/src/main/java/com/gh/gamecenter/libao/Libao1FragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/libao/Libao1FragmentAdapter.java index 769a0c9980..b4f837b728 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/Libao1FragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/libao/Libao1FragmentAdapter.java @@ -128,7 +128,6 @@ class Libao1FragmentAdapter extends BaseRecyclerAdapter { @Override public void onFailure(HttpException e) { - Utils.log("getLibao==" + e.toString()); mCallBackListener.loadError(); isNetworkError = true; isLoading = false; @@ -193,7 +192,7 @@ class Libao1FragmentAdapter extends BaseRecyclerAdapter { if (repeat > 0 && mLibaoDao.isCanLing(libaoEntity.getId(), mContext) && ("ling".equals(beforeStatus) || "tao".equals(beforeStatus))) { // 判断是否可以重复领取 - if ("ling".equals(libaoStatusEntity.getBeforeStatus())) { + if ("ling".equals(beforeStatus)) { if (mLibaoDao.repeatedLingedCount(libaoStatusEntity.getId()) >= repeat) { libaoEntity.setStatus(libaoStatusEntity.getStatus()); } else { diff --git a/app/src/main/java/com/gh/gamecenter/retrofit/MessageService.java b/app/src/main/java/com/gh/gamecenter/retrofit/MessageService.java index 6f7f430918..95bf9950f3 100644 --- a/app/src/main/java/com/gh/gamecenter/retrofit/MessageService.java +++ b/app/src/main/java/com/gh/gamecenter/retrofit/MessageService.java @@ -47,5 +47,5 @@ public interface MessageService { @Headers({"Content-Type: application/json", "Accept: application/json"}) @POST("message/user/comment/confirm/read") - Observable postMarkCommentRead(@Header("TOKEN") String token); //提交已读客服消息+ + Observable postMarkCommentRead(@Header("TOKEN") String token); //提交已读评论消息 } diff --git a/app/src/main/res/layout/activity_game_detail.xml b/app/src/main/res/layout/activity_game_detail.xml index e383cf2559..2bd5cc944b 100644 --- a/app/src/main/res/layout/activity_game_detail.xml +++ b/app/src/main/res/layout/activity_game_detail.xml @@ -194,6 +194,7 @@ android:layout_width = "90dp" android:layout_height = "25dp" android:gravity = "center" + android:textColor="@color/title" android:textSize = "12sp" android:text = "@string/game_detail_info" /> diff --git a/app/src/main/res/layout/gamedetail_item_kaifu.xml b/app/src/main/res/layout/gamedetail_item_kaifu.xml index 7be1302e91..27d069eb9c 100644 --- a/app/src/main/res/layout/gamedetail_item_kaifu.xml +++ b/app/src/main/res/layout/gamedetail_item_kaifu.xml @@ -63,7 +63,8 @@ android:layout_weight = "1" android:gravity = "center" android:visibility = "gone" - android:textSize = "12sp" /> + android:textSize = "12sp" + android:textColor = "@color/title"/>