1、移除部分haloapp的静态变量

2、整理hardcode tag
3、修复NPE
This commit is contained in:
CsHeng
2017-12-15 18:04:56 +08:00
parent 40fccea23a
commit 05be092d69
31 changed files with 287 additions and 118 deletions

View File

@ -151,7 +151,7 @@ public class ChooseReceiverActivity extends BaseActivity implements View.OnClick
public void onBackPressed() {
super.onBackPressed();
closeSocket();
HaloApp.remove("FileInfo");
HaloApp.remove(KcSelectGameActivity.KEY_FILE_INFO);
}
@Override
@ -374,11 +374,11 @@ public class ChooseReceiverActivity extends BaseActivity implements View.OnClick
@OnClick(R.id.actionbar_rl_back)
public void onBackListener() {
closeSocket();
HaloApp.remove("FileInfo");
HaloApp.remove(KcSelectGameActivity.KEY_FILE_INFO);
} //发送UDP通知信息到 文件接收方 开启ServerSocketRunnable
private void createSendMsgToServerRunnable(final String ipAddress) {
HaloApp.MAIN_EXECUTOR.execute(new Runnable() {
HaloApp.getInstance().getMainExecutor().execute(new Runnable() {
@Override
public void run() {
try {
@ -503,7 +503,7 @@ public class ChooseReceiverActivity extends BaseActivity implements View.OnClick
}
private void sendFileInfoListToFileReceiverWithUdp(int serverPort, InetAddress ipAddress) {
List<FileInfo> fileInfoList = (List<FileInfo>) HaloApp.get("FileInfo", false);
List<FileInfo> fileInfoList = (List<FileInfo>) HaloApp.get(KcSelectGameActivity.KEY_FILE_INFO, false);
if (fileInfoList == null) {
return;
}