改8.25号的bug

app/src/main/java/com/navinfo/outdoor/activity/LoginActivity.java

@@ -131,7 +131,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
                     return;
                 }
                 if (!cbStatement.isChecked()){
-                    Toast.makeText(this, "请先同意免责协议", Toast.LENGTH_SHORT).show();
+                    Toast.makeText(this, "请先同意免责声明", Toast.LENGTH_SHORT).show();
                     return;
                 }else {
                     initLogIn(name, paw);

app/src/main/java/com/navinfo/outdoor/fragment/GatheringFragment.java

@@ -104,7 +104,7 @@ public class GatheringFragment extends BaseFragment implements View.OnClickListe
         }
         if (Constant.ID_NUMBER!=null){
             etBankNum.setText(Constant.ID_NUMBER);
-            btnBank.setText("已绑定");
+            btnBank.setText("重新绑定");
         }
     }
 
@@ -244,17 +244,17 @@ public class GatheringFragment extends BaseFragment implements View.OnClickListe
             Constant.FILE_PATH = absolutePath;
             gatheringCamera.setTag(absolutePath);
             //银行卡识别
-            String bankCard = BankCard.bankCard();
-            if (bankCard!=null&&!bankCard.equals("")){
-                BankCardBean bankCardBean = new Gson().fromJson(bankCard, BankCardBean.class);
-                if (bankCardBean==null){
-                    Toast.makeText(getContext(), "请手动添加银行卡号", Toast.LENGTH_SHORT).show();
-                }else {
+            BankCardBean bankCardBean = new Gson().fromJson(BankCard.bankCard(), BankCardBean.class);
+            if (bankCardBean==null){
+                Toast.makeText(getContext(), "请手动添加银行卡号", Toast.LENGTH_SHORT).show();
+            }else {
+                if (bankCardBean.getResult().getBank_card_number()!=null){
                     String bank_card_number = bankCardBean.getResult().getBank_card_number();
                     etBankNum.setText(bank_card_number);
+                }else {
+                    Toast.makeText(getActivity(), "请拍银行卡照片", Toast.LENGTH_SHORT).show();
                 }
-            }else {
-                Toast.makeText(getContext(), "请手动添加银行卡号", Toast.LENGTH_SHORT).show();
+
             }
 
 

app/src/main/java/com/navinfo/outdoor/fragment/PoiVideoFragment.java

@@ -195,7 +195,7 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick
             @Override
             public boolean onLongClick(View v) {
                 DialogSettings.style = DialogSettings.STYLE.STYLE_KONGZUE;
-                MessageDialog.show((AppCompatActivity) Objects.requireNonNull(getContext()), "提示", "对否删除", "确定", "取消").setOkButton(new OnDialogButtonClickListener() {
+                MessageDialog.show((AppCompatActivity) Objects.requireNonNull(getContext()), "提示", "是否删除", "确定", "取消").setOkButton(new OnDialogButtonClickListener() {
                     @Override
                     public boolean onClick(BaseDialog baseDialog, View v) {
                         List<File> videoFileListByUUID = AWMp4ParserHelper.getInstance().getVideoFileListByUUID(showPoiEntity.getId());

app/src/main/java/com/navinfo/outdoor/fragment/UserAttestationFragment.java

@@ -144,6 +144,7 @@ public class UserAttestationFragment extends BaseFragment implements View.OnClic
             etAttestationName.setEnabled(false);
             etNamePhone.setEnabled(false);
             btnAttestation.setEnabled(false);
+            useCamera.setEnabled(false);
         }
 
 
@@ -349,19 +350,23 @@ public class UserAttestationFragment extends BaseFragment implements View.OnClic
             String absolutePath = file.getAbsolutePath();
             Constant.FILE_PATH = absolutePath;
             useCamera.setTag(absolutePath);
+
             //身份证识别
-            String icarus = IdCard.icarus();
-            if (icarus!=null&&!icarus.equals("")){
-                IdCardNumberBean idCardNumberBean = new Gson().fromJson(icarus, IdCardNumberBean.class);
+            String idcard = IdCard.icarus();
+            if (idcard!=null){
+                IdCardNumberBean idCardNumberBean = new Gson().fromJson(idcard, IdCardNumberBean.class);
                 if (idCardNumberBean ==null){
                     Toast.makeText(getActivity(), "请手动添加身份证号", Toast.LENGTH_SHORT).show();
                 }else {
-                    String words = idCardNumberBean.getWords_result().get公民身份号码().getWords();
-                    etNamePhone.setText(words);
+                    if (idCardNumberBean.getWords_result().get公民身份号码()!=null){
+                        String words = idCardNumberBean.getWords_result().get公民身份号码().getWords();
+                        etNamePhone.setText(words);
+                    }else {
+                        Toast.makeText(getActivity(), "请拍身份证照片", Toast.LENGTH_SHORT).show();
+                    }
                 }
             }else {
                 Toast.makeText(getActivity(), "请手动添加身份证号", Toast.LENGTH_SHORT).show();
-
             }
 
         }