1、解决toolbar上面文字的问题。。。简直6

2、解决快传文件的一个bug
This commit is contained in:
CsHeng
2017-12-21 17:01:29 +08:00
parent ae6ba7832d
commit 352d7d032e
22 changed files with 251 additions and 206 deletions

View File

@ -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 {