diff --git a/.idea/dictionaries/LGT.xml b/.idea/dictionaries/LGT.xml new file mode 100644 index 0000000000..141c7c5cb2 --- /dev/null +++ b/.idea/dictionaries/LGT.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 45bb483c5e..1a3eaffb45 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -37,7 +37,7 @@ - + diff --git a/app/src/main/java/android/support/v7/widget/AdapterHelper.java b/app/src/main/java/android/support/v7/widget/AdapterHelper.java index 84070ab9ad..e1db0f74ae 100644 --- a/app/src/main/java/android/support/v7/widget/AdapterHelper.java +++ b/app/src/main/java/android/support/v7/widget/AdapterHelper.java @@ -23,7 +23,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import static android.support.v7.widget.RecyclerView.*; +import static android.support.v7.widget.RecyclerView.ViewHolder; /** * Helper class that can enqueue and process adapter update operations. diff --git a/app/src/main/java/android/support/v7/widget/LinearLayoutManager.java b/app/src/main/java/android/support/v7/widget/LinearLayoutManager.java index ff7e3c6e1e..230db34523 100644 --- a/app/src/main/java/android/support/v7/widget/LinearLayoutManager.java +++ b/app/src/main/java/android/support/v7/widget/LinearLayoutManager.java @@ -17,9 +17,9 @@ package android.support.v7.widget; import android.content.Context; +import android.graphics.PointF; import android.os.Parcel; import android.os.Parcelable; -import android.graphics.PointF; import android.support.v4.view.ViewCompat; import android.support.v4.view.accessibility.AccessibilityEventCompat; import android.support.v4.view.accessibility.AccessibilityRecordCompat; @@ -28,10 +28,10 @@ import android.view.View; import android.view.ViewGroup; import android.view.accessibility.AccessibilityEvent; -import static android.support.v7.widget.RecyclerView.NO_POSITION; - import java.util.List; +import static android.support.v7.widget.RecyclerView.NO_POSITION; + /** * A {@link RecyclerView.LayoutManager} implementation which provides * similar functionality to {@link android.widget.ListView}. diff --git a/app/src/main/java/android/support/v7/widget/OpReorderer.java b/app/src/main/java/android/support/v7/widget/OpReorderer.java index e123ce8dca..1a34cba3e2 100644 --- a/app/src/main/java/android/support/v7/widget/OpReorderer.java +++ b/app/src/main/java/android/support/v7/widget/OpReorderer.java @@ -16,9 +16,10 @@ package android.support.v7.widget; +import android.support.v7.widget.AdapterHelper.UpdateOp; + import java.util.List; -import android.support.v7.widget.AdapterHelper.UpdateOp; import static android.support.v7.widget.AdapterHelper.UpdateOp.ADD; import static android.support.v7.widget.AdapterHelper.UpdateOp.MOVE; import static android.support.v7.widget.AdapterHelper.UpdateOp.REMOVE; diff --git a/app/src/main/java/android/support/v7/widget/RecyclerView.java b/app/src/main/java/android/support/v7/widget/RecyclerView.java index 8485a80ceb..8c21e9e8fb 100644 --- a/app/src/main/java/android/support/v7/widget/RecyclerView.java +++ b/app/src/main/java/android/support/v7/widget/RecyclerView.java @@ -36,9 +36,6 @@ import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat; import android.support.v4.view.accessibility.AccessibilityRecordCompat; import android.support.v4.widget.EdgeEffectCompat; import android.support.v4.widget.ScrollerCompat; -import static android.support.v7.widget.AdapterHelper.UpdateOp; -import static android.support.v7.widget.AdapterHelper.Callback; - import android.util.AttributeSet; import android.util.Log; import android.util.SparseArray; @@ -54,12 +51,13 @@ import android.view.accessibility.AccessibilityEvent; import android.view.accessibility.AccessibilityManager; import android.view.animation.Interpolator; -import com.gh.common.util.Utils; - import java.util.ArrayList; import java.util.Collections; import java.util.List; +import static android.support.v7.widget.AdapterHelper.Callback; +import static android.support.v7.widget.AdapterHelper.UpdateOp; + /** * A flexible view for providing a limited window into a large data set. * diff --git a/app/src/main/java/android/support/v7/widget/StaggeredGridLayoutManager.java b/app/src/main/java/android/support/v7/widget/StaggeredGridLayoutManager.java index 83ce0edb73..0389012358 100644 --- a/app/src/main/java/android/support/v7/widget/StaggeredGridLayoutManager.java +++ b/app/src/main/java/android/support/v7/widget/StaggeredGridLayoutManager.java @@ -36,10 +36,10 @@ import java.util.Arrays; import java.util.BitSet; import java.util.List; -import static android.support.v7.widget.LayoutState.LAYOUT_START; -import static android.support.v7.widget.LayoutState.LAYOUT_END; import static android.support.v7.widget.LayoutState.ITEM_DIRECTION_HEAD; import static android.support.v7.widget.LayoutState.ITEM_DIRECTION_TAIL; +import static android.support.v7.widget.LayoutState.LAYOUT_END; +import static android.support.v7.widget.LayoutState.LAYOUT_START; import static android.support.v7.widget.RecyclerView.NO_POSITION; /** diff --git a/app/src/main/java/cn/sharesdk/onekeyshare/EditPageFakeActivity.java b/app/src/main/java/cn/sharesdk/onekeyshare/EditPageFakeActivity.java index 946097c5d8..25c4087e1b 100644 --- a/app/src/main/java/cn/sharesdk/onekeyshare/EditPageFakeActivity.java +++ b/app/src/main/java/cn/sharesdk/onekeyshare/EditPageFakeActivity.java @@ -9,23 +9,24 @@ package cn.sharesdk.onekeyshare; -import static com.mob.tools.utils.R.getStringRes; +import android.graphics.Bitmap; +import android.os.AsyncTask; +import android.text.TextUtils; +import android.view.View; +import android.widget.Toast; + +import com.mob.tools.FakeActivity; +import com.mob.tools.utils.BitmapHelper; import java.io.File; import java.util.ArrayList; import java.util.HashMap; import java.util.List; -import android.graphics.Bitmap; -import android.os.AsyncTask; -import android.text.TextUtils; -import android.view.View; -import android.widget.Toast; import cn.sharesdk.framework.Platform; import cn.sharesdk.framework.ShareSDK; -import com.mob.tools.FakeActivity; -import com.mob.tools.utils.BitmapHelper; +import static com.mob.tools.utils.R.getStringRes; public class EditPageFakeActivity extends FakeActivity { diff --git a/app/src/main/java/cn/sharesdk/onekeyshare/FollowerListFakeActivity.java b/app/src/main/java/cn/sharesdk/onekeyshare/FollowerListFakeActivity.java index 93481bc26f..02b2837d34 100644 --- a/app/src/main/java/cn/sharesdk/onekeyshare/FollowerListFakeActivity.java +++ b/app/src/main/java/cn/sharesdk/onekeyshare/FollowerListFakeActivity.java @@ -1,12 +1,12 @@ package cn.sharesdk.onekeyshare; +import com.mob.tools.FakeActivity; + import java.util.ArrayList; import java.util.HashMap; import cn.sharesdk.framework.Platform; -import com.mob.tools.FakeActivity; - public class FollowerListFakeActivity extends FakeActivity { protected Platform platform; diff --git a/app/src/main/java/cn/sharesdk/onekeyshare/OnekeyShare.java b/app/src/main/java/cn/sharesdk/onekeyshare/OnekeyShare.java index 0da9c9c596..12d1bd2eff 100644 --- a/app/src/main/java/cn/sharesdk/onekeyshare/OnekeyShare.java +++ b/app/src/main/java/cn/sharesdk/onekeyshare/OnekeyShare.java @@ -8,14 +8,6 @@ package cn.sharesdk.onekeyshare; -import static com.mob.tools.utils.BitmapHelper.captureView; -import static com.mob.tools.utils.R.getStringRes; - -import java.io.File; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Map.Entry; - import android.app.NotificationManager; import android.content.Context; import android.graphics.Bitmap; @@ -25,12 +17,21 @@ import android.text.TextUtils; import android.view.View; import android.view.View.OnClickListener; import android.widget.Toast; + +import com.mob.tools.utils.UIHandler; + +import java.io.File; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Map.Entry; + import cn.sharesdk.framework.CustomPlatform; import cn.sharesdk.framework.Platform; import cn.sharesdk.framework.PlatformActionListener; import cn.sharesdk.framework.ShareSDK; -import com.mob.tools.utils.UIHandler; +import static com.mob.tools.utils.BitmapHelper.captureView; +import static com.mob.tools.utils.R.getStringRes; /** * 快捷分享的入口 diff --git a/app/src/main/java/cn/sharesdk/onekeyshare/PicViewer.java b/app/src/main/java/cn/sharesdk/onekeyshare/PicViewer.java index c5cbb4da11..333995fde9 100644 --- a/app/src/main/java/cn/sharesdk/onekeyshare/PicViewer.java +++ b/app/src/main/java/cn/sharesdk/onekeyshare/PicViewer.java @@ -9,7 +9,6 @@ package cn.sharesdk.onekeyshare; -import android.annotation.SuppressLint; import android.graphics.Bitmap; import android.graphics.Matrix; import android.graphics.PointF; diff --git a/app/src/main/java/cn/sharesdk/onekeyshare/PlatformListFakeActivity.java b/app/src/main/java/cn/sharesdk/onekeyshare/PlatformListFakeActivity.java index 73e945dd15..0605087c5c 100644 --- a/app/src/main/java/cn/sharesdk/onekeyshare/PlatformListFakeActivity.java +++ b/app/src/main/java/cn/sharesdk/onekeyshare/PlatformListFakeActivity.java @@ -1,18 +1,19 @@ package cn.sharesdk.onekeyshare; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; - import android.content.Context; import android.content.Intent; import android.view.KeyEvent; import android.view.View; -import cn.sharesdk.framework.Platform; -import cn.sharesdk.framework.ShareSDK; import com.mob.tools.FakeActivity; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; + +import cn.sharesdk.framework.Platform; +import cn.sharesdk.framework.ShareSDK; + public class PlatformListFakeActivity extends FakeActivity { protected HashMap shareParamsMap; protected boolean silent; diff --git a/app/src/main/java/cn/sharesdk/onekeyshare/ReflectableShareContentCustomizeCallback.java b/app/src/main/java/cn/sharesdk/onekeyshare/ReflectableShareContentCustomizeCallback.java index e56cc752c5..f5684d5aba 100644 --- a/app/src/main/java/cn/sharesdk/onekeyshare/ReflectableShareContentCustomizeCallback.java +++ b/app/src/main/java/cn/sharesdk/onekeyshare/ReflectableShareContentCustomizeCallback.java @@ -2,11 +2,12 @@ package cn.sharesdk.onekeyshare; import android.os.Handler.Callback; import android.os.Message; -import cn.sharesdk.framework.Platform; -import cn.sharesdk.framework.Platform.ShareParams; import com.mob.tools.utils.UIHandler; +import cn.sharesdk.framework.Platform; +import cn.sharesdk.framework.Platform.ShareParams; + /** * 此类在Onekeyshare中并无用途，只是在Socialization中考虑到耦合度，需要通过反射的方式操作Onekeyshare， *而原先的{@link ShareContentCustomizeCallback}无法完成此需求，故创建本类，以供外部设置操作回调。 diff --git a/app/src/main/java/cn/sharesdk/onekeyshare/Shake2Share.java b/app/src/main/java/cn/sharesdk/onekeyshare/Shake2Share.java index 2c678155ef..5d34e4fb9e 100644 --- a/app/src/main/java/cn/sharesdk/onekeyshare/Shake2Share.java +++ b/app/src/main/java/cn/sharesdk/onekeyshare/Shake2Share.java @@ -8,8 +8,6 @@ package cn.sharesdk.onekeyshare; -import static com.mob.tools.utils.R.getBitmapRes; -import static com.mob.tools.utils.R.getStringRes; import android.app.Activity; import android.content.Context; import android.hardware.Sensor; @@ -23,6 +21,9 @@ import android.widget.Toast; import com.mob.tools.FakeActivity; +import static com.mob.tools.utils.R.getBitmapRes; +import static com.mob.tools.utils.R.getStringRes; + /** 摇一摇启动分享的例子 */ public class Shake2Share extends FakeActivity implements SensorEventListener { // 检测的时间间隔 diff --git a/app/src/main/java/cn/sharesdk/onekeyshare/ShareCore.java b/app/src/main/java/cn/sharesdk/onekeyshare/ShareCore.java index db1a3e0862..b9cccb9493 100644 --- a/app/src/main/java/cn/sharesdk/onekeyshare/ShareCore.java +++ b/app/src/main/java/cn/sharesdk/onekeyshare/ShareCore.java @@ -8,23 +8,24 @@ package cn.sharesdk.onekeyshare; -import java.io.File; -import java.io.FileOutputStream; -import java.util.HashMap; - import android.content.Context; import android.content.Intent; import android.content.pm.ResolveInfo; import android.graphics.Bitmap; import android.graphics.Bitmap.CompressFormat; import android.text.TextUtils; + +import com.mob.tools.utils.R; + +import java.io.File; +import java.io.FileOutputStream; +import java.util.HashMap; + import cn.sharesdk.framework.CustomPlatform; import cn.sharesdk.framework.Platform; import cn.sharesdk.framework.Platform.ShareParams; import cn.sharesdk.framework.ShareSDK; -import com.mob.tools.utils.R; - /** * ShareCore是快捷分享的实际出口，此类使用了反射的方式，配合传递进来的HashMap， *构造{@link ShareParams}对象，并执行分享，使快捷分享不再需要考虑目标平台 diff --git a/app/src/main/java/cn/sharesdk/onekeyshare/theme/classic/EditPage.java b/app/src/main/java/cn/sharesdk/onekeyshare/theme/classic/EditPage.java index c547b449f7..1096832c20 100644 --- a/app/src/main/java/cn/sharesdk/onekeyshare/theme/classic/EditPage.java +++ b/app/src/main/java/cn/sharesdk/onekeyshare/theme/classic/EditPage.java @@ -8,16 +8,6 @@ package cn.sharesdk.onekeyshare.theme.classic; -import static com.mob.tools.utils.BitmapHelper.blur; -import static com.mob.tools.utils.BitmapHelper.captureView; -import static com.mob.tools.utils.R.dipToPx; -import static com.mob.tools.utils.R.getBitmapRes; -import static com.mob.tools.utils.R.getScreenWidth; -import static com.mob.tools.utils.R.getStringRes; - -import java.util.ArrayList; -import java.util.HashMap; - import android.app.Activity; import android.content.Context; import android.content.res.Configuration; @@ -51,6 +41,12 @@ import android.widget.ProgressBar; import android.widget.RelativeLayout; import android.widget.TextView; import android.widget.Toast; + +import com.mob.tools.utils.UIHandler; + +import java.util.ArrayList; +import java.util.HashMap; + import cn.sharesdk.framework.CustomPlatform; import cn.sharesdk.framework.Platform; import cn.sharesdk.framework.ShareSDK; @@ -59,7 +55,12 @@ import cn.sharesdk.onekeyshare.EditPageFakeActivity; import cn.sharesdk.onekeyshare.PicViewer; import cn.sharesdk.onekeyshare.ShareCore; -import com.mob.tools.utils.UIHandler; +import static com.mob.tools.utils.BitmapHelper.blur; +import static com.mob.tools.utils.BitmapHelper.captureView; +import static com.mob.tools.utils.R.dipToPx; +import static com.mob.tools.utils.R.getBitmapRes; +import static com.mob.tools.utils.R.getScreenWidth; +import static com.mob.tools.utils.R.getStringRes; /** * Photo-text Sharing will be handling in this page diff --git a/app/src/main/java/cn/sharesdk/onekeyshare/theme/classic/FollowListPage.java b/app/src/main/java/cn/sharesdk/onekeyshare/theme/classic/FollowListPage.java index 9e0a42398e..e0289bb43e 100644 --- a/app/src/main/java/cn/sharesdk/onekeyshare/theme/classic/FollowListPage.java +++ b/app/src/main/java/cn/sharesdk/onekeyshare/theme/classic/FollowListPage.java @@ -8,13 +8,6 @@ package cn.sharesdk.onekeyshare.theme.classic; -import static com.mob.tools.utils.R.dipToPx; -import static com.mob.tools.utils.R.getBitmapRes; -import static com.mob.tools.utils.R.getStringRes; - -import java.util.ArrayList; -import java.util.HashMap; - import android.app.Activity; import android.content.Context; import android.graphics.Bitmap; @@ -35,10 +28,6 @@ import android.widget.LinearLayout; import android.widget.LinearLayout.LayoutParams; import android.widget.ProgressBar; import android.widget.TextView; -import cn.sharesdk.framework.Platform; -import cn.sharesdk.framework.PlatformActionListener; -import cn.sharesdk.framework.TitleLayout; -import cn.sharesdk.onekeyshare.FollowerListFakeActivity; import com.mob.tools.gui.AsyncImageView; import com.mob.tools.gui.BitmapProcessor; @@ -46,6 +35,18 @@ import com.mob.tools.gui.PullToRefreshListAdapter; import com.mob.tools.gui.PullToRefreshView; import com.mob.tools.utils.UIHandler; +import java.util.ArrayList; +import java.util.HashMap; + +import cn.sharesdk.framework.Platform; +import cn.sharesdk.framework.PlatformActionListener; +import cn.sharesdk.framework.TitleLayout; +import cn.sharesdk.onekeyshare.FollowerListFakeActivity; + +import static com.mob.tools.utils.R.dipToPx; +import static com.mob.tools.utils.R.getBitmapRes; +import static com.mob.tools.utils.R.getStringRes; + /** 获取好友或关注列表 */ public class FollowListPage extends FollowerListFakeActivity implements OnClickListener, OnItemClickListener { private TitleLayout llTitle; diff --git a/app/src/main/java/cn/sharesdk/onekeyshare/theme/classic/PlatformGridView.java b/app/src/main/java/cn/sharesdk/onekeyshare/theme/classic/PlatformGridView.java index 2c305d828c..a7c56a1dc5 100644 --- a/app/src/main/java/cn/sharesdk/onekeyshare/theme/classic/PlatformGridView.java +++ b/app/src/main/java/cn/sharesdk/onekeyshare/theme/classic/PlatformGridView.java @@ -8,14 +8,6 @@ package cn.sharesdk.onekeyshare.theme.classic; -import static com.mob.tools.utils.R.getBitmapRes; - -import java.lang.reflect.Method; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; - import android.content.Context; import android.graphics.Bitmap; import android.graphics.BitmapFactory; @@ -32,14 +24,23 @@ import android.widget.ImageView; import android.widget.ImageView.ScaleType; import android.widget.LinearLayout; import android.widget.TextView; -import cn.sharesdk.framework.Platform; -import cn.sharesdk.framework.ShareSDK; -import cn.sharesdk.onekeyshare.CustomerLogo; import com.mob.tools.gui.ViewPagerAdapter; import com.mob.tools.gui.ViewPagerClassic; import com.mob.tools.utils.UIHandler; +import java.lang.reflect.Method; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; + +import cn.sharesdk.framework.Platform; +import cn.sharesdk.framework.ShareSDK; +import cn.sharesdk.onekeyshare.CustomerLogo; + +import static com.mob.tools.utils.R.getBitmapRes; + /** platform logo list gridview */ public class PlatformGridView extends LinearLayout implements OnClickListener, Callback { diff --git a/app/src/main/java/cn/sharesdk/onekeyshare/theme/classic/PlatformListPage.java b/app/src/main/java/cn/sharesdk/onekeyshare/theme/classic/PlatformListPage.java index 6f98ed264c..87b0249443 100644 --- a/app/src/main/java/cn/sharesdk/onekeyshare/theme/classic/PlatformListPage.java +++ b/app/src/main/java/cn/sharesdk/onekeyshare/theme/classic/PlatformListPage.java @@ -8,11 +8,6 @@ package cn.sharesdk.onekeyshare.theme.classic; -import static com.mob.tools.utils.R.getBitmapRes; -import static com.mob.tools.utils.R.getStringRes; - -import java.util.ArrayList; - import android.annotation.TargetApi; import android.content.res.Configuration; import android.graphics.drawable.ColorDrawable; @@ -28,11 +23,17 @@ import android.view.animation.ScaleAnimation; import android.widget.Button; import android.widget.FrameLayout; import android.widget.LinearLayout; -import cn.sharesdk.onekeyshare.PlatformListFakeActivity; import com.gh.common.util.DisplayUtils; import com.gh.gamecenter.manager.SystemBarTintManager; +import java.util.ArrayList; + +import cn.sharesdk.onekeyshare.PlatformListFakeActivity; + +import static com.mob.tools.utils.R.getBitmapRes; +import static com.mob.tools.utils.R.getStringRes; + public class PlatformListPage extends PlatformListFakeActivity implements View.OnClickListener { // page container diff --git a/app/src/main/java/cn/sharesdk/onekeyshare/theme/skyblue/EditPage.java b/app/src/main/java/cn/sharesdk/onekeyshare/theme/skyblue/EditPage.java index b1707607f8..3322f3fe54 100644 --- a/app/src/main/java/cn/sharesdk/onekeyshare/theme/skyblue/EditPage.java +++ b/app/src/main/java/cn/sharesdk/onekeyshare/theme/skyblue/EditPage.java @@ -8,13 +8,6 @@ package cn.sharesdk.onekeyshare.theme.skyblue; -import static com.mob.tools.utils.R.getIdRes; -import static com.mob.tools.utils.R.getLayoutRes; -import static com.mob.tools.utils.R.getStringRes; - -import java.util.ArrayList; -import java.util.HashMap; - import android.text.Editable; import android.text.TextWatcher; import android.view.LayoutInflater; @@ -26,11 +19,19 @@ import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.RelativeLayout; import android.widget.TextView; + +import java.util.ArrayList; +import java.util.HashMap; + import cn.sharesdk.framework.Platform; import cn.sharesdk.framework.ShareSDK; import cn.sharesdk.onekeyshare.EditPageFakeActivity; import cn.sharesdk.onekeyshare.PicViewer; +import static com.mob.tools.utils.R.getIdRes; +import static com.mob.tools.utils.R.getLayoutRes; +import static com.mob.tools.utils.R.getStringRes; + /** 执行图文分享的页面，此页面不支持微信平台的分享 */ public class EditPage extends EditPageFakeActivity implements OnClickListener, TextWatcher { private static final int MAX_TEXT_COUNT = 140; diff --git a/app/src/main/java/cn/sharesdk/onekeyshare/theme/skyblue/FollowListPage.java b/app/src/main/java/cn/sharesdk/onekeyshare/theme/skyblue/FollowListPage.java index 1cc2f8fcbb..a0880588a9 100644 --- a/app/src/main/java/cn/sharesdk/onekeyshare/theme/skyblue/FollowListPage.java +++ b/app/src/main/java/cn/sharesdk/onekeyshare/theme/skyblue/FollowListPage.java @@ -8,13 +8,6 @@ package cn.sharesdk.onekeyshare.theme.skyblue; -import static com.mob.tools.utils.R.dipToPx; -import static com.mob.tools.utils.R.getBitmapRes; -import static com.mob.tools.utils.R.getStringRes; - -import java.util.ArrayList; -import java.util.HashMap; - import android.app.Activity; import android.content.Context; import android.graphics.Bitmap; @@ -35,10 +28,6 @@ import android.widget.LinearLayout; import android.widget.LinearLayout.LayoutParams; import android.widget.ProgressBar; import android.widget.TextView; -import cn.sharesdk.framework.Platform; -import cn.sharesdk.framework.PlatformActionListener; -import cn.sharesdk.framework.TitleLayout; -import cn.sharesdk.onekeyshare.FollowerListFakeActivity; import com.mob.tools.gui.AsyncImageView; import com.mob.tools.gui.BitmapProcessor; @@ -46,6 +35,18 @@ import com.mob.tools.gui.PullToRefreshListAdapter; import com.mob.tools.gui.PullToRefreshView; import com.mob.tools.utils.UIHandler; +import java.util.ArrayList; +import java.util.HashMap; + +import cn.sharesdk.framework.Platform; +import cn.sharesdk.framework.PlatformActionListener; +import cn.sharesdk.framework.TitleLayout; +import cn.sharesdk.onekeyshare.FollowerListFakeActivity; + +import static com.mob.tools.utils.R.dipToPx; +import static com.mob.tools.utils.R.getBitmapRes; +import static com.mob.tools.utils.R.getStringRes; + /** 获取好友或关注列表 */ public class FollowListPage extends FollowerListFakeActivity implements OnClickListener, OnItemClickListener { private TitleLayout llTitle; diff --git a/app/src/main/java/cn/sharesdk/onekeyshare/theme/skyblue/PlatformGridViewAdapter.java b/app/src/main/java/cn/sharesdk/onekeyshare/theme/skyblue/PlatformGridViewAdapter.java index e6c7e2f4c6..57c097320d 100644 --- a/app/src/main/java/cn/sharesdk/onekeyshare/theme/skyblue/PlatformGridViewAdapter.java +++ b/app/src/main/java/cn/sharesdk/onekeyshare/theme/skyblue/PlatformGridViewAdapter.java @@ -8,15 +8,6 @@ package cn.sharesdk.onekeyshare.theme.skyblue; -import static com.mob.tools.utils.R.getBitmapRes; -import static com.mob.tools.utils.R.getIdRes; -import static com.mob.tools.utils.R.getLayoutRes; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; - import android.content.Context; import android.graphics.Bitmap; import android.graphics.BitmapFactory; @@ -26,10 +17,20 @@ import android.view.ViewGroup; import android.widget.BaseAdapter; import android.widget.ImageView; import android.widget.TextView; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; + import cn.sharesdk.framework.Platform; import cn.sharesdk.onekeyshare.CustomerLogo; import cn.sharesdk.onekeyshare.ShareCore; +import static com.mob.tools.utils.R.getBitmapRes; +import static com.mob.tools.utils.R.getIdRes; +import static com.mob.tools.utils.R.getLayoutRes; + public class PlatformGridViewAdapter extends BaseAdapter implements View.OnClickListener { private final Context context; diff --git a/app/src/main/java/cn/sharesdk/onekeyshare/theme/skyblue/PlatformListPage.java b/app/src/main/java/cn/sharesdk/onekeyshare/theme/skyblue/PlatformListPage.java index f32fd96367..6e93c248cc 100644 --- a/app/src/main/java/cn/sharesdk/onekeyshare/theme/skyblue/PlatformListPage.java +++ b/app/src/main/java/cn/sharesdk/onekeyshare/theme/skyblue/PlatformListPage.java @@ -8,19 +8,20 @@ package cn.sharesdk.onekeyshare.theme.skyblue; -import static com.mob.tools.utils.R.getLayoutRes; -import static com.mob.tools.utils.R.getStringRes; - -import java.util.List; - import android.os.AsyncTask; import android.view.View; import android.widget.GridView; import android.widget.Toast; + +import java.util.List; + import cn.sharesdk.framework.Platform; import cn.sharesdk.framework.ShareSDK; import cn.sharesdk.onekeyshare.PlatformListFakeActivity; +import static com.mob.tools.utils.R.getLayoutRes; +import static com.mob.tools.utils.R.getStringRes; + public class PlatformListPage extends PlatformListFakeActivity implements View.OnClickListener { private PlatformGridViewAdapter gridViewAdapter; diff --git a/app/src/main/java/com/android/volley/CacheDispatcher.java b/app/src/main/java/com/android/volley/CacheDispatcher.java index ac30463936..da31e1cfd6 100644 --- a/app/src/main/java/com/android/volley/CacheDispatcher.java +++ b/app/src/main/java/com/android/volley/CacheDispatcher.java @@ -16,10 +16,10 @@ package com.android.volley; -import java.util.concurrent.BlockingQueue; - import android.os.Process; +import java.util.concurrent.BlockingQueue; + /** * Provides a thread for performing cache triage on a queue of requests. * diff --git a/app/src/main/java/com/android/volley/ExecutorDelivery.java b/app/src/main/java/com/android/volley/ExecutorDelivery.java index 5d4a5840b9..1babfcd195 100644 --- a/app/src/main/java/com/android/volley/ExecutorDelivery.java +++ b/app/src/main/java/com/android/volley/ExecutorDelivery.java @@ -16,10 +16,10 @@ package com.android.volley; -import java.util.concurrent.Executor; - import android.os.Handler; +import java.util.concurrent.Executor; + /** * Delivers responses and errors. */ diff --git a/app/src/main/java/com/android/volley/NetworkDispatcher.java b/app/src/main/java/com/android/volley/NetworkDispatcher.java index 9ae39ba3e3..0a82c81c8a 100644 --- a/app/src/main/java/com/android/volley/NetworkDispatcher.java +++ b/app/src/main/java/com/android/volley/NetworkDispatcher.java @@ -16,12 +16,12 @@ package com.android.volley; -import java.util.concurrent.BlockingQueue; - import android.net.TrafficStats; import android.os.Build; import android.os.Process; +import java.util.concurrent.BlockingQueue; + /** * Provides a thread for performing network dispatch from a queue of requests. * diff --git a/app/src/main/java/com/android/volley/NetworkResponse.java b/app/src/main/java/com/android/volley/NetworkResponse.java index c200a26269..6a0b5c2b5d 100644 --- a/app/src/main/java/com/android/volley/NetworkResponse.java +++ b/app/src/main/java/com/android/volley/NetworkResponse.java @@ -16,11 +16,11 @@ package com.android.volley; +import org.apache.http.HttpStatus; + import java.util.Collections; import java.util.Map; -import org.apache.http.HttpStatus; - /** * Data and headers returned from {@link Network#performRequest(Request)}. */ diff --git a/app/src/main/java/com/android/volley/Request.java b/app/src/main/java/com/android/volley/Request.java index a053043733..9fee0a08ba 100644 --- a/app/src/main/java/com/android/volley/Request.java +++ b/app/src/main/java/com/android/volley/Request.java @@ -16,11 +16,6 @@ package com.android.volley; -import java.io.UnsupportedEncodingException; -import java.net.URLEncoder; -import java.util.Collections; -import java.util.Map; - import android.net.TrafficStats; import android.net.Uri; import android.os.Handler; @@ -30,6 +25,11 @@ import android.text.TextUtils; import com.android.volley.VolleyLog.MarkerLog; +import java.io.UnsupportedEncodingException; +import java.net.URLEncoder; +import java.util.Collections; +import java.util.Map; + /** * Base class for all network requests. * diff --git a/app/src/main/java/com/android/volley/RequestQueue.java b/app/src/main/java/com/android/volley/RequestQueue.java index 94898f479b..bcd86f6726 100644 --- a/app/src/main/java/com/android/volley/RequestQueue.java +++ b/app/src/main/java/com/android/volley/RequestQueue.java @@ -16,6 +16,9 @@ package com.android.volley; +import android.os.Handler; +import android.os.Looper; + import java.util.HashMap; import java.util.HashSet; import java.util.LinkedList; @@ -25,9 +28,6 @@ import java.util.Set; import java.util.concurrent.PriorityBlockingQueue; import java.util.concurrent.atomic.AtomicInteger; -import android.os.Handler; -import android.os.Looper; - /** * A request dispatch queue with a thread pool of dispatchers. * diff --git a/app/src/main/java/com/android/volley/VolleyLog.java b/app/src/main/java/com/android/volley/VolleyLog.java index c3ad580050..6684690216 100644 --- a/app/src/main/java/com/android/volley/VolleyLog.java +++ b/app/src/main/java/com/android/volley/VolleyLog.java @@ -16,13 +16,13 @@ package com.android.volley; +import android.os.SystemClock; +import android.util.Log; + import java.util.ArrayList; import java.util.List; import java.util.Locale; -import android.os.SystemClock; -import android.util.Log; - /** Logging helper class. */ public class VolleyLog { public static String TAG = "Volley"; diff --git a/app/src/main/java/com/android/volley/toolbox/BasicNetwork.java b/app/src/main/java/com/android/volley/toolbox/BasicNetwork.java index ea3b507d08..4a719f1f7e 100644 --- a/app/src/main/java/com/android/volley/toolbox/BasicNetwork.java +++ b/app/src/main/java/com/android/volley/toolbox/BasicNetwork.java @@ -16,22 +16,6 @@ package com.android.volley.toolbox; -import java.io.IOException; -import java.io.InputStream; -import java.net.MalformedURLException; -import java.net.SocketTimeoutException; -import java.util.Date; -import java.util.HashMap; -import java.util.Map; - -import org.apache.http.Header; -import org.apache.http.HttpEntity; -import org.apache.http.HttpResponse; -import org.apache.http.HttpStatus; -import org.apache.http.StatusLine; -import org.apache.http.conn.ConnectTimeoutException; -import org.apache.http.impl.cookie.DateUtils; - import android.os.SystemClock; import com.android.volley.AuthFailureError; @@ -51,6 +35,22 @@ import com.gh.common.util.GzipUtils; import com.gh.gamecenter.volley.extended.JsonArrayExtendedRequest; import com.gh.gamecenter.volley.extended.JsonObjectExtendedRequest; +import org.apache.http.Header; +import org.apache.http.HttpEntity; +import org.apache.http.HttpResponse; +import org.apache.http.HttpStatus; +import org.apache.http.StatusLine; +import org.apache.http.conn.ConnectTimeoutException; +import org.apache.http.impl.cookie.DateUtils; + +import java.io.IOException; +import java.io.InputStream; +import java.net.MalformedURLException; +import java.net.SocketTimeoutException; +import java.util.Date; +import java.util.HashMap; +import java.util.Map; + /** * A network performing Volley requests over an {@link HttpStack}. */ @@ -165,8 +165,7 @@ public class BasicNetwork implements Network { // else throw NoConnectionError throw new NoConnectionError(e); } - VolleyLog.e("Unexpected response code %d for %s", statusCode, - request.getUrl()); + VolleyLog.e("Unexpected response code %d for %s", statusCode, request.getUrl()); if (responseContents != null) { networkResponse = new NetworkResponse(statusCode, responseContents, responseHeaders, false); diff --git a/app/src/main/java/com/android/volley/toolbox/DiskBasedCache.java b/app/src/main/java/com/android/volley/toolbox/DiskBasedCache.java index af2c47d6d1..31c7676744 100644 --- a/app/src/main/java/com/android/volley/toolbox/DiskBasedCache.java +++ b/app/src/main/java/com/android/volley/toolbox/DiskBasedCache.java @@ -16,6 +16,14 @@ package com.android.volley.toolbox; +import android.os.SystemClock; +import android.util.Log; + +import com.android.volley.Cache; +import com.android.volley.VolleyLog; +import com.gh.common.util.TimestampUtils; +import com.gh.common.util.Utils; + import java.io.EOFException; import java.io.File; import java.io.FileInputStream; @@ -30,13 +38,6 @@ import java.util.Iterator; import java.util.LinkedHashMap; import java.util.Map; -import android.os.SystemClock; -import android.util.Log; - -import com.android.volley.Cache; -import com.android.volley.VolleyLog; -import com.gh.common.util.TimestampUtils; - /** * Cache implementation that caches files directly onto the hard disk in the * specified directory. The default disk usage size is 5MB, but is configurable. @@ -115,9 +116,9 @@ public class DiskBasedCache implements Cache { // if the entry does not exist, return. if (entry == null) { if (key.contains("timestamp")) { - key = TimestampUtils.removeTimestamp(key); - entry = mEntries.get(key); - if (entry == null) { + Log.i("result", "get entrey is noll"); + entry = mEntries.get(TimestampUtils.removeTimestamp(key)); + if (entry == null){ return null; } } else { @@ -125,6 +126,10 @@ public class DiskBasedCache implements Cache { } } File file = getFileForKey(key); + if (!file.exists() && key.contains("timestamp")) { + Log.i("result", "file = " + file.getName() + " not exists"); + file = getFileForKey(TimestampUtils.removeTimestamp(key)); + } Log.i("result", "key = " + key); Log.i("result", "name = " + file.getName()); CountingInputStream cis = null; diff --git a/app/src/main/java/com/android/volley/toolbox/HttpClientStack.java b/app/src/main/java/com/android/volley/toolbox/HttpClientStack.java index 7cf69d1ad0..f8dfdabc66 100644 --- a/app/src/main/java/com/android/volley/toolbox/HttpClientStack.java +++ b/app/src/main/java/com/android/volley/toolbox/HttpClientStack.java @@ -16,10 +16,9 @@ package com.android.volley.toolbox; -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; +import com.android.volley.AuthFailureError; +import com.android.volley.Request; +import com.android.volley.Request.Method; import org.apache.http.HttpEntity; import org.apache.http.HttpResponse; @@ -36,9 +35,10 @@ import org.apache.http.message.BasicNameValuePair; import org.apache.http.params.HttpConnectionParams; import org.apache.http.params.HttpParams; -import com.android.volley.AuthFailureError; -import com.android.volley.Request; -import com.android.volley.Request.Method; +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; /** * An HttpStack that performs request over an {@link HttpClient}. diff --git a/app/src/main/java/com/android/volley/toolbox/HttpHeaderParser.java b/app/src/main/java/com/android/volley/toolbox/HttpHeaderParser.java index e782f57096..4ed5eba1e9 100644 --- a/app/src/main/java/com/android/volley/toolbox/HttpHeaderParser.java +++ b/app/src/main/java/com/android/volley/toolbox/HttpHeaderParser.java @@ -16,14 +16,14 @@ package com.android.volley.toolbox; -import java.util.Map; +import com.android.volley.Cache; +import com.android.volley.NetworkResponse; import org.apache.http.impl.cookie.DateParseException; import org.apache.http.impl.cookie.DateUtils; import org.apache.http.protocol.HTTP; -import com.android.volley.Cache; -import com.android.volley.NetworkResponse; +import java.util.Map; /** * Utility methods for parsing HTTP headers. diff --git a/app/src/main/java/com/android/volley/toolbox/HttpStack.java b/app/src/main/java/com/android/volley/toolbox/HttpStack.java index 0f01761526..a52fd06ca7 100644 --- a/app/src/main/java/com/android/volley/toolbox/HttpStack.java +++ b/app/src/main/java/com/android/volley/toolbox/HttpStack.java @@ -16,13 +16,13 @@ package com.android.volley.toolbox; -import java.io.IOException; -import java.util.Map; +import com.android.volley.AuthFailureError; +import com.android.volley.Request; import org.apache.http.HttpResponse; -import com.android.volley.AuthFailureError; -import com.android.volley.Request; +import java.io.IOException; +import java.util.Map; /** * An HTTP stack abstraction. diff --git a/app/src/main/java/com/android/volley/toolbox/HurlStack.java b/app/src/main/java/com/android/volley/toolbox/HurlStack.java index 8b49f99279..404d4bb885 100644 --- a/app/src/main/java/com/android/volley/toolbox/HurlStack.java +++ b/app/src/main/java/com/android/volley/toolbox/HurlStack.java @@ -16,6 +16,20 @@ package com.android.volley.toolbox; +import com.android.volley.AuthFailureError; +import com.android.volley.Request; +import com.android.volley.Request.Method; + +import org.apache.http.Header; +import org.apache.http.HttpEntity; +import org.apache.http.HttpResponse; +import org.apache.http.ProtocolVersion; +import org.apache.http.StatusLine; +import org.apache.http.entity.BasicHttpEntity; +import org.apache.http.message.BasicHeader; +import org.apache.http.message.BasicHttpResponse; +import org.apache.http.message.BasicStatusLine; + import java.io.DataOutputStream; import java.io.IOException; import java.io.InputStream; @@ -29,20 +43,6 @@ import java.util.Map.Entry; import javax.net.ssl.HttpsURLConnection; import javax.net.ssl.SSLSocketFactory; -import org.apache.http.Header; -import org.apache.http.HttpEntity; -import org.apache.http.HttpResponse; -import org.apache.http.ProtocolVersion; -import org.apache.http.StatusLine; -import org.apache.http.entity.BasicHttpEntity; -import org.apache.http.message.BasicHeader; -import org.apache.http.message.BasicHttpResponse; -import org.apache.http.message.BasicStatusLine; - -import com.android.volley.AuthFailureError; -import com.android.volley.Request; -import com.android.volley.Request.Method; - /** * An {@link HttpStack} based on {@link HttpURLConnection}. */ diff --git a/app/src/main/java/com/android/volley/toolbox/ImageLoader.java b/app/src/main/java/com/android/volley/toolbox/ImageLoader.java index 4335a89a87..fda8660d85 100644 --- a/app/src/main/java/com/android/volley/toolbox/ImageLoader.java +++ b/app/src/main/java/com/android/volley/toolbox/ImageLoader.java @@ -15,9 +15,6 @@ */ package com.android.volley.toolbox; -import java.util.HashMap; -import java.util.LinkedList; - import android.graphics.Bitmap; import android.graphics.Bitmap.Config; import android.os.Handler; @@ -30,6 +27,9 @@ import com.android.volley.Response.ErrorListener; import com.android.volley.Response.Listener; import com.android.volley.VolleyError; +import java.util.HashMap; +import java.util.LinkedList; + /** * Helper that handles loading and caching images from remote URLs. * diff --git a/app/src/main/java/com/android/volley/toolbox/JsonArrayRequest.java b/app/src/main/java/com/android/volley/toolbox/JsonArrayRequest.java index df83190b51..b1eae805f7 100644 --- a/app/src/main/java/com/android/volley/toolbox/JsonArrayRequest.java +++ b/app/src/main/java/com/android/volley/toolbox/JsonArrayRequest.java @@ -16,17 +16,17 @@ package com.android.volley.toolbox; -import java.io.UnsupportedEncodingException; - -import org.json.JSONArray; -import org.json.JSONException; - import com.android.volley.NetworkResponse; import com.android.volley.ParseError; import com.android.volley.Response; import com.android.volley.Response.ErrorListener; import com.android.volley.Response.Listener; +import org.json.JSONArray; +import org.json.JSONException; + +import java.io.UnsupportedEncodingException; + /** * A request for retrieving a {@link JSONArray} response body at a given URL. */ diff --git a/app/src/main/java/com/android/volley/toolbox/JsonObjectRequest.java b/app/src/main/java/com/android/volley/toolbox/JsonObjectRequest.java index dc82277d71..93bc22af54 100644 --- a/app/src/main/java/com/android/volley/toolbox/JsonObjectRequest.java +++ b/app/src/main/java/com/android/volley/toolbox/JsonObjectRequest.java @@ -16,17 +16,17 @@ package com.android.volley.toolbox; -import java.io.UnsupportedEncodingException; - -import org.json.JSONException; -import org.json.JSONObject; - import com.android.volley.NetworkResponse; import com.android.volley.ParseError; import com.android.volley.Response; import com.android.volley.Response.ErrorListener; import com.android.volley.Response.Listener; +import org.json.JSONException; +import org.json.JSONObject; + +import java.io.UnsupportedEncodingException; + /** * A request for retrieving a {@link JSONObject} response body at a given URL, allowing for an * optional {@link JSONObject} to be passed in as part of the request body. diff --git a/app/src/main/java/com/android/volley/toolbox/JsonRequest.java b/app/src/main/java/com/android/volley/toolbox/JsonRequest.java index e60bce16ab..f11ac14e43 100644 --- a/app/src/main/java/com/android/volley/toolbox/JsonRequest.java +++ b/app/src/main/java/com/android/volley/toolbox/JsonRequest.java @@ -16,8 +16,6 @@ package com.android.volley.toolbox; -import java.io.UnsupportedEncodingException; - import com.android.volley.NetworkResponse; import com.android.volley.Request; import com.android.volley.Response; @@ -25,6 +23,8 @@ import com.android.volley.Response.ErrorListener; import com.android.volley.Response.Listener; import com.android.volley.VolleyLog; +import java.io.UnsupportedEncodingException; + /** * A request for retrieving a T type response body at a given URL that also * optionally sends along a JSON body in the request specified. diff --git a/app/src/main/java/com/android/volley/toolbox/RequestFuture.java b/app/src/main/java/com/android/volley/toolbox/RequestFuture.java index 78bfb7503b..173c44ccbc 100644 --- a/app/src/main/java/com/android/volley/toolbox/RequestFuture.java +++ b/app/src/main/java/com/android/volley/toolbox/RequestFuture.java @@ -16,15 +16,15 @@ package com.android.volley.toolbox; +import com.android.volley.Request; +import com.android.volley.Response; +import com.android.volley.VolleyError; + import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import com.android.volley.Request; -import com.android.volley.Response; -import com.android.volley.VolleyError; - /** * A Future that represents a Volley request. * diff --git a/app/src/main/java/com/android/volley/toolbox/StringRequest.java b/app/src/main/java/com/android/volley/toolbox/StringRequest.java index 1a5040c240..6b3dfcf8ab 100644 --- a/app/src/main/java/com/android/volley/toolbox/StringRequest.java +++ b/app/src/main/java/com/android/volley/toolbox/StringRequest.java @@ -16,14 +16,14 @@ package com.android.volley.toolbox; -import java.io.UnsupportedEncodingException; - import com.android.volley.NetworkResponse; import com.android.volley.Request; import com.android.volley.Response; import com.android.volley.Response.ErrorListener; import com.android.volley.Response.Listener; +import java.io.UnsupportedEncodingException; + /** * A canned request for retrieving the response body at a given URL as a String. */ diff --git a/app/src/main/java/com/android/volley/toolbox/Volley.java b/app/src/main/java/com/android/volley/toolbox/Volley.java index 218672887d..0e04e87698 100644 --- a/app/src/main/java/com/android/volley/toolbox/Volley.java +++ b/app/src/main/java/com/android/volley/toolbox/Volley.java @@ -16,8 +16,6 @@ package com.android.volley.toolbox; -import java.io.File; - import android.content.Context; import android.content.pm.PackageInfo; import android.content.pm.PackageManager.NameNotFoundException; @@ -27,6 +25,8 @@ import android.os.Build; import com.android.volley.Network; import com.android.volley.RequestQueue; +import java.io.File; + public class Volley { /** Default on-disk cache directory. */ diff --git a/app/src/main/java/com/gh/base/AppController.java b/app/src/main/java/com/gh/base/AppController.java index 5a70b8d999..e1a848c769 100644 --- a/app/src/main/java/com/gh/base/AppController.java +++ b/app/src/main/java/com/gh/base/AppController.java @@ -1,8 +1,5 @@ package com.gh.base; -import java.util.ArrayList; -import java.util.List; - import android.app.Activity; import android.app.ActivityManager; import android.app.ActivityManager.RunningAppProcessInfo; @@ -23,6 +20,9 @@ import com.xiaomi.channel.commonutils.logger.LoggerInterface; import com.xiaomi.mipush.sdk.Logger; import com.xiaomi.mipush.sdk.MiPushClient; +import java.util.ArrayList; +import java.util.List; + public class AppController extends Application { public static final String TAG = AppController.class.getSimpleName(); diff --git a/app/src/main/java/com/gh/base/AppUncaHandler.java b/app/src/main/java/com/gh/base/AppUncaHandler.java index 1c63444d39..4b4007ab8a 100644 --- a/app/src/main/java/com/gh/base/AppUncaHandler.java +++ b/app/src/main/java/com/gh/base/AppUncaHandler.java @@ -1,15 +1,5 @@ package com.gh.base; -import java.io.File; -import java.io.FileWriter; -import java.io.IOException; -import java.lang.Thread.UncaughtExceptionHandler; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.HashMap; -import java.util.Locale; -import java.util.Map; - import android.app.AlarmManager; import android.app.PendingIntent; import android.content.Context; @@ -22,6 +12,16 @@ import com.gh.common.util.FileUtils; import com.gh.gamecenter.SplashScreenActivity; import com.gh.gamecenter.manager.DataCollectionManager; +import java.io.File; +import java.io.FileWriter; +import java.io.IOException; +import java.lang.Thread.UncaughtExceptionHandler; +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.HashMap; +import java.util.Locale; +import java.util.Map; + public class AppUncaHandler implements UncaughtExceptionHandler { private UncaughtExceptionHandler mDefaultHandler; diff --git a/app/src/main/java/com/gh/base/BaseActivity.java b/app/src/main/java/com/gh/base/BaseActivity.java index 42217a3790..dffbc6fadd 100644 --- a/app/src/main/java/com/gh/base/BaseActivity.java +++ b/app/src/main/java/com/gh/base/BaseActivity.java @@ -1,10 +1,5 @@ package com.gh.base; -import java.lang.reflect.Field; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - import android.annotation.TargetApi; import android.app.Activity; import android.content.Context; @@ -20,9 +15,6 @@ import android.widget.LinearLayout; import android.widget.RelativeLayout; import android.widget.TextView; import android.widget.Toast; -import cn.sharesdk.framework.ShareSDK; -import cn.sharesdk.onekeyshare.OnekeyShare; -import cn.sharesdk.onekeyshare.PlatformListFakeActivity.OnShareButtonClickListener; import com.gh.common.constant.Config; import com.gh.common.util.DialogUtils; @@ -36,6 +28,14 @@ import com.gh.gamecenter.manager.SystemBarTintManager; import com.gh.gamecenter.manager.SystemBarTintManager.SystemBarConfig; import com.tendcloud.tenddata.TCAgent; +import java.lang.reflect.Field; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import cn.sharesdk.framework.ShareSDK; +import cn.sharesdk.onekeyshare.OnekeyShare; +import cn.sharesdk.onekeyshare.PlatformListFakeActivity.OnShareButtonClickListener; import de.greenrobot.event.EventBus; public class BaseActivity extends Activity { diff --git a/app/src/main/java/com/gh/base/BaseFragmentActivity.java b/app/src/main/java/com/gh/base/BaseFragmentActivity.java index a0988af640..09efa68396 100644 --- a/app/src/main/java/com/gh/base/BaseFragmentActivity.java +++ b/app/src/main/java/com/gh/base/BaseFragmentActivity.java @@ -1,10 +1,5 @@ package com.gh.base; -import java.lang.reflect.Field; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - import android.annotation.TargetApi; import android.content.Context; import android.os.Build; @@ -20,9 +15,6 @@ import android.widget.LinearLayout; import android.widget.RelativeLayout; import android.widget.TextView; import android.widget.Toast; -import cn.sharesdk.framework.ShareSDK; -import cn.sharesdk.onekeyshare.OnekeyShare; -import cn.sharesdk.onekeyshare.PlatformListFakeActivity.OnShareButtonClickListener; import com.gh.common.constant.Config; import com.gh.common.util.DialogUtils; @@ -36,6 +28,14 @@ import com.gh.gamecenter.manager.SystemBarTintManager; import com.gh.gamecenter.manager.SystemBarTintManager.SystemBarConfig; import com.tendcloud.tenddata.TCAgent; +import java.lang.reflect.Field; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import cn.sharesdk.framework.ShareSDK; +import cn.sharesdk.onekeyshare.OnekeyShare; +import cn.sharesdk.onekeyshare.PlatformListFakeActivity.OnShareButtonClickListener; import de.greenrobot.event.EventBus; public class BaseFragmentActivity extends FragmentActivity { diff --git a/app/src/main/java/com/gh/base/GHPushMessageReceiver.java b/app/src/main/java/com/gh/base/GHPushMessageReceiver.java index 4127eba84a..c6cc50674e 100644 --- a/app/src/main/java/com/gh/base/GHPushMessageReceiver.java +++ b/app/src/main/java/com/gh/base/GHPushMessageReceiver.java @@ -1,17 +1,5 @@ package com.gh.base; -import java.io.File; -import java.io.IOException; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.Locale; - -import org.json.JSONArray; -import org.json.JSONException; -import org.json.JSONObject; - import android.annotation.SuppressLint; import android.app.Notification; import android.app.NotificationManager; @@ -40,6 +28,18 @@ import com.xiaomi.mipush.sdk.MiPushCommandMessage; import com.xiaomi.mipush.sdk.MiPushMessage; import com.xiaomi.mipush.sdk.PushMessageReceiver; +import org.json.JSONArray; +import org.json.JSONException; +import org.json.JSONObject; + +import java.io.File; +import java.io.IOException; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Locale; + /** * 1、PushMessageReceiver是个抽象类，该类继承了BroadcastReceiver。 * 2、需要将自定义的DemoMessageReceiver注册在AndroidManifest.xml文件中 diff --git a/app/src/main/java/com/gh/common/view/CropImageCustom.java b/app/src/main/java/com/gh/common/view/CropImageCustom.java index 58120758e8..5d04ee37d9 100644 --- a/app/src/main/java/com/gh/common/view/CropImageCustom.java +++ b/app/src/main/java/com/gh/common/view/CropImageCustom.java @@ -1,10 +1,5 @@ package com.gh.common.view; -import java.io.BufferedOutputStream; -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; - import android.content.Context; import android.graphics.Bitmap; import android.util.AttributeSet; @@ -12,6 +7,11 @@ import android.util.TypedValue; import android.widget.ImageView; import android.widget.RelativeLayout; +import java.io.BufferedOutputStream; +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; + public class CropImageCustom extends RelativeLayout { private CropImageZoomView mZoomImageView; diff --git a/app/src/main/java/com/gh/common/view/DownloadDialog.java b/app/src/main/java/com/gh/common/view/DownloadDialog.java index 192725b1ad..1f1270e42c 100644 --- a/app/src/main/java/com/gh/common/view/DownloadDialog.java +++ b/app/src/main/java/com/gh/common/view/DownloadDialog.java @@ -1,12 +1,5 @@ package com.gh.common.view; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Set; - import android.app.Dialog; import android.content.Context; import android.content.SharedPreferences; @@ -22,7 +15,6 @@ import android.support.v4.util.ArrayMap; import android.support.v4.view.PagerAdapter; import android.support.v4.view.ViewPager; import android.support.v4.view.ViewPager.OnPageChangeListener; -import android.support.v7.widget.DefaultItemAnimator; import android.support.v7.widget.GridLayoutManager; import android.support.v7.widget.RecyclerView; import android.text.Html; @@ -74,6 +66,13 @@ import com.gh.gamecenter.manager.DataCollectionManager; import com.gh.gamecenter.manager.PackageManager; import com.tendcloud.tenddata.TCAgent; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; + import de.greenrobot.event.EventBus; /** diff --git a/app/src/main/java/com/gh/download/DownloadDao.java b/app/src/main/java/com/gh/download/DownloadDao.java index cf1be0171a..f6cf69c7cb 100644 --- a/app/src/main/java/com/gh/download/DownloadDao.java +++ b/app/src/main/java/com/gh/download/DownloadDao.java @@ -1,12 +1,12 @@ package com.gh.download; -import java.util.List; - import android.content.Context; import android.database.SQLException; import com.j256.ormlite.dao.Dao; +import java.util.List; + public class DownloadDao { private static Dao downloadDaoOpe; private static DBHelper helper; diff --git a/app/src/main/java/com/gh/download/DownloadEntry.java b/app/src/main/java/com/gh/download/DownloadEntry.java index 3116796281..fce50c6aaa 100644 --- a/app/src/main/java/com/gh/download/DownloadEntry.java +++ b/app/src/main/java/com/gh/download/DownloadEntry.java @@ -1,13 +1,13 @@ package com.gh.download; -import java.io.Serializable; -import java.util.HashMap; -import java.util.Map.Entry; - import com.j256.ormlite.field.DataType; import com.j256.ormlite.field.DatabaseField; import com.j256.ormlite.table.DatabaseTable; +import java.io.Serializable; +import java.util.HashMap; +import java.util.Map.Entry; + @DatabaseTable(tableName = "download") public class DownloadEntry implements Serializable{ diff --git a/app/src/main/java/com/gh/download/DownloadManager.java b/app/src/main/java/com/gh/download/DownloadManager.java index 41c4cace99..95e5249071 100644 --- a/app/src/main/java/com/gh/download/DownloadManager.java +++ b/app/src/main/java/com/gh/download/DownloadManager.java @@ -1,9 +1,5 @@ package com.gh.download; -import java.io.File; -import java.util.List; -import java.util.Map.Entry; - import android.content.Context; import android.content.Intent; import android.widget.Toast; @@ -12,6 +8,10 @@ import com.gh.common.constant.Constants; import com.gh.common.util.FileUtils; import com.gh.common.util.Trace; +import java.io.File; +import java.util.List; +import java.util.Map.Entry; + public class DownloadManager { private static DownloadManager mInstance; private Context context; diff --git a/app/src/main/java/com/gh/download/DownloadService.java b/app/src/main/java/com/gh/download/DownloadService.java index 4b1db28cdd..37fa958c3b 100644 --- a/app/src/main/java/com/gh/download/DownloadService.java +++ b/app/src/main/java/com/gh/download/DownloadService.java @@ -1,7 +1,5 @@ package com.gh.download; -import java.util.Map.Entry; - import android.annotation.SuppressLint; import android.app.Service; import android.content.Intent; @@ -13,6 +11,8 @@ import android.os.IBinder; import com.gh.common.constant.Constants; import com.gh.common.util.Trace; +import java.util.Map.Entry; + public class DownloadService extends Service { @Override diff --git a/app/src/main/java/com/gh/download/DownloadTask.java b/app/src/main/java/com/gh/download/DownloadTask.java index c385dff763..8342cce7a5 100644 --- a/app/src/main/java/com/gh/download/DownloadTask.java +++ b/app/src/main/java/com/gh/download/DownloadTask.java @@ -1,10 +1,5 @@ package com.gh.download; -import java.text.DecimalFormat; -import java.util.HashMap; -import java.util.Iterator; -import java.util.Map.Entry; - import android.content.Context; import android.os.Handler; import android.os.Message; @@ -13,6 +8,11 @@ import com.gh.common.constant.Constants; import com.gh.common.util.FileUtils; import com.gh.common.util.Trace; +import java.text.DecimalFormat; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map.Entry; + public class DownloadTask implements DownloadListener { private DownloadEntry entry; diff --git a/app/src/main/java/com/gh/download/DownloadThread.java b/app/src/main/java/com/gh/download/DownloadThread.java index e65d0266a8..be3adea899 100644 --- a/app/src/main/java/com/gh/download/DownloadThread.java +++ b/app/src/main/java/com/gh/download/DownloadThread.java @@ -1,14 +1,5 @@ package com.gh.download; -import java.io.BufferedInputStream; -import java.io.BufferedOutputStream; -import java.io.File; -import java.io.FileOutputStream; -import java.net.HttpURLConnection; -import java.net.URL; - -import org.apache.http.HttpStatus; - import android.content.Context; import android.text.TextUtils; import android.util.Log; @@ -16,6 +7,15 @@ import android.util.Log; import com.gh.common.util.Trace; import com.gh.common.util.Utils; +import org.apache.http.HttpStatus; + +import java.io.BufferedInputStream; +import java.io.BufferedOutputStream; +import java.io.File; +import java.io.FileOutputStream; +import java.net.HttpURLConnection; +import java.net.URL; + public class DownloadThread extends Thread { private static final int CONNECT_TIME = 5000; private static final int READ_TIME = 5000; diff --git a/app/src/main/java/com/gh/gamecenter/ConcernActivity.java b/app/src/main/java/com/gh/gamecenter/ConcernActivity.java index e78b7668a2..f5514db45c 100644 --- a/app/src/main/java/com/gh/gamecenter/ConcernActivity.java +++ b/app/src/main/java/com/gh/gamecenter/ConcernActivity.java @@ -1,14 +1,5 @@ package com.gh.gamecenter; -import java.lang.reflect.Type; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.json.JSONArray; -import org.json.JSONObject; - import android.content.Intent; import android.os.Bundle; import android.support.v7.widget.GridLayoutManager; @@ -20,7 +11,6 @@ import android.view.ViewGroup; import android.widget.ImageView; import android.widget.RelativeLayout; import android.widget.TextView; -import android.widget.Toast; import com.android.volley.NoConnectionError; import com.android.volley.Response; @@ -42,6 +32,15 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.tendcloud.tenddata.TCAgent; +import org.json.JSONArray; +import org.json.JSONObject; + +import java.lang.reflect.Type; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + public class ConcernActivity extends BaseActivity implements OnClickListener { private Concern_LinearLayout view; @@ -252,8 +251,7 @@ public class ConcernActivity extends BaseActivity implements OnClickListener { concern_item_btn.setClickable(false); view.setClickable(false); } else { - Toast.makeText(ConcernActivity.this, "取消失败，请稍后再试", - Toast.LENGTH_SHORT).show(); + toast("取消失败，请稍后再试"); } } else { if (concernList != null && !concernList.isEmpty()) { diff --git a/app/src/main/java/com/gh/gamecenter/CropImageActivity.java b/app/src/main/java/com/gh/gamecenter/CropImageActivity.java index f363050d7c..b8aff88e87 100644 --- a/app/src/main/java/com/gh/gamecenter/CropImageActivity.java +++ b/app/src/main/java/com/gh/gamecenter/CropImageActivity.java @@ -1,7 +1,5 @@ package com.gh.gamecenter; -import java.io.File; - import android.app.Dialog; import android.content.Intent; import android.os.Bundle; @@ -12,7 +10,6 @@ import android.view.View; import android.view.ViewGroup.LayoutParams; import android.widget.RelativeLayout; import android.widget.TextView; -import android.widget.Toast; import com.gh.base.BaseActivity; import com.gh.common.constant.Config; @@ -23,6 +20,8 @@ import com.gh.common.util.ImageUtils; import com.gh.common.util.TokenUtils; import com.gh.common.view.CropImageCustom; +import java.io.File; + public class CropImageActivity extends BaseActivity { private CropImageCustom cropimage_custom; @@ -31,11 +30,9 @@ public class CropImageActivity extends BaseActivity { @Override public void handleMessage(Message msg) { if (msg.what == 0) { - Toast.makeText(CropImageActivity.this, "上传成功", - Toast.LENGTH_SHORT).show(); + toast("上传成功"); } else if (msg.what == 1) { - Toast.makeText(CropImageActivity.this, "上传失败", - Toast.LENGTH_SHORT).show(); + toast("上传失败"); } } }; diff --git a/app/src/main/java/com/gh/gamecenter/GameDetailsActivity.java b/app/src/main/java/com/gh/gamecenter/GameDetailsActivity.java index d91d4bf25d..581255b056 100644 --- a/app/src/main/java/com/gh/gamecenter/GameDetailsActivity.java +++ b/app/src/main/java/com/gh/gamecenter/GameDetailsActivity.java @@ -1,12 +1,5 @@ package com.gh.gamecenter; -import java.util.Calendar; -import java.util.HashMap; -import java.util.Map; -import java.util.Map.Entry; - -import org.json.JSONObject; - import android.app.Dialog; import android.content.DialogInterface; import android.os.Bundle; @@ -31,7 +24,6 @@ import android.widget.LinearLayout; import android.widget.ProgressBar; import android.widget.RelativeLayout; import android.widget.TextView; -import android.widget.Toast; import com.android.volley.NoConnectionError; import com.android.volley.Response; @@ -78,6 +70,13 @@ import com.gh.gamecenter.volley.extended.JsonObjectExtendedRequest; import com.google.gson.Gson; import com.tendcloud.tenddata.TCAgent; +import org.json.JSONObject; + +import java.util.Calendar; +import java.util.HashMap; +import java.util.Map; +import java.util.Map.Entry; + import de.greenrobot.event.EventBus; /** @@ -304,8 +303,7 @@ public class GameDetailsActivity extends BaseFragmentActivity implements // 无网络连接和访问超时 if (error.getClass().equals(NoConnectionError.class) || error.getClass().equals(TimeoutError.class)) { - Toast.makeText(GameDetailsActivity.this, "网络错误", - Toast.LENGTH_SHORT).show(); + toast("网络错误"); reuse_no_connection.setVisibility(View.VISIBLE); gamedetails_ll_loading.setVisibility(View.GONE); } @@ -557,8 +555,7 @@ public class GameDetailsActivity extends BaseFragmentActivity implements statusMap.put(entry.getUrl(), "downloading"); } else { - Toast.makeText(GameDetailsActivity.this, msg, - Toast.LENGTH_SHORT).show(); + toast(msg); } } } else { @@ -710,9 +707,7 @@ public class GameDetailsActivity extends BaseFragmentActivity implements "downloading"); } else { - Toast.makeText( - GameDetailsActivity.this, msg, - Toast.LENGTH_SHORT).show(); + toast(msg); } } } else { @@ -734,8 +729,7 @@ public class GameDetailsActivity extends BaseFragmentActivity implements dialog.show(); } } else { - Toast.makeText(this, "稍等片刻~！游戏正在上传中...", Toast.LENGTH_SHORT) - .show(); + toast("稍等片刻~！游戏正在上传中..."); } break; case R.id.gamedetails_iv_share: @@ -903,8 +897,7 @@ public class GameDetailsActivity extends BaseFragmentActivity implements kv6.put("操作", "一次性完成"); TCAgent.onEvent(GameDetailsActivity.this, "插件化", gameName, kv6); if (FileUtils.isEmptyFile(path)) { - Toast.makeText(GameDetailsActivity.this, "解析包错误", - Toast.LENGTH_SHORT).show(); + toast("解析包错误"); } else { MainActivity.uninstallMap.put( PackageUtils.getPackageNameByPath( diff --git a/app/src/main/java/com/gh/gamecenter/HotCardActivity.java b/app/src/main/java/com/gh/gamecenter/HotCardActivity.java index 97cede7dc1..a87d1572aa 100644 --- a/app/src/main/java/com/gh/gamecenter/HotCardActivity.java +++ b/app/src/main/java/com/gh/gamecenter/HotCardActivity.java @@ -1,18 +1,9 @@ package com.gh.gamecenter; -import java.lang.reflect.Type; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.concurrent.LinkedBlockingQueue; - -import org.json.JSONArray; - import android.os.Bundle; import android.os.Handler; import android.os.Message; import android.support.v4.util.ArrayMap; -import android.support.v7.widget.DefaultItemAnimator; import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.RecyclerView; import android.view.View; @@ -44,6 +35,14 @@ import com.gh.gamecenter.volley.extended.JsonArrayExtendedRequest; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; +import org.json.JSONArray; + +import java.lang.reflect.Type; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.concurrent.LinkedBlockingQueue; + public class HotCardActivity extends BaseActivity { private RecyclerView hotcard_list; diff --git a/app/src/main/java/com/gh/gamecenter/MainActivity.java b/app/src/main/java/com/gh/gamecenter/MainActivity.java index ccc08252b7..1f1b24e8dc 100644 --- a/app/src/main/java/com/gh/gamecenter/MainActivity.java +++ b/app/src/main/java/com/gh/gamecenter/MainActivity.java @@ -1,23 +1,5 @@ package com.gh.gamecenter; -import java.io.File; -import java.io.IOException; -import java.lang.reflect.Type; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Date; -import java.util.Enumeration; -import java.util.HashMap; -import java.util.List; -import java.util.Locale; -import java.util.Map; -import java.util.zip.ZipEntry; -import java.util.zip.ZipFile; - -import org.json.JSONArray; -import org.json.JSONException; -import org.json.JSONObject; - import android.app.Dialog; import android.app.Notification; import android.app.NotificationManager; @@ -43,7 +25,6 @@ import android.view.Window; import android.widget.ImageView; import android.widget.ProgressBar; import android.widget.TextView; -import android.widget.Toast; import com.android.volley.Request.Method; import com.android.volley.Response; @@ -90,6 +71,24 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.tendcloud.tenddata.TCAgent; +import org.json.JSONArray; +import org.json.JSONException; +import org.json.JSONObject; + +import java.io.File; +import java.io.IOException; +import java.lang.reflect.Type; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Date; +import java.util.Enumeration; +import java.util.HashMap; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.zip.ZipEntry; +import java.util.zip.ZipFile; + import de.greenrobot.event.EventBus; /** @@ -292,22 +291,15 @@ public class MainActivity extends BaseFragmentActivity implements } else { msg = msg + " - 下载完成"; } - Toast.makeText(getApplicationContext(), - msg, Toast.LENGTH_SHORT).show(); + toast(msg); } else { - Toast.makeText( - getApplicationContext(), - downloadEntry.getName() + " - 下载完成", - Toast.LENGTH_SHORT).show(); + toast(downloadEntry.getName() + " - 下载完成"); } if (downloadEntry.getMeta().get("isPlugin") == null) { if (sp.getBoolean("autoinstall", true)) { if (FileUtils.isEmptyFile(entry .getValue().getPath())) { - Toast.makeText( - getApplicationContext(), - "解析包错误", Toast.LENGTH_SHORT) - .show(); + toast("解析包错误"); } else { PackageManager manager = new PackageManager( getApplicationContext()); @@ -364,7 +356,7 @@ public class MainActivity extends BaseFragmentActivity implements if (mHits[0] >= (SystemClock.uptimeMillis() - 1000)) { finish(); } else { - Toast.makeText(this, "再按一次退出", Toast.LENGTH_SHORT).show(); + toast("再按一次退出"); return true; } } diff --git a/app/src/main/java/com/gh/gamecenter/MobileActivity.java b/app/src/main/java/com/gh/gamecenter/MobileActivity.java index f49a82cda2..6bf71c6981 100644 --- a/app/src/main/java/com/gh/gamecenter/MobileActivity.java +++ b/app/src/main/java/com/gh/gamecenter/MobileActivity.java @@ -1,11 +1,5 @@ package com.gh.gamecenter; -import java.util.HashMap; -import java.util.regex.Pattern; - -import org.json.JSONException; -import org.json.JSONObject; - import android.app.Dialog; import android.content.Context; import android.os.Bundle; @@ -24,7 +18,6 @@ import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.RelativeLayout; import android.widget.TextView; -import android.widget.Toast; import com.android.volley.Request.Method; import com.android.volley.Response; @@ -40,6 +33,12 @@ import com.gh.gamecenter.entity.UserEntity; import com.gh.gamecenter.eventbus.EBSms; import com.gh.gamecenter.volley.extended.JsonObjectExtendedRequest; +import org.json.JSONException; +import org.json.JSONObject; + +import java.util.HashMap; +import java.util.regex.Pattern; + public class MobileActivity extends BaseActivity implements OnClickListener { private TextView mobile_tv_title, mobile_tv_hint, mobile_tv_send_again, @@ -127,17 +126,14 @@ public class MobileActivity extends BaseActivity implements OnClickListener { String mobileNumber = mobile_et_mobile.getText() .toString(); if (TextUtils.isEmpty(mobileNumber)) { - Toast.makeText(MobileActivity.this, "请输入手机号码", - Toast.LENGTH_SHORT).show(); + toast("请输入手机号码"); return true; } else if (mobileNumber.length() != 11) { - Toast.makeText(MobileActivity.this, "手机号码长度错误", - Toast.LENGTH_SHORT).show(); + toast("手机号码长度错误"); return true; } else if (!Pattern.matches(Constants.REGEX_MOBILE, mobileNumber)) { - Toast.makeText(MobileActivity.this, "手机号码错误", - Toast.LENGTH_SHORT).show(); + toast("手机号码错误"); return true; } else { InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); @@ -160,12 +156,10 @@ public class MobileActivity extends BaseActivity implements OnClickListener { String code = mobile_et_code.getText().toString() .trim(); if (TextUtils.isEmpty(code)) { - Toast.makeText(MobileActivity.this, "请输入验证码", - Toast.LENGTH_SHORT).show(); + toast("请输入验证码"); return true; } else if (code.length() != 6) { - Toast.makeText(MobileActivity.this, "验证码长度错误", - Toast.LENGTH_SHORT).show(); + toast("验证码长度错误"); return true; } else { InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); @@ -202,15 +196,12 @@ public class MobileActivity extends BaseActivity implements OnClickListener { if ("发送验证码".equals(str)) { String mobileNumber = mobile_et_mobile.getText().toString(); if (TextUtils.isEmpty(mobileNumber)) { - Toast.makeText(MobileActivity.this, "请输入手机号码", - Toast.LENGTH_SHORT).show(); + toast("请输入手机号码"); } else if (mobileNumber.length() != 11) { - Toast.makeText(MobileActivity.this, "手机号码长度错误", - Toast.LENGTH_SHORT).show(); + toast("手机号码长度错误"); } else if (!Pattern.matches(Constants.REGEX_MOBILE, mobileNumber)) { - Toast.makeText(MobileActivity.this, "手机号码错误", - Toast.LENGTH_SHORT).show(); + toast("手机号码错误"); } else { InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); imm.hideSoftInputFromWindow( @@ -220,11 +211,9 @@ public class MobileActivity extends BaseActivity implements OnClickListener { } else if ("确定绑定号码".equals(str)) { String code = mobile_et_code.getText().toString().trim(); if (TextUtils.isEmpty(code)) { - Toast.makeText(MobileActivity.this, "请输入验证码", - Toast.LENGTH_SHORT).show(); + toast("请输入验证码"); } else if (code.length() != 6) { - Toast.makeText(MobileActivity.this, "验证码长度错误", - Toast.LENGTH_SHORT).show(); + toast("验证码长度错误"); } else { InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); imm.hideSoftInputFromWindow( @@ -265,9 +254,7 @@ public class MobileActivity extends BaseActivity implements OnClickListener { try { if ("success".equals(response .getString("status"))) { - Toast.makeText(MobileActivity.this, - "绑定成功", Toast.LENGTH_SHORT) - .show(); + toast("绑定成功"); mobile_tv_confirm.setText("确定"); user.setMobileNumber(mobileNumber @@ -309,23 +296,17 @@ public class MobileActivity extends BaseActivity implements OnClickListener { if (!response.isNull("reason") && "MOBILE_NUMBER_ERROR".equals(response .getString("reason"))) { - Toast.makeText(MobileActivity.this, - "手机号码错误", - Toast.LENGTH_SHORT).show(); + toast("手机号码错误"); return; } else if (!response.isNull("reason") && "CODE_ERROR".equals(response .getString("reason"))) { - Toast.makeText(MobileActivity.this, - "验证码错误", Toast.LENGTH_SHORT) - .show(); + toast("验证码错误"); return; } else if (!response.isNull("reason") && "CODE_EXPIRE".equals(response .getString("reason"))) { - Toast.makeText(MobileActivity.this, - "验证码过期", Toast.LENGTH_SHORT) - .show(); + toast("验证码过期"); return; } } @@ -333,8 +314,7 @@ public class MobileActivity extends BaseActivity implements OnClickListener { e.printStackTrace(); } - Toast.makeText(MobileActivity.this, "发送失败", - Toast.LENGTH_SHORT).show(); + toast("发送失败"); } }); request.addHeader("Auth", token); @@ -364,9 +344,7 @@ public class MobileActivity extends BaseActivity implements OnClickListener { try { if ("success".equals(response .getString("status"))) { - Toast.makeText(MobileActivity.this, - "发送成功", Toast.LENGTH_SHORT) - .show(); + toast("发送成功"); if (mobile_tv_send_again != null) { mobile_tv_send_again .setClickable(false); @@ -419,23 +397,17 @@ public class MobileActivity extends BaseActivity implements OnClickListener { if (!response.isNull("reason") && "MOBILE_NUMBER_ERROR".equals(response .getString("reason"))) { - Toast.makeText(MobileActivity.this, - "手机号码错误", - Toast.LENGTH_SHORT).show(); + toast("手机号码错误"); return; } else if (!response.isNull("reason") && "USER_EXIST".equals(response .getString("reason"))) { - Toast.makeText(MobileActivity.this, - "用户已存在", Toast.LENGTH_SHORT) - .show(); + toast("用户已存在"); return; } else if (!response.isNull("reason") && "TIME_IS_NOT".equals(response .getString("reason"))) { - Toast.makeText(MobileActivity.this, - "稍后再试", Toast.LENGTH_SHORT) - .show(); + toast("稍后再试"); return; } } @@ -443,8 +415,7 @@ public class MobileActivity extends BaseActivity implements OnClickListener { e.printStackTrace(); } - Toast.makeText(MobileActivity.this, "发送失败", - Toast.LENGTH_SHORT).show(); + toast("发送失败"); } }); String token = TokenUtils.getToken(MobileActivity.this); diff --git a/app/src/main/java/com/gh/gamecenter/ModifyMobileActivity.java b/app/src/main/java/com/gh/gamecenter/ModifyMobileActivity.java index 57729b3475..2542d7a995 100644 --- a/app/src/main/java/com/gh/gamecenter/ModifyMobileActivity.java +++ b/app/src/main/java/com/gh/gamecenter/ModifyMobileActivity.java @@ -1,11 +1,5 @@ package com.gh.gamecenter; -import java.util.HashMap; -import java.util.regex.Pattern; - -import org.json.JSONException; -import org.json.JSONObject; - import android.app.Dialog; import android.content.Context; import android.os.Bundle; @@ -20,7 +14,6 @@ import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.RelativeLayout; import android.widget.TextView; -import android.widget.Toast; import com.android.volley.Request.Method; import com.android.volley.Response; @@ -36,6 +29,12 @@ import com.gh.gamecenter.entity.UserEntity; import com.gh.gamecenter.eventbus.EBSms; import com.gh.gamecenter.volley.extended.JsonObjectExtendedRequest; +import org.json.JSONException; +import org.json.JSONObject; + +import java.util.HashMap; +import java.util.regex.Pattern; + public class ModifyMobileActivity extends BaseActivity implements OnClickListener { @@ -117,15 +116,12 @@ public class ModifyMobileActivity extends BaseActivity implements if (step == 1 || step == 3) { String mobileNumber = modify_et_mobile.getText().toString(); if (TextUtils.isEmpty(mobileNumber)) { - Toast.makeText(ModifyMobileActivity.this, "请输入手机号码", - Toast.LENGTH_SHORT).show(); + toast("请输入手机号码"); } else if (mobileNumber.length() != 11) { - Toast.makeText(ModifyMobileActivity.this, "手机号码长度错误", - Toast.LENGTH_SHORT).show(); + toast("手机号码长度错误"); } else if (!Pattern.matches(Constants.REGEX_MOBILE, mobileNumber)) { - Toast.makeText(ModifyMobileActivity.this, "手机号码格式错误", - Toast.LENGTH_SHORT).show(); + toast("手机号码格式错误"); } else { InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); imm.hideSoftInputFromWindow( @@ -135,11 +131,9 @@ public class ModifyMobileActivity extends BaseActivity implements } else if (step == 2 || step == 4) { String code = modify_et_code.getText().toString().trim(); if (TextUtils.isEmpty(code)) { - Toast.makeText(ModifyMobileActivity.this, "请输入验证码", - Toast.LENGTH_SHORT).show(); + toast("请输入验证码"); } else if (code.length() != 6) { - Toast.makeText(ModifyMobileActivity.this, "验证码长度错误", - Toast.LENGTH_SHORT).show(); + toast("验证码长度错误"); } else { InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); imm.hideSoftInputFromWindow( @@ -184,10 +178,7 @@ public class ModifyMobileActivity extends BaseActivity implements try { if ("success".equals(response .getString("status"))) { - Toast.makeText( - ModifyMobileActivity.this, - "发送成功", Toast.LENGTH_SHORT) - .show(); + toast("发送成功"); if (modify_tv_send_again != null) { modify_tv_send_again .setClickable(false); @@ -266,10 +257,7 @@ public class ModifyMobileActivity extends BaseActivity implements try { if ("success".equals(response .getString("status"))) { - Toast.makeText( - ModifyMobileActivity.this, - "验证成功", Toast.LENGTH_SHORT) - .show(); + toast("验证成功"); step = 3; modify_tv_confirm.setText("发送验证码"); diff --git a/app/src/main/java/com/gh/gamecenter/NewsActivity.java b/app/src/main/java/com/gh/gamecenter/NewsActivity.java index 1abb01de22..05727eaebb 100644 --- a/app/src/main/java/com/gh/gamecenter/NewsActivity.java +++ b/app/src/main/java/com/gh/gamecenter/NewsActivity.java @@ -1,22 +1,5 @@ package com.gh.gamecenter; -import java.io.File; -import java.lang.reflect.Type; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Locale; -import java.util.Map; -import java.util.Random; - -import org.json.JSONArray; -import org.json.JSONException; -import org.json.JSONObject; - import android.app.Dialog; import android.content.Context; import android.content.Intent; @@ -50,7 +33,6 @@ import android.webkit.WebSettings; import android.webkit.WebSettings.LayoutAlgorithm; import android.webkit.WebView; import android.webkit.WebViewClient; -import android.widget.AbsListView; import android.widget.EditText; import android.widget.ImageView; import android.widget.LinearLayout; @@ -58,7 +40,6 @@ import android.widget.PopupWindow; import android.widget.ProgressBar; import android.widget.RelativeLayout; import android.widget.TextView; -import android.widget.Toast; import com.android.volley.NoConnectionError; import com.android.volley.Request.Method; @@ -111,6 +92,23 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.tendcloud.tenddata.TCAgent; +import org.json.JSONArray; +import org.json.JSONException; +import org.json.JSONObject; + +import java.io.File; +import java.lang.reflect.Type; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.Random; + import de.greenrobot.event.EventBus; /** @@ -182,31 +180,36 @@ public class NewsActivity extends BaseActivity implements OnClickListener { if (System.currentTimeMillis() - timeMap.get(key) >= 1000) { if (msg.arg1 == 0) { modifyUserNewsFeedbackVolleyCache("up"); - modifyNewsFeedback(entity.getId(), "up"); + modifyNewsFeedback(entity.getId(), "up", msg.arg2); } else if (msg.arg1 == 1) { modifyUserNewsFeedbackVolleyCache("down"); - modifyNewsFeedback(entity.getId(), "down"); + modifyNewsFeedback(entity.getId(), "down", msg.arg2); } else if (msg.arg1 == 2) { modifyUserNewsFeedbackVolleyCache(null); - cancelNewsFeedback(entity.getId()); + cancelNewsFeedback(entity.getId(), msg.arg2); } } } else if (msg.what == Constants.SEND_COMMENT_FEEDBACK) { String key = (String) msg.obj; + String oldAction = null; + if (key.contains("=")){ + int i = key.indexOf("="); + oldAction = key.substring(i + 1); + key = key.substring(0, i); + } if (System.currentTimeMillis() - timeMap.get(key) >= 1000) { int index = msg.arg2; - CommentEntity commentEntity = null; - commentEntity = commentList.get(index); + CommentEntity commentEntity = commentList.get(index); final String id = commentEntity.getId(); if (msg.arg1 == 0) { modifyUserCommentFeedbackVolleyCache(id, "up"); - modifyCommentFeedback(entity.getId(), id, "up"); + modifyCommentFeedback(entity.getId(), id, "up", oldAction, index); } else if (msg.arg1 == 1) { modifyUserCommentFeedbackVolleyCache(id, "down"); - modifyCommentFeedback(entity.getId(), id, "down"); + modifyCommentFeedback(entity.getId(), id, "down", oldAction, index); } else if (msg.arg1 == 2) { modifyUserCommentFeedbackVolleyCache(id, null); - cancelCommentFeedback(entity.getId(), id); + cancelCommentFeedback(entity.getId(), id, oldAction, index); } } } @@ -250,8 +253,7 @@ public class NewsActivity extends BaseActivity implements OnClickListener { DisplayMetrics outMetrics = new DisplayMetrics(); getWindowManager().getDefaultDisplay().getMetrics(outMetrics); - width = outMetrics.widthPixels - - DisplayUtils.dip2px(getApplicationContext(), 73); + width = outMetrics.widthPixels - DisplayUtils.dip2px(getApplicationContext(), 73); RelativeLayout reuse_actionbar = (RelativeLayout) findViewById(R.id.reuse_actionbar); @@ -259,10 +261,8 @@ public class NewsActivity extends BaseActivity implements OnClickListener { share.setOnClickListener(new OnClickListener() { @Override public void onClick(View v) { - String url = "http://news.ghzhushou.com/" + entity.getId() - + ".html"; - showShare(url, entity.getTitle(), gameEntity.getIcon(), - entrance, "新闻"); + String url = "http://news.ghzhushou.com/" + entity.getId() + ".html"; + showShare(url, entity.getTitle(), gameEntity.getIcon(), entrance, "新闻"); } }); ((ImageView) share.findViewById(R.id.reuse_iv_ico)) @@ -287,7 +287,8 @@ public class NewsActivity extends BaseActivity implements OnClickListener { animation.setDuration(500); essaydetails_ll_comment.startAnimation(animation); } - essaydetails_rv_show.scrollToPosition(2); + int moreSize = entity.getMore() == null ? 0 : entity.getMore().size(); + essaydetails_rv_show.smoothScrollToPosition(3 + moreSize); } }); ((ImageView) comment.findViewById(R.id.reuse_iv_ico)) @@ -319,11 +320,9 @@ public class NewsActivity extends BaseActivity implements OnClickListener { if (NetworkUtils.isWifiConnected(this)) { essaydetails_webView.setVisibility(View.INVISIBLE); if (newsId != null) { - essaydetails_webView.loadUrl("http://news.ghzhushou.com/" - + newsId + ".html"); + essaydetails_webView.loadUrl("http://news.ghzhushou.com/" + newsId + ".html"); } else { - essaydetails_webView.loadUrl("http://news.ghzhushou.com/" - + entity.getId() + ".html"); + essaydetails_webView.loadUrl("http://news.ghzhushou.com/" + entity.getId() + ".html"); } } else { essaydetails_webView.setVisibility(View.GONE); @@ -411,7 +410,8 @@ public class NewsActivity extends BaseActivity implements OnClickListener { super.onScrollStateChanged(recyclerView, newState); if (!isDestroy){ if (newState == 0) { - if (linearLayoutManager.findLastVisibleItemPosition() >= 3) { + int moreSize = entity.getMore() == null ? 0 : entity.getMore().size(); + if (linearLayoutManager.findLastVisibleItemPosition() >= 2 + moreSize) { if (essaydetails_ll_comment.getVisibility() != View.VISIBLE) { essaydetails_ll_comment.setVisibility(View.VISIBLE); essaydetails_ll_bottom.setVisibility(View.GONE); @@ -432,7 +432,7 @@ public class NewsActivity extends BaseActivity implements OnClickListener { } } } - if (linearLayoutManager.findLastVisibleItemPosition() == adapter.getItemCount() - 1 && isLoading) { + if (isLoading && linearLayoutManager.findLastVisibleItemPosition() == adapter.getItemCount() - 1) { getComment(commentList.size()); } } @@ -460,7 +460,7 @@ public class NewsActivity extends BaseActivity implements OnClickListener { System.arraycopy(mHits, 1, mHits, 0, mHits.length - 1); mHits[mHits.length - 1] = SystemClock.uptimeMillis(); if (mHits[0] >= (SystemClock.uptimeMillis() - 1000)) { - essaydetails_rv_show.scrollToPosition(0); + essaydetails_rv_show.smoothScrollToPosition(0); } } }); @@ -606,8 +606,7 @@ public class NewsActivity extends BaseActivity implements OnClickListener { statusMap.put(entry.getUrl(), "downloading"); } else { - Toast.makeText(NewsActivity.this, msg, - Toast.LENGTH_SHORT).show(); + toast(msg); } } } else { @@ -752,8 +751,7 @@ public class NewsActivity extends BaseActivity implements OnClickListener { "downloading"); } else { - Toast.makeText(NewsActivity.this, msg, - Toast.LENGTH_SHORT).show(); + toast(msg); } } } else { @@ -773,8 +771,7 @@ public class NewsActivity extends BaseActivity implements OnClickListener { dialog.show(); } } else { - Toast.makeText(this, "稍等片刻~！游戏正在上传中...", Toast.LENGTH_SHORT) - .show(); + toast("稍等片刻~！游戏正在上传中..."); } } else if (v == essaydetails_iv_share) { Map map = new HashMap(); @@ -915,8 +912,7 @@ public class NewsActivity extends BaseActivity implements OnClickListener { public void onResponse(JSONArray response) { Utils.log(response); if (!isDestroy) { - Type listType = new TypeToken>() { - }.getType(); + Type listType = new TypeToken>() {}.getType(); Gson gson = new Gson(); List list = gson.fromJson( response.toString(), listType); @@ -945,7 +941,7 @@ public class NewsActivity extends BaseActivity implements OnClickListener { more.add(list.get(index[i])); } entity.setMore(more); - + adapter.notifyItemChanged(0); adapter.notifyItemRangeInserted(1, entity.getMore().size()); } } @@ -1003,22 +999,18 @@ public class NewsActivity extends BaseActivity implements OnClickListener { essaydetails_progressbar.setVisibility(View.GONE); essaydetails_tv_per.setVisibility(View.GONE); if (isInstalled) { - essaydetails_tv_download.setText("启动《" + gameEntity.getName() - + "》"); + essaydetails_tv_download.setText("启动《" + gameEntity.getName() + "》"); } else { - essaydetails_tv_download.setText("下载《" + gameEntity.getName() - + "》"); + essaydetails_tv_download.setText("下载《" + gameEntity.getName() + "》"); } } else { essaydetails_tv_download.setVisibility(View.VISIBLE); essaydetails_progressbar.setVisibility(View.GONE); essaydetails_tv_per.setVisibility(View.GONE); if (isInstalled) { - essaydetails_tv_download.setText("启动《" + gameEntity.getName() - + "》" + gameEntity.getDownloadAddWord()); + essaydetails_tv_download.setText("启动《" + gameEntity.getName() + "》" + gameEntity.getDownloadAddWord()); } else { - essaydetails_tv_download.setText("下载《" + gameEntity.getName() - + "》" + gameEntity.getDownloadAddWord()); + essaydetails_tv_download.setText("下载《" + gameEntity.getName() + "》" + gameEntity.getDownloadAddWord()); } } if (gameEntity.getApk() == null) { @@ -1026,8 +1018,7 @@ public class NewsActivity extends BaseActivity implements OnClickListener { isShowBottom = false; } else { for (int i = 0, size = gameEntity.getApk().size(); i < size; i++) { - String packageName = gameEntity.getApk().get(i) - .getPackageName(); + String packageName = gameEntity.getApk().get(i).getPackageName(); if (PackageManager.isInstalled(packageName) || getPackageName().equals(packageName)) { essaydetails_ll_bottom.setVisibility(View.GONE); @@ -1097,27 +1088,21 @@ public class NewsActivity extends BaseActivity implements OnClickListener { + response.toString()); if (!isDestroy) { try { - String action = response.getJSONObject( - "news").getString("action"); + String action = response.getJSONObject("news").getString("action"); if (!TextUtils.isEmpty(action)) { entity.setAction(action); } - JSONArray comment = response - .getJSONArray("comment"); + JSONArray comment = response.getJSONArray("comment"); if (comment.length() != 0) { commentFeedbackMap = new ArrayMap(); - for (int i = 0; i < comment - .length(); i++) { - JSONObject jsonObject = comment - .getJSONObject(i); + for (int i = 0; i < comment.length(); i++) { + JSONObject jsonObject = comment.getJSONObject(i); commentFeedbackMap.put( - jsonObject - .getString("id"), - jsonObject - .getString("action")); + jsonObject.getString("id"), + jsonObject.getString("action")); } } - adapter.notifyDataSetChanged(); + adapter.notifyItemRangeChanged(1, adapter.getItemCount() - 1); } catch (JSONException e) { e.printStackTrace(); } @@ -1333,6 +1318,8 @@ public class NewsActivity extends BaseActivity implements OnClickListener { @Override public void onClick(View v) { if (v == essaydetails_ll_liked) { + Message msg = Message.obtain(); + msg.what = Constants.SEND_NEWS_FEEDBACK; if (entity.getAction() != null) { if ("up".equals(entity.getAction())) { entity.setAction(null); @@ -1342,16 +1329,18 @@ public class NewsActivity extends BaseActivity implements OnClickListener { } else { adapter.notifyItemChanged(1 + entity.getMore().size()); } - Message msg = Message.obtain(); - msg.what = Constants.SEND_NEWS_FEEDBACK; msg.arg1 = 2; + msg.arg2 = 1; msg.obj = "CancelNewsLike"; timeMap.put("CancelNewsLike", System.currentTimeMillis()); handler.sendMessageDelayed(msg, 1000); return; } else if ("down".equals(entity.getAction())) { entity.setDown(entity.getDown() - 1); + msg.arg2 = 2; } + } else { + msg.arg2 = 0; } entity.setAction("up"); entity.setUp(entity.getUp() + 1); @@ -1360,13 +1349,13 @@ public class NewsActivity extends BaseActivity implements OnClickListener { } else { adapter.notifyItemChanged(1 + entity.getMore().size()); } - Message msg = Message.obtain(); - msg.what = Constants.SEND_NEWS_FEEDBACK; msg.arg1 = 0; msg.obj = "SendNewsLike"; timeMap.put("SendNewsLike", System.currentTimeMillis()); handler.sendMessageDelayed(msg, 1000); } else if (v == essaydetails_ll_unliked) { + Message msg = Message.obtain(); + msg.what = Constants.SEND_NEWS_FEEDBACK; if (entity.getAction() != null) { if ("down".equals(entity.getAction())) { entity.setAction(null); @@ -1376,16 +1365,18 @@ public class NewsActivity extends BaseActivity implements OnClickListener { } else { adapter.notifyItemChanged(1 + entity.getMore().size()); } - Message msg = Message.obtain(); - msg.what = Constants.SEND_NEWS_FEEDBACK; msg.arg1 = 2; + msg.arg2 = 2; msg.obj = "CancelNewsLike"; timeMap.put("CancelNewsLike", System.currentTimeMillis()); handler.sendMessageDelayed(msg, 1000); return; } else if ("up".equals(entity.getAction())) { entity.setUp(entity.getUp() - 1); + msg.arg2 = 1; } + } else { + msg.arg2 = 0; } entity.setAction("down"); entity.setDown(entity.getDown() + 1); @@ -1394,8 +1385,6 @@ public class NewsActivity extends BaseActivity implements OnClickListener { } else { adapter.notifyItemChanged(1 + entity.getMore().size()); } - Message msg = Message.obtain(); - msg.what = Constants.SEND_NEWS_FEEDBACK; msg.arg1 = 1; msg.obj = "SendNewsUnlike"; timeMap.put("SendNewsUnlike", System.currentTimeMillis()); @@ -1521,41 +1510,44 @@ public class NewsActivity extends BaseActivity implements OnClickListener { if (entity.getAuthor() != null) { holder.essaydetails_author.setText(entity.getAuthor()); } - - holder.essaydetails_wv_content.addJavascriptInterface(new JsInterface(NewsActivity.this), "imagelistener"); - WebSettings webSettings = holder.essaydetails_wv_content.getSettings(); - webSettings.setLayoutAlgorithm(LayoutAlgorithm.SINGLE_COLUMN); - webSettings.setJavaScriptEnabled(true); - holder.essaydetails_wv_content.loadDataWithBaseURL(null, entity.getContent(), "text/html", "utf-8", null); - holder.essaydetails_wv_content .setWebViewClient(new WebViewClient() { - @Override - public void onPageFinished(WebView view, - String url) { - view.loadUrl("javascript:(function(){" - + "var imgs = document.getElementsByTagName(\"img\");" - + "for(var i = 0; i < imgs.length - 1; i++) {" - + " window.imagelistener.addImage(imgs[i].src);" - + "}" - + "for(var i = 0; i < imgs.length - 1; i++) {" - + " imgs[i].onclick = function() {" - + " window.imagelistener.openImage(this.src);" - + " }" - + "}" - + "var as = document.getElementsByTagName(\"a\");" - + "for(var i = 0; i < as.length; i++) {" - + " as[i].onclick = function() {" - + " window.imagelistener.skip(this.id, this.type);" - + " }" - + "}" - + "})()"); - super.onPageFinished(view, url); - if (essaydetails_ll_loading != null) { - essaydetails_ll_loading.setVisibility(View.GONE); - essaydetails_rv_show.setVisibility(View.VISIBLE); + if (holder.essaydetails_wv_content.getTag() == null) { + holder.essaydetails_wv_content.addJavascriptInterface(new JsInterface(NewsActivity.this), "imagelistener"); + WebSettings webSettings = holder.essaydetails_wv_content.getSettings(); + webSettings.setLayoutAlgorithm(LayoutAlgorithm.SINGLE_COLUMN); + webSettings.setJavaScriptEnabled(true); + holder.essaydetails_wv_content.loadDataWithBaseURL(null, entity.getContent(), "text/html", "utf-8", null); + holder.essaydetails_wv_content .setWebViewClient(new WebViewClient() { + @Override + public void onPageFinished(WebView view, + String url) { + view.loadUrl("javascript:(function(){" + + "var imgs = document.getElementsByTagName(\"img\");" + + "for(var i = 0; i < imgs.length - 1; i++) {" + + " window.imagelistener.addImage(imgs[i].src);" + + "}" + + "for(var i = 0; i < imgs.length - 1; i++) {" + + " imgs[i].onclick = function() {" + + " window.imagelistener.openImage(this.src);" + + " }" + + "}" + + "var as = document.getElementsByTagName(\"a\");" + + "for(var i = 0; i < as.length; i++) {" + + " as[i].onclick = function() {" + + " window.imagelistener.skip(this.id, this.type);" + + " }" + + "}" + + "})()"); + super.onPageFinished(view, url); + if (essaydetails_ll_loading != null) { + essaydetails_ll_loading.setVisibility(View.GONE); + essaydetails_rv_show.setVisibility(View.VISIBLE); + } } - } - }); - if (entity.getMore() != null) { + }); + holder.essaydetails_wv_content.setTag("show"); + } + + if (entity.getMore() != null && entity.getMore().size() != 0) { holder.essaydetails_tv_more.setVisibility(View.VISIBLE); } else { holder.essaydetails_tv_more.setVisibility(View.GONE); @@ -1633,10 +1625,10 @@ public class NewsActivity extends BaseActivity implements OnClickListener { fullMap.put(commentEntity.getId(), true); if (entity.getMore() == null) { adapter.notifyItemChanged(index + 2); - essaydetails_rv_show.scrollToPosition(index + 2); + essaydetails_rv_show.smoothScrollToPosition(index + 2); } else { adapter.notifyItemChanged(index + 2 + entity.getMore().size()); - essaydetails_rv_show.scrollToPosition(index + 2 + entity.getMore().size()); + essaydetails_rv_show.smoothScrollToPosition(index + 2 + entity.getMore().size()); } } }); @@ -1700,6 +1692,8 @@ public class NewsActivity extends BaseActivity implements OnClickListener { holder.comment_item_tv_like.setOnClickListener(new OnClickListener() { @Override public void onClick(View v) { + Message msg = Message.obtain(); + msg.what = Constants.SEND_COMMENT_FEEDBACK; if (commentFeedbackMap != null) { String key = commentEntity.getId(); String action = commentFeedbackMap.get(key); @@ -1712,20 +1706,22 @@ public class NewsActivity extends BaseActivity implements OnClickListener { } else { adapter.notifyItemChanged(index + 2 + entity.getMore().size()); } - Message msg = Message.obtain(); - msg.what = Constants.SEND_COMMENT_FEEDBACK; msg.arg1 = 2; msg.arg2 = index; - msg.obj = "CancelCommentLike"; + msg.obj = "CancelCommentLike=up"; timeMap.put("CancelCommentLike", System.currentTimeMillis()); handler.sendMessageDelayed(msg, 1000); return; } else { commentEntity.getFeedback().setDown(commentEntity.getFeedback().getDown() - 1); + msg.obj = "SendCommentLike=down"; } + } else { + msg.obj = "SendCommentLike"; } } else { commentFeedbackMap = new ArrayMap(); + msg.obj = "SendCommentLike"; } commentFeedbackMap.put(commentEntity.getId(), "up"); commentEntity.getFeedback().setUp(commentEntity.getFeedback().getUp() + 1); @@ -1734,11 +1730,8 @@ public class NewsActivity extends BaseActivity implements OnClickListener { } else { adapter.notifyItemChanged(index + 2 + entity.getMore().size()); } - Message msg = Message.obtain(); - msg.what = Constants.SEND_COMMENT_FEEDBACK; msg.arg1 = 0; msg.arg2 = index; - msg.obj = "SendCommentLike"; timeMap.put("SendCommentLike", System.currentTimeMillis()); handler.sendMessageDelayed(msg, 1000); } @@ -1746,6 +1739,8 @@ public class NewsActivity extends BaseActivity implements OnClickListener { holder.comment_item_tv_unlike.setOnClickListener(new OnClickListener() { @Override public void onClick(View v) { + Message msg = Message.obtain(); + msg.what = Constants.SEND_COMMENT_FEEDBACK; if (commentFeedbackMap != null) { String key = commentList.get(index).getId(); String action = commentFeedbackMap.get(key); @@ -1759,21 +1754,22 @@ public class NewsActivity extends BaseActivity implements OnClickListener { } else { adapter.notifyItemChanged(index + 2 + entity.getMore().size()); } - Message msg = Message.obtain(); - msg.what = Constants.SEND_COMMENT_FEEDBACK; msg.arg1 = 2; msg.arg2 = index; - msg.obj = "CancelCommentLike"; + msg.obj = "CancelCommentLike=down"; timeMap.put("CancelCommentLike", System.currentTimeMillis()); handler.sendMessageDelayed(msg, 1000); return; } else { - commentList.get(index).getFeedback() - .setUp(commentList.get(index).getFeedback().getUp() - 1); + commentList.get(index).getFeedback().setUp(commentList.get(index).getFeedback().getUp() - 1); + msg.obj = "SendCommentUnlike=up"; } + } else { + msg.obj = "SendCommentUnlike"; } } else { commentFeedbackMap = new ArrayMap(); + msg.obj = "SendCommentUnlike"; } commentFeedbackMap.put(commentList.get(index).getId(), "down"); commentList.get(index).getFeedback() @@ -1783,11 +1779,8 @@ public class NewsActivity extends BaseActivity implements OnClickListener { } else { adapter.notifyItemChanged(index + 2 + entity.getMore().size()); } - Message msg = Message.obtain(); - msg.what = Constants.SEND_COMMENT_FEEDBACK; msg.arg1 = 1; msg.arg2 = index; - msg.obj = "SendCommentUnlike"; timeMap.put("SendCommentUnlike", System.currentTimeMillis()); handler.sendMessageDelayed(msg, 1000); } @@ -1804,7 +1797,7 @@ public class NewsActivity extends BaseActivity implements OnClickListener { @Override public void onClick(View v) { isNetworkError = false; - adapter.notifyDataSetChanged(); + adapter.notifyItemChanged(adapter.getItemCount() - 1); getComment(commentList.size()); } }); @@ -1921,11 +1914,9 @@ public class NewsActivity extends BaseActivity implements OnClickListener { essaydetails_progressbar.setVisibility(View.GONE); essaydetails_tv_per.setVisibility(View.GONE); if (TextUtils.isEmpty(gameEntity.getDownloadAddWord())) { - essaydetails_tv_download.setText("下载《" + gameEntity.getName() - + "》"); + essaydetails_tv_download.setText("下载《" + gameEntity.getName() + "》"); } else { - essaydetails_tv_download.setText("下载《" + gameEntity.getName() - + "》" + gameEntity.getDownloadAddWord()); + essaydetails_tv_download.setText("下载《" + gameEntity.getName() + "》" + gameEntity.getDownloadAddWord()); } break; default: @@ -1937,8 +1928,7 @@ public class NewsActivity extends BaseActivity implements OnClickListener { private void getComment(int offset) { JsonArrayExtendedRequest request = new JsonArrayExtendedRequest( TimestampUtils.addTimestamp( - Config.HOST + "v1d45/news/" + entity.getId() - + "/comment?limit=10&offset=" + offset, + Config.HOST + "v1d45/news/" + entity.getId() + "/comment?limit=10&offset=" + offset, Constants.COMMENT_CD), new Response.Listener() { @@ -1953,6 +1943,11 @@ public class NewsActivity extends BaseActivity implements OnClickListener { commentList.add(list.get(i)); adapter.notifyItemInserted(adapter.getItemCount() - 2); } + if (list.size() > 4){ + essaydetails_rv_show.smoothScrollToPosition(adapter.getItemCount() - list.size() + 2); + } else { + essaydetails_rv_show.smoothScrollToPosition(adapter.getItemCount() - 1); + } if (list.size() < 10) { isLoading = false; adapter.notifyItemRemoved(adapter.getItemCount() - 1); @@ -1968,7 +1963,7 @@ public class NewsActivity extends BaseActivity implements OnClickListener { || error.getClass().equals(TimeoutError.class)) { if (!isDestroy) { // TODO 处理加载时断网或超时情况 - Toast.makeText(NewsActivity.this, "网络错误", Toast.LENGTH_SHORT).show(); + toast("网络错误"); isNetworkError = true; adapter.notifyItemChanged(adapter.getItemCount() - 2); } @@ -2100,7 +2095,7 @@ public class NewsActivity extends BaseActivity implements OnClickListener { private void sendComment(final CharSequence text) { if (text.length() == 0) { - Toast.makeText(this, "请输入评论内容！", Toast.LENGTH_SHORT).show(); + toast("请输入评论内容！"); return; } @@ -2123,32 +2118,28 @@ public class NewsActivity extends BaseActivity implements OnClickListener { Utils.log(response.toString()); dialog.dismiss(); try { - if (response.getString("status").equals( - "success")) { - essaydetails_tv_comment_content - .setText(""); - Toast.makeText(NewsActivity.this, - "发送成功", Toast.LENGTH_SHORT) - .show(); + if (response.getString("status").equals("success")) { + essaydetails_tv_comment_content.setText(""); + toast("发送成功"); Gson gson = new Gson(); - CommentEntity commentEntity = gson - .fromJson( - response.getJSONObject( - "comment") - .toString(), - CommentEntity.class); + CommentEntity commentEntity = gson.fromJson(response.getJSONObject("comment").toString(), CommentEntity.class); commentList.add(0, commentEntity); int moreSize = entity.getMore() == null ? 0 : entity.getMore().size(); adapter.notifyItemInserted(2 + moreSize); + if (commentList.size() == 1) { + essaydetails_rv_show.smoothScrollToPosition(adapter.getItemCount() - 1); + } else { + essaydetails_rv_show.smoothScrollToPosition(1 + moreSize); + } modifyNewsCommentVolleyCache(0, response.getJSONObject("comment")); } else if (response.getString("status").equals("refuse")) { - Toast.makeText(NewsActivity.this, "评论太频繁，请稍后再试", Toast.LENGTH_SHORT).show(); + toast("评论太频繁，请稍后再试"); } else if (response.getString("status").equals("device_block") || response.getString("status").equals("user_block")) { - Toast.makeText(NewsActivity.this, "你已被禁言，请稍后再试", Toast.LENGTH_SHORT).show(); + toast("你已被禁言，请稍后再试"); } else { - Toast.makeText(NewsActivity.this, "发送失败", Toast.LENGTH_SHORT).show(); + toast("发送失败"); } } catch (JSONException e) { e.printStackTrace(); @@ -2165,8 +2156,7 @@ public class NewsActivity extends BaseActivity implements OnClickListener { error.networkResponse.data)); } dialog.dismiss(); - Toast.makeText(NewsActivity.this, "发送失败", - Toast.LENGTH_SHORT).show(); + toast("发送失败"); } }); String token = TokenUtils.getToken(NewsActivity.this); @@ -2185,6 +2175,7 @@ public class NewsActivity extends BaseActivity implements OnClickListener { private void modifyNewsCommentVolleyCache(int offset, JSONObject commentData) { File cacheDir = new File(getCacheDir(), DEFAULT_CACHE_DIR); DiskBasedCache cache = new DiskBasedCache(cacheDir); +// String key = Config.HOST + "v1d45/news/" + entity.getId() + "/comment?limit=10&offset=" + offset; String key = TimestampUtils.addTimestamp(Config.HOST + "v1d45/news/" + entity.getId() + "/comment?limit=10&offset=" + offset, Constants.COMMENT_CD); @@ -2219,6 +2210,7 @@ public class NewsActivity extends BaseActivity implements OnClickListener { if (TextUtils.isEmpty(action)) { return; } +// String key = Config.HOST + "v1d45/news/" + entity.getId() + "/feedback"; String key = TimestampUtils.addTimestamp(Config.HOST + "v1d45/news/" + entity.getId() + "/feedback", Constants.COMMENT_CD); File cacheDir = new File(getCacheDir(), DEFAULT_CACHE_DIR); @@ -2242,6 +2234,7 @@ public class NewsActivity extends BaseActivity implements OnClickListener { * 修改用户对新闻的反馈的volley缓存 */ private void modifyUserNewsFeedbackVolleyCache(String action) { +// String key = Config.HOST + "v1d45/news/" + entity.getId() + "/user/feedback"; String key = TimestampUtils.addTimestamp(Config.HOST + "v1d45/news/" + entity.getId() + "/user/feedback", Constants.COMMENT_CD); File cacheDir = new File(getCacheDir(), DEFAULT_CACHE_DIR); @@ -2253,18 +2246,12 @@ public class NewsActivity extends BaseActivity implements OnClickListener { GzipUtils.decompressBytes(data))); if (!jsonObject.isNull("news")) { if (action == null) { - modifyNewsFeedbackVolleyCache( - jsonObject.getJSONObject("news").getString( - "action"), -1); + modifyNewsFeedbackVolleyCache(jsonObject.getJSONObject("news").getString("action"), -1); jsonObject.getJSONObject("news").put("action", ""); } else { - modifyNewsFeedbackVolleyCache( - jsonObject.getJSONObject("news").getString( - "action"), -1); + modifyNewsFeedbackVolleyCache(jsonObject.getJSONObject("news").getString("action"), -1); jsonObject.getJSONObject("news").put("action", action); - modifyNewsFeedbackVolleyCache( - jsonObject.getJSONObject("news").getString( - "action"), 1); + modifyNewsFeedbackVolleyCache(jsonObject.getJSONObject("news").getString("action"), 1); } } else { if (action != null) { @@ -2287,6 +2274,7 @@ public class NewsActivity extends BaseActivity implements OnClickListener { * 修改用户对评论的反馈的volley缓存 */ private void modifyUserCommentFeedbackVolleyCache(String id, String action) { +// String key = Config.HOST + "v1d45/news/" + entity.getId() + "/user/feedback"; String key = TimestampUtils.addTimestamp(Config.HOST + "v1d45/news/" + entity.getId() + "/user/feedback", Constants.COMMENT_CD); File cacheDir = new File(getCacheDir(), DEFAULT_CACHE_DIR); @@ -2305,8 +2293,7 @@ public class NewsActivity extends BaseActivity implements OnClickListener { if (!item.getString("id").equals(id)) { newComment.put(item); } else { - modifyCommentFeedbackVolleyCache(0, id, - item.getString("action"), -1); + modifyCommentFeedbackVolleyCache(0, id, item.getString("action"), -1); } } jsonObject.put("comment", newComment); @@ -2314,11 +2301,9 @@ public class NewsActivity extends BaseActivity implements OnClickListener { for (int i = 0; i < comment.length(); i++) { JSONObject item = comment.getJSONObject(i); if (item.getString("id").equals(id)) { - modifyCommentFeedbackVolleyCache(0, id, - item.getString("action"), -1); + modifyCommentFeedbackVolleyCache(0, id, item.getString("action"), -1); item.put("action", action); - modifyCommentFeedbackVolleyCache(0, id, - item.getString("action"), 1); + modifyCommentFeedbackVolleyCache(0, id, item.getString("action"), 1); break; } } @@ -2346,36 +2331,29 @@ public class NewsActivity extends BaseActivity implements OnClickListener { /* * 修改评论反馈的volley缓存 */ - private void modifyCommentFeedbackVolleyCache(int offset, String id, - String action, int value) { + private void modifyCommentFeedbackVolleyCache(int offset, String id, String action, int value) { +// String key = Config.HOST + "v1d45/news/" + entity.getId() + "/comment?limit=10&offset=" + offset; String key = TimestampUtils.addTimestamp(Config.HOST + "v1d45/news/" - + entity.getId() + "/comment?limit=10&offset=" + offset, - Constants.COMMENT_CD); + + entity.getId() + "/comment?limit=10&offset=" + offset, Constants.COMMENT_CD); File cacheDir = new File(getCacheDir(), DEFAULT_CACHE_DIR); DiskBasedCache cache = new DiskBasedCache(cacheDir); byte[] data = cache.getData(key); if (data != null) { try { - JSONArray jsonArray = new JSONArray(new String( - GzipUtils.decompressBytes(data))); + JSONArray jsonArray = new JSONArray(new String(GzipUtils.decompressBytes(data))); for (int i = 0; i < jsonArray.length(); i++) { JSONObject comment = jsonArray.getJSONObject(i); if (comment.getString("_id").equals(id)) { JSONObject feedback = comment.getJSONObject("feedback"); feedback.put(action, feedback.getLong(action) + value); - feedback.put( - "val", - feedback.getLong("up") - - feedback.getLong("down")); + feedback.put("val", feedback.getLong("up") - feedback.getLong("down")); Utils.log(jsonArray.toString()); - cache.modify(key, GzipUtils.compressBytes(jsonArray - .toString().getBytes())); + cache.modify(key, GzipUtils.compressBytes(jsonArray.toString().getBytes())); return; } } if (jsonArray.length() == 10) { - modifyCommentFeedbackVolleyCache(offset + 10, id, action, - value); + modifyCommentFeedbackVolleyCache(offset + 10, id, action, value); } } catch (JSONException e) { e.printStackTrace(); @@ -2386,9 +2364,8 @@ public class NewsActivity extends BaseActivity implements OnClickListener { /* * 修改新闻的反馈 */ - private void modifyNewsFeedback(String news_id, String action) { - final String url = Config.HOST + "v1d45/news/" + news_id + "/feedback/" - + action; + private void modifyNewsFeedback(String news_id, final String newAction, final int oldAction) { + final String url = Config.HOST + "v1d45/news/" + news_id + "/feedback/" + newAction; new Thread() { @Override public void run() { @@ -2397,15 +2374,40 @@ public class NewsActivity extends BaseActivity implements OnClickListener { @Override public void onResponse(JSONObject response) { - Utils.log("modifyNewsFeedback = " - + response.toString()); + Utils.log("modifyNewsFeedback = " + response.toString()); } }, new Response.ErrorListener() { @Override public void onErrorResponse(VolleyError error) { - Utils.log("modifyNewsFeedback = " - + error.toString()); + Utils.log("modifyNewsFeedback = " + error.toString()); + //TODO 失败回滚 + String action = null; + if ("up".equals(newAction)) { + if (oldAction == 2) { + action = "down"; + entity.setUp(entity.getUp() - 1); + entity.setDown(entity.getDown() + 1); + } else if (oldAction == 0) { + entity.setUp(entity.getUp() - 1); + } else { + action = "up"; + } + } else if ("down".equals(newAction)) { + if (oldAction == 1) { + action = "up"; + entity.setUp(entity.getUp() + 1); + entity.setDown(entity.getDown() - 1); + } else if (oldAction == 0) { + entity.setDown(entity.getDown() - 1); + } else { + action = "down"; + } + } + modifyUserNewsFeedbackVolleyCache(action); + entity.setAction(action); + int moreSize = entity.getMore() == null ? 0 : entity.getMore().size(); + adapter.notifyItemChanged(1 + moreSize); } }); String token = TokenUtils.getToken(NewsActivity.this); @@ -2419,7 +2421,7 @@ public class NewsActivity extends BaseActivity implements OnClickListener { /* * 取消对新闻的反馈 */ - private void cancelNewsFeedback(String news_id) { + private void cancelNewsFeedback(String news_id, final int oldAction) { final String url = Config.HOST + "v1d45/news/" + news_id + "/feedback"; new Thread() { @Override @@ -2429,15 +2431,25 @@ public class NewsActivity extends BaseActivity implements OnClickListener { @Override public void onResponse(JSONObject response) { - Utils.log("cancelNewsFeedback = " - + response.toString()); + Utils.log("cancelNewsFeedback = " + response.toString()); } }, new Response.ErrorListener() { @Override public void onErrorResponse(VolleyError error) { - Utils.log("cancelNewsFeedback = " - + error.toString()); + Utils.log("cancelNewsFeedback = " + error.toString()); + //TODO 失败回滚 + if (oldAction == 1) { + entity.setAction("up"); + entity.setUp(entity.getUp() + 1); + modifyUserNewsFeedbackVolleyCache("up"); + } else if (oldAction == 2) { + entity.setAction("down"); + entity.setDown(entity.getDown() + 1); + modifyUserNewsFeedbackVolleyCache("down"); + } + int moreSize = entity.getMore() == null ? 0 : entity.getMore().size(); + adapter.notifyItemChanged(1 + moreSize); } }); String token = TokenUtils.getToken(NewsActivity.this); @@ -2451,10 +2463,8 @@ public class NewsActivity extends BaseActivity implements OnClickListener { /* * 修改评论的反馈 */ - private void modifyCommentFeedback(String news_id, String comment_id, - String action) { - final String url = Config.HOST + "v1d45/news/" + news_id + "/comment/" - + comment_id + "/feedback/" + action; + private void modifyCommentFeedback(String news_id, String comment_id, final String newAction, final String oldAction, final int index) { + final String url = Config.HOST + "v1d45/news/" + news_id + "/comment/" + comment_id + "/feedback/" + newAction; new Thread() { @Override public void run() { @@ -2463,15 +2473,43 @@ public class NewsActivity extends BaseActivity implements OnClickListener { @Override public void onResponse(JSONObject response) { - Utils.log("modifyCommentFeedback = " - + response.toString()); + Utils.log("modifyCommentFeedback = " + response.toString()); } }, new Response.ErrorListener() { @Override public void onErrorResponse(VolleyError error) { - Utils.log("modifyCommentFeedback = " - + error.toString()); + Utils.log("modifyCommentFeedback = " + error.toString()); + //TODO 失败回滚 + String action = null; + if ("up".equals(newAction)) { + if ("down".equals(oldAction)) { + commentList.get(index).getFeedback().setUp(commentList.get(index).getFeedback().getUp() - 1); + commentList.get(index).getFeedback().setDown(commentList.get(index).getFeedback().getDown() + 1); + commentFeedbackMap.put(commentList.get(index).getId(), "down"); + action = "down"; + } else if (oldAction == null) { + commentList.get(index).getFeedback().setUp(commentList.get(index).getFeedback().getUp() - 1); + commentFeedbackMap.remove(commentList.get(index).getId()); + } else { + action = "up"; + } + } else if ("down".equals(newAction)) { + if ("up".equals(oldAction)) { + commentList.get(index).getFeedback().setUp(commentList.get(index).getFeedback().getUp() + 1); + commentList.get(index).getFeedback().setDown(commentList.get(index).getFeedback().getDown() - 1); + commentFeedbackMap.put(commentList.get(index).getId(), "up"); + action = "up"; + } else if (oldAction == null) { + commentList.get(index).getFeedback().setDown(commentList.get(index).getFeedback().getDown() - 1); + commentFeedbackMap.remove(commentList.get(index).getId()); + } else { + action = "down"; + } + } + modifyUserCommentFeedbackVolleyCache(commentList.get(index).getId(), action); + int moreSize = entity.getMore() == null ? 0 : entity.getMore().size(); + adapter.notifyItemChanged(index + 2 + moreSize); } }); String token = TokenUtils.getToken(NewsActivity.this); @@ -2486,7 +2524,7 @@ public class NewsActivity extends BaseActivity implements OnClickListener { * 取消对评论的反馈 */ - private void cancelCommentFeedback(String news_id, String comment_id) { + private void cancelCommentFeedback(String news_id, String comment_id, final String oldAction, final int index) { final String url = Config.HOST + "v1d45/news/" + news_id + "/comment/" + comment_id + "/feedback"; new Thread() { @@ -2497,15 +2535,25 @@ public class NewsActivity extends BaseActivity implements OnClickListener { @Override public void onResponse(JSONObject response) { - Utils.log("cancelCommentFeedback = " - + response.toString()); + Utils.log("cancelCommentFeedback = " + response.toString()); } }, new Response.ErrorListener() { @Override public void onErrorResponse(VolleyError error) { - Utils.log("cancelCommentFeedback = " - + error.toString()); + Utils.log("cancelCommentFeedback = " + error.toString()); + //TODO 失败回滚 + if ("up".equals(oldAction)) { + commentList.get(index).getFeedback().setUp(commentList.get(index).getFeedback().getUp() + 1); + commentFeedbackMap.put(commentList.get(index).getId(), "up"); + modifyUserCommentFeedbackVolleyCache(commentList.get(index).getId(), "up"); + } else if ("down".equals(oldAction)) { + commentList.get(index).getFeedback().setDown(commentList.get(index).getFeedback().getDown() + 1); + commentFeedbackMap.put(commentList.get(index).getId(), "down"); + modifyUserCommentFeedbackVolleyCache(commentList.get(index).getId(), "down"); + } + int moreSize = entity.getMore() == null ? 0 : entity.getMore().size(); + adapter.notifyItemChanged(index + 2 + moreSize); } }); String token = TokenUtils.getToken(NewsActivity.this); @@ -2520,23 +2568,18 @@ public class NewsActivity extends BaseActivity implements OnClickListener { public void onResume() { super.onResume(); if (gameEntity != null && gameEntity.getApk().size() == 1) { - if (PackageManager.isInstalled(gameEntity.getApk().get(0) - .getPackageName())) { + if (PackageManager.isInstalled(gameEntity.getApk().get(0).getPackageName())) { essaydetails_tv_download.setVisibility(View.VISIBLE); essaydetails_progressbar.setVisibility(View.GONE); essaydetails_tv_per.setVisibility(View.GONE); if (TextUtils.isEmpty(gameEntity.getDownloadAddWord())) { - essaydetails_tv_download.setText("启动《" - + gameEntity.getName() + "》"); + essaydetails_tv_download.setText("启动《" + gameEntity.getName() + "》"); } else { - essaydetails_tv_download.setText("启动《" - + gameEntity.getName() + "》" - + gameEntity.getDownloadAddWord()); + essaydetails_tv_download.setText("启动《" + gameEntity.getName() + "》" + gameEntity.getDownloadAddWord()); } } else { String url = gameEntity.getApk().get(0).getUrl(); - for (DownloadEntry entry : DownloadManager.getInstance( - getApplicationContext()).getAll()) { + for (DownloadEntry entry : DownloadManager.getInstance(getApplicationContext()).getAll()) { if (url.equals(entry.getUrl())) { downloadEntry = entry; essaydetails_tv_download.setVisibility(View.GONE); diff --git a/app/src/main/java/com/gh/gamecenter/NewsOrRaidersActivity.java b/app/src/main/java/com/gh/gamecenter/NewsOrRaidersActivity.java index 8233c5b3a6..54ebd7e34b 100644 --- a/app/src/main/java/com/gh/gamecenter/NewsOrRaidersActivity.java +++ b/app/src/main/java/com/gh/gamecenter/NewsOrRaidersActivity.java @@ -1,7 +1,6 @@ package com.gh.gamecenter; import android.os.Bundle; -import android.support.v7.widget.DefaultItemAnimator; import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.RecyclerView; import android.view.MotionEvent; diff --git a/app/src/main/java/com/gh/gamecenter/PasswordActivity.java b/app/src/main/java/com/gh/gamecenter/PasswordActivity.java index a8696ad919..9011292f71 100644 --- a/app/src/main/java/com/gh/gamecenter/PasswordActivity.java +++ b/app/src/main/java/com/gh/gamecenter/PasswordActivity.java @@ -1,11 +1,5 @@ package com.gh.gamecenter; -import java.util.HashMap; -import java.util.regex.Pattern; - -import org.json.JSONException; -import org.json.JSONObject; - import android.app.Dialog; import android.os.Bundle; import android.text.InputType; @@ -17,7 +11,6 @@ import android.view.inputmethod.EditorInfo; import android.widget.EditText; import android.widget.ImageView; import android.widget.TextView; -import android.widget.Toast; import com.android.volley.Request.Method; import com.android.volley.Response; @@ -33,6 +26,12 @@ import com.gh.common.util.Utils; import com.gh.gamecenter.entity.UserEntity; import com.gh.gamecenter.volley.extended.JsonObjectExtendedRequest; +import org.json.JSONException; +import org.json.JSONObject; + +import java.util.HashMap; +import java.util.regex.Pattern; + public class PasswordActivity extends BaseActivity implements OnClickListener { private EditText password_et_current, password_et_new, password_et_again; @@ -106,8 +105,7 @@ public class PasswordActivity extends BaseActivity implements OnClickListener { String currentPassword = password_et_current .getText().toString().trim(); if (TextUtils.isEmpty(currentPassword)) { - Toast.makeText(PasswordActivity.this, "请输入旧密码", - Toast.LENGTH_SHORT).show(); + toast("请输入旧密码"); password_et_current.requestFocus(); return true; } @@ -125,20 +123,17 @@ public class PasswordActivity extends BaseActivity implements OnClickListener { String newPassword = password_et_new.getText() .toString().trim(); if (TextUtils.isEmpty(newPassword)) { - Toast.makeText(PasswordActivity.this, "请输入新密码", - Toast.LENGTH_SHORT).show(); + toast("请输入新密码"); password_et_new.requestFocus(); return true; } else if (newPassword.length() < 6 || newPassword.length() > 32) { - Toast.makeText(PasswordActivity.this, - "新密码长度错误", Toast.LENGTH_SHORT).show(); + toast("新密码长度错误"); password_et_new.requestFocus(); return true; } else if (!Pattern.matches( Constants.REGEX_PASSWORD, newPassword)) { - Toast.makeText(PasswordActivity.this, - "新密码格式错误", Toast.LENGTH_SHORT).show(); + toast("新密码格式错误"); password_et_new.requestFocus(); return true; } @@ -158,26 +153,21 @@ public class PasswordActivity extends BaseActivity implements OnClickListener { String confirmPassword = password_et_again .getText().toString().trim(); if (TextUtils.isEmpty(newPassword)) { - Toast.makeText(PasswordActivity.this, "请输入新密码", - Toast.LENGTH_SHORT).show(); + toast("请输入新密码"); password_et_new.requestFocus(); return true; } else if (newPassword.length() < 6 || newPassword.length() > 32) { - Toast.makeText(PasswordActivity.this, - "新密码长度错误", Toast.LENGTH_SHORT).show(); + toast("新密码长度错误"); password_et_new.requestFocus(); return true; } else if (!Pattern.matches( Constants.REGEX_PASSWORD, newPassword)) { - Toast.makeText(PasswordActivity.this, - "新密码格式错误", Toast.LENGTH_SHORT).show(); + toast("新密码格式错误"); password_et_new.requestFocus(); return true; } else if (!newPassword.equals(confirmPassword)) { - Toast.makeText(PasswordActivity.this, - "两次输入的密码不相同", Toast.LENGTH_SHORT) - .show(); + toast("两次输入的密码不相同"); password_et_again.requestFocus(); return true; } else { @@ -185,22 +175,15 @@ public class PasswordActivity extends BaseActivity implements OnClickListener { String currentPassword = password_et_current .getText().toString().trim(); if (TextUtils.isEmpty(currentPassword)) { - Toast.makeText(PasswordActivity.this, - "请输入旧密码", Toast.LENGTH_SHORT) - .show(); + toast("请输入旧密码"); password_et_current.requestFocus(); return true; } else { - Dialog dialog = DialogUtils - .showWaitDialog( - PasswordActivity.this, - "修改中..."); - modifyPassword(dialog, currentPassword, - newPassword); + Dialog dialog = DialogUtils.showWaitDialog(PasswordActivity.this, "修改中..."); + modifyPassword(dialog, currentPassword, newPassword); } } else { - Dialog dialog = DialogUtils.showWaitDialog( - PasswordActivity.this, "设置中..."); + Dialog dialog = DialogUtils.showWaitDialog(PasswordActivity.this, "设置中..."); modifyPassword(dialog, null, newPassword); } } @@ -234,28 +217,26 @@ public class PasswordActivity extends BaseActivity implements OnClickListener { String confirmPassword = password_et_again.getText().toString() .trim(); if (TextUtils.isEmpty(newPassword)) { - Toast.makeText(this, "请输入新密码", Toast.LENGTH_SHORT).show(); + toast("请输入新密码"); password_et_new.requestFocus(); } else if (newPassword.length() < 6 || newPassword.length() > 32) { - Toast.makeText(this, "新密码长度错误", Toast.LENGTH_SHORT).show(); + toast("新密码长度错误"); password_et_new.requestFocus(); } else if (!Pattern.matches(Constants.REGEX_PASSWORD, newPassword)) { - Toast.makeText(this, "新密码格式错误", Toast.LENGTH_SHORT).show(); + toast("新密码格式错误"); password_et_new.requestFocus(); } else if (!newPassword.equals(confirmPassword)) { - Toast.makeText(this, "两次输入的密码不相同", Toast.LENGTH_SHORT).show(); + toast("两次输入的密码不相同"); password_et_again.requestFocus(); } else { if (user.isActivation()) { String currentPassword = password_et_current.getText() .toString().trim(); if (TextUtils.isEmpty(currentPassword)) { - Toast.makeText(this, "请输入旧密码", Toast.LENGTH_SHORT) - .show(); + toast("请输入旧密码"); password_et_current.requestFocus(); } else { - Dialog dialog = DialogUtils.showWaitDialog(this, - "修改中..."); + Dialog dialog = DialogUtils.showWaitDialog(this, "修改中..."); modifyPassword(dialog, currentPassword, newPassword); } } else { @@ -354,15 +335,11 @@ public class PasswordActivity extends BaseActivity implements OnClickListener { String reason = response .getString("reason"); if ("PASSWORD_ERROR".equals(reason)) { - Toast.makeText(PasswordActivity.this, - "两次输入的密码不相同", Toast.LENGTH_SHORT) - .show(); + toast("两次输入的密码不相同"); password_et_again.requestFocus(); return; } else if ("PASSWORD_ILLEGAL".equals(reason)) { - Toast.makeText(PasswordActivity.this, - "新密码格式错误", Toast.LENGTH_SHORT) - .show(); + toast("新密码格式错误"); password_et_new.requestFocus(); return; } @@ -373,11 +350,9 @@ public class PasswordActivity extends BaseActivity implements OnClickListener { e.printStackTrace(); } if (currentPassword != null) { - Toast.makeText(PasswordActivity.this, "修改密码失败", - Toast.LENGTH_SHORT).show(); + toast("修改密码失败"); } else { - Toast.makeText(PasswordActivity.this, "设置密码失败", - Toast.LENGTH_SHORT).show(); + toast("设置密码失败"); } } }); diff --git a/app/src/main/java/com/gh/gamecenter/RetrieveActivity.java b/app/src/main/java/com/gh/gamecenter/RetrieveActivity.java index 2001b77ffe..957d17293f 100644 --- a/app/src/main/java/com/gh/gamecenter/RetrieveActivity.java +++ b/app/src/main/java/com/gh/gamecenter/RetrieveActivity.java @@ -1,11 +1,5 @@ package com.gh.gamecenter; -import java.util.HashMap; -import java.util.regex.Pattern; - -import org.json.JSONException; -import org.json.JSONObject; - import android.app.Dialog; import android.content.Context; import android.os.Bundle; @@ -22,7 +16,6 @@ import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.RelativeLayout; import android.widget.TextView; -import android.widget.Toast; import com.android.volley.Request.Method; import com.android.volley.Response; @@ -38,6 +31,12 @@ import com.gh.common.util.Utils; import com.gh.gamecenter.eventbus.EBSms; import com.gh.gamecenter.volley.extended.JsonObjectExtendedRequest; +import org.json.JSONException; +import org.json.JSONObject; + +import java.util.HashMap; +import java.util.regex.Pattern; + public class RetrieveActivity extends BaseActivity implements OnClickListener { private LinearLayout retrieve_ll_mobile, retrieve_ll_title, @@ -101,14 +100,12 @@ public class RetrieveActivity extends BaseActivity implements OnClickListener { String account = retrieve_et_account.getText() .toString().trim(); if (TextUtils.isEmpty(account)) { - Toast.makeText(RetrieveActivity.this, "请输入光环号", - Toast.LENGTH_SHORT).show(); + toast("请输入光环号"); retrieve_et_account.requestFocus(); return true; } else if (account.length() < 6 || account.length() > 18) { - Toast.makeText(RetrieveActivity.this, - "光环号长度错误", Toast.LENGTH_SHORT).show(); + toast("光环号长度错误"); retrieve_et_account.requestFocus(); return true; } else { @@ -178,12 +175,10 @@ public class RetrieveActivity extends BaseActivity implements OnClickListener { String account = retrieve_et_account.getText().toString() .trim(); if (TextUtils.isEmpty(account)) { - Toast.makeText(RetrieveActivity.this, "请输入光环号", - Toast.LENGTH_SHORT).show(); + toast("请输入光环号"); retrieve_et_account.requestFocus(); } else if (account.length() < 6 || account.length() > 18) { - Toast.makeText(RetrieveActivity.this, "光环号长度错误", - Toast.LENGTH_SHORT).show(); + toast("光环号长度错误"); retrieve_et_account.requestFocus(); } else { verifyAccount(account); @@ -194,17 +189,14 @@ public class RetrieveActivity extends BaseActivity implements OnClickListener { String mobileNumber = retrieve_et_mobile.getText().toString() .trim(); if (TextUtils.isEmpty(mobileNumber)) { - Toast.makeText(RetrieveActivity.this, "请输入手机号码", - Toast.LENGTH_SHORT).show(); + toast("请输入手机号码"); retrieve_et_mobile.requestFocus(); } else if (mobileNumber.length() != 11) { - Toast.makeText(RetrieveActivity.this, "手机号码长度错误", - Toast.LENGTH_SHORT).show(); + toast("手机号码长度错误"); retrieve_et_mobile.requestFocus(); } else if (!Pattern.matches(Constants.REGEX_MOBILE, mobileNumber)) { - Toast.makeText(RetrieveActivity.this, "手机号码错误", - Toast.LENGTH_SHORT).show(); + toast("手机号码错误"); retrieve_et_mobile.requestFocus(); } else { InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); @@ -221,28 +213,22 @@ public class RetrieveActivity extends BaseActivity implements OnClickListener { String password = retrieve_et_password.getText().toString() .trim(); if (TextUtils.isEmpty(code)) { - Toast.makeText(RetrieveActivity.this, "验证码为空", - Toast.LENGTH_SHORT).show(); + toast("验证码为空"); retrieve_et_mobile.requestFocus(); } else if (code.length() != 6) { - Toast.makeText(RetrieveActivity.this, "验证码长度错误", - Toast.LENGTH_SHORT).show(); + toast("验证码长度错误"); retrieve_et_mobile.requestFocus(); } else if (!Pattern.matches("^\\d{6}$", code)) { - Toast.makeText(RetrieveActivity.this, "验证码格式错误", - Toast.LENGTH_SHORT).show(); + toast("验证码格式错误"); retrieve_et_mobile.requestFocus(); } else if (TextUtils.isEmpty(password)) { - Toast.makeText(RetrieveActivity.this, "请输入密码", - Toast.LENGTH_SHORT).show(); + toast("请输入密码"); retrieve_et_password.requestFocus(); } else if (password.length() < 6 || password.length() > 32) { - Toast.makeText(RetrieveActivity.this, "密码长度错误", - Toast.LENGTH_SHORT).show(); + toast("密码长度错误"); retrieve_et_password.requestFocus(); } else if (!Pattern.matches(Constants.REGEX_PASSWORD, password)) { - Toast.makeText(RetrieveActivity.this, "密码格式错误", - Toast.LENGTH_SHORT).show(); + toast("密码格式错误"); retrieve_et_password.requestFocus(); } else { resetPassword(account, mobile_number, code, password); @@ -343,11 +329,7 @@ public class RetrieveActivity extends BaseActivity implements OnClickListener { String reason = response .getString("reason"); if ("USER_NO_EXIST".equals(reason)) { - Toast.makeText( - RetrieveActivity.this, - "用户不存在", - Toast.LENGTH_SHORT) - .show(); + toast("用户不存在"); return; } } @@ -356,8 +338,7 @@ public class RetrieveActivity extends BaseActivity implements OnClickListener { e.printStackTrace(); } - Toast.makeText(RetrieveActivity.this, "验证失败", - Toast.LENGTH_SHORT).show(); + toast("验证失败"); } }); String token = TokenUtils.getToken(RetrieveActivity.this); @@ -388,31 +369,19 @@ public class RetrieveActivity extends BaseActivity implements OnClickListener { try { if ("success".equals(response .getString("status"))) { - Toast.makeText(RetrieveActivity.this, - "发送成功", Toast.LENGTH_SHORT) - .show(); + toast("发送成功"); if (isFirst) { - retrieve_ll_mobile - .setVisibility(View.VISIBLE); - retrieve_tv_mobile - .setText(mobileNumber); - retrieve_tv_confrim - .setText("确定修改密码"); - retrieve_iv_mobile - .setVisibility(View.GONE); - retrieve_mobile_cutting_line - .setVisibility(View.GONE); + retrieve_ll_mobile.setVisibility(View.VISIBLE); + retrieve_tv_mobile.setText(mobileNumber); + retrieve_tv_confrim.setText("确定修改密码"); + retrieve_iv_mobile.setVisibility(View.GONE); + retrieve_mobile_cutting_line.setVisibility(View.GONE); retrieve_et_mobile.setText(""); - retrieve_et_mobile - .setHint("请输入短信验证码"); - retrieve_rl_password - .setVisibility(View.VISIBLE); - retrieve_tv_again - .setVisibility(View.VISIBLE); - retrieve_line_one - .setVisibility(View.VISIBLE); - retrieve_line_two - .setVisibility(View.VISIBLE); + retrieve_et_mobile.setHint("请输入短信验证码"); + retrieve_rl_password.setVisibility(View.VISIBLE); + retrieve_tv_again.setVisibility(View.VISIBLE); + retrieve_line_one.setVisibility(View.VISIBLE); + retrieve_line_two.setVisibility(View.VISIBLE); } retrieve_tv_again.setClickable(false); @@ -443,19 +412,11 @@ public class RetrieveActivity extends BaseActivity implements OnClickListener { String reason = response .getString("reason"); if ("TIME_IS_NOT".equals(reason)) { - Toast.makeText( - RetrieveActivity.this, - "请稍后再试", - Toast.LENGTH_SHORT) - .show(); + toast("请稍后再试"); return; } else if ("MOBILE_NUMBER_ERROR" .equals(reason)) { - Toast.makeText( - RetrieveActivity.this, - "手机号码错误", - Toast.LENGTH_SHORT) - .show(); + toast("手机号码错误"); return; } } @@ -464,8 +425,7 @@ public class RetrieveActivity extends BaseActivity implements OnClickListener { e.printStackTrace(); } - Toast.makeText(RetrieveActivity.this, "发送失败", - Toast.LENGTH_SHORT).show(); + toast("发送失败"); } }); String token = TokenUtils.getToken(RetrieveActivity.this); @@ -546,35 +506,19 @@ public class RetrieveActivity extends BaseActivity implements OnClickListener { String reason = response .getString("reason"); if ("USER_NO_EXIST".equals(reason)) { - Toast.makeText( - RetrieveActivity.this, - "用户不存在", - Toast.LENGTH_SHORT) - .show(); + toast("用户不存在"); return; } else if ("CODE_ERROR" .equals(reason)) { - Toast.makeText( - RetrieveActivity.this, - "验证码错误", - Toast.LENGTH_SHORT) - .show(); + toast("验证码错误"); return; } else if ("CODE_EXPIRE" .equals(reason)) { - Toast.makeText( - RetrieveActivity.this, - "验证码已过期", - Toast.LENGTH_SHORT) - .show(); + toast("验证码已过期"); return; } else if ("PASSWORD_ILLEGAL" .equals(reason)) { - Toast.makeText( - RetrieveActivity.this, - "密码格式错误", - Toast.LENGTH_SHORT) - .show(); + toast("密码格式错误"); return; } } @@ -583,8 +527,7 @@ public class RetrieveActivity extends BaseActivity implements OnClickListener { e.printStackTrace(); } - Toast.makeText(RetrieveActivity.this, "修改失败", - Toast.LENGTH_SHORT).show(); + toast("修改失败"); } }); String token = TokenUtils.getToken(RetrieveActivity.this); diff --git a/app/src/main/java/com/gh/gamecenter/SearchActivity.java b/app/src/main/java/com/gh/gamecenter/SearchActivity.java index 2430dba06f..63f28ea68a 100644 --- a/app/src/main/java/com/gh/gamecenter/SearchActivity.java +++ b/app/src/main/java/com/gh/gamecenter/SearchActivity.java @@ -1,8 +1,5 @@ package com.gh.gamecenter; -import java.util.HashMap; -import java.util.Map; - import android.app.ActionBar.LayoutParams; import android.app.FragmentManager; import android.app.FragmentTransaction; @@ -24,7 +21,6 @@ import android.widget.LinearLayout; import android.widget.RelativeLayout; import android.widget.TextView; import android.widget.TextView.OnEditorActionListener; -import android.widget.Toast; import com.gh.base.BaseActivity; import com.gh.common.constant.Config; @@ -38,6 +34,9 @@ import com.gh.gamecenter.search.Search2GameListFragment; import com.gh.gamecenter.search.Search3HistoryFragment; import com.tendcloud.tenddata.TCAgent; +import java.util.HashMap; +import java.util.Map; + public class SearchActivity extends BaseActivity { private final static int SEARCH_HISTORY_MODEL = 0; @@ -136,8 +135,7 @@ public class SearchActivity extends BaseActivity { // TODO: add new history dao.add(searchKey); } else { - Toast.makeText(SearchActivity.this, "请输入搜索内容", - Toast.LENGTH_SHORT).show(); + toast("请输入搜索内容"); } } return false; @@ -178,8 +176,7 @@ public class SearchActivity extends BaseActivity { // TODO: add new history dao.add(searchKey); } else { - Toast.makeText(SearchActivity.this, "请输入搜索内容", - Toast.LENGTH_SHORT).show(); + toast("请输入搜索内容"); } } }); diff --git a/app/src/main/java/com/gh/gamecenter/SettingActivity.java b/app/src/main/java/com/gh/gamecenter/SettingActivity.java index bdff4f115c..086daccba4 100644 --- a/app/src/main/java/com/gh/gamecenter/SettingActivity.java +++ b/app/src/main/java/com/gh/gamecenter/SettingActivity.java @@ -1,11 +1,5 @@ package com.gh.gamecenter; -import java.io.File; -import java.util.HashMap; -import java.util.Map.Entry; - -import org.json.JSONObject; - import android.app.Activity; import android.app.Dialog; import android.content.Intent; @@ -21,7 +15,6 @@ import android.view.View.OnClickListener; import android.view.Window; import android.widget.ProgressBar; import android.widget.TextView; -import android.widget.Toast; import com.android.volley.Response; import com.android.volley.VolleyError; @@ -46,6 +39,12 @@ import com.google.gson.Gson; import com.kyleduo.switchbutton.SwitchButton; import com.tendcloud.tenddata.TCAgent; +import org.json.JSONObject; + +import java.io.File; +import java.util.HashMap; +import java.util.Map.Entry; + /** * * 游戏设置页面 @@ -332,8 +331,7 @@ public class SettingActivity extends BaseActivity implements OnClickListener { } if (response.length() == 0) { - Toast.makeText(SettingActivity.this, "已是最新版本", - Toast.LENGTH_SHORT).show(); + toast("已是最新版本"); } else { Gson gson = new Gson(); appEntity = gson.fromJson(response.toString(), @@ -378,8 +376,7 @@ public class SettingActivity extends BaseActivity implements OnClickListener { Utils.log("error = " + error.toString()); - Toast.makeText(SettingActivity.this, "检查更新失败", - Toast.LENGTH_SHORT).show(); + toast("检查更新失败"); } }); AppController.addToRequestQueue(request, SettingActivity.class); diff --git a/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java b/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java index a8d16cbe01..baad6c5cd1 100644 --- a/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java +++ b/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java @@ -1,26 +1,5 @@ package com.gh.gamecenter; -import java.io.BufferedReader; -import java.io.File; -import java.io.IOException; -import java.io.InputStreamReader; -import java.lang.reflect.Type; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Comparator; -import java.util.Date; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Locale; -import java.util.Set; - -import org.json.JSONArray; -import org.json.JSONException; -import org.json.JSONObject; - import android.app.ActionBar; import android.app.ActionBar.LayoutParams; import android.content.Context; @@ -63,6 +42,27 @@ import com.gh.gamecenter.volley.extended.JsonObjectExtendedRequest; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; +import org.json.JSONArray; +import org.json.JSONException; +import org.json.JSONObject; + +import java.io.BufferedReader; +import java.io.File; +import java.io.IOException; +import java.io.InputStreamReader; +import java.lang.reflect.Type; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.Date; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Locale; +import java.util.Set; + /** * 引导页面 * diff --git a/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java b/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java index de111b6d3a..e4f7e6d802 100644 --- a/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java +++ b/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java @@ -1,13 +1,5 @@ package com.gh.gamecenter; -import java.util.HashMap; -import java.util.Map; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -import org.json.JSONException; -import org.json.JSONObject; - import android.app.Dialog; import android.content.Context; import android.content.DialogInterface; @@ -23,7 +15,6 @@ import android.view.Window; import android.view.inputmethod.InputMethodManager; import android.widget.EditText; import android.widget.TextView; -import android.widget.Toast; import com.android.volley.Request.Method; import com.android.volley.Response; @@ -33,6 +24,14 @@ import com.gh.base.AppController; import com.gh.base.BaseActivity; import com.gh.common.constant.Config; +import org.json.JSONException; +import org.json.JSONObject; + +import java.util.HashMap; +import java.util.Map; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + /** * @author fang * @from SettingActivity @@ -120,17 +119,15 @@ public class SuggestionActivity extends BaseActivity implements OnClickListener @Override public void onDismiss(DialogInterface dialog) { if (isShowing) { - AppController - .canclePendingRequests(SuggestionActivity.class); - Toast.makeText(SuggestionActivity.this, "取消发送", - Toast.LENGTH_SHORT).show(); + AppController.canclePendingRequests(SuggestionActivity.class); + toast("取消发送"); } } }); dialog.show(); sendSuggestion(dialog, email); } else { - Toast.makeText(this, "邮箱错误", Toast.LENGTH_SHORT).show(); + toast("邮箱错误"); } break; default: @@ -199,10 +196,8 @@ public class SuggestionActivity extends BaseActivity implements OnClickListener @Override public void onDismiss(DialogInterface dialog) { if (isShowing) { - AppController - .canclePendingRequests(SuggestionActivity.class); - Toast.makeText(SuggestionActivity.this, "取消发送", - Toast.LENGTH_SHORT).show(); + AppController.canclePendingRequests(SuggestionActivity.class); + toast("取消发送"); } } }); @@ -229,14 +224,10 @@ public class SuggestionActivity extends BaseActivity implements OnClickListener try { if ("ok".equals(object.getString("status"))) { - Toast.makeText(SuggestionActivity.this, - "提交成功，感谢您的反馈！", Toast.LENGTH_SHORT) - .show(); + toast("提交成功，感谢您的反馈！"); finish(); } else { - Toast.makeText(SuggestionActivity.this, - "提交失败，请稍后尝试！", Toast.LENGTH_SHORT) - .show(); + toast("提交失败，请稍后尝试！"); } } catch (JSONException e) { e.printStackTrace(); @@ -248,8 +239,7 @@ public class SuggestionActivity extends BaseActivity implements OnClickListener public void onErrorResponse(VolleyError error) { isShowing = false; dialog.dismiss(); - Toast.makeText(SuggestionActivity.this, - "发送失败，请检查网络情况！", Toast.LENGTH_LONG).show(); + toast("发送失败，请检查网络情况！"); } }); request.setShouldCache(false); diff --git a/app/src/main/java/com/gh/gamecenter/UserInfoActivity.java b/app/src/main/java/com/gh/gamecenter/UserInfoActivity.java index acc4eed8d2..9eec6c95b7 100644 --- a/app/src/main/java/com/gh/gamecenter/UserInfoActivity.java +++ b/app/src/main/java/com/gh/gamecenter/UserInfoActivity.java @@ -1,11 +1,5 @@ package com.gh.gamecenter; -import java.io.File; -import java.util.HashMap; -import java.util.Map; - -import org.json.JSONObject; - import android.app.Dialog; import android.content.Context; import android.content.Intent; @@ -28,7 +22,6 @@ import android.widget.EditText; import android.widget.ImageView; import android.widget.PopupWindow; import android.widget.TextView; -import android.widget.Toast; import com.android.volley.Request.Method; import com.android.volley.Response; @@ -47,6 +40,12 @@ import com.gh.gamecenter.entity.UserEntity; import com.gh.gamecenter.eventbus.EBLogout; import com.gh.gamecenter.volley.extended.JsonObjectExtendedRequest; +import org.json.JSONObject; + +import java.io.File; +import java.util.HashMap; +import java.util.Map; + import de.greenrobot.event.EventBus; public class UserInfoActivity extends BaseActivity implements OnClickListener { @@ -438,8 +437,7 @@ public class UserInfoActivity extends BaseActivity implements OnClickListener { user.setName(name); user.setSign(sign); EventBus.getDefault().post(new EBLogout(1)); - Toast.makeText(UserInfoActivity.this, "保存成功", - Toast.LENGTH_SHORT).show(); + toast("保存成功"); finish(); } }, new Response.ErrorListener() { @@ -449,8 +447,7 @@ public class UserInfoActivity extends BaseActivity implements OnClickListener { Utils.log(error.toString()); dialog.dismiss(); - Toast.makeText(UserInfoActivity.this, "保存失败", - Toast.LENGTH_SHORT).show(); + toast("保存失败"); } }); String token = TokenUtils.getToken(UserInfoActivity.this); diff --git a/app/src/main/java/com/gh/gamecenter/ViewImageActivity.java b/app/src/main/java/com/gh/gamecenter/ViewImageActivity.java index d86b1824c7..790884af56 100644 --- a/app/src/main/java/com/gh/gamecenter/ViewImageActivity.java +++ b/app/src/main/java/com/gh/gamecenter/ViewImageActivity.java @@ -1,7 +1,5 @@ package com.gh.gamecenter; -import java.util.ArrayList; - import android.content.Intent; import android.os.Bundle; import android.support.v4.view.PagerAdapter; @@ -19,6 +17,8 @@ import com.gh.common.util.ImageUtils; import com.gh.common.view.Gh_ImageView; import com.gh.common.view.Gh_ImageView.OnSingleTapListener; +import java.util.ArrayList; + /** * 查看游戏截图页面 * diff --git a/app/src/main/java/com/gh/gamecenter/adapter/HotCardAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/HotCardAdapter.java index 7345be89a4..d00cb8fead 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/HotCardAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/HotCardAdapter.java @@ -1,11 +1,5 @@ package com.gh.gamecenter.adapter; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.concurrent.LinkedBlockingQueue; - import android.content.Context; import android.content.Intent; import android.os.Handler; @@ -26,6 +20,12 @@ import com.gh.gamecenter.entity.DismissEntity; import com.gh.gamecenter.entity.GameEntity; import com.tendcloud.tenddata.TCAgent; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.concurrent.LinkedBlockingQueue; + /** * * @author 温冠超 diff --git a/app/src/main/java/com/gh/gamecenter/adapter/ImagePagerAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/ImagePagerAdapter.java index d89c1dc9b3..d6e35661df 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/ImagePagerAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/ImagePagerAdapter.java @@ -5,10 +5,6 @@ */ package com.gh.gamecenter.adapter; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - import android.content.Context; import android.content.Intent; import android.view.View; @@ -23,6 +19,10 @@ import com.gh.gamecenter.entity.GameEntity; import com.gh.gamecenter.manager.DataCollectionManager; import com.tendcloud.tenddata.TCAgent; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + /** * ImagePagerAdapter * diff --git a/app/src/main/java/com/gh/gamecenter/adapter/NewsOrRaidersListAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/NewsOrRaidersListAdapter.java index 1f37193789..7565aed882 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/NewsOrRaidersListAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/NewsOrRaidersListAdapter.java @@ -1,19 +1,5 @@ package com.gh.gamecenter.adapter; -import java.lang.reflect.Type; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Comparator; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Locale; -import java.util.Map; - -import org.json.JSONArray; -import org.json.JSONObject; - import android.content.Context; import android.content.Intent; import android.net.Uri; @@ -62,6 +48,20 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.tendcloud.tenddata.TCAgent; +import org.json.JSONArray; +import org.json.JSONObject; + +import java.lang.reflect.Type; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Locale; +import java.util.Map; + /** * * @author 温冠超 diff --git a/app/src/main/java/com/gh/gamecenter/db/ConcernDao.java b/app/src/main/java/com/gh/gamecenter/db/ConcernDao.java index 45f17085d3..ef76030335 100644 --- a/app/src/main/java/com/gh/gamecenter/db/ConcernDao.java +++ b/app/src/main/java/com/gh/gamecenter/db/ConcernDao.java @@ -1,15 +1,15 @@ package com.gh.gamecenter.db; -import java.sql.SQLException; -import java.util.ArrayList; -import java.util.List; - import android.content.Context; import com.gh.gamecenter.db.info.ConcernInfo; import com.j256.ormlite.dao.Dao; import com.j256.ormlite.stmt.QueryBuilder; +import java.sql.SQLException; +import java.util.ArrayList; +import java.util.List; + public class ConcernDao { private DatabaseHelper helper; diff --git a/app/src/main/java/com/gh/gamecenter/db/DataCollectionDao.java b/app/src/main/java/com/gh/gamecenter/db/DataCollectionDao.java index 34a0464da7..9bcc230b09 100644 --- a/app/src/main/java/com/gh/gamecenter/db/DataCollectionDao.java +++ b/app/src/main/java/com/gh/gamecenter/db/DataCollectionDao.java @@ -1,13 +1,13 @@ package com.gh.gamecenter.db; -import java.sql.SQLException; -import java.util.List; - import android.content.Context; import com.gh.gamecenter.db.info.DataCollectionInfo; import com.j256.ormlite.dao.Dao; +import java.sql.SQLException; +import java.util.List; + public class DataCollectionDao { private DatabaseHelper helper; diff --git a/app/src/main/java/com/gh/gamecenter/db/DatabaseHelper.java b/app/src/main/java/com/gh/gamecenter/db/DatabaseHelper.java index 09c61d4141..51f65a6573 100644 --- a/app/src/main/java/com/gh/gamecenter/db/DatabaseHelper.java +++ b/app/src/main/java/com/gh/gamecenter/db/DatabaseHelper.java @@ -1,7 +1,5 @@ package com.gh.gamecenter.db; -import java.sql.SQLException; - import android.content.Context; import android.database.sqlite.SQLiteDatabase; import android.support.v4.util.ArrayMap; @@ -18,6 +16,8 @@ import com.j256.ormlite.dao.Dao; import com.j256.ormlite.support.ConnectionSource; import com.j256.ormlite.table.TableUtils; +import java.sql.SQLException; + public class DatabaseHelper extends OrmLiteSqliteOpenHelper { private static final String DATABASE_NAME = "gh_assist.db"; diff --git a/app/src/main/java/com/gh/gamecenter/db/FilterDao.java b/app/src/main/java/com/gh/gamecenter/db/FilterDao.java index fc86212754..01d8967ef9 100644 --- a/app/src/main/java/com/gh/gamecenter/db/FilterDao.java +++ b/app/src/main/java/com/gh/gamecenter/db/FilterDao.java @@ -1,13 +1,13 @@ package com.gh.gamecenter.db; -import java.sql.SQLException; -import java.util.List; - import android.content.Context; import com.gh.gamecenter.db.info.FilterInfo; import com.j256.ormlite.dao.Dao; +import java.sql.SQLException; +import java.util.List; + public class FilterDao { private DatabaseHelper helper; diff --git a/app/src/main/java/com/gh/gamecenter/db/GameDao.java b/app/src/main/java/com/gh/gamecenter/db/GameDao.java index 93d63b578e..dfc7225fca 100644 --- a/app/src/main/java/com/gh/gamecenter/db/GameDao.java +++ b/app/src/main/java/com/gh/gamecenter/db/GameDao.java @@ -1,13 +1,13 @@ package com.gh.gamecenter.db; -import java.sql.SQLException; -import java.util.List; - import android.content.Context; import com.gh.gamecenter.db.info.GameInfo; import com.j256.ormlite.dao.Dao; +import java.sql.SQLException; +import java.util.List; + public class GameDao { private DatabaseHelper helper; diff --git a/app/src/main/java/com/gh/gamecenter/db/SearchHistoryDao.java b/app/src/main/java/com/gh/gamecenter/db/SearchHistoryDao.java index bcbd2aeebd..c5633cbe66 100644 --- a/app/src/main/java/com/gh/gamecenter/db/SearchHistoryDao.java +++ b/app/src/main/java/com/gh/gamecenter/db/SearchHistoryDao.java @@ -1,16 +1,16 @@ package com.gh.gamecenter.db; -import java.sql.SQLException; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - import android.content.Context; import com.gh.gamecenter.db.info.SearchHistoryInfo; import com.j256.ormlite.dao.CloseableIterator; import com.j256.ormlite.dao.Dao; +import java.sql.SQLException; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; + public class SearchHistoryDao { private DatabaseHelper helper; diff --git a/app/src/main/java/com/gh/gamecenter/db/SuspectedGameDao.java b/app/src/main/java/com/gh/gamecenter/db/SuspectedGameDao.java index 6ff6a63b79..916c72a3f5 100644 --- a/app/src/main/java/com/gh/gamecenter/db/SuspectedGameDao.java +++ b/app/src/main/java/com/gh/gamecenter/db/SuspectedGameDao.java @@ -1,13 +1,13 @@ package com.gh.gamecenter.db; -import java.sql.SQLException; -import java.util.List; - import android.content.Context; import com.gh.gamecenter.db.info.SuspectedGameInfo; import com.j256.ormlite.dao.Dao; +import java.sql.SQLException; +import java.util.List; + public class SuspectedGameDao { private DatabaseHelper helper; diff --git a/app/src/main/java/com/gh/gamecenter/db/info/ConcernInfo.java b/app/src/main/java/com/gh/gamecenter/db/info/ConcernInfo.java index fcf8a15201..30b77d8025 100644 --- a/app/src/main/java/com/gh/gamecenter/db/info/ConcernInfo.java +++ b/app/src/main/java/com/gh/gamecenter/db/info/ConcernInfo.java @@ -1,12 +1,12 @@ package com.gh.gamecenter.db.info; -import java.io.Serializable; -import java.util.HashMap; - import com.j256.ormlite.field.DataType; import com.j256.ormlite.field.DatabaseField; import com.j256.ormlite.table.DatabaseTable; +import java.io.Serializable; +import java.util.HashMap; + @DatabaseTable(tableName = "tb_concern") public class ConcernInfo implements Serializable { diff --git a/app/src/main/java/com/gh/gamecenter/db/info/DataCollectionInfo.java b/app/src/main/java/com/gh/gamecenter/db/info/DataCollectionInfo.java index 03e13073ac..70747e2081 100644 --- a/app/src/main/java/com/gh/gamecenter/db/info/DataCollectionInfo.java +++ b/app/src/main/java/com/gh/gamecenter/db/info/DataCollectionInfo.java @@ -1,10 +1,10 @@ package com.gh.gamecenter.db.info; -import java.io.Serializable; - import com.j256.ormlite.field.DatabaseField; import com.j256.ormlite.table.DatabaseTable; +import java.io.Serializable; + @DatabaseTable(tableName = "tb_datacollection") public class DataCollectionInfo implements Serializable { diff --git a/app/src/main/java/com/gh/gamecenter/db/info/FilterInfo.java b/app/src/main/java/com/gh/gamecenter/db/info/FilterInfo.java index 603b25dafe..92c009b4c2 100644 --- a/app/src/main/java/com/gh/gamecenter/db/info/FilterInfo.java +++ b/app/src/main/java/com/gh/gamecenter/db/info/FilterInfo.java @@ -1,10 +1,10 @@ package com.gh.gamecenter.db.info; -import java.io.Serializable; - import com.j256.ormlite.field.DatabaseField; import com.j256.ormlite.table.DatabaseTable; +import java.io.Serializable; + @DatabaseTable(tableName = "tb_filter") public class FilterInfo implements Serializable { diff --git a/app/src/main/java/com/gh/gamecenter/db/info/GameInfo.java b/app/src/main/java/com/gh/gamecenter/db/info/GameInfo.java index 17d7a2e0ab..7186af657c 100644 --- a/app/src/main/java/com/gh/gamecenter/db/info/GameInfo.java +++ b/app/src/main/java/com/gh/gamecenter/db/info/GameInfo.java @@ -1,10 +1,10 @@ package com.gh.gamecenter.db.info; -import java.io.Serializable; - import com.j256.ormlite.field.DatabaseField; import com.j256.ormlite.table.DatabaseTable; +import java.io.Serializable; + @DatabaseTable(tableName = "tb_game") public class GameInfo implements Serializable { diff --git a/app/src/main/java/com/gh/gamecenter/db/info/SearchHistoryInfo.java b/app/src/main/java/com/gh/gamecenter/db/info/SearchHistoryInfo.java index c939b433cb..8f0de43157 100644 --- a/app/src/main/java/com/gh/gamecenter/db/info/SearchHistoryInfo.java +++ b/app/src/main/java/com/gh/gamecenter/db/info/SearchHistoryInfo.java @@ -1,13 +1,13 @@ package com.gh.gamecenter.db.info; +import com.j256.ormlite.field.DatabaseField; +import com.j256.ormlite.table.DatabaseTable; + import java.io.Serializable; import java.text.SimpleDateFormat; import java.util.Date; import java.util.Locale; -import com.j256.ormlite.field.DatabaseField; -import com.j256.ormlite.table.DatabaseTable; - @DatabaseTable(tableName = "tb_search") public class SearchHistoryInfo implements Serializable { diff --git a/app/src/main/java/com/gh/gamecenter/db/info/SuspectedGameInfo.java b/app/src/main/java/com/gh/gamecenter/db/info/SuspectedGameInfo.java index d29e6089a3..314c165077 100644 --- a/app/src/main/java/com/gh/gamecenter/db/info/SuspectedGameInfo.java +++ b/app/src/main/java/com/gh/gamecenter/db/info/SuspectedGameInfo.java @@ -1,10 +1,10 @@ package com.gh.gamecenter.db.info; -import java.io.Serializable; - import com.j256.ormlite.field.DatabaseField; import com.j256.ormlite.table.DatabaseTable; +import java.io.Serializable; + @DatabaseTable(tableName = "tb_suspectedgame") public class SuspectedGameInfo implements Serializable { diff --git a/app/src/main/java/com/gh/gamecenter/download/DownLoadManagerFragment.java b/app/src/main/java/com/gh/gamecenter/download/DownLoadManagerFragment.java index 847f58524d..37a3a96ccf 100644 --- a/app/src/main/java/com/gh/gamecenter/download/DownLoadManagerFragment.java +++ b/app/src/main/java/com/gh/gamecenter/download/DownLoadManagerFragment.java @@ -1,11 +1,5 @@ package com.gh.gamecenter.download; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; - import android.app.Dialog; import android.os.Bundle; import android.os.Handler; @@ -57,6 +51,12 @@ import com.gh.gamecenter.eventbus.EBUISwitch; import com.gh.gamecenter.manager.PackageManager; import com.tendcloud.tenddata.TCAgent; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; + import de.greenrobot.event.EventBus; /** diff --git a/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragment.java b/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragment.java index 89eb7f951b..7e38dfa888 100644 --- a/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragment.java +++ b/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragment.java @@ -1,15 +1,5 @@ package com.gh.gamecenter.download; -import java.lang.reflect.Type; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Comparator; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.json.JSONArray; - import android.os.Bundle; import android.os.Handler; import android.support.annotation.Nullable; @@ -60,6 +50,16 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.tendcloud.tenddata.TCAgent; +import org.json.JSONArray; + +import java.lang.reflect.Type; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + import de.greenrobot.event.EventBus; /** diff --git a/app/src/main/java/com/gh/gamecenter/entity/GameEntity.java b/app/src/main/java/com/gh/gamecenter/entity/GameEntity.java index ec7e570a01..757168b637 100644 --- a/app/src/main/java/com/gh/gamecenter/entity/GameEntity.java +++ b/app/src/main/java/com/gh/gamecenter/entity/GameEntity.java @@ -1,12 +1,12 @@ package com.gh.gamecenter.entity; -import java.util.ArrayList; - import android.support.v4.util.ArrayMap; import com.gh.download.DownloadEntry; import com.google.gson.annotations.SerializedName; +import java.util.ArrayList; + public class GameEntity { @SerializedName("_id") diff --git a/app/src/main/java/com/gh/gamecenter/entity/NewsDetailsEntity.java b/app/src/main/java/com/gh/gamecenter/entity/NewsDetailsEntity.java index c9b9619498..48b9a26143 100644 --- a/app/src/main/java/com/gh/gamecenter/entity/NewsDetailsEntity.java +++ b/app/src/main/java/com/gh/gamecenter/entity/NewsDetailsEntity.java @@ -1,10 +1,10 @@ package com.gh.gamecenter.entity; +import com.google.gson.annotations.SerializedName; + import java.io.Serializable; import java.util.List; -import com.google.gson.annotations.SerializedName; - public class NewsDetailsEntity implements Serializable { private static final long serialVersionUID = 2608000952273704433L; diff --git a/app/src/main/java/com/gh/gamecenter/game/Game1Fragment.java b/app/src/main/java/com/gh/gamecenter/game/Game1Fragment.java index 8f11b48a72..dcce9d7e48 100644 --- a/app/src/main/java/com/gh/gamecenter/game/Game1Fragment.java +++ b/app/src/main/java/com/gh/gamecenter/game/Game1Fragment.java @@ -1,10 +1,5 @@ package com.gh.gamecenter.game; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.concurrent.LinkedBlockingQueue; - import android.os.Bundle; import android.os.Handler; import android.os.Message; @@ -13,7 +8,6 @@ import android.support.v4.app.Fragment; import android.support.v4.util.ArrayMap; import android.support.v4.widget.SwipeRefreshLayout; import android.support.v4.widget.SwipeRefreshLayout.OnRefreshListener; -import android.support.v7.widget.DefaultItemAnimator; import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.RecyclerView; import android.view.LayoutInflater; @@ -37,6 +31,11 @@ import com.gh.gamecenter.eventbus.EBNetworkState; import com.gh.gamecenter.eventbus.EBPWDismiss; import com.gh.gamecenter.eventbus.EBPackage; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.concurrent.LinkedBlockingQueue; + import de.greenrobot.event.EventBus; /** diff --git a/app/src/main/java/com/gh/gamecenter/game/Game1FragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/game/Game1FragmentAdapter.java index 17fa94e431..249e435a2f 100644 --- a/app/src/main/java/com/gh/gamecenter/game/Game1FragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/game/Game1FragmentAdapter.java @@ -1,14 +1,5 @@ package com.gh.gamecenter.game; -import java.lang.reflect.Type; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.concurrent.LinkedBlockingQueue; - -import org.json.JSONArray; - import android.content.Context; import android.content.Intent; import android.os.Handler; @@ -49,6 +40,15 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.tendcloud.tenddata.TCAgent; +import org.json.JSONArray; + +import java.lang.reflect.Type; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.concurrent.LinkedBlockingQueue; + /** * * @author 温冠超 diff --git a/app/src/main/java/com/gh/gamecenter/game/Game2Fragment.java b/app/src/main/java/com/gh/gamecenter/game/Game2Fragment.java index c5473e9b36..8dec8b4f62 100644 --- a/app/src/main/java/com/gh/gamecenter/game/Game2Fragment.java +++ b/app/src/main/java/com/gh/gamecenter/game/Game2Fragment.java @@ -1,9 +1,5 @@ package com.gh.gamecenter.game; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.concurrent.LinkedBlockingQueue; - import android.os.Bundle; import android.os.Handler; import android.os.Message; @@ -12,7 +8,6 @@ import android.support.v4.app.Fragment; import android.support.v4.util.ArrayMap; import android.support.v4.widget.SwipeRefreshLayout; import android.support.v4.widget.SwipeRefreshLayout.OnRefreshListener; -import android.support.v7.widget.DefaultItemAnimator; import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.RecyclerView; import android.view.LayoutInflater; @@ -39,6 +34,10 @@ import com.gh.gamecenter.eventbus.EBNetworkState; import com.gh.gamecenter.eventbus.EBPWDismiss; import com.gh.gamecenter.eventbus.EBPackage; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.concurrent.LinkedBlockingQueue; + import de.greenrobot.event.EventBus; public class Game2Fragment extends Fragment implements OnRefreshListener { diff --git a/app/src/main/java/com/gh/gamecenter/game/Game2FragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/game/Game2FragmentAdapter.java index 32fb664f3e..94359db880 100644 --- a/app/src/main/java/com/gh/gamecenter/game/Game2FragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/game/Game2FragmentAdapter.java @@ -1,16 +1,5 @@ package com.gh.gamecenter.game; -import java.lang.reflect.Type; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.concurrent.LinkedBlockingQueue; - -import org.json.JSONArray; - import android.content.Context; import android.content.Intent; import android.os.Handler; @@ -53,6 +42,17 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.tendcloud.tenddata.TCAgent; +import org.json.JSONArray; + +import java.lang.reflect.Type; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.concurrent.LinkedBlockingQueue; + public class Game2FragmentAdapter extends RecyclerView.Adapter { diff --git a/app/src/main/java/com/gh/gamecenter/gamedetails/GameDetailsFragment.java b/app/src/main/java/com/gh/gamecenter/gamedetails/GameDetailsFragment.java index 575d9a69bd..2ba93528c1 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetails/GameDetailsFragment.java +++ b/app/src/main/java/com/gh/gamecenter/gamedetails/GameDetailsFragment.java @@ -1,19 +1,5 @@ package com.gh.gamecenter.gamedetails; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Comparator; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Locale; -import java.util.Map; - -import org.json.JSONArray; -import org.json.JSONException; -import org.json.JSONObject; - import android.content.Intent; import android.os.Bundle; import android.os.Handler; @@ -65,6 +51,20 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.tendcloud.tenddata.TCAgent; +import org.json.JSONArray; +import org.json.JSONException; +import org.json.JSONObject; + +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Locale; +import java.util.Map; + import de.greenrobot.event.EventBus; /** @@ -653,8 +653,7 @@ public class GameDetailsFragment extends Fragment { } else { plugin_position = 3; } - if ("收回".equals(fm_gamedetails_tv_primatte_details.getText() - .toString())) { + if ("收回".equals(fm_gamedetails_tv_primatte_details.getText().toString())) { Map kv0 = new HashMap(); kv0.put("点击", "插件介绍-收回^"); @@ -665,12 +664,10 @@ public class GameDetailsFragment extends Fragment { map.put("createOn", System.currentTimeMillis() / 1000); map.put("game", gameName); map.put("page", "游戏详情"); - DataCollectionManager.onEvent(getActivity(), "click-item", - map); + DataCollectionManager.onEvent(getActivity(), "click-item", map); fm_gamedetails_tv_primatte_details.setText("详情"); - fm_gamedetails_iv_primatte_details - .setImageResource(R.drawable.down); + fm_gamedetails_iv_primatte_details.setImageResource(R.drawable.down); adapter.notifyItemChanged(plugin_position); } else { Map kv0 = new HashMap(); @@ -790,16 +787,12 @@ public class GameDetailsFragment extends Fragment { .setVisibility(View.GONE); } if (entity.getTag() == null || entity.getTag().isEmpty()) { - viewHolder.fm_gamedetails_tv_primatte_details - .setVisibility(View.GONE); + viewHolder.fm_gamedetails_ll_primatte_details_show.setVisibility(View.GONE); } else { - viewHolder.fm_gamedetails_ll_primatte_details - .removeAllViews(); + viewHolder.fm_gamedetails_ll_primatte_details.removeAllViews(); if (entity.getTag().size() >= 3) { - viewHolder.fm_gamedetails_tv_primatte_details - .setVisibility(View.VISIBLE); - if ("详情".equals(viewHolder.fm_gamedetails_tv_primatte_details - .getText().toString())) { + viewHolder.fm_gamedetails_ll_primatte_details_show.setVisibility(View.VISIBLE); + if ("详情".equals(viewHolder.fm_gamedetails_tv_primatte_details.getText().toString())) { TagEntity tagEntity = entity.getTag().get(0); View child = View.inflate(getActivity(), R.layout.primatte_details_item, null); @@ -840,8 +833,7 @@ public class GameDetailsFragment extends Fragment { return; } } else { - viewHolder.fm_gamedetails_tv_primatte_details - .setVisibility(View.GONE); + viewHolder.fm_gamedetails_ll_primatte_details_show.setVisibility(View.GONE); } for (int i = 0, size = entity.getTag().size(); i < size; i++) { TagEntity tagEntity = entity.getTag().get(i); diff --git a/app/src/main/java/com/gh/gamecenter/gamedetails/GameInformationFragment.java b/app/src/main/java/com/gh/gamecenter/gamedetails/GameInformationFragment.java index 2cc3dfb32e..6699c75528 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetails/GameInformationFragment.java +++ b/app/src/main/java/com/gh/gamecenter/gamedetails/GameInformationFragment.java @@ -1,14 +1,5 @@ package com.gh.gamecenter.gamedetails; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.json.JSONArray; -import org.json.JSONException; -import org.json.JSONObject; - import android.content.Context; import android.content.SharedPreferences; import android.net.Uri; @@ -62,6 +53,15 @@ import com.gh.gamecenter.volley.extended.JsonArrayExtendedRequest; import com.google.gson.Gson; import com.tendcloud.tenddata.TCAgent; +import org.json.JSONArray; +import org.json.JSONException; +import org.json.JSONObject; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + import de.greenrobot.event.EventBus; /** diff --git a/app/src/main/java/com/gh/gamecenter/gamedetails/GameStrategyFragment.java b/app/src/main/java/com/gh/gamecenter/gamedetails/GameStrategyFragment.java index e748d206e4..58e11c2c39 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetails/GameStrategyFragment.java +++ b/app/src/main/java/com/gh/gamecenter/gamedetails/GameStrategyFragment.java @@ -1,14 +1,5 @@ package com.gh.gamecenter.gamedetails; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.json.JSONArray; -import org.json.JSONException; -import org.json.JSONObject; - import android.content.Context; import android.content.SharedPreferences; import android.net.Uri; @@ -62,6 +53,15 @@ import com.gh.gamecenter.volley.extended.JsonArrayExtendedRequest; import com.google.gson.Gson; import com.tendcloud.tenddata.TCAgent; +import org.json.JSONArray; +import org.json.JSONException; +import org.json.JSONObject; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + import de.greenrobot.event.EventBus; /** diff --git a/app/src/main/java/com/gh/gamecenter/home/HomeFragment.java b/app/src/main/java/com/gh/gamecenter/home/HomeFragment.java index 957dca8b1d..37549eb20b 100644 --- a/app/src/main/java/com/gh/gamecenter/home/HomeFragment.java +++ b/app/src/main/java/com/gh/gamecenter/home/HomeFragment.java @@ -1,11 +1,5 @@ package com.gh.gamecenter.home; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.concurrent.LinkedBlockingQueue; - import android.content.Context; import android.content.Intent; import android.content.SharedPreferences; @@ -17,7 +11,6 @@ import android.os.Message; import android.support.annotation.Nullable; import android.support.v4.app.Fragment; import android.support.v4.util.ArrayMap; -import android.support.v7.widget.DefaultItemAnimator; import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.RecyclerView; import android.text.TextUtils; @@ -60,6 +53,12 @@ import com.gh.gamecenter.manager.DataCollectionManager; import com.gh.gamecenter.manager.PackageManager; import com.tendcloud.tenddata.TCAgent; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.concurrent.LinkedBlockingQueue; + import de.greenrobot.event.EventBus; /** diff --git a/app/src/main/java/com/gh/gamecenter/home/HomeFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/home/HomeFragmentAdapter.java index 8d9cbacb8b..a093013da9 100644 --- a/app/src/main/java/com/gh/gamecenter/home/HomeFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/home/HomeFragmentAdapter.java @@ -1,16 +1,5 @@ package com.gh.gamecenter.home; -import java.lang.reflect.Type; -import java.util.ArrayList; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Random; -import java.util.concurrent.LinkedBlockingQueue; - -import org.json.JSONArray; - import android.content.Context; import android.content.Intent; import android.net.Uri; @@ -71,6 +60,17 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.tendcloud.tenddata.TCAgent; +import org.json.JSONArray; + +import java.lang.reflect.Type; +import java.util.ArrayList; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Random; +import java.util.concurrent.LinkedBlockingQueue; + import de.greenrobot.event.EventBus; /** diff --git a/app/src/main/java/com/gh/gamecenter/manager/ConcernManager.java b/app/src/main/java/com/gh/gamecenter/manager/ConcernManager.java index 1478cab58c..ae93a3396f 100644 --- a/app/src/main/java/com/gh/gamecenter/manager/ConcernManager.java +++ b/app/src/main/java/com/gh/gamecenter/manager/ConcernManager.java @@ -1,9 +1,5 @@ package com.gh.gamecenter.manager; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; - import android.content.Context; import android.support.v4.util.ArrayMap; @@ -15,6 +11,10 @@ import com.gh.gamecenter.entity.ApkEntity; import com.gh.gamecenter.entity.GameEntity; import com.gh.gamecenter.eventbus.EBConcernChanged; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; + import de.greenrobot.event.EventBus; public class ConcernManager { diff --git a/app/src/main/java/com/gh/gamecenter/manager/DataCollectionManager.java b/app/src/main/java/com/gh/gamecenter/manager/DataCollectionManager.java index de2ab66339..4df0dbd0e0 100644 --- a/app/src/main/java/com/gh/gamecenter/manager/DataCollectionManager.java +++ b/app/src/main/java/com/gh/gamecenter/manager/DataCollectionManager.java @@ -1,15 +1,5 @@ package com.gh.gamecenter.manager; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.UUID; - -import org.json.JSONArray; -import org.json.JSONException; -import org.json.JSONObject; - import android.content.Context; import android.util.Log; @@ -23,6 +13,16 @@ import com.gh.gamecenter.db.DataCollectionDao; import com.gh.gamecenter.db.info.DataCollectionInfo; import com.gh.gamecenter.volley.extended.JsonObjectExtendedRequest; +import org.json.JSONArray; +import org.json.JSONException; +import org.json.JSONObject; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.UUID; + public class DataCollectionManager { private static DataCollectionManager mInstance; diff --git a/app/src/main/java/com/gh/gamecenter/manager/FilterManager.java b/app/src/main/java/com/gh/gamecenter/manager/FilterManager.java index 512b8015ee..bb8708948b 100644 --- a/app/src/main/java/com/gh/gamecenter/manager/FilterManager.java +++ b/app/src/main/java/com/gh/gamecenter/manager/FilterManager.java @@ -1,11 +1,5 @@ package com.gh.gamecenter.manager; -import java.util.ArrayList; -import java.util.List; - -import org.json.JSONArray; -import org.json.JSONException; - import android.content.Context; import android.content.SharedPreferences; @@ -19,6 +13,12 @@ import com.gh.gamecenter.db.FilterDao; import com.gh.gamecenter.db.info.FilterInfo; import com.gh.gamecenter.volley.extended.JsonArrayExtendedRequest; +import org.json.JSONArray; +import org.json.JSONException; + +import java.util.ArrayList; +import java.util.List; + public class FilterManager { private FilterDao dao; diff --git a/app/src/main/java/com/gh/gamecenter/manager/GameManager.java b/app/src/main/java/com/gh/gamecenter/manager/GameManager.java index a1cebf976e..7caaf33213 100644 --- a/app/src/main/java/com/gh/gamecenter/manager/GameManager.java +++ b/app/src/main/java/com/gh/gamecenter/manager/GameManager.java @@ -1,12 +1,12 @@ package com.gh.gamecenter.manager; -import java.util.List; - import android.content.Context; import com.gh.gamecenter.db.GameDao; import com.gh.gamecenter.db.info.GameInfo; +import java.util.List; + public class GameManager { private GameDao dao; diff --git a/app/src/main/java/com/gh/gamecenter/manager/PackageManager.java b/app/src/main/java/com/gh/gamecenter/manager/PackageManager.java index 0f01fc8e87..dcb2736990 100644 --- a/app/src/main/java/com/gh/gamecenter/manager/PackageManager.java +++ b/app/src/main/java/com/gh/gamecenter/manager/PackageManager.java @@ -1,12 +1,5 @@ package com.gh.gamecenter.manager; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; - -import org.json.JSONArray; -import org.json.JSONObject; - import android.content.Context; import android.content.pm.ApplicationInfo; import android.content.pm.PackageInfo; @@ -17,6 +10,13 @@ import android.text.TextUtils; import com.gh.common.util.PackageUtils; import com.gh.gamecenter.entity.GameUpdateEntity; +import org.json.JSONArray; +import org.json.JSONObject; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; + public class PackageManager { private Context context; diff --git a/app/src/main/java/com/gh/gamecenter/manager/SuspectedGameManager.java b/app/src/main/java/com/gh/gamecenter/manager/SuspectedGameManager.java index f99267c681..a3c0ca48e1 100644 --- a/app/src/main/java/com/gh/gamecenter/manager/SuspectedGameManager.java +++ b/app/src/main/java/com/gh/gamecenter/manager/SuspectedGameManager.java @@ -1,12 +1,12 @@ package com.gh.gamecenter.manager; -import java.util.List; - import android.content.Context; import com.gh.gamecenter.db.SuspectedGameDao; import com.gh.gamecenter.db.info.SuspectedGameInfo; +import java.util.List; + public class SuspectedGameManager { private SuspectedGameDao dao; diff --git a/app/src/main/java/com/gh/gamecenter/manager/SystemBarTintManager.java b/app/src/main/java/com/gh/gamecenter/manager/SystemBarTintManager.java index e192dc5244..e71d4c6dbf 100644 --- a/app/src/main/java/com/gh/gamecenter/manager/SystemBarTintManager.java +++ b/app/src/main/java/com/gh/gamecenter/manager/SystemBarTintManager.java @@ -16,8 +16,6 @@ package com.gh.gamecenter.manager; -import java.lang.reflect.Method; - import android.annotation.SuppressLint; import android.annotation.TargetApi; import android.app.Activity; @@ -37,6 +35,8 @@ import android.view.Window; import android.view.WindowManager; import android.widget.FrameLayout.LayoutParams; +import java.lang.reflect.Method; + /** * Class to manage status and navigation bar tint effects when using KitKat * translucent system UI modes. diff --git a/app/src/main/java/com/gh/gamecenter/personal/PersonalFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/personal/PersonalFragmentAdapter.java index aa617e1609..4f6a554dc1 100644 --- a/app/src/main/java/com/gh/gamecenter/personal/PersonalFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/personal/PersonalFragmentAdapter.java @@ -1,17 +1,5 @@ package com.gh.gamecenter.personal; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Comparator; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.regex.Pattern; - -import org.json.JSONException; -import org.json.JSONObject; - import android.app.Dialog; import android.content.Context; import android.content.DialogInterface; @@ -118,6 +106,18 @@ import com.gh.gamecenter.volley.extended.JsonObjectExtendedRequest; import com.google.gson.Gson; import com.tendcloud.tenddata.TCAgent; +import org.json.JSONException; +import org.json.JSONObject; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.regex.Pattern; + import de.greenrobot.event.EventBus; public class PersonalFragmentAdapter extends diff --git a/app/src/main/java/com/gh/gamecenter/plugin/Plugin1Fragment.java b/app/src/main/java/com/gh/gamecenter/plugin/Plugin1Fragment.java index 7f87ab1b02..5fbcdc145d 100644 --- a/app/src/main/java/com/gh/gamecenter/plugin/Plugin1Fragment.java +++ b/app/src/main/java/com/gh/gamecenter/plugin/Plugin1Fragment.java @@ -1,10 +1,5 @@ package com.gh.gamecenter.plugin; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.concurrent.LinkedBlockingQueue; - import android.os.Bundle; import android.os.Handler; import android.os.Message; @@ -13,7 +8,6 @@ import android.support.v4.app.Fragment; import android.support.v4.util.ArrayMap; import android.support.v4.widget.SwipeRefreshLayout; import android.support.v4.widget.SwipeRefreshLayout.OnRefreshListener; -import android.support.v7.widget.DefaultItemAnimator; import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.RecyclerView; import android.text.TextUtils; @@ -39,6 +33,11 @@ import com.gh.gamecenter.eventbus.EBPWDismiss; import com.gh.gamecenter.eventbus.EBPackage; import com.gh.gamecenter.eventbus.EBUISwitch; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.concurrent.LinkedBlockingQueue; + import de.greenrobot.event.EventBus; /** diff --git a/app/src/main/java/com/gh/gamecenter/plugin/Plugin1FragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/plugin/Plugin1FragmentAdapter.java index 335807cabe..c96b867dcd 100644 --- a/app/src/main/java/com/gh/gamecenter/plugin/Plugin1FragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/plugin/Plugin1FragmentAdapter.java @@ -1,14 +1,5 @@ package com.gh.gamecenter.plugin; -import java.lang.reflect.Type; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.concurrent.LinkedBlockingQueue; - -import org.json.JSONArray; - import android.content.Context; import android.content.Intent; import android.os.Handler; @@ -56,6 +47,15 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.tendcloud.tenddata.TCAgent; +import org.json.JSONArray; + +import java.lang.reflect.Type; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.concurrent.LinkedBlockingQueue; + /** * * @author 温冠超 diff --git a/app/src/main/java/com/gh/gamecenter/plugin/Plugin2Fragment.java b/app/src/main/java/com/gh/gamecenter/plugin/Plugin2Fragment.java index f3e27b9d61..56eeaf633a 100644 --- a/app/src/main/java/com/gh/gamecenter/plugin/Plugin2Fragment.java +++ b/app/src/main/java/com/gh/gamecenter/plugin/Plugin2Fragment.java @@ -1,10 +1,5 @@ package com.gh.gamecenter.plugin; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.concurrent.LinkedBlockingQueue; - import android.os.Bundle; import android.os.Handler; import android.os.Message; @@ -13,7 +8,6 @@ import android.support.v4.app.Fragment; import android.support.v4.util.ArrayMap; import android.support.v4.widget.SwipeRefreshLayout; import android.support.v4.widget.SwipeRefreshLayout.OnRefreshListener; -import android.support.v7.widget.DefaultItemAnimator; import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.RecyclerView; import android.text.TextUtils; @@ -39,6 +33,11 @@ import com.gh.gamecenter.eventbus.EBPWDismiss; import com.gh.gamecenter.eventbus.EBPackage; import com.gh.gamecenter.eventbus.EBUISwitch; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.concurrent.LinkedBlockingQueue; + import de.greenrobot.event.EventBus; /** diff --git a/app/src/main/java/com/gh/gamecenter/plugin/Plugin2FragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/plugin/Plugin2FragmentAdapter.java index bb4724d7fb..158c3ae34a 100644 --- a/app/src/main/java/com/gh/gamecenter/plugin/Plugin2FragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/plugin/Plugin2FragmentAdapter.java @@ -1,14 +1,5 @@ package com.gh.gamecenter.plugin; -import java.lang.reflect.Type; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.concurrent.LinkedBlockingQueue; - -import org.json.JSONArray; - import android.content.Context; import android.content.Intent; import android.os.Handler; @@ -48,6 +39,15 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.tendcloud.tenddata.TCAgent; +import org.json.JSONArray; + +import java.lang.reflect.Type; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.concurrent.LinkedBlockingQueue; + /** * * @author 温冠超 diff --git a/app/src/main/java/com/gh/gamecenter/plugin/Plugin3Fragment.java b/app/src/main/java/com/gh/gamecenter/plugin/Plugin3Fragment.java index a83a1f29d2..79cdfc569a 100644 --- a/app/src/main/java/com/gh/gamecenter/plugin/Plugin3Fragment.java +++ b/app/src/main/java/com/gh/gamecenter/plugin/Plugin3Fragment.java @@ -1,10 +1,5 @@ package com.gh.gamecenter.plugin; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.concurrent.LinkedBlockingQueue; - import android.os.Bundle; import android.os.Handler; import android.os.Message; @@ -13,7 +8,6 @@ import android.support.v4.app.Fragment; import android.support.v4.util.ArrayMap; import android.support.v4.widget.SwipeRefreshLayout; import android.support.v4.widget.SwipeRefreshLayout.OnRefreshListener; -import android.support.v7.widget.DefaultItemAnimator; import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.RecyclerView; import android.text.TextUtils; @@ -39,6 +33,11 @@ import com.gh.gamecenter.eventbus.EBPWDismiss; import com.gh.gamecenter.eventbus.EBPackage; import com.gh.gamecenter.eventbus.EBUISwitch; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.concurrent.LinkedBlockingQueue; + import de.greenrobot.event.EventBus; /** diff --git a/app/src/main/java/com/gh/gamecenter/plugin/Plugin3FragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/plugin/Plugin3FragmentAdapter.java index 15b73276b1..11d730a76a 100644 --- a/app/src/main/java/com/gh/gamecenter/plugin/Plugin3FragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/plugin/Plugin3FragmentAdapter.java @@ -1,14 +1,5 @@ package com.gh.gamecenter.plugin; -import java.lang.reflect.Type; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.concurrent.LinkedBlockingQueue; - -import org.json.JSONArray; - import android.content.Context; import android.content.Intent; import android.os.Handler; @@ -48,6 +39,15 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.tendcloud.tenddata.TCAgent; +import org.json.JSONArray; + +import java.lang.reflect.Type; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.concurrent.LinkedBlockingQueue; + /** * * @author 温冠超 diff --git a/app/src/main/java/com/gh/gamecenter/plugin/PluginFragment.java b/app/src/main/java/com/gh/gamecenter/plugin/PluginFragment.java index 054ed9ffad..618351b504 100644 --- a/app/src/main/java/com/gh/gamecenter/plugin/PluginFragment.java +++ b/app/src/main/java/com/gh/gamecenter/plugin/PluginFragment.java @@ -1,9 +1,5 @@ package com.gh.gamecenter.plugin; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - import android.content.Context; import android.content.Intent; import android.content.SharedPreferences; @@ -47,6 +43,10 @@ import com.gh.gamecenter.manager.DataCollectionManager; import com.gh.gamecenter.manager.PackageManager; import com.tendcloud.tenddata.TCAgent; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + import de.greenrobot.event.EventBus; /** diff --git a/app/src/main/java/com/gh/gamecenter/receiver/NotificationReceiver.java b/app/src/main/java/com/gh/gamecenter/receiver/NotificationReceiver.java index ac3c758d8e..4a4e2f7ba5 100644 --- a/app/src/main/java/com/gh/gamecenter/receiver/NotificationReceiver.java +++ b/app/src/main/java/com/gh/gamecenter/receiver/NotificationReceiver.java @@ -1,12 +1,5 @@ package com.gh.gamecenter.receiver; -import java.util.ArrayList; -import java.util.List; - -import org.json.JSONArray; -import org.json.JSONException; -import org.json.JSONObject; - import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; @@ -26,6 +19,13 @@ import com.gh.gamecenter.entity.NewsDetailsEntity; import com.gh.gamecenter.eventbus.EBMiPush; import com.google.gson.Gson; +import org.json.JSONArray; +import org.json.JSONException; +import org.json.JSONObject; + +import java.util.ArrayList; +import java.util.List; + import de.greenrobot.event.EventBus; /** diff --git a/app/src/main/java/com/gh/gamecenter/receiver/SmsReceiver.java b/app/src/main/java/com/gh/gamecenter/receiver/SmsReceiver.java index b8e0594fc7..c3721b760e 100644 --- a/app/src/main/java/com/gh/gamecenter/receiver/SmsReceiver.java +++ b/app/src/main/java/com/gh/gamecenter/receiver/SmsReceiver.java @@ -1,7 +1,5 @@ package com.gh.gamecenter.receiver; -import java.util.regex.Pattern; - import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; @@ -10,6 +8,8 @@ import android.telephony.SmsMessage; import com.gh.common.util.Utils; import com.gh.gamecenter.eventbus.EBSms; +import java.util.regex.Pattern; + import de.greenrobot.event.EventBus; public class SmsReceiver extends BroadcastReceiver { diff --git a/app/src/main/java/com/gh/gamecenter/receiver/UninstallReceiver.java b/app/src/main/java/com/gh/gamecenter/receiver/UninstallReceiver.java index cce04c5afe..689f7a8143 100644 --- a/app/src/main/java/com/gh/gamecenter/receiver/UninstallReceiver.java +++ b/app/src/main/java/com/gh/gamecenter/receiver/UninstallReceiver.java @@ -1,7 +1,5 @@ package com.gh.gamecenter.receiver; -import java.util.List; - import android.app.ActivityManager; import android.app.ActivityManager.RunningTaskInfo; import android.content.BroadcastReceiver; @@ -14,6 +12,8 @@ import com.gh.gamecenter.DownloadManagerActivity; import com.gh.gamecenter.SplashScreenActivity; import com.gh.gamecenter.eventbus.EBMiPush; +import java.util.List; + import de.greenrobot.event.EventBus; public class UninstallReceiver extends BroadcastReceiver { diff --git a/app/src/main/java/com/gh/gamecenter/search/Search1DetailFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/search/Search1DetailFragmentAdapter.java index bb20e0d25d..0ed90e7788 100644 --- a/app/src/main/java/com/gh/gamecenter/search/Search1DetailFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/search/Search1DetailFragmentAdapter.java @@ -1,13 +1,5 @@ package com.gh.gamecenter.search; -import java.lang.reflect.Type; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.json.JSONArray; - import android.content.Context; import android.content.Intent; import android.net.Uri; @@ -40,6 +32,14 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.tendcloud.tenddata.TCAgent; +import org.json.JSONArray; + +import java.lang.reflect.Type; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + public class Search1DetailFragmentAdapter extends RecyclerView.Adapter { diff --git a/app/src/main/java/com/gh/gamecenter/search/Search2GameListAdapter.java b/app/src/main/java/com/gh/gamecenter/search/Search2GameListAdapter.java index 77e98f7130..b91cb90eb9 100644 --- a/app/src/main/java/com/gh/gamecenter/search/Search2GameListAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/search/Search2GameListAdapter.java @@ -1,13 +1,5 @@ package com.gh.gamecenter.search; -import java.lang.reflect.Type; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.json.JSONArray; - import android.content.Context; import android.content.Intent; import android.net.Uri; @@ -17,7 +9,6 @@ import android.view.View; import android.view.View.OnClickListener; import android.view.ViewGroup; import android.view.inputmethod.InputMethodManager; -import android.widget.ImageView; import android.widget.TextView; import com.android.volley.NoConnectionError; @@ -32,7 +23,6 @@ import com.gh.common.util.TimestampUtils; import com.gh.common.view.DownloadDialog; import com.gh.gamecenter.GameDetailsActivity; import com.gh.gamecenter.R; -import com.gh.gamecenter.SearchActivity; import com.gh.gamecenter.adapter.viewholder.GameViewHolder; import com.gh.gamecenter.entity.DismissEntity; import com.gh.gamecenter.entity.GameEntity; @@ -42,6 +32,14 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.tendcloud.tenddata.TCAgent; +import org.json.JSONArray; + +import java.lang.reflect.Type; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + public class Search2GameListAdapter extends RecyclerView.Adapter { diff --git a/app/src/main/java/com/gh/gamecenter/search/Search3HistoryAdapter.java b/app/src/main/java/com/gh/gamecenter/search/Search3HistoryAdapter.java index bb1a6aea55..a1c779fc1c 100644 --- a/app/src/main/java/com/gh/gamecenter/search/Search3HistoryAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/search/Search3HistoryAdapter.java @@ -1,9 +1,5 @@ package com.gh.gamecenter.search; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - import android.app.Dialog; import android.content.Context; import android.support.v7.widget.RecyclerView; @@ -23,6 +19,10 @@ import com.gh.gamecenter.db.SearchHistoryDao; import com.gh.gamecenter.manager.DataCollectionManager; import com.tendcloud.tenddata.TCAgent; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + public class Search3HistoryAdapter extends RecyclerView.Adapter { diff --git a/app/src/main/java/com/gh/gamecenter/volley/extended/ExtendedRequest.java b/app/src/main/java/com/gh/gamecenter/volley/extended/ExtendedRequest.java index 7c959fff43..fa4b8131db 100644 --- a/app/src/main/java/com/gh/gamecenter/volley/extended/ExtendedRequest.java +++ b/app/src/main/java/com/gh/gamecenter/volley/extended/ExtendedRequest.java @@ -1,12 +1,5 @@ package com.gh.gamecenter.volley.extended; -import java.io.IOException; -import java.io.UnsupportedEncodingException; -import java.util.HashMap; -import java.util.Map; - -import org.apache.http.HttpStatus; - import android.text.TextUtils; import com.android.volley.AuthFailureError; @@ -18,6 +11,13 @@ import com.android.volley.toolbox.HttpHeaderParser; import com.gh.common.util.GzipUtils; import com.gh.common.util.Trace; +import org.apache.http.HttpStatus; + +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.util.HashMap; +import java.util.Map; + /** * * @author 温冠超 diff --git a/app/src/main/java/com/gh/gamecenter/volley/extended/JsonArrayExtendedRequest.java b/app/src/main/java/com/gh/gamecenter/volley/extended/JsonArrayExtendedRequest.java index 8ca80c43b3..03a551250e 100644 --- a/app/src/main/java/com/gh/gamecenter/volley/extended/JsonArrayExtendedRequest.java +++ b/app/src/main/java/com/gh/gamecenter/volley/extended/JsonArrayExtendedRequest.java @@ -1,10 +1,5 @@ package com.gh.gamecenter.volley.extended; -import java.io.UnsupportedEncodingException; - -import org.json.JSONArray; -import org.json.JSONException; - import com.android.volley.NetworkResponse; import com.android.volley.ParseError; import com.android.volley.Response; @@ -13,6 +8,11 @@ import com.android.volley.Response.Listener; import com.android.volley.toolbox.HttpHeaderParser; import com.gh.common.util.Utils; +import org.json.JSONArray; +import org.json.JSONException; + +import java.io.UnsupportedEncodingException; + /** * * @author 温冠超 diff --git a/app/src/main/java/com/gh/gamecenter/volley/extended/JsonExtendedRequest.java b/app/src/main/java/com/gh/gamecenter/volley/extended/JsonExtendedRequest.java index 4d9c637c62..2d0f8cb374 100644 --- a/app/src/main/java/com/gh/gamecenter/volley/extended/JsonExtendedRequest.java +++ b/app/src/main/java/com/gh/gamecenter/volley/extended/JsonExtendedRequest.java @@ -1,13 +1,13 @@ package com.gh.gamecenter.volley.extended; -import java.io.UnsupportedEncodingException; - import com.android.volley.NetworkResponse; import com.android.volley.Response; import com.android.volley.Response.ErrorListener; import com.android.volley.Response.Listener; import com.android.volley.VolleyLog; +import java.io.UnsupportedEncodingException; + /** * * @author 温冠超 diff --git a/app/src/main/java/com/gh/gamecenter/volley/extended/JsonObjectExtendedRequest.java b/app/src/main/java/com/gh/gamecenter/volley/extended/JsonObjectExtendedRequest.java index 21386f23a3..832fc86b7d 100644 --- a/app/src/main/java/com/gh/gamecenter/volley/extended/JsonObjectExtendedRequest.java +++ b/app/src/main/java/com/gh/gamecenter/volley/extended/JsonObjectExtendedRequest.java @@ -1,10 +1,5 @@ package com.gh.gamecenter.volley.extended; -import java.io.UnsupportedEncodingException; - -import org.json.JSONException; -import org.json.JSONObject; - import com.android.volley.NetworkResponse; import com.android.volley.ParseError; import com.android.volley.Response; @@ -12,6 +7,11 @@ import com.android.volley.Response.ErrorListener; import com.android.volley.toolbox.HttpHeaderParser; import com.gh.common.util.Utils; +import org.json.JSONException; +import org.json.JSONObject; + +import java.io.UnsupportedEncodingException; + /** * * @author 温冠超 diff --git a/app/src/main/java/com/gh/gamecenter/volley/extended/StringExtendedRequest.java b/app/src/main/java/com/gh/gamecenter/volley/extended/StringExtendedRequest.java index 65443c3a41..4b7e1d2f7b 100644 --- a/app/src/main/java/com/gh/gamecenter/volley/extended/StringExtendedRequest.java +++ b/app/src/main/java/com/gh/gamecenter/volley/extended/StringExtendedRequest.java @@ -1,12 +1,12 @@ package com.gh.gamecenter.volley.extended; -import java.io.UnsupportedEncodingException; - import com.android.volley.NetworkResponse; import com.android.volley.Response; import com.android.volley.toolbox.HttpHeaderParser; import com.gh.common.util.Utils; +import java.io.UnsupportedEncodingException; + /** * * @author 温冠超 diff --git a/app/src/main/java/com/kyleduo/switchbutton/Configuration.java b/app/src/main/java/com/kyleduo/switchbutton/Configuration.java index 86414613f9..80494d5a8d 100644 --- a/app/src/main/java/com/kyleduo/switchbutton/Configuration.java +++ b/app/src/main/java/com/kyleduo/switchbutton/Configuration.java @@ -1,7 +1,5 @@ package com.kyleduo.switchbutton; -import java.lang.reflect.Field; - import android.graphics.Color; import android.graphics.Rect; import android.graphics.drawable.Drawable; @@ -9,6 +7,8 @@ import android.graphics.drawable.GradientDrawable; import android.graphics.drawable.StateListDrawable; import android.view.View; +import java.lang.reflect.Field; + /** * class for configuring the Switchbutton * used when you want to change the face of this view in code diff --git a/app/src/test/java/com/gh/gamecenter/ExampleUnitTest.java b/app/src/test/java/com/gh/gamecenter/ExampleUnitTest.java index e98aa64218..3e8b9b8ee8 100644 --- a/app/src/test/java/com/gh/gamecenter/ExampleUnitTest.java +++ b/app/src/test/java/com/gh/gamecenter/ExampleUnitTest.java @@ -2,7 +2,7 @@ package com.gh.gamecenter; import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; /** * To work on unit tests, switch the Test Artifact in the Build Variants view.