diff --git a/app/src/main/java/com/gh/base/BaseActivity.java b/app/src/main/java/com/gh/base/BaseActivity.java index 6495850daa..4ec5b5b0a4 100644 --- a/app/src/main/java/com/gh/base/BaseActivity.java +++ b/app/src/main/java/com/gh/base/BaseActivity.java @@ -1,11 +1,8 @@ package com.gh.base; -import android.annotation.TargetApi; import android.content.Context; -import android.graphics.Color; -import android.os.Build; import android.os.Bundle; -import android.view.*; +import android.view.View; import android.view.View.OnClickListener; import android.view.ViewGroup.LayoutParams; import android.widget.*; @@ -16,12 +13,9 @@ import com.gh.download.DownloadManager; import com.gh.gamecenter.R; import com.gh.gamecenter.eventbus.EBShowDialog; import com.gh.gamecenter.listener.OnCallBackListener; -import com.readystatesoftware.systembartint.SystemBarTintManager; import com.readystatesoftware.systembartint.SystemBarTintManager.SystemBarConfig; import de.greenrobot.event.EventBus; -import java.lang.reflect.Field; -import java.lang.reflect.Method; import java.util.ArrayList; import static com.gh.common.util.EntranceUtils.KEY_DATA; @@ -35,7 +29,6 @@ public abstract class BaseActivity extends BaseAppCompatToolBarActivity implemen } protected String mEntrance; - private SystemBarTintManager mTintManager; private boolean isPause; @Override @@ -53,64 +46,12 @@ public abstract class BaseActivity extends BaseAppCompatToolBarActivity implemen protected void init(String title) { TextView actionbar_tv_title = (TextView) findViewById(R.id.actionbar_tv_title); actionbar_tv_title.setText(title); +// setNavigationTitle(title); } private void init(View contentView) { - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) { -// setTheme(R.style.AppTheme); - setTranslucentStatus(true); - mTintManager = new SystemBarTintManager(this); - mTintManager.setStatusBarTintEnabled(true); -// mTintManager.setNavigationBarTintEnabled(true); - if (Build.MANUFACTURER.equals("Meizu") || Build.MANUFACTURER.equals("Xiaomi")) { - mTintManager.setStatusBarTintColor(Color.WHITE); - } else { - mTintManager.setStatusBarTintColor(Color.BLACK); - } - SystemBarConfig config = mTintManager.getConfig(); - contentView.setPadding(0, config.getPixelInsetTop(false), 0, config.getPixelInsetBottom()); - - switch (Build.MANUFACTURER) { - case "Meizu": - try { - Window window = getWindow(); - if (window != null) { - WindowManager.LayoutParams lp = window.getAttributes(); - Field darkFlag = WindowManager.LayoutParams.class.getDeclaredField("MEIZU_FLAG_DARK_STATUS_BAR_ICON"); - Field meizuFlags = WindowManager.LayoutParams.class.getDeclaredField("meizuFlags"); - darkFlag.setAccessible(true); - meizuFlags.setAccessible(true); - int bit = darkFlag.getInt(null); - int value = meizuFlags.getInt(lp); - value |= bit; - meizuFlags.setInt(lp, value); - window.setAttributes(lp); - } - } catch (Exception e) { - e.printStackTrace(); - } - break; - case "Xiaomi": - try { - Window window = getWindow(); - if (window != null) { - Class clazz = window.getClass(); - Class layoutParams = Class.forName("android.view.MiuiWindowManager$LayoutParams"); - Field field = layoutParams.getField("EXTRA_FLAG_STATUS_BAR_DARK_MODE"); - int darkModeFlag = field.getInt(layoutParams); - Method extraFlagField = clazz.getMethod("setExtraFlags", int.class, int.class); - extraFlagField.invoke(window, darkModeFlag, darkModeFlag); - } - } catch (Exception e) { - e.printStackTrace(); - } - break; - default: - break; - - } - } - + SystemBarConfig config = getTintManager().getConfig(); + contentView.setPadding(0, config.getPixelInsetTop(false), 0, config.getPixelInsetBottom()); setContentView(contentView); ButterKnife.bind(this); @@ -132,10 +73,6 @@ public abstract class BaseActivity extends BaseAppCompatToolBarActivity implemen } } - protected SystemBarTintManager getTintManager() { - return mTintManager; - } - public void toast(String msg) { Toast.makeText(this, msg, Toast.LENGTH_SHORT).show(); } @@ -144,19 +81,6 @@ public abstract class BaseActivity extends BaseAppCompatToolBarActivity implemen Toast.makeText(this, msg, Toast.LENGTH_SHORT).show(); } - @TargetApi(19) - protected void setTranslucentStatus(boolean status) { - Window window = getWindow(); - WindowManager.LayoutParams winParams = window.getAttributes(); - final int bits = WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS; - if (status) { - winParams.flags |= bits; - } else { - winParams.flags &= ~bits; - } - window.setAttributes(winParams); - } - //如果是游戏分享，newsTitle默认为空 public void showShare(String url, String gameName, String icon, String newsTitle, ArrayList tag) { diff --git a/app/src/main/java/com/gh/base/BaseAppCompatToolBarActivity.java b/app/src/main/java/com/gh/base/BaseAppCompatToolBarActivity.java index 9e9ce16806..0e2e5149d2 100644 --- a/app/src/main/java/com/gh/base/BaseAppCompatToolBarActivity.java +++ b/app/src/main/java/com/gh/base/BaseAppCompatToolBarActivity.java @@ -1,32 +1,108 @@ package com.gh.base; +import android.graphics.Color; +import android.os.Build; import android.os.Bundle; -import android.support.v4.content.ContextCompat; import android.support.v7.widget.Toolbar; -import android.view.MenuItem; -import com.gh.common.util.Util_Window; +import android.view.*; import com.gh.gamecenter.R; +import com.readystatesoftware.systembartint.SystemBarTintManager; + +import java.lang.reflect.Field; +import java.lang.reflect.Method; /** * Created by csheng on 15-10-12. */ abstract class BaseAppCompatToolBarActivity extends BaseAppCompatActivity implements ToolbarController { - protected Toolbar mToolbar; + private Toolbar mToolbar; + private SystemBarTintManager mTintManager; + + protected SystemBarTintManager getTintManager() { + return mTintManager; + } @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - initNavigationBar(); - Util_Window.initStatusBarColor(getWindow(), ContextCompat.getColor(this, R.color.theme)); + initToolbar(); +// Util_Window.initStatusBarColor(getWindow(), ContextCompat.getColor(this, R.color.theme)); + initStatusBar(); } - private void initNavigationBar() { + protected void setTranslucentStatus(boolean status) { + Window window = getWindow(); + WindowManager.LayoutParams winParams = window.getAttributes(); + final int bits = WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS; + if (status) { + winParams.flags |= bits; + } else { + winParams.flags &= ~bits; + } + window.setAttributes(winParams); + } + + private void initStatusBar() { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) { + setTranslucentStatus(true); + mTintManager = new SystemBarTintManager(this); + mTintManager.setStatusBarTintEnabled(true); +// mTintManager.setNavigationBarTintEnabled(true); + if (Build.MANUFACTURER.equals("Meizu") || Build.MANUFACTURER.equals("Xiaomi")) { + mTintManager.setStatusBarTintColor(Color.WHITE); + } else { + mTintManager.setStatusBarTintColor(Color.BLACK); + } + + switch (Build.MANUFACTURER) { + case "Meizu": + try { + Window window = getWindow(); + if (window != null) { + WindowManager.LayoutParams lp = window.getAttributes(); + Field darkFlag = WindowManager.LayoutParams.class.getDeclaredField("MEIZU_FLAG_DARK_STATUS_BAR_ICON"); + Field meizuFlags = WindowManager.LayoutParams.class.getDeclaredField("meizuFlags"); + darkFlag.setAccessible(true); + meizuFlags.setAccessible(true); + int bit = darkFlag.getInt(null); + int value = meizuFlags.getInt(lp); + value |= bit; + meizuFlags.setInt(lp, value); + window.setAttributes(lp); + } + } catch (Exception e) { + e.printStackTrace(); + } + break; + case "Xiaomi": + try { + Window window = getWindow(); + if (window != null) { + Class clazz = window.getClass(); + Class layoutParams = Class.forName("android.view.MiuiWindowManager$LayoutParams"); + Field field = layoutParams.getField("EXTRA_FLAG_STATUS_BAR_DARK_MODE"); + int darkModeFlag = field.getInt(layoutParams); + Method extraFlagField = clazz.getMethod("setExtraFlags", int.class, int.class); + extraFlagField.invoke(window, darkModeFlag, darkModeFlag); + } + } catch (Exception e) { + e.printStackTrace(); + } + break; + default: + break; + + } + } + } + + private void initToolbar() { mToolbar = (Toolbar) findViewById(R.id.toolbar_navigation); if (mToolbar != null) { mToolbar.setTitle(""); + setSupportActionBar(mToolbar); } - setSupportActionBar(mToolbar); } @Override diff --git a/app/src/main/java/com/gh/base/SuggestionType.java b/app/src/main/java/com/gh/base/SuggestionType.java new file mode 100644 index 0000000000..25bf0a890f --- /dev/null +++ b/app/src/main/java/com/gh/base/SuggestionType.java @@ -0,0 +1,48 @@ +package com.gh.base; + +import java.io.Serializable; + +public enum SuggestionType implements Serializable { + + FEEDBACK("普通反馈", 1), + SUGGESTION("功能建议", 2), + CRASH("发生闪退", 3), + GAME("游戏问题", 4), + COLLECT("游戏收录", 5), + POST("文章投稿", 6); + + private String mName; + private int mIndex; + + private SuggestionType(String name, int index) { + mName = name; + mIndex = index; + } + + public int getIndex() { + return mIndex; + } + + public String getName() { + return mName; + } + + public static String getName(int index) { + for (SuggestionType c : SuggestionType.values()) { + if (c.mIndex == index) { + return c.mName; + } + } + return ""; + } + + public static int getIndex(String name) { + for (SuggestionType c : SuggestionType.values()) { + if (c.mName == name) { + return c.mIndex; + } + } + return -1; + } + +} diff --git a/app/src/main/java/com/gh/common/util/PatternUtils.java b/app/src/main/java/com/gh/common/util/PatternUtils.java index 9ff26259f6..6dc0e58e6c 100644 --- a/app/src/main/java/com/gh/common/util/PatternUtils.java +++ b/app/src/main/java/com/gh/common/util/PatternUtils.java @@ -1,7 +1,8 @@ package com.gh.common.util; +import android.util.Patterns; + import java.util.regex.Matcher; -import java.util.regex.Pattern; /** * @author CsHeng @@ -11,19 +12,19 @@ import java.util.regex.Pattern; public class PatternUtils { - public static final Pattern VALID_EMAIL_ADDRESS_REGEX = - Pattern.compile("^[A-Z0-9._%+-]+@[A-Z0-9.-]+\\.[A-Z]{2,6}$", Pattern.CASE_INSENSITIVE); +// public static final Pattern VALID_EMAIL_ADDRESS_REGEX = +// Pattern.compile("^[A-Z0-9._%+-]+@[A-Z0-9.-]+\\.[A-Z]{2,6}$", Pattern.CASE_INSENSITIVE); - public static final Pattern VALIDATE_URL_REGEX = - Pattern.compile("((http://|ftp://|https://|www.))(([a-zA-Z0-9\\._-]+\\.[a-zA-Z]{2,6})|([0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}))(:[0-9]{1,4})*(/[a-zA-Z0-9\\&%_\\./-~-]*)?"); +// public static final Pattern VALIDATE_URL_REGEX = +// Pattern.compile("((http://|ftp://|https://|www.))(([a-zA-Z0-9\\._-]+\\.[a-zA-Z]{2,6})|([0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}))(:[0-9]{1,4})*(/[a-zA-Z0-9\\&%_\\./-~-]*)?"); public static boolean isEmailAddress(String emailStr) { - Matcher matcher = VALID_EMAIL_ADDRESS_REGEX.matcher(emailStr); + Matcher matcher = Patterns.EMAIL_ADDRESS.matcher(emailStr); return matcher.matches(); } public static boolean isUrlAddress(String url) { - Matcher matcher = VALIDATE_URL_REGEX.matcher(url); + Matcher matcher = Patterns.WEB_URL.matcher(url); return matcher.matches(); } diff --git a/app/src/main/java/com/gh/gamecenter/DownloadManagerActivity.java b/app/src/main/java/com/gh/gamecenter/DownloadManagerActivity.java index 5d239a0b5e..3698f6a5ed 100644 --- a/app/src/main/java/com/gh/gamecenter/DownloadManagerActivity.java +++ b/app/src/main/java/com/gh/gamecenter/DownloadManagerActivity.java @@ -3,7 +3,6 @@ package com.gh.gamecenter; import android.content.Context; import android.content.Intent; import android.os.Bundle; -import android.os.Handler; import android.support.v4.app.Fragment; import android.support.v4.content.ContextCompat; import android.support.v4.view.ViewPager; @@ -35,6 +34,12 @@ import java.util.List; */ public class DownloadManagerActivity extends BaseActivity implements OnClickListener, OnPageChangeListener { + public static final int INDEX_SEND = 0; + public static final int INDEX_DOWNLOAD = 1; + public static final int INDEX_UPDATE = 2; + + public static final String TAG = "DownloadManagerActivity"; + @BindView(R.id.downloadmanager_viewPager) ViewPager downloadmanager_viewPager; @BindView(R.id.downloadmanager_tv_download) @@ -63,7 +68,6 @@ public class DownloadManagerActivity extends BaseActivity implements OnClickList }; private LinearLayout.LayoutParams lparams; private int width; - private Handler handler = new Handler(); public static Intent getDownloadMangerIntent(Context context, GameEntity gameEntity, String value) { Intent intent = new Intent(context, DownloadManagerActivity.class); @@ -148,21 +152,15 @@ public class DownloadManagerActivity extends BaseActivity implements OnClickList downloadmanager_viewPager.setCurrentItem(currentItem); } - @Override - protected void onDestroy() { - super.onDestroy(); - handler.removeCallbacksAndMessages(null); - } - @Override public void onPageSelected(int position) { if (position == 1) { - EventBus.getDefault().post(new EBUISwitch("DownloadManagerActivity", 1)); + EventBus.getDefault().post(new EBUISwitch(DownloadManagerActivity.TAG, 1)); downloadmanager_tv_download.setTextColor(ContextCompat.getColor(this, R.color.theme)); downloadmanager_tv_update.setTextColor(ContextCompat.getColor(this, R.color.title)); downloadmanager_tv_send.setTextColor(ContextCompat.getColor(this, R.color.title)); } else if (position == 2) { - EventBus.getDefault().post(new EBUISwitch("DownloadManagerActivity", 2)); + EventBus.getDefault().post(new EBUISwitch(DownloadManagerActivity.TAG, 2)); downloadmanager_tv_download.setTextColor(ContextCompat.getColor(this, R.color.title)); downloadmanager_tv_update.setTextColor(ContextCompat.getColor(this, R.color.theme)); downloadmanager_tv_send.setTextColor(ContextCompat.getColor(this, R.color.title)); @@ -188,16 +186,18 @@ public class DownloadManagerActivity extends BaseActivity implements OnClickList @Override public void onClick(View view) { - final int id = view.getId(); - if (id == R.id.actionbar_rl_back) { - finish(); - } else if (id == R.id.downloadmanager_ll_download) { - downloadmanager_viewPager.setCurrentItem(1); - } else if (id == R.id.downloadmanager_ll_update) { - downloadmanager_viewPager.setCurrentItem(2); - } else if (id == R.id.downloadmanager_ll_send) { - downloadmanager_viewPager.setCurrentItem(0); + switch (view.getId()) { + case R.id.downloadmanager_ll_send: + downloadmanager_viewPager.setCurrentItem(INDEX_SEND); + break; + case R.id.downloadmanager_ll_download: + downloadmanager_viewPager.setCurrentItem(INDEX_DOWNLOAD); + break; + case R.id.downloadmanager_ll_update: + downloadmanager_viewPager.setCurrentItem(INDEX_UPDATE); + break; } + } public void onEventMainThread(EBMiPush mipush) { @@ -242,9 +242,9 @@ public class DownloadManagerActivity extends BaseActivity implements OnClickList } public void onEventMainThread(EBSkip skip) { - if ("DownloadManagerActivity".equals(skip.getType())) { + if (DownloadManagerActivity.TAG.equals(skip.getType())) { if (skip.getCurrentItem() == 1) { - handler.postDelayed(runnable, 300); + getWindow().getDecorView().postDelayed(runnable, 300); } } } diff --git a/app/src/main/java/com/gh/gamecenter/FileReceiverActivity.java b/app/src/main/java/com/gh/gamecenter/FileReceiverActivity.java index cc108bea4c..32090c0426 100644 --- a/app/src/main/java/com/gh/gamecenter/FileReceiverActivity.java +++ b/app/src/main/java/com/gh/gamecenter/FileReceiverActivity.java @@ -10,6 +10,7 @@ import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.RecyclerView; import android.text.TextUtils; import android.view.View; +import android.view.View.OnClickListener; import android.widget.*; import butterknife.BindView; import butterknife.OnClick; @@ -20,6 +21,7 @@ import com.gh.common.constant.Config; import com.gh.common.util.*; import com.gh.download.*; import com.gh.gamecenter.adapter.FileReceiverAdapter; +import com.gh.gamecenter.adapter.FileReceiverAdapter.OnReceiverCancelListener; import com.gh.gamecenter.eventbus.*; import com.gh.gamecenter.kuaichuan.*; import com.gh.gamecenter.manager.DataCollectionManager; @@ -35,7 +37,7 @@ import java.util.*; /** * Created by khy on 2017/1/20. */ -public class FileReceiverActivity extends BaseActivity implements FileReceiverAdapter.OnReceiverCancelListener { +public class FileReceiverActivity extends BaseActivity implements OnReceiverCancelListener, OnClickListener { @BindView(R.id.sender_rv) RecyclerView mReceiverRv; @@ -179,14 +181,10 @@ public class FileReceiverActivity extends BaseActivity implements FileReceiverAd initServer(); //启动接收服务 } - findViewById(R.id.actionbar_rl_back).setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - backHint(); - } - }); + findViewById(R.id.actionbar_rl_back).setOnClickListener(this); } + private void initUserData() { isReceivesOver = false; @@ -200,7 +198,7 @@ public class FileReceiverActivity extends BaseActivity implements FileReceiverAd String sizeName = df.format(size) + "MB"; mSenderUserDes.setText(mFileInfos.size() + "个游戏，共" + sizeName); - mSenderUserName.setText(StringUtils.buildString("来自 " , mIpPortInfo.getSenderName())); + mSenderUserName.setText(StringUtils.buildString("来自 ", mIpPortInfo.getSenderName())); mSenderUserIcon.setImageURI(UserIconUtils.getUserIcon(mIpPortInfo.getSenderIcon())); mReceiverBottom.setVisibility(View.GONE); @@ -478,6 +476,15 @@ public class FileReceiverActivity extends BaseActivity implements FileReceiverAd } } + @Override + public void onClick(View v) { + switch (v.getId()) { + case R.id.actionbar_rl_back: + backHint(); + break; + } + } + /** * ServerSocket启动线程 */ @@ -485,7 +492,6 @@ public class FileReceiverActivity extends BaseActivity implements FileReceiverAd ServerSocket serverSocket; private int port; - public ServerRunnable(int port) { this.port = port; } diff --git a/app/src/main/java/com/gh/gamecenter/MainActivity.java b/app/src/main/java/com/gh/gamecenter/MainActivity.java index cd8da69541..a7bc2f6cc4 100644 --- a/app/src/main/java/com/gh/gamecenter/MainActivity.java +++ b/app/src/main/java/com/gh/gamecenter/MainActivity.java @@ -1087,7 +1087,6 @@ public class MainActivity extends BaseActivity implements OnClickListener { // private T alterFragment(Class cls) { private T alterFragment(FragmentTransaction transaction, Class cls) { T fragmentByTag = (T) getSupportFragmentManager().findFragmentByTag(cls.getSimpleName()); - AppDebugConfig.logMethodWithParams(this, cls, cls.getSimpleName(), fragmentByTag); try { if (fragmentByTag != null) { transaction.show(fragmentByTag); @@ -1105,7 +1104,6 @@ public class MainActivity extends BaseActivity implements OnClickListener { } private void setTabSelection(int index) { - AppDebugConfig.logMethodWithParams(this, index); clearSelection(); FragmentTransaction transaction = getSupportFragmentManager().beginTransaction(); hideFragments(transaction); diff --git a/app/src/main/java/com/gh/gamecenter/SettingActivity.java b/app/src/main/java/com/gh/gamecenter/SettingActivity.java index 467a6aa951..767814cdc1 100644 --- a/app/src/main/java/com/gh/gamecenter/SettingActivity.java +++ b/app/src/main/java/com/gh/gamecenter/SettingActivity.java @@ -2,15 +2,16 @@ package com.gh.gamecenter; import android.app.Activity; import android.app.Dialog; -import android.content.*; +import android.content.Intent; +import android.content.SharedPreferences; 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.*; import butterknife.BindView; +import butterknife.OnClick; import com.gh.base.BaseActivity; import com.gh.common.constant.Config; import com.gh.common.util.DialogUtils; @@ -19,9 +20,16 @@ import com.gh.gamecenter.eventbus.EBReuse; import com.gh.gamecenter.eventbus.EBSkip; import com.kyleduo.switchbutton.SwitchButton; import de.greenrobot.event.EventBus; +import rx.*; +import rx.Observable.OnSubscribe; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; import java.io.File; +import static com.gh.gamecenter.R.id.setting_rl_about; +import static java.lang.Thread.sleep; + /** * 游戏设置页面 * @@ -47,12 +55,8 @@ public class SettingActivity extends BaseActivity implements OnClickListener { private Dialog loadingDialog = null; - private Handler handler = new Handler(); - private int checkSizeIndex; - private Context context = this; - @Override public void finish() { saveCurrentSetting(); @@ -70,15 +74,6 @@ public class SettingActivity extends BaseActivity implements OnClickListener { init(getString(R.string.title_settings)); - findViewById(R.id.setting_rl_autoinstall).setOnClickListener(this); - findViewById(R.id.setting_rl_autodelete).setOnClickListener(this); - findViewById(R.id.setting_rl_deletedata).setOnClickListener(this); -// findViewById(R.id.setting_rl_feedback).setOnClickListener(this); - findViewById(R.id.setting_rl_cache).setOnClickListener(this); - findViewById(R.id.setting_cv_font_size).setOnClickListener(this); - findViewById(R.id.setting_rl_concerngame).setOnClickListener(this); - findViewById(R.id.setting_rl_about).setOnClickListener(this); - setting_tv_cache.setText(getCacheSize()); sp = getSharedPreferences(Config.PREFERENCE, Activity.MODE_PRIVATE); @@ -86,7 +81,6 @@ public class SettingActivity extends BaseActivity implements OnClickListener { // 未打开下载按钮，显示修复下载按钮 if (!sp.getBoolean("isShow", true)) { findViewById(R.id.setting_cv_fix_download).setVisibility(View.VISIBLE); - findViewById(R.id.setting_cv_fix_download).setOnClickListener(this); } setting_sb_autoinstall.setChecked(sp.getBoolean("autoinstall", true)); @@ -146,12 +140,20 @@ public class SettingActivity extends BaseActivity implements OnClickListener { mEditor.apply(); } + @OnClick({ + R.id.setting_cv_fix_download, + R.id.setting_rl_autoinstall, + R.id.setting_rl_autodelete, + R.id.setting_rl_deletedata, + R.id.setting_rl_cache, + R.id.setting_cv_font_size, + R.id.setting_rl_concerngame, + R.id.setting_rl_about + }) @Override public void onClick(final View v) { + switch (v.getId()) { - case R.id.actionbar_rl_back: - finish(); - break; case R.id.setting_cv_fix_download: Editor editor = sp.edit(); editor.putBoolean("isShow", true); @@ -186,20 +188,15 @@ public class SettingActivity extends BaseActivity implements OnClickListener { new DialogUtils.ConfirmListener() { @Override public void onConfirm() { - loadingDialog = DialogUtils.showWaitDialog(context, "清除缓存中..."); - claerCache(); + loadingDialog = DialogUtils.showWaitDialog(SettingActivity.this, "清除缓存中..."); + clearCache(); } }); break; -// case R.id.setting_rl_feedback: -// Intent intent = new Intent(SettingActivity.this, SuggestionActivity.class); -// intent.putExtra("mEntrance", "(设置)"); -// startActivity(intent); -// break; case R.id.setting_cv_font_size: fontSize(); break; - case R.id.setting_rl_about: + case setting_rl_about: Intent intentAbout = new Intent(this, AboutActivity.class); startActivity(intentAbout); break; @@ -261,10 +258,12 @@ public class SettingActivity extends BaseActivity implements OnClickListener { } // 清除缓存 - private void claerCache() { - new Thread() { + private void clearCache() { + + Observable.create(new OnSubscribe() { @Override - public void run() { + public void call(Subscriber subscriber) { + long start = System.currentTimeMillis(); FileUtils.deleteFolder(getCacheDir()); FileUtils.deleteFolder(getExternalCacheDir()); @@ -273,22 +272,33 @@ public class SettingActivity extends BaseActivity implements OnClickListener { try { sleep(1000 - time); } catch (InterruptedException e) { - e.printStackTrace(); } } + subscriber.onCompleted(); + } + + }).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { if (loadingDialog != null) { loadingDialog.dismiss(); } - handler.post(new Runnable() { - @Override - public void run() { - setting_tv_cache.setText(getCacheSize()); - Toast.makeText(SettingActivity.this, "缓存清除成功", Toast.LENGTH_SHORT).show(); - } - }); + setting_tv_cache.setText(getCacheSize()); + Toast.makeText(SettingActivity.this, "缓存清除成功", Toast.LENGTH_SHORT).show(); } - }.start(); + + @Override + public void onError(Throwable e) { + + } + + @Override + public void onNext(Object o) { + + } + }); + } @Override @@ -297,9 +307,4 @@ public class SettingActivity extends BaseActivity implements OnClickListener { saveCurrentSetting(); } - @Override - protected void onDestroy() { - super.onDestroy(); - handler.removeCallbacksAndMessages(null); - } } diff --git a/app/src/main/java/com/gh/gamecenter/SkipActivity.java b/app/src/main/java/com/gh/gamecenter/SkipActivity.java index 236f44e67c..a895840ec4 100644 --- a/app/src/main/java/com/gh/gamecenter/SkipActivity.java +++ b/app/src/main/java/com/gh/gamecenter/SkipActivity.java @@ -104,7 +104,7 @@ public class SkipActivity extends BaseActivity { intent.putExtra(KEY_TO, "SuggestionActivity"); break; case HOST_DOWNLOAD: - intent.putExtra(KEY_TO, "DownloadManagerActivity"); + intent.putExtra(KEY_TO, DownloadManagerActivity.TAG); intent.putExtra(KEY_GAMEID, id); intent.putExtra(KEY_PACKAGENAME, getIntent().getData().getQueryParameter(KEY_PACKAGENAME)); break; diff --git a/app/src/main/java/com/gh/gamecenter/SuggestSelectActivity.java b/app/src/main/java/com/gh/gamecenter/SuggestSelectActivity.java index 33aa32a65f..22c3c666bd 100644 --- a/app/src/main/java/com/gh/gamecenter/SuggestSelectActivity.java +++ b/app/src/main/java/com/gh/gamecenter/SuggestSelectActivity.java @@ -3,33 +3,14 @@ package com.gh.gamecenter; import android.content.Intent; import android.os.Bundle; import android.view.View; -import android.widget.RelativeLayout; -import android.widget.TextView; - +import butterknife.OnClick; import com.gh.base.BaseActivity; import com.gh.common.util.QQUtils; -import butterknife.BindView; -import butterknife.OnClick; - /** * Created by khy on 2017/3/31. */ public class SuggestSelectActivity extends BaseActivity { - @BindView(R.id.suggest_type1) - RelativeLayout mType1; - @BindView(R.id.suggest_type2) - RelativeLayout mType2; - @BindView(R.id.suggest_type3) - RelativeLayout mType3; - @BindView(R.id.suggest_type4) - RelativeLayout mType4; - @BindView(R.id.suggest_type5) - RelativeLayout mType5; - @BindView(R.id.suggest_type6) - RelativeLayout mType6; - @BindView(R.id.suggest_qqun) - TextView mQqun; @Override protected void onActivityResult(int requestCode, int resultCode, Intent data) { @@ -50,8 +31,8 @@ public class SuggestSelectActivity extends BaseActivity { init(getString(R.string.title_suggest_select)); } - @OnClick({R.id.suggest_type1, R.id.suggest_type2, R.id.suggest_type3 - , R.id.suggest_type4, R.id.suggest_type5, R.id.suggest_type6, R.id.suggest_qqun_rl}) + @OnClick({R.id.suggest_type1, R.id.suggest_type2, R.id.suggest_type3, R.id.suggest_type4, + R.id.suggest_type5, R.id.suggest_type6, R.id.suggest_qqun_rl}) public void OnClick(View view) { int type = 1; switch (view.getId()) { diff --git a/app/src/main/java/com/gh/gamecenter/download/GameDownLoadFragment.java b/app/src/main/java/com/gh/gamecenter/download/GameDownLoadFragment.java index 7a21afbfab..17574f16c5 100644 --- a/app/src/main/java/com/gh/gamecenter/download/GameDownLoadFragment.java +++ b/app/src/main/java/com/gh/gamecenter/download/GameDownLoadFragment.java @@ -15,8 +15,7 @@ import com.gh.common.constant.Constants; import com.gh.common.util.*; import com.gh.common.view.RecyclerViewExtended; import com.gh.download.*; -import com.gh.gamecenter.MainActivity; -import com.gh.gamecenter.R; +import com.gh.gamecenter.*; import com.gh.gamecenter.eventbus.*; import de.greenrobot.event.EventBus; @@ -317,7 +316,7 @@ public class GameDownLoadFragment extends Fragment implements View.OnClickListen } public void onEventMainThread(EBUISwitch busNine) { - if ("DownloadManagerActivity".equals(busNine.getFrom())) { + if (DownloadManagerActivity.TAG.equals(busNine.getFrom())) { if (busNine.getPosition() != 1) { adapter.getDeleteList().clear(); } diff --git a/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragmentAdapter.java index 8fe44bd8c7..de68c0b8bb 100644 --- a/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragmentAdapter.java @@ -12,6 +12,7 @@ import android.view.*; import android.widget.LinearLayout; import com.gh.common.util.*; import com.gh.download.*; +import com.gh.gamecenter.DownloadManagerActivity; import com.gh.gamecenter.R; import com.gh.gamecenter.adapter.BaseRecyclerAdapter; import com.gh.gamecenter.adapter.viewholder.DownloadHeadViewHolder; @@ -427,7 +428,7 @@ class GameUpdateFragmentAdapter extends BaseRecyclerAdapter { updateEntity.getPackageName()); } else if ("更新中".equals(str) || "插件化中".equals(str)) { notifyItemChanged(0); - EventBus.getDefault().post(new EBSkip("DownloadManagerActivity", 1)); + EventBus.getDefault().post(new EBSkip(DownloadManagerActivity.TAG, 1)); } } }); @@ -555,7 +556,7 @@ class GameUpdateFragmentAdapter extends BaseRecyclerAdapter { DataCollectionUtils.uploadDownload(mContext, downloadEntity, "开始"); notifyItemChanged(0); - EventBus.getDefault().post(new EBSkip("DownloadManagerActivity", 1)); + EventBus.getDefault().post(new EBSkip(DownloadManagerActivity.TAG, 1)); } public List getUpdateList() { diff --git a/app/src/main/java/com/gh/gamecenter/receiver/DownloadReceiver.java b/app/src/main/java/com/gh/gamecenter/receiver/DownloadReceiver.java index 99f8f66a77..a24ababd93 100644 --- a/app/src/main/java/com/gh/gamecenter/receiver/DownloadReceiver.java +++ b/app/src/main/java/com/gh/gamecenter/receiver/DownloadReceiver.java @@ -34,7 +34,7 @@ public class DownloadReceiver extends BroadcastReceiver { context.startActivity(intent2); } // 切换到游戏下载fragment - EventBus.getDefault().post(new EBSkip("DownloadManagerActivity", 1)); + EventBus.getDefault().post(new EBSkip(DownloadManagerActivity.TAG, 1)); } else { Intent intent2 = new Intent(context, DownloadManagerActivity.class); intent2.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); @@ -47,7 +47,7 @@ public class DownloadReceiver extends BroadcastReceiver { Intent intent2 = new Intent(context, SplashScreenActivity.class); intent2.setAction(Intent.ACTION_MAIN); intent2.addCategory(Intent.CATEGORY_LAUNCHER); - intent2.putExtra(KEY_TO, "DownloadManagerActivity"); + intent2.putExtra(KEY_TO, DownloadManagerActivity.TAG); intent2.putExtra(EntranceUtils.KEY_CURRENT_ITEM, 1); intent2.putExtra(KEY_ENTRANCE, ENTRANCE_DOWNLOAD); intent2.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); diff --git a/app/src/main/java/com/gh/gamecenter/receiver/InstallReceiver.java b/app/src/main/java/com/gh/gamecenter/receiver/InstallReceiver.java index 4e4d6411fd..d4e6d76715 100644 --- a/app/src/main/java/com/gh/gamecenter/receiver/InstallReceiver.java +++ b/app/src/main/java/com/gh/gamecenter/receiver/InstallReceiver.java @@ -45,7 +45,7 @@ public class InstallReceiver extends BroadcastReceiver { Intent intent2 = new Intent(context, SplashScreenActivity.class); intent2.setAction(Intent.ACTION_MAIN); intent2.addCategory(Intent.CATEGORY_LAUNCHER); - intent2.putExtra("to", "DownloadManagerActivity"); + intent2.putExtra("to", DownloadManagerActivity.TAG); intent2.putExtra("currentItem", 0); intent2.putExtra("path", path); intent2.putExtra(EntranceUtils.KEY_ENTRANCE, "(安装跳转)"); 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 862685cffd..e30ce03918 100644 --- a/app/src/main/java/com/gh/gamecenter/receiver/NotificationReceiver.java +++ b/app/src/main/java/com/gh/gamecenter/receiver/NotificationReceiver.java @@ -96,7 +96,7 @@ public class NotificationReceiver extends BroadcastReceiver { Intent intent2 = new Intent(context, SplashScreenActivity.class); intent2.setAction(Intent.ACTION_MAIN); intent2.addCategory(Intent.CATEGORY_LAUNCHER); - intent2.putExtra("to", "DownloadManagerActivity"); + intent2.putExtra("to", DownloadManagerActivity.TAG); intent2.putExtra("currentItem", 1); intent2.putExtra("isPushIntent", true); intent2.putExtra(EntranceUtils.KEY_ENTRANCE, "(小米推送)"); diff --git a/app/src/main/res/drawable-hdpi/kc_checkbox_select.png b/app/src/main/res/drawable-xhdpi/kc_checkbox_select.png similarity index 100% rename from app/src/main/res/drawable-hdpi/kc_checkbox_select.png rename to app/src/main/res/drawable-xhdpi/kc_checkbox_select.png diff --git a/app/src/main/res/drawable-hdpi/kc_checkbox_unselect.png b/app/src/main/res/drawable-xhdpi/kc_checkbox_unselect.png similarity index 100% rename from app/src/main/res/drawable-hdpi/kc_checkbox_unselect.png rename to app/src/main/res/drawable-xhdpi/kc_checkbox_unselect.png diff --git a/app/src/main/res/layout/activity_clean_apk.xml b/app/src/main/res/layout/activity_clean_apk.xml index 2106fd1878..b3b11cd820 100644 --- a/app/src/main/res/layout/activity_clean_apk.xml +++ b/app/src/main/res/layout/activity_clean_apk.xml @@ -35,7 +35,7 @@ android:textColor = "@color/title" android:layout_toRightOf = "@+id/scan_pb" /> - - -