diff --git a/app/src/main/java/com/gh/common/view/CardLinearLayout.java b/app/src/main/java/com/gh/common/view/CardLinearLayout.java index c7317a6816..694fec7ee6 100644 --- a/app/src/main/java/com/gh/common/view/CardLinearLayout.java +++ b/app/src/main/java/com/gh/common/view/CardLinearLayout.java @@ -4,6 +4,7 @@ import android.content.Context; import android.content.res.TypedArray; import android.graphics.Canvas; import android.graphics.drawable.Drawable; +import android.support.v4.content.ContextCompat; import android.util.AttributeSet; import android.widget.LinearLayout; import com.gh.gamecenter.R; @@ -47,27 +48,27 @@ public class CardLinearLayout extends LinearLayout { setPadding(getPaddingLeft() + mLeft, getPaddingTop() + mTop, getPaddingRight() + mRight, getPaddingBottom() + mBottom); if (isTran) { - mLeftDrawable = getContext().getResources().getDrawable(R.drawable.frame_tran_left); - mTopDrawable = getContext().getResources().getDrawable(R.drawable.frame_tran_top); - mRightDrawable = getContext().getResources().getDrawable(R.drawable.frame_tran_right); - mBottomDrawable = getContext().getResources().getDrawable(R.drawable.frame_tran_bottom); - mCenterDrawable = getContext().getResources().getDrawable(R.drawable.frame_tran_center); + mLeftDrawable = ContextCompat.getDrawable(getContext(), R.drawable.frame_tran_left); + mTopDrawable = ContextCompat.getDrawable(getContext(), R.drawable.frame_tran_top); + mRightDrawable = ContextCompat.getDrawable(getContext(), R.drawable.frame_tran_right); + mBottomDrawable = ContextCompat.getDrawable(getContext(), R.drawable.frame_tran_bottom); + mCenterDrawable = ContextCompat.getDrawable(getContext(), R.drawable.frame_tran_center); - mLeftTopDrawable = getContext().getResources().getDrawable(R.drawable.frame_tran_left_top_square); - mRightTopDrawable = getContext().getResources().getDrawable(R.drawable.frame_tran_right_top_square); - mLeftBottomDrawable = getContext().getResources().getDrawable(R.drawable.frame_tran_left_bottom_square); - mRightBottomDrawable = getContext().getResources().getDrawable(R.drawable.frame_tran_right_bottom_square); + mLeftTopDrawable = ContextCompat.getDrawable(getContext(), R.drawable.frame_tran_left_top_square); + mRightTopDrawable = ContextCompat.getDrawable(getContext(), R.drawable.frame_tran_right_top_square); + mLeftBottomDrawable = ContextCompat.getDrawable(getContext(), R.drawable.frame_tran_left_bottom_square); + mRightBottomDrawable = ContextCompat.getDrawable(getContext(), R.drawable.frame_tran_right_bottom_square); } else { - mLeftDrawable = getContext().getResources().getDrawable(R.drawable.frame_left); - mTopDrawable = getContext().getResources().getDrawable(R.drawable.frame_top); - mRightDrawable = getContext().getResources().getDrawable(R.drawable.frame_right); - mBottomDrawable = getContext().getResources().getDrawable(R.drawable.frame_bottom); - mCenterDrawable = getContext().getResources().getDrawable(R.drawable.frame_center); + mLeftDrawable = ContextCompat.getDrawable(getContext(), R.drawable.frame_left); + mTopDrawable = ContextCompat.getDrawable(getContext(), R.drawable.frame_top); + mRightDrawable = ContextCompat.getDrawable(getContext(), R.drawable.frame_right); + mBottomDrawable = ContextCompat.getDrawable(getContext(), R.drawable.frame_bottom); + mCenterDrawable = ContextCompat.getDrawable(getContext(), R.drawable.frame_center); - mLeftTopDrawable = getContext().getResources().getDrawable(R.drawable.frame_left_top_square); - mRightTopDrawable = getContext().getResources().getDrawable(R.drawable.frame_right_top_square); - mLeftBottomDrawable = getContext().getResources().getDrawable(R.drawable.frame_left_bottom_square); - mRightBottomDrawable = getContext().getResources().getDrawable(R.drawable.frame_right_bottom_square); + mLeftTopDrawable = ContextCompat.getDrawable(getContext(), R.drawable.frame_left_top_square); + mRightTopDrawable = ContextCompat.getDrawable(getContext(), R.drawable.frame_right_top_square); + mLeftBottomDrawable = ContextCompat.getDrawable(getContext(), R.drawable.frame_left_bottom_square); + mRightBottomDrawable = ContextCompat.getDrawable(getContext(), R.drawable.frame_right_bottom_square); } } diff --git a/app/src/main/java/com/gh/common/view/CropImageZoomView.java b/app/src/main/java/com/gh/common/view/CropImageZoomView.java index 57a2753f61..456b183049 100644 --- a/app/src/main/java/com/gh/common/view/CropImageZoomView.java +++ b/app/src/main/java/com/gh/common/view/CropImageZoomView.java @@ -3,6 +3,7 @@ package com.gh.common.view; import android.content.Context; import android.graphics.*; import android.graphics.drawable.Drawable; +import android.support.v7.widget.AppCompatImageView; import android.util.AttributeSet; import android.view.*; import android.view.GestureDetector.SimpleOnGestureListener; @@ -11,7 +12,7 @@ import android.view.View.OnTouchListener; import android.widget.ImageView; @SuppressWarnings("deprecation") -public class CropImageZoomView extends ImageView implements +public class CropImageZoomView extends AppCompatImageView implements OnScaleGestureListener, OnTouchListener, ViewTreeObserver.OnGlobalLayoutListener { diff --git a/app/src/main/java/com/gh/gamecenter/AboutActivity.java b/app/src/main/java/com/gh/gamecenter/AboutActivity.java index bade6d10df..0d37c33e7b 100644 --- a/app/src/main/java/com/gh/gamecenter/AboutActivity.java +++ b/app/src/main/java/com/gh/gamecenter/AboutActivity.java @@ -54,7 +54,7 @@ public class AboutActivity extends BaseActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); View view = View.inflate(this, R.layout.activity_about, null); - init(view, "关于"); + init(view, getString(R.string.title_about)); ((TextView) findViewById(R.id.about_tv_version)).setText("V" + PackageUtils.getVersionName(this)); diff --git a/app/src/main/java/com/gh/gamecenter/ChooseReceiverActivity.java b/app/src/main/java/com/gh/gamecenter/ChooseReceiverActivity.java index ee0c8c999b..6fedecf03f 100644 --- a/app/src/main/java/com/gh/gamecenter/ChooseReceiverActivity.java +++ b/app/src/main/java/com/gh/gamecenter/ChooseReceiverActivity.java @@ -2,59 +2,30 @@ package com.gh.gamecenter; import android.animation.Animator; import android.app.Activity; -import android.content.Context; -import android.content.Intent; -import android.content.SharedPreferences; +import android.content.*; import android.graphics.Color; import android.net.wifi.ScanResult; -import android.os.Bundle; -import android.os.Handler; -import android.os.Message; +import android.os.*; import android.text.Html; -import android.view.Gravity; -import android.view.View; -import android.view.ViewGroup; -import android.view.animation.AccelerateInterpolator; -import android.view.animation.AlphaAnimation; -import android.view.animation.Animation; -import android.view.animation.ScaleAnimation; -import android.view.animation.TranslateAnimation; -import android.widget.ImageView; -import android.widget.LinearLayout; -import android.widget.RelativeLayout; -import android.widget.TextView; - +import android.view.*; +import android.view.animation.*; +import android.widget.*; +import butterknife.BindView; +import butterknife.OnClick; import com.facebook.drawee.backends.pipeline.Fresco; import com.facebook.drawee.interfaces.DraweeController; import com.facebook.drawee.view.SimpleDraweeView; import com.gh.base.AppController; import com.gh.base.BaseActivity; import com.gh.common.constant.Config; -import com.gh.common.util.DialogUtils; -import com.gh.common.util.DisplayUtils; -import com.gh.common.util.UserIconUtils; -import com.gh.common.util.Utils; -import com.gh.gamecenter.kuaichuan.BaseTransfer; -import com.gh.gamecenter.kuaichuan.Constant; -import com.gh.gamecenter.kuaichuan.FileInfo; -import com.gh.gamecenter.kuaichuan.HotspotManager; -import com.gh.gamecenter.kuaichuan.WifiMgr; -import com.gh.gamecenter.kuaichuan.WifiUtils; +import com.gh.common.util.*; +import com.gh.gamecenter.kuaichuan.*; import com.readystatesoftware.systembartint.SystemBarTintManager; - import org.json.JSONObject; import java.lang.ref.WeakReference; -import java.net.DatagramPacket; -import java.net.DatagramSocket; -import java.net.InetAddress; -import java.net.InetSocketAddress; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import butterknife.BindView; -import butterknife.OnClick; +import java.net.*; +import java.util.*; /** * Created by khy on 2017/1/20. @@ -135,7 +106,7 @@ public class ChooseReceiverActivity extends BaseActivity implements View.OnClick protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); View contentView = View.inflate(this, R.layout.activity_choosereceiver, null); - init(contentView, "发送游戏"); + init(contentView, getString(R.string.title_choose_activity)); mTitleTv.setTextColor(Color.WHITE); mBackIv.setImageResource(R.drawable.reuse_kc_back); diff --git a/app/src/main/java/com/gh/gamecenter/CleanApkActivity.java b/app/src/main/java/com/gh/gamecenter/CleanApkActivity.java index c4d5938fdd..6d76bc3d55 100644 --- a/app/src/main/java/com/gh/gamecenter/CleanApkActivity.java +++ b/app/src/main/java/com/gh/gamecenter/CleanApkActivity.java @@ -7,30 +7,21 @@ import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.RecyclerView; import android.text.Html; import android.view.View; -import android.widget.CheckBox; -import android.widget.CompoundButton; -import android.widget.LinearLayout; -import android.widget.ProgressBar; -import android.widget.RelativeLayout; -import android.widget.TextView; - +import android.widget.*; +import butterknife.BindView; +import butterknife.OnClick; import com.gh.base.BaseActivity; -import com.gh.common.util.DialogUtils; -import com.gh.common.util.StringUtils; -import com.gh.common.util.Utils; +import com.gh.common.util.*; import com.gh.common.view.VerticalItemDecoration; import com.gh.gamecenter.adapter.CleanApkAdapter; import com.gh.gamecenter.entity.InstallGameEntity; import com.gh.gamecenter.eventbus.EBSkip; +import de.greenrobot.event.EventBus; import java.io.File; import java.text.DecimalFormat; import java.util.List; -import butterknife.BindView; -import butterknife.OnClick; -import de.greenrobot.event.EventBus; - /** * Created by khy on 2017/1/24. */ @@ -63,7 +54,7 @@ public class CleanApkActivity extends BaseActivity implements CleanApkAdapter.On protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); View contentView = View.inflate(this, R.layout.activity_clean_apk, null); - init(contentView, "安装包清理"); + init(contentView, getString(R.string.title_clean_apk)); mNodataSkipLl.setVisibility(View.GONE); diff --git a/app/src/main/java/com/gh/gamecenter/CommentDetailActivity.java b/app/src/main/java/com/gh/gamecenter/CommentDetailActivity.java index 66514b75af..8b1d6a3d06 100644 --- a/app/src/main/java/com/gh/gamecenter/CommentDetailActivity.java +++ b/app/src/main/java/com/gh/gamecenter/CommentDetailActivity.java @@ -23,7 +23,7 @@ public class CommentDetailActivity extends BaseActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); View view = View.inflate(this, R.layout.activity_comment_detail, null); - init(view, "查看对话"); + init(view, getString(R.string.title_comment_detail)); String commentId = getIntent().getExtras().getString("commentId"); diff --git a/app/src/main/java/com/gh/gamecenter/ConcernActivity.java b/app/src/main/java/com/gh/gamecenter/ConcernActivity.java index 55970f9ee1..3f77a2b488 100644 --- a/app/src/main/java/com/gh/gamecenter/ConcernActivity.java +++ b/app/src/main/java/com/gh/gamecenter/ConcernActivity.java @@ -44,7 +44,7 @@ public class ConcernActivity extends BaseActivity implements OnClickListener { super.onCreate(savedInstanceState); view = (Concern_LinearLayout) View.inflate(this, R.layout.activity_concern, null); - init(view, "我的关注"); + init(view, getString(R.string.title_concern)); concernManager = new ConcernManager(getApplicationContext()); diff --git a/app/src/main/java/com/gh/gamecenter/CropImageActivity.java b/app/src/main/java/com/gh/gamecenter/CropImageActivity.java index f40c22ae6b..3f15e007ad 100644 --- a/app/src/main/java/com/gh/gamecenter/CropImageActivity.java +++ b/app/src/main/java/com/gh/gamecenter/CropImageActivity.java @@ -1,32 +1,27 @@ package com.gh.gamecenter; import android.app.Dialog; -import android.content.Context; -import android.content.Intent; -import android.content.SharedPreferences; +import android.content.*; import android.graphics.Bitmap; -import android.os.Bundle; -import android.os.Handler; -import android.os.Message; +import android.os.*; +import android.support.v4.content.ContextCompat; import android.text.TextUtils; import android.util.TypedValue; import android.view.View; import android.view.ViewGroup.LayoutParams; -import android.widget.ImageView; -import android.widget.RelativeLayout; -import android.widget.TextView; - +import android.widget.*; +import butterknife.BindView; import com.gh.base.BaseActivity; import com.gh.common.constant.Config; -import com.gh.common.util.BitmapUtils; -import com.gh.common.util.DialogUtils; -import com.gh.common.util.DisplayUtils; -import com.gh.common.util.FileUtils; -import com.gh.common.util.TokenUtils; +import com.gh.common.util.*; import com.gh.common.view.CropImageCustom; - import org.json.JSONException; import org.json.JSONObject; +import rx.Observable; +import rx.Subscriber; +import rx.functions.Action1; +import rx.functions.Func1; +import rx.schedulers.Schedulers; import java.io.File; import java.lang.ref.SoftReference; @@ -34,13 +29,6 @@ import java.net.HttpURLConnection; import java.text.SimpleDateFormat; import java.util.Date; -import butterknife.BindView; -import rx.Observable; -import rx.Subscriber; -import rx.functions.Action1; -import rx.functions.Func1; -import rx.schedulers.Schedulers; - public class CropImageActivity extends BaseActivity { @BindView(R.id.cropimage_custom) @@ -69,7 +57,7 @@ public class CropImageActivity extends BaseActivity { View contentView = View.inflate(this, R.layout.activity_cropimage, null); - init(contentView, "图片裁剪"); + init(contentView, getString(R.string.title_crop_image)); sp = getSharedPreferences(Config.PREFERENCE, Context.MODE_PRIVATE); @@ -77,7 +65,7 @@ public class CropImageActivity extends BaseActivity { TextView confirm = new TextView(this); confirm.setText("确定"); - confirm.setTextColor(getResources().getColor(R.color.title)); + confirm.setTextColor(ContextCompat.getColor(this, R.color.title)); confirm.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 16); int padding = DisplayUtils.dip2px(getApplicationContext(), 10); confirm.setPadding(padding, padding, padding, padding); @@ -215,7 +203,7 @@ public class CropImageActivity extends BaseActivity { @Override protected void onDestroy() { super.onDestroy(); - if (reference != null) { + if (reference != null && reference.get() != null) { reference.get().recycle(); } diff --git a/app/src/main/java/com/gh/gamecenter/FileReceiverActivity.java b/app/src/main/java/com/gh/gamecenter/FileReceiverActivity.java index d0f4002d54..cda8409ce1 100644 --- a/app/src/main/java/com/gh/gamecenter/FileReceiverActivity.java +++ b/app/src/main/java/com/gh/gamecenter/FileReceiverActivity.java @@ -144,7 +144,7 @@ public class FileReceiverActivity extends BaseActivity implements FileReceiverAd protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); View contentView = View.inflate(this, R.layout.activity_file_sender, null); - init(contentView, "接收游戏"); + init(contentView, getString(R.string.title_file_receive)); isDestroy = false; diff --git a/app/src/main/java/com/gh/gamecenter/FileSenderActivity.java b/app/src/main/java/com/gh/gamecenter/FileSenderActivity.java index eb275ccc04..28872e5267 100644 --- a/app/src/main/java/com/gh/gamecenter/FileSenderActivity.java +++ b/app/src/main/java/com/gh/gamecenter/FileSenderActivity.java @@ -89,7 +89,7 @@ public class FileSenderActivity extends BaseActivity implements FileSenderAdapte protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); View contentView = View.inflate(this, R.layout.activity_file_sender, null); - init(contentView, "发送游戏"); + init(contentView, getString(R.string.title_file_sender)); mFileInfos = (List) AppController.get("FileInfo", false); diff --git a/app/src/main/java/com/gh/gamecenter/KaiFuActivity.java b/app/src/main/java/com/gh/gamecenter/KaiFuActivity.java index 4c147f70f6..8b79466af8 100644 --- a/app/src/main/java/com/gh/gamecenter/KaiFuActivity.java +++ b/app/src/main/java/com/gh/gamecenter/KaiFuActivity.java @@ -8,34 +8,25 @@ import android.support.v7.widget.RecyclerView; import android.text.TextUtils; import android.view.KeyEvent; import android.view.View; -import android.widget.LinearLayout; -import android.widget.PopupWindow; -import android.widget.RelativeLayout; -import android.widget.TextView; - +import android.widget.*; +import butterknife.BindView; import com.gc.materialdesign.views.ProgressBarCircularIndeterminate; import com.gh.base.BaseActivity; import com.gh.common.util.DownloadItemUtils; import com.gh.common.util.Utils; import com.gh.common.view.VerticalItemDecoration; -import com.gh.download.DataWatcher; -import com.gh.download.DownloadEntity; -import com.gh.download.DownloadManager; +import com.gh.download.*; import com.gh.gamecenter.adapter.KaiFuAdapter; import com.gh.gamecenter.adapter.KaiFuDialogAdapter; import com.gh.gamecenter.entity.ApkEntity; import com.gh.gamecenter.entity.GameEntity; -import com.gh.gamecenter.eventbus.EBDownloadStatus; -import com.gh.gamecenter.eventbus.EBNetworkState; -import com.gh.gamecenter.eventbus.EBPackage; +import com.gh.gamecenter.eventbus.*; import com.jakewharton.rxbinding.view.RxView; +import rx.functions.Action1; import java.util.ArrayList; import java.util.concurrent.TimeUnit; -import butterknife.BindView; -import rx.functions.Action1; - /** * Created by khy on 2017/3/16. * 首页-开服表 @@ -116,7 +107,7 @@ public class KaiFuActivity extends BaseActivity implements KaiFuDialogAdapter.On protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); View view = View.inflate(this, R.layout.activity_kaifu, null); - init(view, "开服表"); + init(view, getString(R.string.title_kaifu)); kaifuType = "全部"; diff --git a/app/src/main/java/com/gh/gamecenter/KcSelectGameActivity.java b/app/src/main/java/com/gh/gamecenter/KcSelectGameActivity.java index f2ff04075c..42395379b4 100644 --- a/app/src/main/java/com/gh/gamecenter/KcSelectGameActivity.java +++ b/app/src/main/java/com/gh/gamecenter/KcSelectGameActivity.java @@ -58,7 +58,7 @@ public class KcSelectGameActivity extends BaseActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); View contentView = View.inflate(this, R.layout.activity_kc_select_game, null); - init(contentView, "选择游戏"); + init(contentView, getString(R.string.title_select_game)); if (getIntent() != null && getIntent().getExtras() != null) { mIsConn = getIntent().getExtras().getBoolean("isConn"); diff --git a/app/src/main/java/com/gh/gamecenter/MessageDetailActivity.java b/app/src/main/java/com/gh/gamecenter/MessageDetailActivity.java index 2250a6f4a0..715eb4c62e 100644 --- a/app/src/main/java/com/gh/gamecenter/MessageDetailActivity.java +++ b/app/src/main/java/com/gh/gamecenter/MessageDetailActivity.java @@ -129,7 +129,7 @@ public class MessageDetailActivity extends BaseActivity implements MessageDetail } View contentView = View.inflate(this, R.layout.activity_messagedetail, null); - init(contentView, "消息详情"); + init(contentView, getString(R.string.title_message_detail)); sp = getSharedPreferences(Config.PREFERENCE, Context.MODE_PRIVATE); diff --git a/app/src/main/java/com/gh/gamecenter/NewsNormalActivity.java b/app/src/main/java/com/gh/gamecenter/NewsNormalActivity.java index cff9ca93f7..b6459c727c 100644 --- a/app/src/main/java/com/gh/gamecenter/NewsNormalActivity.java +++ b/app/src/main/java/com/gh/gamecenter/NewsNormalActivity.java @@ -51,9 +51,9 @@ public class NewsNormalActivity extends BaseActivity implements SwipeRefreshLayo View view = View.inflate(this, R.layout.activity_newsnormal, null); if ("yuanchuang".equals(mNewsType)) { - init(view, "原创"); + init(view, getString(R.string.title_news_original)); } else { - init(view, "资讯"); + init(view, getString(R.string.title_news_info)); } mRefreshLayout.setColorSchemeResources(R.color.theme); diff --git a/app/src/main/java/com/gh/gamecenter/PluginActivity.java b/app/src/main/java/com/gh/gamecenter/PluginActivity.java index 0ffebd3305..faaeed0add 100644 --- a/app/src/main/java/com/gh/gamecenter/PluginActivity.java +++ b/app/src/main/java/com/gh/gamecenter/PluginActivity.java @@ -63,7 +63,7 @@ public class PluginActivity extends BaseActivity { View contentView = View.inflate(this, R.layout.activity_plugin, null); - init(contentView, "可以插件化的游戏"); + init(contentView, getString(R.string.title_plugin)); reuse_no_connection.setOnClickListener(new View.OnClickListener() { @Override diff --git a/app/src/main/java/com/gh/gamecenter/ReceiverWaitingActivity.java b/app/src/main/java/com/gh/gamecenter/ReceiverWaitingActivity.java index 6b94ccdf9a..ba684e9406 100644 --- a/app/src/main/java/com/gh/gamecenter/ReceiverWaitingActivity.java +++ b/app/src/main/java/com/gh/gamecenter/ReceiverWaitingActivity.java @@ -76,7 +76,7 @@ public class ReceiverWaitingActivity extends BaseActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); View contentView = View.inflate(this, R.layout.activity_receiver_waiting, null); - init(contentView, "接收游戏"); + init(contentView, getString(R.string.title_receive_waiting)); mTitleTv.setTextColor(Color.WHITE); mBackIv.setImageResource(R.drawable.reuse_kc_back); diff --git a/app/src/main/java/com/gh/gamecenter/SelectUserIconActivity.java b/app/src/main/java/com/gh/gamecenter/SelectUserIconActivity.java index 14b5138f5e..f11301f4e2 100644 --- a/app/src/main/java/com/gh/gamecenter/SelectUserIconActivity.java +++ b/app/src/main/java/com/gh/gamecenter/SelectUserIconActivity.java @@ -33,7 +33,7 @@ public class SelectUserIconActivity extends BaseActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); View contentView = View.inflate(this, R.layout.activity_select_user_icon, null); - init(contentView, "选择头像"); + init(contentView, getString(R.string.title_select_user_icon)); sp = getSharedPreferences(Config.PREFERENCE, Context.MODE_PRIVATE); diff --git a/app/src/main/java/com/gh/gamecenter/SettingActivity.java b/app/src/main/java/com/gh/gamecenter/SettingActivity.java index 9a99e4ae4f..23d277dd6a 100644 --- a/app/src/main/java/com/gh/gamecenter/SettingActivity.java +++ b/app/src/main/java/com/gh/gamecenter/SettingActivity.java @@ -2,20 +2,15 @@ package com.gh.gamecenter; import android.app.Activity; import android.app.Dialog; -import android.content.Context; -import android.content.Intent; -import android.content.SharedPreferences; +import android.content.*; import android.content.SharedPreferences.Editor; import android.os.Bundle; import android.os.Handler; import android.view.View; import android.view.View.OnClickListener; import android.view.Window; -import android.widget.RadioButton; -import android.widget.RadioGroup; -import android.widget.TextView; -import android.widget.Toast; - +import android.widget.*; +import butterknife.BindView; import com.gh.base.BaseActivity; import com.gh.common.constant.Config; import com.gh.common.util.DialogUtils; @@ -23,12 +18,10 @@ import com.gh.common.util.FileUtils; import com.gh.gamecenter.eventbus.EBReuse; import com.gh.gamecenter.eventbus.EBSkip; import com.kyleduo.switchbutton.SwitchButton; +import de.greenrobot.event.EventBus; import java.io.File; -import butterknife.BindView; -import de.greenrobot.event.EventBus; - /** * 游戏设置页面 * @@ -72,7 +65,7 @@ public class SettingActivity extends BaseActivity implements OnClickListener { View contentView = View.inflate(this, R.layout.activity_setting, null); - init(contentView, "设置"); + init(contentView, getString(R.string.title_settings)); findViewById(R.id.setting_rl_autoinstall).setOnClickListener(this); findViewById(R.id.setting_rl_autodelete).setOnClickListener(this); diff --git a/app/src/main/java/com/gh/gamecenter/ShareCardActivity.java b/app/src/main/java/com/gh/gamecenter/ShareCardActivity.java index e0ab36a369..afb78a8259 100644 --- a/app/src/main/java/com/gh/gamecenter/ShareCardActivity.java +++ b/app/src/main/java/com/gh/gamecenter/ShareCardActivity.java @@ -68,7 +68,7 @@ public class ShareCardActivity extends BaseActivity { picName = "shareImg.jpg"; View contentView = View.inflate(this, R.layout.activity_sharecard, null); - init(contentView, "分享卡片"); + init(contentView, getString(R.string.title_share_card)); //修改沉浸栏以及ActionBar 颜色 mActionbar.setBackgroundColor(getResources().getColor(android.R.color.black)); diff --git a/app/src/main/java/com/gh/gamecenter/ShareCardPicActivity.java b/app/src/main/java/com/gh/gamecenter/ShareCardPicActivity.java index ef59dd3575..13847d2dd6 100644 --- a/app/src/main/java/com/gh/gamecenter/ShareCardPicActivity.java +++ b/app/src/main/java/com/gh/gamecenter/ShareCardPicActivity.java @@ -117,7 +117,7 @@ public class ShareCardPicActivity extends BaseActivity { currentImgPosition = 0; View contentView = View.inflate(this, R.layout.activity_sharecard_pic, null); - init(contentView, "分享卡片"); + init(contentView, getString(R.string.title_share_card_pic)); shareArrImg = new Vector<>(); shareArrImg.addAll(arrImg); diff --git a/app/src/main/java/com/gh/gamecenter/ShareGhActivity.java b/app/src/main/java/com/gh/gamecenter/ShareGhActivity.java index cf21106628..e4b46e23b4 100644 --- a/app/src/main/java/com/gh/gamecenter/ShareGhActivity.java +++ b/app/src/main/java/com/gh/gamecenter/ShareGhActivity.java @@ -30,7 +30,7 @@ public class ShareGhActivity extends BaseActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); View contentView = View.inflate(this, R.layout.activity_share_gh, null); - init(contentView, "分享光环"); + init(contentView, getString(R.string.title_share_gh)); ButterKnife.bind(this); mGhAddress.setText(Html.fromHtml("" + "www.ghzhushou.com" + "")); diff --git a/app/src/main/java/com/gh/gamecenter/ShareGhWfifActivity.java b/app/src/main/java/com/gh/gamecenter/ShareGhWfifActivity.java index 2a4af60437..9e042de975 100644 --- a/app/src/main/java/com/gh/gamecenter/ShareGhWfifActivity.java +++ b/app/src/main/java/com/gh/gamecenter/ShareGhWfifActivity.java @@ -63,7 +63,7 @@ public class ShareGhWfifActivity extends BaseActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); View contentView = View.inflate(this, R.layout.activity_share_gh_wifi, null); - init(contentView, "免流量分享"); + init(contentView, getString(R.string.title_share_via_wifi)); ButterKnife.bind(this); mUriHandlers = new ArrayList<>(); diff --git a/app/src/main/java/com/gh/gamecenter/SubjectActivity.java b/app/src/main/java/com/gh/gamecenter/SubjectActivity.java index 06635a2f23..4a766f9770 100644 --- a/app/src/main/java/com/gh/gamecenter/SubjectActivity.java +++ b/app/src/main/java/com/gh/gamecenter/SubjectActivity.java @@ -1,43 +1,33 @@ package com.gh.gamecenter; import android.os.Bundle; -import android.support.v7.widget.DefaultItemAnimator; -import android.support.v7.widget.GridLayoutManager; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import android.support.v7.widget.*; import android.text.TextUtils; import android.view.View; import android.view.ViewGroup; import android.widget.LinearLayout; import android.widget.TextView; - +import butterknife.BindView; import com.gc.materialdesign.views.ProgressBarCircularIndeterminate; import com.gh.base.BaseActivity; import com.gh.common.util.DisplayUtils; import com.gh.common.util.DownloadItemUtils; import com.gh.common.view.VerticalItemDecoration; -import com.gh.download.DataWatcher; -import com.gh.download.DownloadEntity; -import com.gh.download.DownloadManager; +import com.gh.download.*; import com.gh.gamecenter.adapter.SubjectAdapter; import com.gh.gamecenter.adapter.SubjectTypeAdapter; import com.gh.gamecenter.entity.ApkEntity; import com.gh.gamecenter.entity.GameEntity; -import com.gh.gamecenter.eventbus.EBDownloadStatus; -import com.gh.gamecenter.eventbus.EBNetworkState; -import com.gh.gamecenter.eventbus.EBPackage; +import com.gh.gamecenter.eventbus.*; import com.gh.gamecenter.retrofit.JSONObjectResponse; import com.gh.gamecenter.retrofit.RetrofitManager; - import org.json.JSONException; import org.json.JSONObject; - -import java.util.ArrayList; - -import butterknife.BindView; import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; +import java.util.ArrayList; + public class SubjectActivity extends BaseActivity implements SubjectTypeAdapter.OnSelectTypeListener { @BindView(R.id.subject_list) @@ -93,11 +83,12 @@ public class SubjectActivity extends BaseActivity implements SubjectTypeAdapter. mName = getIntent().getStringExtra("name"); mIsOrder = getIntent().getBooleanExtra("order", false); mEntrance = getIntent().getStringExtra("entrance"); - if (getIntent().getBundleExtra("data") != null) { - mId = getIntent().getBundleExtra("data").getString("id"); - mName = getIntent().getBundleExtra("data").getString("name"); - mIsOrder = getIntent().getBundleExtra("data").getBoolean("order", false); - mEntrance = getIntent().getBundleExtra("data").getString("entrance"); + Bundle data = getIntent().getBundleExtra("data"); + if (data != null) { + mId = data.getString("id"); + mName = data.getString("name"); + mIsOrder = data.getBoolean("order", false); + mEntrance = data.getString("entrance"); } init(contentView, mName); diff --git a/app/src/main/java/com/gh/gamecenter/SuggestSelectActivity.java b/app/src/main/java/com/gh/gamecenter/SuggestSelectActivity.java index 73a0c1d2b8..9d6066b3ae 100644 --- a/app/src/main/java/com/gh/gamecenter/SuggestSelectActivity.java +++ b/app/src/main/java/com/gh/gamecenter/SuggestSelectActivity.java @@ -43,7 +43,7 @@ public class SuggestSelectActivity extends BaseActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); View view = View.inflate(this, R.layout.activity_suggest_select, null); - init(view, "意见反馈"); + init(view, getString(R.string.title_suggest_select)); } @OnClick({R.id.suggest_type1, R.id.suggest_type2, R.id.suggest_type3 diff --git a/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java b/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java index 849edc5e60..4747c0ab59 100644 --- a/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java +++ b/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java @@ -112,7 +112,7 @@ public class SuggestionActivity extends BaseActivity implements SuggestTypeAdapt protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); View view = View.inflate(this, R.layout.activity_suggest, null); - init(view, "意见反馈"); + init(view, getString(R.string.title_suggestion)); curType = getIntent().getExtras().getInt("suggestType"); String suggestContent = getIntent().getExtras().getString("content"); diff --git a/app/src/main/java/com/gh/gamecenter/ViewImageActivity.java b/app/src/main/java/com/gh/gamecenter/ViewImageActivity.java index a7281c6cf2..0b5209a26e 100644 --- a/app/src/main/java/com/gh/gamecenter/ViewImageActivity.java +++ b/app/src/main/java/com/gh/gamecenter/ViewImageActivity.java @@ -6,20 +6,13 @@ import android.graphics.Bitmap; import android.graphics.Color; import android.graphics.drawable.Animatable; import android.net.Uri; -import android.os.Bundle; -import android.os.Environment; -import android.os.Handler; -import android.os.Message; +import android.os.*; import android.support.v4.view.PagerAdapter; import android.support.v4.view.ViewPager.OnPageChangeListener; import android.util.DisplayMetrics; -import android.view.View; -import android.view.ViewGroup; -import android.view.Window; -import android.widget.LinearLayout; -import android.widget.RelativeLayout; -import android.widget.TextView; - +import android.view.*; +import android.widget.*; +import butterknife.BindView; import com.facebook.common.executors.CallerThreadExecutor; import com.facebook.common.references.CloseableReference; import com.facebook.datasource.DataSource; @@ -35,25 +28,14 @@ import com.facebook.imagepipeline.request.ImageRequest; import com.facebook.imagepipeline.request.ImageRequestBuilder; import com.gc.materialdesign.views.ProgressBarCircularIndeterminate; import com.gh.base.BaseActivity; -import com.gh.common.util.DisplayUtils; -import com.gh.common.util.ImageUtils; -import com.gh.common.util.MessageShareUtils; -import com.gh.common.util.Utils; -import com.gh.common.view.Gh_RelativeLayout; +import com.gh.common.util.*; +import com.gh.common.view.*; import com.gh.common.view.Gh_RelativeLayout.OnSingleTapListener; -import com.gh.common.view.Gh_ViewPager; -import com.gh.common.view.ZoomSimpleDraweeView; -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; +import java.io.*; import java.net.HttpURLConnection; import java.net.URL; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Map; - -import butterknife.BindView; +import java.util.*; /** @@ -272,8 +254,7 @@ public class ViewImageActivity extends BaseActivity implements OnPageChangeListe handler.removeCallbacksAndMessages(null); } - private class ViewImageAdapter extends PagerAdapter implements - OnSingleTapListener { + private class ViewImageAdapter extends PagerAdapter implements OnSingleTapListener { @Override public int getCount() { diff --git a/app/src/main/java/com/gh/gamecenter/VoteActivity.java b/app/src/main/java/com/gh/gamecenter/VoteActivity.java index 07353f4d40..291d083951 100644 --- a/app/src/main/java/com/gh/gamecenter/VoteActivity.java +++ b/app/src/main/java/com/gh/gamecenter/VoteActivity.java @@ -74,7 +74,7 @@ public class VoteActivity extends BaseActivity implements SwipeRefreshLayout.OnR mVoteDao = new VersionVoteDao(this); View view = View.inflate(this, R.layout.activity_vote, null); - init(view, gameName + " - 求版本"); + init(view, getString(R.string.title_vote_formatable, gameName)); layoutManager = new LinearLayoutManager(this); mVoteRv.setLayoutManager(layoutManager); diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 42738a0a92..4030b086f4 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -206,5 +206,29 @@ 目前还没有评论 没有更多评论啦 加载失败，点击重试 + 关于 + 发送游戏 + 安装包清理 + 查看对话 + 我的关注 + 图片裁剪 + 接收游戏 + 发送游戏 + 开服表 + 选择游戏 + 消息详情 + 原创 + 资讯 + 可以插件化的游戏 + 接收游戏 + 选择头像 + 设置 + 分享卡片 + 分享卡片 + 分享光环 + 免流量分享 + 意见反馈 + 意见反馈 + %s - 求版本