main UI
chengzhenyu
共有 4 个文件被更改，包括 24 次插入 和 1 次删除
+ 7
- 0
app/src/main/java/ai/pai/lensman/main/MainActivity.java
@@ -5,6 +5,7 @@ import android.os.Bundle; |
||
| 5 | 5 |
import android.support.v7.widget.GridLayoutManager; |
| 6 | 6 |
import android.support.v7.widget.LinearLayoutManager; |
| 7 | 7 |
import android.support.v7.widget.RecyclerView; |
| 8 |
+import android.view.View; |
|
| 8 | 9 |
import android.widget.ImageView; |
| 9 | 10 |
import android.widget.TextView; |
| 10 | 11 |
import android.widget.Toast; |
@@ -28,6 +29,7 @@ public class MainActivity extends BaseActivity implements MainContract.View {
|
||
| 28 | 29 |
@BindView(R.id.iv_box_status) ImageView boxStatusImageView; |
| 29 | 30 |
@BindView(R.id.icon_no_data) android.view.View noDataLayout; |
| 30 | 31 |
@BindView(R.id.iv_add_session) ImageView addSessionBtn; |
| 32 |
+ @BindView(R.id.container_view) View containerView; |
|
| 31 | 33 |
@BindView(R.id.recycler_view_sessions) RecyclerView sessionsRecyclerView; |
| 32 | 34 |
private SessionRecyclerAdapter adapter; |
| 33 | 35 |
private MainContract.Presenter presenter; |
@@ -74,6 +76,11 @@ public class MainActivity extends BaseActivity implements MainContract.View {
|
||
| 74 | 76 |
} |
| 75 | 77 |
|
| 76 | 78 |
@Override |
| 79 |
+ public void showOrderSnackBar() {
|
|
| 80 |
+ |
|
| 81 |
+ } |
|
| 82 |
+ |
|
| 83 |
+ @Override |
|
| 77 | 84 |
public void showBoxDisconnectedView() {
|
| 78 | 85 |
boxStatusTextView.setText(R.string.bt_disconnected); |
| 79 | 86 |
boxStatusImageView.setImageResource(R.drawable.wifi_disconnect); |
+ 1
- 0
app/src/main/java/ai/pai/lensman/main/MainContract.java
@@ -10,6 +10,7 @@ public class MainContract {
|
||
| 10 | 10 |
|
| 11 | 11 |
interface View extends BaseView {
|
| 12 | 12 |
|
| 13 |
+ void showOrderSnackBar(); |
|
| 13 | 14 |
void showBoxDisconnectedView(); |
| 14 | 15 |
void showBoxConnectedView(); |
| 15 | 16 |
void showEmptyView(); |
+ 15
- 1
app/src/main/java/ai/pai/lensman/main/MainPresenter.java
@@ -7,6 +7,7 @@ import android.content.ServiceConnection; |
||
| 7 | 7 |
import android.os.IBinder; |
| 8 | 8 |
|
| 9 | 9 |
import com.android.common.utils.LogHelper; |
| 10 |
+import com.android.common.utils.NetworkUtil; |
|
| 10 | 11 |
|
| 11 | 12 |
import java.text.SimpleDateFormat; |
| 12 | 13 |
import java.util.ArrayList; |
@@ -51,6 +52,12 @@ public class MainPresenter implements MainContract.Presenter,BaseInteractor.Inte |
||
| 51 | 52 |
|
| 52 | 53 |
@Override |
| 53 | 54 |
public void start() {
|
| 55 |
+ if(NetworkUtil.isWifiConnected(App.getAppContext())){
|
|
| 56 |
+ uploadView.showBoxConnectedView(); |
|
| 57 |
+ }else{
|
|
| 58 |
+ uploadView.showBoxDisconnectedView(); |
|
| 59 |
+ } |
|
| 60 |
+ |
|
| 54 | 61 |
if(sessionIds==null|| sessionIds.size()<20){
|
| 55 | 62 |
interactor.startJob(); |
| 56 | 63 |
} |
@@ -70,6 +77,7 @@ public class MainPresenter implements MainContract.Presenter,BaseInteractor.Inte |
||
| 70 | 77 |
|
| 71 | 78 |
App.getAppContext().startService(new Intent(App.getAppContext(), UploadService.class)); |
| 72 | 79 |
App.getAppContext().bindService(new Intent(App.getAppContext(),UploadService.class),serviceConnection, Context.BIND_AUTO_CREATE); |
| 80 |
+ uploadView.showOrderSnackBar(); |
|
| 73 | 81 |
} |
| 74 | 82 |
|
| 75 | 83 |
@Override |
@@ -100,11 +108,17 @@ public class MainPresenter implements MainContract.Presenter,BaseInteractor.Inte |
||
| 100 | 108 |
public void onInteractSuccess(ArrayList<String> sessionIds) {
|
| 101 | 109 |
this.sessionIds.addAll(sessionIds); |
| 102 | 110 |
uploadView.setNewSessionBtnEnabled(true); |
| 111 |
+ uploadView.showBoxConnectedView(); |
|
| 103 | 112 |
} |
| 104 | 113 |
|
| 105 | 114 |
@Override |
| 106 | 115 |
public void onInteractFail(String errorMsg) {
|
| 107 |
- interactor.startJob(); |
|
| 116 |
+ if(NetworkUtil.isWifiConnected(App.getAppContext())){
|
|
| 117 |
+ interactor.startJob(); |
|
| 118 |
+ }else{
|
|
| 119 |
+ uploadView.showBoxDisconnectedView(); |
|
| 120 |
+ } |
|
| 121 |
+ |
|
| 108 | 122 |
} |
| 109 | 123 |
|
| 110 | 124 |
|
+ 1
- 0
app/src/main/res/layout/activity_upload.xml
@@ -1,5 +1,6 @@ |
||
| 1 | 1 |
<?xml version="1.0" encoding="utf-8"?> |
| 2 | 2 |
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" |
| 3 |
+ android:id="@+id/container_view" |
|
| 3 | 4 |
android:layout_width="match_parent" |
| 4 | 5 |
android:layout_height="match_parent" |
| 5 | 6 |
android:background="@color/background_white"> |