ホーム エスクプローラ ヘルプ
登録 サインイン
chengzhenyu
/
lensman
Watch 1
Star 0
Fork 0

ソースを参照
arch. change

chengzhenyu 9 年 前
親
eaae20f9c3
コミット
902887b8b5
共有8 個のファイルを変更した、15 個の追加 と 15 個の削除を含む
差分情報を表示
  1. 1 1
      app/src/main/AndroidManifest.xml
  2. 2 2
      app/src/main/java/ai/pai/lensman/login/LoginActivity.java
  3. 1 1
      app/src/main/java/ai/pai/lensman/session/SessionInteractor.java
  4. 2 2
      app/src/main/java/ai/pai/lensman/splash/SplashActivity.java
  5. 3 3
      app/src/main/java/ai/pai/lensman/upload/UploadActivity.java
  6. 1 1
      app/src/main/java/ai/pai/lensman/upload/UploadContract.java
  7. 4 4
      app/src/main/java/ai/pai/lensman/upload/UploadPresenter.java
  8. 1 1
      app/src/main/java/ai/pai/lensman/box/BoxUrlContainer.java

+ 1 - 1
app/src/main/AndroidManifest.xml
ファイルの表示 

@@ -47,7 +47,7 @@
47 47 
         </activity>
48 48
49 49 
         <activity
50 
-            android:name=".upload.UploadActivity"
50 
+            android:name=".upload.MainActivity"
51 51 
             android:configChanges="keyboardHidden|orientation|screenSize"
52 52 
             android:label="@string/app_name"
53 53 
             android:screenOrientation="portrait">

+ 2 - 2
app/src/main/java/ai/pai/lensman/login/LoginActivity.java
ファイルの表示 

@@ -10,7 +10,7 @@ import android.widget.Toast;
10 10 
 import com.android.views.progressbar.ProgressWheel;
11 11
12 12 
 import ai.pai.lensman.R;
13 
-import ai.pai.lensman.upload.UploadActivity;
13 
+import ai.pai.lensman.upload.MainActivity;
14 14 
 import butterknife.BindView;
15 15 
 import butterknife.ButterKnife;
16 16 
 import butterknife.OnClick;
 
@@ -63,7 +63,7 @@ public class LoginActivity extends FragmentActivity implements LoginContract.Vie
63 63
64 64 
     @Override
65 65 
     public void jumpMain() {
66 
-        startActivity(new Intent(this, UploadActivity.class));
66 
+        startActivity(new Intent(this, MainActivity.class));
67 67 
         finish();
68 68 
     }
69 69

+ 1 - 1
app/src/main/java/ai/pai/lensman/session/SessionInteractor.java
ファイルの表示 

@@ -22,7 +22,7 @@ import java.util.TimerTask;
22 22 
 import ai.pai.lensman.BuildConfig;
23 23 
 import ai.pai.lensman.bean.PhotoBean;
24 24 
 import ai.pai.lensman.bean.SessionBean;
25 
-import ai.pai.lensman.box.BoxUrlContainer;
25 
+import ai.pai.lensman.utils.BoxUrlContainer;
26 26 
 import ai.pai.lensman.utils.Constants;
27 27 
 import ai.pai.lensman.utils.HttpPostTask;
28 28

+ 2 - 2
app/src/main/java/ai/pai/lensman/splash/SplashActivity.java
ファイルの表示 

@@ -6,7 +6,7 @@ import android.support.v4.app.FragmentActivity;
6 6
7 7 
 import ai.pai.lensman.R;
8 8 
 import ai.pai.lensman.login.LoginActivity;
9 
-import ai.pai.lensman.upload.UploadActivity;
9 
+import ai.pai.lensman.upload.MainActivity;
10 10
11 11 
 public class SplashActivity extends FragmentActivity implements SplashContract.View {
12 12 
 
@@ -35,7 +35,7 @@ public class SplashActivity extends FragmentActivity implements SplashContract.V
35 35
36 36 
     @Override
37 37 
     public void jump2Main() {
38 
-        Intent intent = new Intent(SplashActivity.this, UploadActivity.class);
38 
+        Intent intent = new Intent(SplashActivity.this, MainActivity.class);
39 39 
         startActivity(intent);
40 40 
         finish();
41 41 
     }

+ 3 - 3
app/src/main/java/ai/pai/lensman/upload/UploadActivity.java
ファイルの表示 

@@ -22,7 +22,7 @@ import butterknife.BindView;
22 22 
 import butterknife.ButterKnife;
23 23 
 import butterknife.OnClick;
24 24
25 
-public class UploadActivity extends BaseActivity implements UploadContract.View {
25 
+public class MainActivity extends BaseActivity implements MainContract.View {
26 26
27 27 
     @BindView(R.id.tv_box_status) TextView boxStatusTextView;
28 28 
     @BindView(R.id.iv_box_status) ImageView boxStatusImageView;
 
@@ -30,7 +30,7 @@ public class UploadActivity extends BaseActivity implements UploadContract.View
30 30 
     @BindView(R.id.iv_add_session) ImageView addSessionBtn;
31 31 
     @BindView(R.id.recycler_view_sessions) RecyclerView sessionsRecyclerView;
32 32 
     private SessionRecyclerAdapter adapter;
33 
-    private UploadContract.Presenter presenter;
33 
+    private MainContract.Presenter presenter;
34 34 
     private long exitTime;
35 35
36 36 
     @Override
 
@@ -39,7 +39,7 @@ public class UploadActivity extends BaseActivity implements UploadContract.View
39 39 
         setContentView(R.layout.activity_upload);
40 40 
         unbinder = ButterKnife.bind(this);
41 41
42 
-        presenter = new UploadPresenter(this);
42 
+        presenter = new MainPresenter(this);
43 43 
         adapter = new SessionRecyclerAdapter(this);
44 44 
         RecyclerView.LayoutManager layoutManager = new GridLayoutManager(this,2,LinearLayoutManager.VERTICAL,false);
45 45 
         sessionsRecyclerView.setLayoutManager(layoutManager);

+ 1 - 1
app/src/main/java/ai/pai/lensman/upload/UploadContract.java
ファイルの表示 

@@ -6,7 +6,7 @@ import ai.pai.lensman.base.BasePresenter;
6 6 
 import ai.pai.lensman.base.BaseView;
7 7 
 import ai.pai.lensman.bean.SessionBean;
8 8
9 
-public class UploadContract {
9 
+public class MainContract {
10 10
11 11 
     interface View extends BaseView {
12 12

+ 4 - 4
app/src/main/java/ai/pai/lensman/upload/UploadPresenter.java
ファイルの表示 

@@ -20,9 +20,9 @@ import ai.pai.lensman.db.DBService;
20 20 
 import ai.pai.lensman.db.Preferences;
21 21 
 import ai.pai.lensman.service.UploadService;
22 22
23 
-public class UploadPresenter implements UploadContract.Presenter,BaseInteractor.InteractorListener<ArrayList<String>>,UploadService.PhotoUploadListener {
23 
+public class MainPresenter implements MainContract.Presenter,BaseInteractor.InteractorListener<ArrayList<String>>,UploadService.PhotoUploadListener {
24 24
25 
-    private UploadContract.View uploadView;
25 
+    private MainContract.View uploadView;
26 26 
     private ArrayList<SessionBean> sessionList;
27 27 
     private String lensmanId;
28 28 
     private int sessionSeq;
 
@@ -30,7 +30,7 @@ public class UploadPresenter implements UploadContract.Presenter,BaseInteractor.
30 30 
     private FetchSessionIdsInteractor interactor;
31 31 
     private ServiceConnection serviceConnection;
32 32
33 
-    public UploadPresenter(UploadContract.View view){
33 
+    public MainPresenter(MainContract.View view){
34 34 
         this.uploadView = view;
35 35 
         this.lensmanId = Preferences.getInstance().getLensManId();
36 36 
         sessionIds = new ArrayList<>();
 
@@ -38,7 +38,7 @@ public class UploadPresenter implements UploadContract.Presenter,BaseInteractor.
38 38 
         serviceConnection = new ServiceConnection() {
39 39 
             @Override
40 40 
             public void onServiceConnected(ComponentName componentName, IBinder iBinder) {
41 
-                ((UploadService.MyBinder) iBinder).getService().setPhotoUploadListener(UploadPresenter.this);
41 
+                ((UploadService.MyBinder) iBinder).getService().setPhotoUploadListener(MainPresenter.this);
42 42 
             }
43 43
44 44 
             @Override

+ 1 - 1
app/src/main/java/ai/pai/lensman/box/BoxUrlContainer.java
ファイルの表示 

@@ -1,4 +1,4 @@
1 
-package ai.pai.lensman.box;
1 
+package ai.pai.lensman.utils;
2 2
3 3 
 public final class BoxUrlContainer {
4 4