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

快传优化以及增加传完继续传的功能， 增加8个默认头像（未与服务器交互）

Browse Source
This commit is contained in:
khy
2017-02-15 19:01:24 +08:00
parent cb54d87daf
commit 045c1e0305
59 changed files with 3215 additions and 289 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
app/src/main/java/com/gh/gamecenter/KcSelectGameActivity.java
View File

@ -33,10 +33,12 @@ public class KcSelectGameActivity extends BaseActivity {
private KcSelectGameAdapter mAdapter;
private boolean mIsConn;
@Override
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
super.onActivityResult(requestCode, resultCode, data);
if (requestCode == 0*123) {
if (requestCode == 0x123) {
finish();
}
}
@ -47,6 +49,13 @@ public class KcSelectGameActivity extends BaseActivity {
View contentView = View.inflate(this, R.layout.activity_kc_select_game, null);
init(contentView, "选择游戏");
if (getIntent() != null && getIntent().getExtras() != null) {
mIsConn = getIntent().getExtras().getBoolean("isConn");
} else {
mIsConn = false;
}
mAdapter = new KcSelectGameAdapter(this, mSelectSend);
mSelectRv.setLayoutManager(new LinearLayoutManager(this));
@ -60,9 +69,22 @@ public class KcSelectGameActivity extends BaseActivity {
Utils.toast(KcSelectGameActivity.this, "请选择游戏");
return;
}
AppController.put("FileInfo", selectData);
Intent intent = new Intent(KcSelectGameActivity.this, ChooseReceiverActivity.class);
startActivityForResult(intent, 0*123);
if (mIsConn) {
List<FileInfo> oldInfo = (List<FileInfo>) AppController.get("FileInfo", false);
for (FileInfo fileInfo : selectData) {
oldInfo.add(fileInfo);
}
AppController.put("FileInfo", oldInfo);
setResult(0x178);
finish();
} else {
AppController.put("FileInfo", selectData);
Intent intent = new Intent(KcSelectGameActivity.this, ChooseReceiverActivity.class);
startActivityForResult(intent, 0x123);
}
}
});