通知3.23

@@ -31,9 +31,7 @@
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
         android:usesCleartextTraffic="true">
-        <activity android:name=".ui.jxt.fragment.Dc.Dcxq_Activity"></activity>
         <activity android:name=".ui.jxt.fragment.Tz.Tjtz_Activity" />
-        <activity android:name=".ui.jxt.fragment.Tz.TjtzmbActivity" />
         <activity android:name=".ui.jxt.fragment.Tz.TzmbxqActivity" />
         <activity android:name=".ui.my.Select_StudentActivity" />
         <activity android:name=".ui.jxt.fragment.Tz.TjtzActivity" />

@@ -282,8 +282,6 @@ public final class CaptureActivity extends Activity implements
 
     }
 
-
-
     /**
      * 扫描成功，处理反馈信息
      *
@@ -306,7 +304,7 @@ public final class CaptureActivity extends Activity implements
     int currentIdSize = 0;
     private void getStatus(Intent intent,Result rawResult){
         ApiStore.createApi(ApiService.class)
-                .erweima(Config.Token, LoginActivity.ids.get(currentIdSize), rawResult.getText())
+                .erweima(Config.Token, Config.id, rawResult.getText())
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(new Observer<ErweimaEntity>() {
@@ -323,31 +321,40 @@ public final class CaptureActivity extends Activity implements
                             ErweimaEntity.DataBean.EvaluateBean evaluate = data.getEvaluate();
                             ErweimaEntity.DataBean.StudentBean studentBean = data.getStudent();
                             Log.d("TagA",evaluate.getStatus()+"");
-                            switch (evaluate.getStatus()) {
-                                case 1:
-                                    Log.d("TagA", LoginActivity.ids.get(currentIdSize) + "success");
-                                    intent.setClass(CaptureActivity.this, Jifen_Activity.class);//成功
-                                    intent.putExtra("score", evaluate.getScore());
-                                    intent.putExtra("status", evaluate.getStatus());
-                                    intent.putExtra("name", evaluate.getName());
-                                    intent.putExtra("qrcode", evaluate.getQrcode());
-                                    intent.putExtra("names", studentBean.getName());
-                                    intent.putExtra("base_name", evaluate.getBase_name());
-                                    startActivity(intent);
-                                    break;
-                            }
+                            Log.d("TagA", LoginActivity.ids.get(currentIdSize) + "success");
+                            intent.setClass(CaptureActivity.this, Jifen_Activity.class);//成功
+                            intent.putExtra("score", evaluate.getScore());
+                            intent.putExtra("status", evaluate.getStatus());
+                            intent.putExtra("name", evaluate.getName());
+                            intent.putExtra("qrcode", evaluate.getQrcode());
+                            intent.putExtra("names", studentBean.getName());
+                            intent.putExtra("base_name", evaluate.getBase_name());
+                            startActivity(intent);
+//                            switch (evaluate.getStatus()) {
+//                                case 1:
+//                                    intent.setClass(CaptureActivity.this, Jifen_Activity.class);//成功
+//                                    intent.putExtra("score", evaluate.getScore());
+//                                    intent.putExtra("status", evaluate.getStatus());
+//                                    intent.putExtra("name", evaluate.getName());
+//                                    intent.putExtra("qrcode", evaluate.getQrcode());
+//                                    intent.putExtra("names", studentBean.getName());
+//                                    intent.putExtra("base_name", evaluate.getBase_name());
+//                                    startActivity(intent);
+//                                    break;
+//                            }
+                        }
+                        else if (erweimaEntity.getData().getStudent().getId() == 1) {
+                            intent.setClass(CaptureActivity.this, jafsbActivity.class);//失败
+                            startActivity(intent);
+                        }else {
+                            Toast.makeText(CaptureActivity.this, ""+erweimaEntity.getMsg(), Toast.LENGTH_SHORT).show();
                         }
                         finish();
                     }
                     @Override
                     public void onError(Throwable e) {
-                        if (e.equals("1")){
-                            Toast.makeText(CaptureActivity.this, "非本班二维码", Toast.LENGTH_SHORT).show();
-                        }else{
-//                            Toast.makeText(CaptureActivity.this, "", Toast.LENGTH_SHORT).show();
-                            intent.setClass(CaptureActivity.this, jafsbActivity.class);//失败
-                            startActivity(intent);
-                        }
+                        intent.setClass(CaptureActivity.this, jafsbActivity.class);//失败
+                        startActivity(intent);
                     }
                     @Override
                     public void onComplete() {