diff --git a/app/src/main/java/com/gh/common/util/RandomUtils.java b/app/src/main/java/com/gh/common/util/RandomUtils.java index 2de48acbec..dde7320885 100644 --- a/app/src/main/java/com/gh/common/util/RandomUtils.java +++ b/app/src/main/java/com/gh/common/util/RandomUtils.java @@ -1,5 +1,6 @@ package com.gh.common.util; +import java.math.BigDecimal; import java.util.Random; /** @@ -41,4 +42,13 @@ public class RandomUtils { return random.nextInt(size); } + /** + * 四舍五入取整 + * @return + */ + public static int getInt(double d) { + BigDecimal bigDecimal = new BigDecimal(d).setScale(0, BigDecimal.ROUND_HALF_UP); + return bigDecimal.intValue(); + } + } diff --git a/app/src/main/java/com/gh/gamecenter/LibaoActivity.java b/app/src/main/java/com/gh/gamecenter/LibaoActivity.java index 40ba398bb6..bfecee0cc5 100644 --- a/app/src/main/java/com/gh/gamecenter/LibaoActivity.java +++ b/app/src/main/java/com/gh/gamecenter/LibaoActivity.java @@ -16,6 +16,7 @@ import com.gh.base.BaseActivity; import com.gh.base.adapter.FragmentAdapter; import com.gh.common.util.DisplayUtils; import com.gh.common.util.EntranceUtils; +import com.gh.common.util.RandomUtils; import com.gh.gamecenter.eventbus.EBReuse; import com.gh.gamecenter.eventbus.EBUISwitch; import com.gh.gamecenter.libao.Libao1Fragment; @@ -91,7 +92,7 @@ public class LibaoActivity extends BaseActivity implements View.OnClickListener, width = outMetrics.widthPixels / 3; lparams = new LinearLayout.LayoutParams(width / 2, DisplayUtils.dip2px(this, 2)); - lparams.leftMargin = (int) (width * (currentItem + 0.25)); + lparams.leftMargin = RandomUtils.getInt(width * (currentItem + 0.25)); mLibaoLine.setLayoutParams(lparams); mLibaoTopLl.postDelayed(new Runnable() { @@ -117,7 +118,7 @@ public class LibaoActivity extends BaseActivity implements View.OnClickListener, @Override public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) { if (positionOffset != 0) { - lparams.leftMargin = (int) (width * (position + positionOffset + 0.25)); + lparams.leftMargin = RandomUtils.getInt(width * (position + positionOffset + 0.25)); mLibaoLine.setLayoutParams(lparams); } else { if (currentItem != mLibaoVp.getCurrentItem()) { diff --git a/app/src/main/java/com/gh/gamecenter/collection/CollectionFragment.java b/app/src/main/java/com/gh/gamecenter/collection/CollectionFragment.java index eaf861de6b..f8f1e7b304 100644 --- a/app/src/main/java/com/gh/gamecenter/collection/CollectionFragment.java +++ b/app/src/main/java/com/gh/gamecenter/collection/CollectionFragment.java @@ -8,6 +8,7 @@ import android.widget.LinearLayout; import com.gh.base.fragment.BaseFragment_ViewPager_Checkable; import com.gh.common.util.DisplayUtils; +import com.gh.common.util.RandomUtils; import com.gh.gamecenter.R; import java.util.List; @@ -68,7 +69,7 @@ public class CollectionFragment extends BaseFragment_ViewPager_Checkable { getActivity().getWindowManager().getDefaultDisplay().getMetrics(outMetrics); mWindowWidth = outMetrics.widthPixels / 2; mLayoutParams = new LinearLayout.LayoutParams(mWindowWidth / 2, DisplayUtils.dip2px(getContext(), 2)); - mLayoutParams.leftMargin = mWindowWidth / 4; + mLayoutParams.leftMargin = RandomUtils.getInt(mWindowWidth / 4f); mSlideLine.setLayoutParams(mLayoutParams); } @@ -76,7 +77,8 @@ public class CollectionFragment extends BaseFragment_ViewPager_Checkable { public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) { super.onPageScrolled(position, positionOffset, positionOffsetPixels); if (positionOffset != 0) { - mLayoutParams.leftMargin = (int) (mWindowWidth * (position + positionOffset + 0.25)); + double i = mWindowWidth * (position + positionOffset + 0.25); + mLayoutParams.leftMargin = RandomUtils.getInt(i); mSlideLine.setLayoutParams(mLayoutParams); } } diff --git a/app/src/main/java/com/gh/gamecenter/download/DownloadFragment.java b/app/src/main/java/com/gh/gamecenter/download/DownloadFragment.java index 81131e071a..e2629df673 100644 --- a/app/src/main/java/com/gh/gamecenter/download/DownloadFragment.java +++ b/app/src/main/java/com/gh/gamecenter/download/DownloadFragment.java @@ -10,6 +10,7 @@ import android.widget.TextView; import com.gh.base.fragment.BaseFragment_ViewPager_Checkable; import com.gh.common.util.DisplayUtils; +import com.gh.common.util.RandomUtils; import com.gh.download.DownloadManager; import com.gh.gamecenter.DownloadManagerActivity; import com.gh.gamecenter.R; @@ -92,9 +93,9 @@ public class DownloadFragment extends BaseFragment_ViewPager_Checkable { final DisplayMetrics outMetrics = new DisplayMetrics(); getActivity().getWindowManager().getDefaultDisplay().getMetrics(outMetrics); mWindowWidth = outMetrics.widthPixels / 3; - mLayoutParams = new LinearLayout.LayoutParams((int) (mWindowWidth * 0.8), + mLayoutParams = new LinearLayout.LayoutParams((int) (mWindowWidth * 0.8f), DisplayUtils.dip2px(getContext(), 2)); - mLayoutParams.leftMargin = (int) (mWindowWidth * (mCheckedIndex + 0.1)); + mLayoutParams.leftMargin = RandomUtils.getInt(mWindowWidth * (mCheckedIndex + 0.1f)); } @@ -126,7 +127,7 @@ public class DownloadFragment extends BaseFragment_ViewPager_Checkable { public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) { super.onPageScrolled(position, positionOffset, positionOffsetPixels); if (positionOffset != 0) { - mLayoutParams.leftMargin = (int) (mWindowWidth * (position + positionOffset + 0.1)); + mLayoutParams.leftMargin = RandomUtils.getInt(mWindowWidth * (position + positionOffset + 0.1f)); mDownloadmanagerSlideLine.setLayoutParams(mLayoutParams); } } diff --git a/app/src/main/java/com/gh/gamecenter/fragment/NewsFragment.java b/app/src/main/java/com/gh/gamecenter/fragment/NewsFragment.java index 55a24ef3d1..77b5f6f257 100644 --- a/app/src/main/java/com/gh/gamecenter/fragment/NewsFragment.java +++ b/app/src/main/java/com/gh/gamecenter/fragment/NewsFragment.java @@ -11,6 +11,7 @@ import android.widget.LinearLayout; import com.gh.base.fragment.BaseFragment_ViewPager_Checkable; import com.gh.common.util.DataCollectionUtils; import com.gh.common.util.DisplayUtils; +import com.gh.common.util.RandomUtils; import com.gh.gamecenter.MainActivity; import com.gh.gamecenter.R; import com.gh.gamecenter.eventbus.EBUISwitch; @@ -86,7 +87,7 @@ public class NewsFragment extends BaseFragment_ViewPager_Checkable { public void onViewCreated(View view, @Nullable Bundle savedInstanceState) { super.onViewCreated(view, savedInstanceState); - mLayoutParams.leftMargin = (int) (mWidth * (mCheckedIndex + 0.25)); + mLayoutParams.leftMargin = RandomUtils.getInt(mWidth * (mCheckedIndex + 0.25)); mNewsSlidebarLine.setLayoutParams(mLayoutParams); view.postDelayed(new Runnable() { @@ -101,7 +102,7 @@ public class NewsFragment extends BaseFragment_ViewPager_Checkable { public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) { super.onPageScrolled(position, positionOffset, positionOffsetPixels); if (positionOffset != 0) { - mLayoutParams.leftMargin = (int) (mWidth * (position + positionOffset + 0.25)); + mLayoutParams.leftMargin = RandomUtils.getInt(mWidth * (position + positionOffset + 0.25)); mNewsSlidebarLine.setLayoutParams(mLayoutParams); } } diff --git a/app/src/main/java/com/gh/gamecenter/message/MessageFragment.java b/app/src/main/java/com/gh/gamecenter/message/MessageFragment.java index 7a4636a4fd..507b908fc0 100644 --- a/app/src/main/java/com/gh/gamecenter/message/MessageFragment.java +++ b/app/src/main/java/com/gh/gamecenter/message/MessageFragment.java @@ -12,6 +12,7 @@ import android.widget.TextView; import com.gh.base.fragment.BaseFragment_ViewPager_Checkable; import com.gh.common.util.DisplayUtils; +import com.gh.common.util.RandomUtils; import com.gh.gamecenter.R; import com.gh.gamecenter.entity.MessageUnreadEntity; import com.gh.gamecenter.eventbus.EBReuse; @@ -100,7 +101,7 @@ public class MessageFragment extends BaseFragment_ViewPager_Checkable { getActivity().getWindowManager().getDefaultDisplay().getMetrics(outMetrics); mWidth = outMetrics.widthPixels / 2; mLayoutParams = new LinearLayout.LayoutParams((int) (mWidth * 0.6), DisplayUtils.dip2px(getContext(), 2)); - mLayoutParams.leftMargin = (int) (mWidth * (0 + 0.2f)); + mLayoutParams.leftMargin = RandomUtils.getInt(mWidth * (mCheckedIndex + 0.2f)); mMessageSlideLine.setLayoutParams(mLayoutParams); initMessageUnread(getContext()); @@ -186,7 +187,7 @@ public class MessageFragment extends BaseFragment_ViewPager_Checkable { public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) { super.onPageScrolled(position, positionOffset, positionOffsetPixels); if (positionOffset != 0) { - mLayoutParams.leftMargin = (int) (mWidth * (position + positionOffset + 0.2f)); + mLayoutParams.leftMargin = RandomUtils.getInt(mWidth * (position + positionOffset + 0.2f)); // mMessageSlideLine.setLayoutParams(mLayoutParams); mMessageSlideLine.requestLayout(); } diff --git a/app/src/main/java/com/gh/gamecenter/retrofit/OkHttpRetryInterceptor.kt b/app/src/main/java/com/gh/gamecenter/retrofit/OkHttpRetryInterceptor.kt index 89029d9e06..538d7dc6f6 100644 --- a/app/src/main/java/com/gh/gamecenter/retrofit/OkHttpRetryInterceptor.kt +++ b/app/src/main/java/com/gh/gamecenter/retrofit/OkHttpRetryInterceptor.kt @@ -86,6 +86,7 @@ class OkHttpRetryInterceptor internal constructor(context: Context) : Intercepto .refreshToken(body) .subscribe(object : com.gh.gamecenter.retrofit.Response() { override fun onResponse(loginResponseEntity: LoginResponseEntity?) { + loginResponseEntity?.loginType = LoginUtils.getLoginToken(mContext)?.loginType LoginUtils.saveLoginToken(mContext, loginResponseEntity) RetrofitManager.getInstance(mContext) diff --git a/dependencies.gradle b/dependencies.gradle index 05809a8d7c..3e77a2a15e 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -4,7 +4,7 @@ ext { compileSdkVersion = 26 minSdkVersion = 14 // TODO fix permission/ target 23 will cause permission issues - targetSdkVersion = 23 + targetSdkVersion = 22 // application info versionCode = 21