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

1、修复url匹配正则

Browse Source 
2、部分onclick处理
3、代码整理
This commit is contained in:
CsHeng
2017-05-18 12:05:25 +08:00
parent 49624d5afd
commit 6b5fe82d47
20 changed files with 245 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
app/src/main/java/com/gh/gamecenter/FileReceiverActivity.java
View File

@ -10,6 +10,7 @@ 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.*;
import butterknife.BindView;
import butterknife.OnClick;
@ -20,6 +21,7 @@ import com.gh.common.constant.Config;
import com.gh.common.util.*;
import com.gh.download.*;
import com.gh.gamecenter.adapter.FileReceiverAdapter;
import com.gh.gamecenter.adapter.FileReceiverAdapter.OnReceiverCancelListener;
import com.gh.gamecenter.eventbus.*;
import com.gh.gamecenter.kuaichuan.*;
import com.gh.gamecenter.manager.DataCollectionManager;
@ -35,7 +37,7 @@ import java.util.*;
/**
* Created by khy on 2017/1/20.
*/
public class FileReceiverActivity extends BaseActivity implements FileReceiverAdapter.OnReceiverCancelListener {
public class FileReceiverActivity extends BaseActivity implements OnReceiverCancelListener, OnClickListener {
@BindView(R.id.sender_rv)
RecyclerView mReceiverRv;
@ -179,14 +181,10 @@ public class FileReceiverActivity extends BaseActivity implements FileReceiverAd
initServer(); //启动接收服务
}
findViewById(R.id.actionbar_rl_back).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
backHint();
}
});
findViewById(R.id.actionbar_rl_back).setOnClickListener(this);
}
private void initUserData() {
isReceivesOver = false;
@ -200,7 +198,7 @@ public class FileReceiverActivity extends BaseActivity implements FileReceiverAd
String sizeName = df.format(size) + "MB";
mSenderUserDes.setText(mFileInfos.size() + "个游戏，共" + sizeName);
mSenderUserName.setText(StringUtils.buildString("来自 " , mIpPortInfo.getSenderName()));
mSenderUserName.setText(StringUtils.buildString("来自 ", mIpPortInfo.getSenderName()));
mSenderUserIcon.setImageURI(UserIconUtils.getUserIcon(mIpPortInfo.getSenderIcon()));
mReceiverBottom.setVisibility(View.GONE);
@ -478,6 +476,15 @@ public class FileReceiverActivity extends BaseActivity implements FileReceiverAd
}
}
@Override
public void onClick(View v) {
switch (v.getId()) {
case R.id.actionbar_rl_back:
backHint();
break;
}
}
/**
* ServerSocket启动线程
*/
@ -485,7 +492,6 @@ public class FileReceiverActivity extends BaseActivity implements FileReceiverAd
ServerSocket serverSocket;
private int port;
public ServerRunnable(int port) {
this.port = port;
}