Huis Verkennen Help
Registreer Inloggen
chengzhenyu
/
lensman
Volgen 1
Ster 0
Vork 0

Bladeren bron
qr scan activity

chengzhenyu 8 jaren geleden
bovenliggende
5321829723
commit
4829a0ebbf
2 gewijzigde bestanden met toevoegingen van 22 en 4 verwijderingen
Toon Diff Stats
  1. 5 2
      app/src/main/AndroidManifest.xml
  2. 17 2
      app/src/main/java/ai/pai/lensman/session/SessionActivity.java

+ 5 - 2
app/src/main/AndroidManifest.xml
Bestand weergeven 

@@ -9,6 +9,11 @@
9 9 
     <uses-permission android:name="android.permission.BLUETOOTH" />
10 10 
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
11 11 
     <uses-permission android:name="android.permission.BLUETOOTH_PRIVILEGED" />
12 
+    <uses-permission android:name="android.permission.CAMERA" />
13 
+    <uses-permission android:name="android.permission.FLASHLIGHT" />
14 
+
15 
+    <uses-feature android:name="android.hardware.camera" />
16 
+    <uses-feature android:name="android.hardware.camera.autofocus" />
12 17
13 18 
     <application
14 19 
         android:allowBackup="true"
 
@@ -33,14 +38,12 @@
33 38 
             android:name=".session.SessionActivity"
34 39 
             android:configChanges="keyboardHidden|orientation|screenSize"
35 40 
             android:label="@string/app_name">
36 
-
37 41 
         </activity>
38 42
39 43 
         <activity
40 44 
             android:name=".qrcode.QRCaptureActivity"
41 45 
             android:configChanges="keyboardHidden|orientation|screenSize"
42 46 
             android:label="@string/app_name">
43 
-
44 47 
         </activity>
45 48
46 49 
     </application>

+ 17 - 2
app/src/main/java/ai/pai/lensman/session/SessionActivity.java
Bestand weergeven 

@@ -1,5 +1,7 @@
1 1 
 package ai.pai.lensman.session;
2 2
3 
+import android.app.Activity;
4 
+import android.content.Intent;
3 5 
 import android.os.Bundle;
4 6 
 import android.support.v7.app.AppCompatActivity;
5 7 
 import android.support.v7.widget.LinearLayoutManager;
 
@@ -8,6 +10,7 @@ import android.view.View;
8 10 
 import android.widget.TextView;
9 11
10 12 
 import ai.pai.lensman.R;
13 
+import ai.pai.lensman.qrcode.QRCaptureActivity;
11 14 
 import ai.pai.lensman.upload.SessionBean;
12 15 
 import butterknife.BindView;
13 16 
 import butterknife.ButterKnife;
 
@@ -22,6 +25,8 @@ public class SessionActivity extends AppCompatActivity implements SessionContrac
22 25
23 26 
     private SessionContract.SessionPresenter presenter;
24 27
28 
+    private static final int JOIN_REQUEST_CODE = 3002;
29 
+
25 30 
     @Override
26 31 
     protected void onCreate(Bundle savedInstanceState) {
27 32 
         super.onCreate(savedInstanceState);
 
@@ -51,7 +56,8 @@ public class SessionActivity extends AppCompatActivity implements SessionContrac
51 56
52 57 
     @OnClick(R.id.iv_scan)
53 58 
     void scanToFetchSessionQR(){
54 
-
59 
+        Intent intent = new Intent(SessionActivity.this, QRCaptureActivity.class);
60 
+        startActivityForResult(intent, JOIN_REQUEST_CODE);
55 61 
     }
56 62
57 63 
     @OnClick(R.id.iv_qrcode)
 
@@ -66,7 +72,7 @@ public class SessionActivity extends AppCompatActivity implements SessionContrac
66 72
67 73 
     @OnClick(R.id.btn_session_complete)
68 74 
     void onSessionComplete(){
69 
-
75 
+        finish();
70 76 
     }
71 77
72 78 
     @Override
 
@@ -101,6 +107,15 @@ public class SessionActivity extends AppCompatActivity implements SessionContrac
101 107 
                 noPhotoLayout.setVisibility(View.VISIBLE);
102 108 
             }
103 109 
         });
110 
+    }
104 111
112 
+    @Override
113 
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
114 
+        super.onActivityResult(requestCode,resultCode,data);
115 
+        if (resultCode == Activity.RESULT_OK) {
116 
+            if (data == null || data.getStringExtra("info") == null) {
117 
+                return;
118 
+            }
119 
+        }
105 120 
     }
106 121 
 }