Leaf-WAI/assistant-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

toolbar修改完成

Browse Source
This commit is contained in:
kehaoyuan
2018-05-14 17:33:12 +08:00
parent 68cfdc57c8
commit 447b7b35ef
33 changed files with 263 additions and 382 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
app/src/main/java/com/gh/gamecenter/ChooseReceiverActivity.java
View File

@ -5,7 +5,6 @@ import android.app.Activity;
import android.content.Context;
import android.content.Intent;
import android.content.SharedPreferences;
import android.graphics.Color;
import android.net.wifi.ScanResult;
import android.os.Bundle;
import android.os.Handler;
@ -13,9 +12,8 @@ import android.os.Message;
import android.preference.PreferenceManager;
import android.support.annotation.NonNull;
import android.text.Html;
import android.view.Gravity;
import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup;
import android.view.animation.AccelerateInterpolator;
import android.view.animation.AlphaAnimation;
import android.view.animation.Animation;
@ -107,6 +105,8 @@ public class ChooseReceiverActivity extends BaseActivity implements View.OnClick
@BindView(R.id.choosereceiver_roket_right)
ImageView mRoketAnimRight;
View mToolbarContainer;
private static final String KET_SHOWCONNHINTDIALOG = "showConnHintDialog";
private List<ScanResult> mScanResultList;
@ -142,41 +142,11 @@ public class ChooseReceiverActivity extends BaseActivity implements View.OnClick
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setNavigationTitle(R.string.title_choose_activity, android.R.color.white);
setNavigationTitle(R.string.title_choose_activity);
setToolbarMenu(R.menu.menu_receive);
// 添加分享图标
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);
params.addRule(RelativeLayout.CENTER_VERTICAL);
RelativeLayout reuse_actionbar = (RelativeLayout) findViewById(R.id.reuse_actionbar);
reuse_actionbar.addView(hintTv, params);
mToolbarContainer = findViewById(R.id.normal_toolbar_container);
init();
hintTv.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
showConnHintDialog();
}
});
boolean showConnHintDialog = sp.getBoolean(KET_SHOWCONNHINTDIALOG, true);
if (showConnHintDialog || (getIntent() != null && getIntent().getExtras() != null
&& getIntent().getExtras().getBoolean(KET_SHOWCONNHINTDIALOG))) {
if (showConnHintDialog) {
sp.edit().putBoolean(KET_SHOWCONNHINTDIALOG, false).apply();
}
showConnHintDialog();
}
}
private void init() {
sp = PreferenceManager.getDefaultSharedPreferences(this);
conUserIconTag = 1;
mRadarView.setSearching(true);
@ -196,6 +166,26 @@ public class ChooseReceiverActivity extends BaseActivity implements View.OnClick
updateWifiScanResult();
handler.sendEmptyMessageDelayed(0, 2000);
boolean showConnHintDialog = sp.getBoolean(KET_SHOWCONNHINTDIALOG, true);
if (showConnHintDialog || (getIntent() != null && getIntent().getExtras() != null
&& getIntent().getExtras().getBoolean(KET_SHOWCONNHINTDIALOG))) {
if (showConnHintDialog) {
sp.edit().putBoolean(KET_SHOWCONNHINTDIALOG, false).apply();
}
showConnHintDialog();
}
}
@Override
public int provideNavigationIcon() {
return R.drawable.ic_filereceive_back;
}
@Override
public boolean onMenuItemClick(MenuItem item) {
if (item.getItemId() == R.id.menu_receive_hint) showConnHintDialog();
return super.onMenuItemClick(item);
}
private void showConnHintDialog() {
@ -504,7 +494,7 @@ public class ChooseReceiverActivity extends BaseActivity implements View.OnClick
// 连接中-动画
private void readyAnimView() {
getSupportActionBar().hide();
mToolbarContainer.setVisibility(View.GONE);
mRoketRl.setVisibility(View.VISIBLE);
mRoketRl.animate()
.alpha(1f)
@ -592,7 +582,7 @@ public class ChooseReceiverActivity extends BaseActivity implements View.OnClick
// 连接失败-动画
private void connFailedAnimView() {
getSupportActionBar().show();
mToolbarContainer.setVisibility(View.VISIBLE);
toast("连接失败");
if (mScaleAnimation != null) {
mScaleAnimation.cancel();