Merge branch 'master' of https://gitee.com/endian11/DriveJudge

yy1717

2020-04-16 1b7c87b81313bca47a6847f203be329a63decff3

 app/src/main/java/safeluck/drive/evaluation/fragment/HomeFragment.java

@@ -15,6 +15,7 @@
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.DialogFragment;


import com.anyun.exam.lib.AYSdk;
@@ -24,6 +25,7 @@
import safeluck.drive.evaluation.BuildConfig;
import safeluck.drive.evaluation.R;
import safeluck.drive.evaluation.bean.ExamPlatformData;
import safeluck.drive.evaluation.customview.LoadProgressDialog;


/**
@@ -82,6 +84,8 @@
                    }
                }



                break;
            case R.id.network_train:
                if (ExamPlatformData.getInstance().getTrainingMode()==ExamPlatformData.TRAINING_MODE){
@@ -106,28 +110,12 @@
                    public void onClick(DialogInterface dialog, int which) {
                        _mActivity.finish();
                    }
                }).setNegativeButton("取消", new DialogInterface.OnClickListener() {
                    @Override
                    public void onClick(DialogInterface dialog, int which) {
                }).setNegativeButton("取消", (DialogInterface dialog, int which)-> {
                        dialog.dismiss();
                    }
                }).show();
//                    TakePhotoFragment takePhotoFragment = findFragment(TakePhotoFragment.class);
//                    if (takePhotoFragment == null){
//                        takePhotoFragment = TakePhotoFragment.newInstance();
//                    }
//                    start(takePhotoFragment);

                break;
            case R.id.system_setting:
                //打开输入密码界面
//                PasswordFragment passwordFragment = findFragment(PasswordFragment.class);
//                if (passwordFragment == null) {
//                    passwordFragment = (PasswordFragment) PasswordFragment.newInstance();
//                    start(passwordFragment);
//                } else {
//                    start(passwordFragment);
//                }
                BaseSettingFragment sysSetingFragment = findFragment(BaseSettingFragment.class);
                if (sysSetingFragment == null) {
                    sysSetingFragment = (BaseSettingFragment) BaseSettingFragment.newInstance();