diff --git a/README.md b/README.md index e29a67da04..cfd22676f1 100644 --- a/README.md +++ b/README.md @@ -52,3 +52,5 @@ * activity 统一入口未完成(外部入口相关)，去除多余activity使用，统一toolbar * release / debug compile不同的类库，不需要再做什么开关 + +* Toolbar分离，有图形按钮/没有图形按钮 diff --git a/app/src/main/java/com/gh/base/BaseToolBarActivity.java b/app/src/main/java/com/gh/base/BaseToolBarActivity.java index 9b0081e5ee..1e378d6857 100644 --- a/app/src/main/java/com/gh/base/BaseToolBarActivity.java +++ b/app/src/main/java/com/gh/base/BaseToolBarActivity.java @@ -1,8 +1,13 @@ package com.gh.base; +import android.graphics.drawable.Drawable; +import android.graphics.drawable.LayerDrawable; import android.os.Bundle; +import android.support.annotation.ColorInt; +import android.support.annotation.ColorRes; import android.support.annotation.StringRes; import android.support.v4.app.Fragment; +import android.support.v4.content.ContextCompat; import android.support.v7.widget.Toolbar; import android.view.MenuItem; import android.view.View; @@ -11,6 +16,7 @@ import android.widget.TextView; import com.gh.gamecenter.R; import com.lightgame.BaseAppCompatActivity; import com.lightgame.OnTitleClickListener; +import com.lightgame.view.TextDrawable; import java.util.List; @@ -21,6 +27,7 @@ import java.util.List; public abstract class BaseToolBarActivity extends BaseAppCompatActivity { private Toolbar mToolbar; + private Drawable mToolbarBackground; private TextView mTitleTv; @Override @@ -29,23 +36,51 @@ public abstract class BaseToolBarActivity extends BaseAppCompatActivity { initToolbar(); } + public void setNavigationTitle(@StringRes int title, @ColorRes int color) { + setNavigationTitle(getString(title), ContextCompat.getColor(this, color)); + } + + public void setNavigationTitle(String title, @ColorInt int color) { + if (mToolbar != null) { + final TextDrawable textDrawable = new TextDrawable(getResources()); + textDrawable.setTextColor(color); + textDrawable.setText(title); + if (mToolbarBackground == null) { + mToolbarBackground = mToolbar.getBackground(); + } + LayerDrawable drawable = new LayerDrawable(new Drawable[]{mToolbarBackground, textDrawable}); + mToolbar.setBackgroundDrawable(drawable); + } + } + public void setNavigationTitle(String title) { - if (mTitleTv != null) { - mTitleTv.setText(title); +// if (mTitleTv != null) { +// mTitleTv.setText(title); +// } + + if (mToolbar != null) { + final TextDrawable textDrawable = new TextDrawable(getResources()); + textDrawable.setText(title); + if (mToolbarBackground == null) { + mToolbarBackground = mToolbar.getBackground(); + } + LayerDrawable drawable = new LayerDrawable(new Drawable[]{mToolbarBackground, textDrawable}); + mToolbar.setBackgroundDrawable(drawable); } } public void setNavigationTitle(@StringRes int res) { - if (mTitleTv != null) { - mTitleTv.setText(getString(res)); - } + setNavigationTitle(getString(res)); } private void initToolbar() { mToolbar = findViewById(R.id.toolbar_navigation); if (mToolbar != null) { setSupportActionBar(mToolbar); - mToolbar.findViewById(R.id.actionbar_rl_back).setOnClickListener(v -> onBackPressed()); + final View back = mToolbar.findViewById(R.id.actionbar_rl_back); + if (back != null) { + back.setOnClickListener(v -> onBackPressed()); + } mTitleTv = findViewById(R.id.actionbar_tv_title); mTitleTv.setOnClickListener(new View.OnClickListener() { @Override @@ -58,6 +93,7 @@ public abstract class BaseToolBarActivity extends BaseAppCompatActivity { } } }); + getSupportActionBar().setDisplayShowTitleEnabled(false); getSupportActionBar().setDisplayHomeAsUpEnabled(false); getSupportActionBar().setDisplayShowHomeEnabled(false); getSupportActionBar().setHomeButtonEnabled(false); diff --git a/app/src/main/java/com/gh/gamecenter/ChooseReceiverActivity.java b/app/src/main/java/com/gh/gamecenter/ChooseReceiverActivity.java index d98ecbff1b..9a16d10de4 100644 --- a/app/src/main/java/com/gh/gamecenter/ChooseReceiverActivity.java +++ b/app/src/main/java/com/gh/gamecenter/ChooseReceiverActivity.java @@ -12,7 +12,6 @@ import android.os.Handler; import android.os.Message; import android.preference.PreferenceManager; import android.support.annotation.NonNull; -import android.support.v4.content.ContextCompat; import android.text.Html; import android.view.Gravity; import android.view.View; @@ -93,8 +92,6 @@ public class ChooseReceiverActivity extends BaseActivity implements View.OnClick TextView mScanUser; @BindView(R.id.scan_user_des) TextView mScanUserDes; - @BindView(R.id.reuse_actionbar) - RelativeLayout mActionbar; @BindView(R.id.scan_hint) TextView mScanHint; @BindView(R.id.choosereceiver_roket_anim) @@ -109,11 +106,6 @@ public class ChooseReceiverActivity extends BaseActivity implements View.OnClick ImageView mRoketAnimLeft; @BindView(R.id.choosereceiver_roket_right) ImageView mRoketAnimRight; - @BindView(R.id.actionbar_iv_back) - ImageView mBackIv; - @BindView(R.id.actionbar_tv_title) - TextView mTitleTv; - private static final String KET_SHOWCONNHINTDIALOG = "showConnHintDialog"; @@ -144,23 +136,13 @@ public class ChooseReceiverActivity extends BaseActivity implements View.OnClick @Override protected int getLayoutId() { - return R.layout.activity_choosereceiver; - } - - @Override - public void onBackPressed() { - super.onBackPressed(); - closeSocket(); - HaloApp.remove(KcSelectGameActivity.KEY_FILE_INFO); + return R.layout.activity_receive_choose; } @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setNavigationTitle(getString(R.string.title_choose_activity)); - - mTitleTv.setTextColor(Color.WHITE); - mBackIv.setImageResource(R.drawable.reuse_kc_back); + setNavigationTitle(R.string.title_choose_activity, android.R.color.white); // 添加分享图标 TextView hintTv = new TextView(this); @@ -175,9 +157,6 @@ public class ChooseReceiverActivity extends BaseActivity implements View.OnClick RelativeLayout reuse_actionbar = (RelativeLayout) findViewById(R.id.reuse_actionbar); reuse_actionbar.addView(hintTv, params); - //修改沉浸栏以及ActionBar 颜色 - mActionbar.setBackgroundColor(ContextCompat.getColor(getApplicationContext(), R.color.scan_bg)); - init(); hintTv.setOnClickListener(new View.OnClickListener() { @@ -297,11 +276,11 @@ public class ChooseReceiverActivity extends BaseActivity implements View.OnClick @Override protected void onDestroy() { - super.onDestroy(); mRadarView.setSearching(false); isDestroy = true; isStopScan = true; handler.removeCallbacksAndMessages(null); + super.onDestroy(); } @Override @@ -371,12 +350,14 @@ public class ChooseReceiverActivity extends BaseActivity implements View.OnClick createSendMsgToServerRunnable(WifiMgr.getInstance(this).getIpAddressFromHotspot()); } - @OnClick(R.id.actionbar_rl_back) - public void onBackListener() { + @Override + public boolean onHandleBackPressed() { closeSocket(); HaloApp.remove(KcSelectGameActivity.KEY_FILE_INFO); - } //发送UDP通知信息到 文件接收方 开启ServerSocketRunnable + return false; + } + //发送UDP通知信息到 文件接收方 开启ServerSocketRunnable private void createSendMsgToServerRunnable(final String ipAddress) { HaloApp.getInstance().getMainExecutor().execute(new Runnable() { @Override @@ -523,7 +504,7 @@ public class ChooseReceiverActivity extends BaseActivity implements View.OnClick // 连接中-动画 private void readyAnimView() { - mActionbar.setVisibility(View.GONE); + getSupportActionBar().hide(); mRoketRl.setVisibility(View.VISIBLE); mRoketRl.animate() .alpha(1f) @@ -611,7 +592,7 @@ public class ChooseReceiverActivity extends BaseActivity implements View.OnClick // 连接失败-动画 private void connFailedAnimView() { - mActionbar.setVisibility(View.VISIBLE); + getSupportActionBar().show(); Utils.toast(ChooseReceiverActivity.this, "连接失败"); if (mScaleAnimation != null) { mScaleAnimation.cancel(); diff --git a/app/src/main/java/com/gh/gamecenter/FileReceiverActivity.java b/app/src/main/java/com/gh/gamecenter/FileReceiverActivity.java index 7bc2ffa53d..0628bf2973 100644 --- a/app/src/main/java/com/gh/gamecenter/FileReceiverActivity.java +++ b/app/src/main/java/com/gh/gamecenter/FileReceiverActivity.java @@ -15,7 +15,6 @@ 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.LinearLayout; import android.widget.RelativeLayout; import android.widget.TextView; @@ -70,7 +69,7 @@ import butterknife.OnClick; /** * Created by khy on 2017/1/20. */ -public class FileReceiverActivity extends BaseActivity implements OnReceiverCancelListener, OnClickListener { +public class FileReceiverActivity extends BaseActivity implements OnReceiverCancelListener { @BindView(R.id.sender_rv) RecyclerView mReceiverRv; @@ -125,7 +124,7 @@ public class FileReceiverActivity extends BaseActivity implements OnReceiverCanc int index = getCurrentFileInfoIndex(); if (index == -100) { Utils.toast(FileReceiverActivity.this, "接收失败"); - colsePage(); + closePage(); return; } @@ -184,30 +183,32 @@ public class FileReceiverActivity extends BaseActivity implements OnReceiverCanc @Override protected int getLayoutId() { - return R.layout.activity_file_sender; + return R.layout.activity_receive_send; } @Override - public void onBackPressed() { + public boolean onHandleBackPressed() { + backHint(); + return true; } private void backHint() { if (isReceivesOver) { - colsePage(); + closePage(); } else { DialogUtils.showWarningDialog(FileReceiverActivity.this, "退出提示", "退出会中断接收，确定要退出吗？" , "取消", "确定" , new DialogUtils.ConfirmListener() { @Override public void onConfirm() { - colsePage(); + closePage(); } }, null); } } - private void colsePage() { + private void closePage() { if (mDatagramSocket != null) { // mDatagramSocket.disconnect(); @@ -260,7 +261,7 @@ public class FileReceiverActivity extends BaseActivity implements OnReceiverCanc @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setNavigationTitle(getString(R.string.title_file_receive)); + setNavigationTitle(R.string.title_file_receive, android.R.color.white); isDestroy = false; @@ -278,7 +279,6 @@ public class FileReceiverActivity extends BaseActivity implements OnReceiverCanc mReceiverRv.addItemDecoration(new VerticalItemDecoration(this, 8, true)); mReceiverRv.setAdapter(mFileReceiverAdapter); - mKeepReceiverTv.setText("继续接收"); sp = PreferenceManager.getDefaultSharedPreferences(this); @@ -292,7 +292,6 @@ public class FileReceiverActivity extends BaseActivity implements OnReceiverCanc initServer(); //启动接收服务 } - findViewById(R.id.actionbar_rl_back).setOnClickListener(this); } private void initUserData() { @@ -496,12 +495,15 @@ public class FileReceiverActivity extends BaseActivity implements OnReceiverCanc } - @OnClick({R.id.actionbar_rl_back, R.id.sender_keep_send, R.id.sender_back}) + @Override + protected boolean onNavigationIconClicked() { + backHint(); + return true; + } + + @OnClick({R.id.sender_keep_send, R.id.sender_back}) public void back(View view) { switch (view.getId()) { - case R.id.actionbar_rl_back: - backHint(); - break; case R.id.sender_back: backHint(); break; @@ -518,15 +520,6 @@ public class FileReceiverActivity extends BaseActivity implements OnReceiverCanc } } - @Override - public void onClick(View v) { - switch (v.getId()) { - case R.id.actionbar_rl_back: - backHint(); - break; - } - } - /** * ServerSocket启动线程 */ @@ -549,7 +542,9 @@ public class FileReceiverActivity extends BaseActivity implements OnReceiverCanc } catch (IOException e) { } } - } @Override + } + + @Override public void run() { Utils.log("接收线程：Socket已经开启"); try { diff --git a/app/src/main/java/com/gh/gamecenter/FileSenderActivity.java b/app/src/main/java/com/gh/gamecenter/FileSenderActivity.java index 5f648d31de..df65ebc163 100644 --- a/app/src/main/java/com/gh/gamecenter/FileSenderActivity.java +++ b/app/src/main/java/com/gh/gamecenter/FileSenderActivity.java @@ -122,7 +122,7 @@ public class FileSenderActivity extends BaseActivity implements FileSenderAdapte @Override protected int getLayoutId() { - return R.layout.activity_file_sender; + return R.layout.activity_receive_send; } @Override @@ -171,14 +171,15 @@ public class FileSenderActivity extends BaseActivity implements FileSenderAdapte } @Override - public void onBackPressed() { + public boolean onHandleBackPressed() { backHint(); + return true; } @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setNavigationTitle(getString(R.string.title_file_sender)); + setNavigationTitle(R.string.title_file_sender, android.R.color.white); mFileInfos = (List) HaloApp.get(KcSelectGameActivity.KEY_FILE_INFO, false); @@ -193,12 +194,14 @@ public class FileSenderActivity extends BaseActivity implements FileSenderAdapte init(); - findViewById(R.id.actionbar_rl_back).setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - backHint(); - } - }); + } + + @Override + protected boolean onNavigationIconClicked() { + + backHint(); + + return true; } private void init() { @@ -223,20 +226,17 @@ public class FileSenderActivity extends BaseActivity implements FileSenderAdapte private void backHint() { if (!isSendOver) { - DialogUtils.showWarningDialog(FileSenderActivity.this, "退出传送", "退出会中断所有游戏的传送，确定要退出吗？" - , "取消", "确定" - , new DialogUtils.ConfirmListener() { + DialogUtils.showWarningDialog(FileSenderActivity.this, + "退出传送", "退出会中断所有游戏的传送，确定要退出吗？", "取消", "确定", new DialogUtils.ConfirmListener() { @Override public void onConfirm() { - colsePage(); - + closePage(); } }, null); } else { - colsePage(); + closePage(); } - } //初始化用户数据 @@ -349,7 +349,7 @@ public class FileSenderActivity extends BaseActivity implements FileSenderAdapte }); } - public void colsePage() { + public void closePage() { if (mDatagramSocket != null) { // mDatagramSocket.disconnect(); mDatagramSocket.close(); @@ -360,7 +360,7 @@ public class FileSenderActivity extends BaseActivity implements FileSenderAdapte HaloApp.remove(KcSelectGameActivity.KEY_FILE_INFO); HaloApp.put("sendData", sendData); - FileSenderActivity.this.finish(); + finish(); } private int getCurrentFileInfoIndex(FileInfo curFileInfo) { @@ -479,10 +479,9 @@ public class FileSenderActivity extends BaseActivity implements FileSenderAdapte } } - @OnClick({R.id.actionbar_rl_back, R.id.sender_keep_send, R.id.sender_back}) + @OnClick({R.id.sender_keep_send, R.id.sender_back}) public void onClick(View view) { switch (view.getId()) { - case R.id.actionbar_rl_back: case R.id.sender_back: backHint(); break; diff --git a/app/src/main/java/com/gh/gamecenter/LibaoDetailActivity.java b/app/src/main/java/com/gh/gamecenter/LibaoDetailActivity.java index 8cc579c5a6..2dcd444905 100644 --- a/app/src/main/java/com/gh/gamecenter/LibaoDetailActivity.java +++ b/app/src/main/java/com/gh/gamecenter/LibaoDetailActivity.java @@ -199,12 +199,6 @@ public class LibaoDetailActivity extends BaseActivity implements LibaoDetailAdap }, 1000); } }); - findViewById(R.id.actionbar_rl_back).setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View view) { - onBackPressed(); - } - }); if (mLibaoEntity == null) { String id = getIntent().getStringExtra(EntranceUtils.KEY_ID); @@ -391,15 +385,17 @@ public class LibaoDetailActivity extends BaseActivity implements LibaoDetailAdap } @Override - public void onBackPressed() { - super.onBackPressed(); + public boolean onHandleBackPressed() { //TODO 哎，绝望的这里会崩啊。。。。。。。NPE啊！！！！ // 重置领取状态 - if (mLibaoEntity == null) return; + if (mLibaoEntity == null) { + return false; + } String status = mLibaoEntity.getStatus(); if (!TextUtils.isEmpty(status) && status.contains("repeat")) { mLibaoEntity.setStatus(mListStatus); } + return false; } @Override diff --git a/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java b/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java index 28fed3b4d4..6ebdcc524e 100644 --- a/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java +++ b/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java @@ -75,8 +75,6 @@ import rx.schedulers.Schedulers; */ public class NewsDetailActivity extends BaseActivity implements OnClickListener, OnRequestCallBackListener { - @BindView(R.id.actionbar_tv_title) - TextView mActionbarTitle; @BindView(R.id.news_detail_rv_show) RecyclerView mDetailRv; @BindView(R.id.news_detail_ll_bottom) @@ -146,7 +144,7 @@ public class NewsDetailActivity extends BaseActivity implements OnClickListener, } else { if (mNewsEntity == null) return; if (mNewsEntity.getType() != null) { - mActionbarTitle.setText(mNewsEntity.getType()); + setNavigationTitle(mNewsEntity.getType()); } adapter.setId(mNewsEntity.getId()); adapter.setType(mNewsEntity.getType()); @@ -240,6 +238,19 @@ public class NewsDetailActivity extends BaseActivity implements OnClickListener, } } +// @Override +// public boolean onCreateOptionsMenu(Menu menu) { +// +// getMenuInflater().inflate(R.menu.menu_share, menu); +// +// return true; +// } +// +// @Override +// public boolean onOptionsItemSelected(MenuItem item) { +// return super.onOptionsItemSelected(item); +// } + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -278,7 +289,7 @@ public class NewsDetailActivity extends BaseActivity implements OnClickListener, mNewsEntity = getIntent().getParcelableExtra(NewsEntity.TAG); if (mNewsEntity != null) { if (mNewsEntity.getType() != null) { - mActionbarTitle.setText(mNewsEntity.getType()); + setNavigationTitle(mNewsEntity.getType()); } adapter.setId(mNewsEntity.getId()); adapter.setType(mNewsEntity.getType()); @@ -465,7 +476,7 @@ public class NewsDetailActivity extends BaseActivity implements OnClickListener, mNewsEntity = response; if (response.getType() != null) { - mActionbarTitle.setText(response.getType()); + setNavigationTitle(response.getType()); } adapter.setId(newsId); diff --git a/app/src/main/java/com/gh/gamecenter/ReceiverWaitingActivity.java b/app/src/main/java/com/gh/gamecenter/ReceiverWaitingActivity.java index 6c0d30afc8..fa51dbb129 100644 --- a/app/src/main/java/com/gh/gamecenter/ReceiverWaitingActivity.java +++ b/app/src/main/java/com/gh/gamecenter/ReceiverWaitingActivity.java @@ -11,20 +11,16 @@ import android.os.Handler; import android.os.Message; import android.preference.PreferenceManager; import android.support.annotation.NonNull; -import android.support.v4.content.ContextCompat; import android.text.Html; import android.text.TextUtils; -import android.view.Gravity; +import android.view.Menu; +import android.view.MenuItem; import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.RelativeLayout; import android.widget.TextView; import com.facebook.drawee.view.SimpleDraweeView; import com.gh.base.BaseActivity; import com.gh.common.util.DialogUtils; -import com.gh.common.util.DisplayUtils; import com.gh.common.util.RandomUtils; import com.gh.common.util.UserIconUtils; import com.gh.common.view.RadarLayout; @@ -67,16 +63,10 @@ public class ReceiverWaitingActivity extends BaseActivity { RadarLayout mRadarLayout; @BindView(R.id.waiting_hint) TextView mWaitingHint; - @BindView(R.id.reuse_actionbar) - RelativeLayout mActionbar; @BindView(R.id.waiting_gprs_hint) TextView mGPRSHint; @BindView(R.id.waiting_no_conn_hint) TextView mNoConnHint; - @BindView(R.id.actionbar_iv_back) - ImageView mBackIv; - @BindView(R.id.actionbar_tv_title) - TextView mTitleTv; /** * 开启 文件接收方 通信服务 (必须在子线程执行) * @@ -86,7 +76,7 @@ public class ReceiverWaitingActivity extends BaseActivity { DatagramSocket mDatagramSocket; private WifiAPBroadcastReceiver mWifiAPBroadcastReceiver; private List mFileInfos; // 接收到的文件列表 - private SharedPreferences sp; + private SharedPreferences mSharedPreferences; private boolean mIsInitialized; private boolean isOpenWifi; //记录开热点前的WiFi状态 private boolean isDestroy; @@ -99,58 +89,58 @@ public class ReceiverWaitingActivity extends BaseActivity { @NonNull public static Intent getIntent(Context context) { - Intent intent = new Intent(context, ReceiverWaitingActivity.class); - return intent; + return new Intent(context, ReceiverWaitingActivity.class); } @Override protected int getLayoutId() { - return R.layout.activity_receiver_waiting; + return R.layout.activity_receive_waiting; } @Override - public void onBackPressed() { - super.onBackPressed(); - colsePage(); + public boolean onHandleBackPressed() { + unregisterReceiver(mWifiAPBroadcastReceiver); + + closePage(); //关闭热点 HotspotManager.initUserAp(getApplicationContext()); if (isOpenWifi) { WifiMgr.getInstance(this).openWifi(); } + + return true; + } + + @Override + public boolean onCreateOptionsMenu(Menu menu) { + + getMenuInflater().inflate(R.menu.menu_receive, menu); + + MenuItem menuItem = menu.findItem(R.id.menu_button); + final TextView textView = menuItem.getActionView().findViewById(R.id.tv_menu_receive); + textView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + showConnHintDialog(); + } + }); + + return true; } @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setNavigationTitle(getString(R.string.title_receive_waiting)); + setNavigationTitle(R.string.title_receive_waiting, android.R.color.white); - mTitleTv.setTextColor(Color.WHITE); - mBackIv.setImageResource(R.drawable.reuse_kc_back); - - // 添加分享图标 - TextView hintTv = new TextView(this); - hintTv.setText("操作说明"); - hintTv.setTextColor(Color.WHITE); - hintTv.setGravity(Gravity.CENTER); - hintTv.setPadding(DisplayUtils.dip2px(this, 13), 0, DisplayUtils.dip2px(this, 13), 0); - RelativeLayout.LayoutParams params = new RelativeLayout.LayoutParams( - ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.MATCH_PARENT); - params.addRule(RelativeLayout.ALIGN_PARENT_RIGHT); - RelativeLayout reuse_actionbar = (RelativeLayout) findViewById( - R.id.reuse_actionbar); - reuse_actionbar.addView(hintTv, params); - - //修改沉浸栏以及ActionBar 颜色 - mActionbar.setBackgroundColor(ContextCompat.getColor(getApplicationContext(), R.color.scan_bg)); - - sp = PreferenceManager.getDefaultSharedPreferences(this); + mSharedPreferences = PreferenceManager.getDefaultSharedPreferences(this); mIsInitialized = false; isDestroy = false; isOpenWifi = WifiMgr.getInstance(this).isWifiEnable(); - mUserName.setText(sp.getString("user_name", "光环用户")); + mUserName.setText(mSharedPreferences.getString("user_name", "光环用户")); if (isOpenWifi) { WifiMgr.getInstance(this).closeWifi(); @@ -162,7 +152,6 @@ public class ReceiverWaitingActivity extends BaseActivity { mRadarLayout.setCount(4); mRadarLayout.start(); - mFileInfos = new ArrayList<>(); HotspotManager.initApData(getApplicationContext()); // 记录原始热点信息 @@ -195,7 +184,7 @@ public class ReceiverWaitingActivity extends BaseActivity { HotspotManager.isApOn(getApplicationContext()); - mySsid = sp.getString("hotspotName", null); + mySsid = mSharedPreferences.getString("hotspotName", null); if (TextUtils.isEmpty(mySsid)) { String chars = "abcdefghijklmnopqrstuvwxyz"; int[] randomArray = RandomUtils.getRandomArray(2, 25); @@ -205,47 +194,26 @@ public class ReceiverWaitingActivity extends BaseActivity { mySsid = mySsid + chars.charAt(i); } - int default_user_icon = sp.getInt("default_user_icon", 0); + int default_user_icon = mSharedPreferences.getInt("default_user_icon", 0); if (default_user_icon == 0) { default_user_icon = RandomUtils.nextInt(8) + 1; - sp.edit().putInt("default_user_icon", default_user_icon).apply(); + mSharedPreferences.edit().putInt("default_user_icon", default_user_icon).apply(); } mySsid = mySsid + default_user_icon; - sp.edit().putString("hotspotName", mySsid).apply(); + mSharedPreferences.edit().putString("hotspotName", mySsid).apply(); } - mUserIcon.setImageURI(UserIconUtils.getUserIcon(sp.getInt("default_user_icon", 1))); + mUserIcon.setImageURI(UserIconUtils.getUserIcon(mSharedPreferences.getInt("default_user_icon", 1))); HotspotManager.configApState(getApplicationContext(), mySsid); // change Ap state :boolean - findViewById(R.id.actionbar_rl_back).setOnClickListener( - new View.OnClickListener() { - @Override - public void onClick(View v) { - colsePage(); - //关闭热点 - HotspotManager.initUserAp(getApplicationContext()); - - if (isOpenWifi) { - WifiMgr.getInstance(ReceiverWaitingActivity.this).openWifi(); - } - } - }); - mHandler.sendEmptyMessageDelayed(1, 300000); - hintTv.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - showConnHintDialog(); - } - }); - - boolean showConnHintReceiver = sp.getBoolean("showConnHintReceiver", true); + boolean showConnHintReceiver = mSharedPreferences.getBoolean("showConnHintReceiver", true); if (showConnHintReceiver) { showConnHintDialog(); - sp.edit().putBoolean("showConnHintReceiver", false).apply(); + mSharedPreferences.edit().putBoolean("showConnHintReceiver", false).apply(); } } @@ -269,7 +237,7 @@ public class ReceiverWaitingActivity extends BaseActivity { /** * 关闭广播并关闭Socket流 */ - private void colsePage() { + private void closePage() { mRadarLayout.stop(); mHandler.removeMessages(1); // 取消无人连接消息 @@ -332,7 +300,7 @@ public class ReceiverWaitingActivity extends BaseActivity { // 反馈 文件发送方的消息 // sendData = Constant.MSG_FILE_RECEIVER_INIT_SUCCESS.getBytes(BaseTransfer.UTF_8); JSONObject receiverData = new JSONObject(); - receiverData.put(Constant.MSG_FILE_RECEIVER_INIT_SUCCESS, sp.getString("user_name", "光环用户")); + receiverData.put(Constant.MSG_FILE_RECEIVER_INIT_SUCCESS, mSharedPreferences.getString("user_name", "光环用户")); sendData = receiverData.toString().getBytes(BaseTransfer.UTF_8); DatagramPacket sendPacket = new DatagramPacket(sendData, sendData.length, inetAddress, port); @@ -342,7 +310,7 @@ public class ReceiverWaitingActivity extends BaseActivity { message.what = 0; JSONObject jsonObject = new JSONObject(msg); message.obj = new IpPortInfo(inetAddress, port, jsonObject.getString(Constant.MSG_FILE_RECEIVER_INIT), - sp.getString("user_name", "光环用户"), jsonObject.getInt("UserIcon")); + mSharedPreferences.getString("user_name", "光环用户"), jsonObject.getInt("UserIcon")); mHandler.sendMessage(message); } else { @@ -417,7 +385,7 @@ public class ReceiverWaitingActivity extends BaseActivity { intent.putExtras(bundle); activity.startActivity(intent); - activity.colsePage(); + activity.closePage(); } else if (msg.what == 1) { activity.mNoConnHint.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/gh/gamecenter/ShareGhWfifActivity.java b/app/src/main/java/com/gh/gamecenter/ShareGhWfifActivity.java index 7dceea4f5a..8731e95b8d 100644 --- a/app/src/main/java/com/gh/gamecenter/ShareGhWfifActivity.java +++ b/app/src/main/java/com/gh/gamecenter/ShareGhWfifActivity.java @@ -41,7 +41,6 @@ import java.util.List; import butterknife.BindView; import butterknife.ButterKnife; -import butterknife.OnClick; /** * Created by khy on 2017/2/6. @@ -92,11 +91,7 @@ public class ShareGhWfifActivity extends BaseActivity { } @Override - public void onBackPressed() { - backActivity(); - } - - private void backActivity() { + public boolean onHandleBackPressed() { DialogUtils.showWarningDialog(this, "退出分享", "退出本页面即会关闭分享热点，确定退出吗？" , "取消", "确定" , new DialogUtils.ConfirmListener() { @@ -136,7 +131,7 @@ public class ShareGhWfifActivity extends BaseActivity { finish(); } }, null); - + return true; } @Override @@ -360,8 +355,4 @@ public class ShareGhWfifActivity extends BaseActivity { return requestEntity; } - @OnClick(R.id.actionbar_rl_back) - public void OnBackClikListener() { - backActivity(); - } } diff --git a/app/src/main/java/com/halo/assistant/fragment/ApkCleanerFragment.java b/app/src/main/java/com/halo/assistant/fragment/ApkCleanerFragment.java index d4e47c6c93..debafc6a96 100644 --- a/app/src/main/java/com/halo/assistant/fragment/ApkCleanerFragment.java +++ b/app/src/main/java/com/halo/assistant/fragment/ApkCleanerFragment.java @@ -9,9 +9,7 @@ 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 com.gh.base.fragment.BaseFragment; @@ -55,11 +53,11 @@ public class ApkCleanerFragment extends BaseFragment implements CleanApkAdapter. @BindView(R.id.reuse_nodata_skip_tv_btn) TextView mNodataSkipBtn; @BindView(R.id.reuse_nodata_skip) - LinearLayout mNodataSkipLl; + View mNodataSkipLl; @BindView(R.id.delete_bottom) - LinearLayout mDeleteBottom; + View mDeleteBottom; @BindView(R.id.select_game_installed_ll) - RelativeLayout mInstallAllData; + View mInstallAllData; private CleanApkAdapter mAdapter; diff --git a/app/src/main/res/drawable-hdpi/reuse_kc_back.png b/app/src/main/res/drawable-hdpi/reuse_kc_back.png deleted file mode 100644 index 02cb05971d..0000000000 Binary files a/app/src/main/res/drawable-hdpi/reuse_kc_back.png and /dev/null differ diff --git a/app/src/main/res/layout/activity_choosereceiver.xml b/app/src/main/res/layout/activity_receive_choose.xml similarity index 98% rename from app/src/main/res/layout/activity_choosereceiver.xml rename to app/src/main/res/layout/activity_receive_choose.xml index 0cef87a263..53cc9441e7 100644 --- a/app/src/main/res/layout/activity_choosereceiver.xml +++ b/app/src/main/res/layout/activity_receive_choose.xml @@ -4,7 +4,8 @@ android:layout_height = "match_parent" android:orientation = "vertical" > - + diff --git a/app/src/main/res/layout/activity_file_sender.xml b/app/src/main/res/layout/activity_receive_send.xml similarity index 98% rename from app/src/main/res/layout/activity_file_sender.xml rename to app/src/main/res/layout/activity_receive_send.xml index 529e82b4e2..4d2a17eb90 100644 --- a/app/src/main/res/layout/activity_file_sender.xml +++ b/app/src/main/res/layout/activity_receive_send.xml @@ -6,7 +6,8 @@ android:gravity = "center_horizontal" android:orientation = "vertical" > - + - + diff --git a/app/src/main/res/layout/layout_menu_receive.xml b/app/src/main/res/layout/layout_menu_receive.xml new file mode 100644 index 0000000000..62e52d4242 --- /dev/null +++ b/app/src/main/res/layout/layout_menu_receive.xml @@ -0,0 +1,17 @@ + + + + + + diff --git a/app/src/main/res/layout/toolbar_filereceive.xml b/app/src/main/res/layout/toolbar_filereceive.xml new file mode 100644 index 0000000000..e140bc5eb7 --- /dev/null +++ b/app/src/main/res/layout/toolbar_filereceive.xml @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/toolbar_title.xml b/app/src/main/res/layout/toolbar_title.xml index 782a4189d2..61e1f42b4c 100644 --- a/app/src/main/res/layout/toolbar_title.xml +++ b/app/src/main/res/layout/toolbar_title.xml @@ -1,23 +1,13 @@ + style = "@style/Base_ToolbarStyle" > + android:layout_height = "match_parent" > - + android:textStyle = "bold" + android:visibility = "invisible" /> + diff --git a/app/src/main/res/menu/menu_receive.xml b/app/src/main/res/menu/menu_receive.xml new file mode 100644 index 0000000000..8fc004bb90 --- /dev/null +++ b/app/src/main/res/menu/menu_receive.xml @@ -0,0 +1,11 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 4518bd6c4a..7047fe8e0d 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -47,7 +47,7 @@ #30000000 - #1668d0 + #1668d0 #59d3ff diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 5f0bac3114..834a21f53e 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -49,7 +49,13 @@ + +