Merge branch 'master' of http://192.168.40.220/dmc/jz_app into master

app/src/main/java/com/huntersun/vkyes/etcopencard/project/api/bean/IFCode.java

@@ -168,9 +168,11 @@ public class IFCode {
     public static final String IFCODE33 = "33"; //单位信息变更
     public static final String IFCODE34 = "34";   //车辆信息变更
 
-    public static final String IFCODE914 = "914";   //订单产品选择
+    public static final String IFCODE914 = "914";   //下单-订单产品选择
 
     public static final String IFCODE_TRANSFER_APPLY = "47631d58945642afa053e07c306e99e6"; //过户接口
     public static final String IFCODE_TRANSFER_CHECK = "54dafed574f5475ea88b50eed9c58486"; //过户检测接口
     public static final String IFCODE_TRANSFER_CONFIRM = "b1e66d22fb6f400f915458f5c50c7118"; //操作接口
+
+    public static final String IFCODE_ACTIVE_OBUIMG = "4a95e1d90e824ee8a50aa9826617e736";   //设备激活照片上传
 }

app/src/main/java/com/huntersun/vkyes/etcopencard/project/bluetooth/BluetoothDialog.java

@@ -28,6 +28,7 @@ import com.huntersun.vkyes.etcopencard.src.action.ToastAction;
 import com.huntersun.vkyes.etcopencard.src.aop.SingleClick;
 import com.huntersun.vkyes.etcopencard.src.ui.dialog.CommonDialog;
 import com.huntersun.vkyes.etcopencard.src.ui.dialog.WaitDialog;
+import com.jeremyliao.liveeventbus.LiveEventBus;
 import com.obu.util.BluetoothHelper;
 import com.sdjictec.jtobu_lib.JtObu;
 
@@ -332,10 +333,12 @@ public class BluetoothDialog {
                         }
                         break;
                     case BluetoothDevice.ACTION_ACL_CONNECTED://扫描结束
+                        LiveEventBus.get("bluetoothConnectStatus").post(true);
                         Log.e("BroadcastReceiver", device.getName() + " 操作 ACL 已连接");
                         unReceiver();
                         break;
                     case BluetoothDevice.ACTION_ACL_DISCONNECTED://扫描结束
+                        LiveEventBus.get("bluetoothConnectStatus").post(false);
                         Log.e("BroadcastReceiver", device.getName() + " 操作 ACL 已断开连接");
                         unReceiver();
                         break;

app/src/main/java/com/huntersun/vkyes/etcopencard/project/bluetooth/BluetoothReadUtils.java

@@ -24,6 +24,8 @@ import java.nio.charset.Charset;
 import java.util.HashMap;
 import java.util.Map;
 
+import retrofit2.Response;
+
 /**
  * Date ：2023-03-27
  * Description：卡签信息读取工具类
@@ -38,6 +40,7 @@ public class BluetoothReadUtils {
         activity.bluetoothLink(new AppActivity.Currency() {
             @Override
             public void success() {
+                activity.showDialog("卡签信息读取中...");
                 CardObuIfoBean cardObuIfoBean = new CardObuIfoBean();
                 CardInfoBean card = BoxManagers.mCardInfoBean;
                 cardObuIfoBean.cardId = card.getCard_No();
@@ -67,6 +70,7 @@ public class BluetoothReadUtils {
                 new MyRetrofit().getRetrofit().create(Api.class).message2(parameters).enqueue(new Converter<Result>(true) {
                     @Override
                     protected void onSuccess(ResultBean resultBean, ResultBean.BizContent bizContent1) {
+                        activity.hideDialog();
                         ResultBean.ProductInfo decVehInfo = Gson().fromJson(String.valueOf(resultBean.getBizContent()), ResultBean.ProductInfo.class);
                         ResultBean.BizContent data = Gson().fromJson(Gson().toJson(decVehInfo.data), ResultBean.BizContent.class);
                         ResultBean.BizContent bizContent = DecVehInfo(data.getFileData());
@@ -87,7 +91,7 @@ public class BluetoothReadUtils {
 
                         //判断卡和obu是否是配套的
                         if (!cardObuIfoBean.cardPlateId.equals(cardObuIfoBean.obuPlateId)){
-                            String errorMsg = "卡中读出的车牌编号和obu中车牌编号不一致，请更换匹配的卡或者obu设备";
+                            String errorMsg = "卡中读出的车牌编号和obu中车牌编号不一致，请更换成匹配的卡或者obu设备";
                             if (callback != null){
                                 callback.readResultFail(errorMsg);
                             }
@@ -100,11 +104,18 @@ public class BluetoothReadUtils {
                             callback.readResultSuccess(cardObuIfoBean);
                         }
                     }
+
+                    @Override
+                    public void onError(String err, Response<Result> resp) {
+                        super.onError(err, resp);
+                        activity.hideDialog();
+                    }
                 });
             }
 
             @Override
             public void close() {
+                activity.hideDialog();
                 //activity.toast("蓝牙已关闭");
             }
         });

app/src/main/java/com/huntersun/vkyes/etcopencard/project/bluetooth/BluetoothReceiver.java

@@ -8,8 +8,6 @@ import android.content.Context;
 import android.content.Intent;
 import android.util.Log;
 
-import com.jeremyliao.liveeventbus.LiveEventBus;
-
 import java.util.ArrayList;
 import java.util.List;
 
@@ -36,20 +34,18 @@ public class BluetoothReceiver extends BroadcastReceiver {
                         break;
                     case BluetoothDevice.BOND_BONDED:
                         Log.d("BlueToothTestActivity", "完成配对");
-                        LiveEventBus.get("bluetoothConnectStatus").post(true);
                         break;
                     case BluetoothDevice.BOND_NONE:
                         Log.d("BlueToothTestActivity", "取消配对");
-                        LiveEventBus.get("bluetoothConnectStatus").post(false);
                     default:
                         break;
                 }
                 break;
             case BluetoothDevice.ACTION_ACL_CONNECTED://扫描结束
-                Log.d("BroadcastReceiver", device.getName() + " 操作 ACL 已连接");
+                Log.d("BroadcastReceiver>>>", device.getName() + " 操作 ACL 已连接");
                 break;
             case BluetoothDevice.ACTION_ACL_DISCONNECTED://扫描结束
-                Log.d("BroadcastReceiver", device.getName() + " 操作 ACL 已断开连接");
+                Log.d("BroadcastReceiver>>>", device.getName() + " 操作 ACL 已断开连接");
                 break;
             case BluetoothAdapter.ACTION_DISCOVERY_STARTED://开始扫描
                 Log.e("log", "打印标题:" + "开始扫描...");

app/src/main/java/com/huntersun/vkyes/etcopencard/project/ui/activity/DefrayActivity.java

@@ -40,7 +40,7 @@ import retrofit2.Response;
  *
  * @author admin
  */
-public class DefrayActivity extends AppActivity implements StatusAction {
+public class DefrayActivity extends AppActivity  {//implements StatusAction
 
     private ActivityDefrayBinding binding;
 
@@ -68,15 +68,17 @@ public class DefrayActivity extends AppActivity implements StatusAction {
         fatherBean.bizContent.setPayConfigId(Constants.PAY_CONFIG_ID); //支付配置编号
         // 15885137270
         Log.e("okhttp", "打印标题:" + new Gson().toJson(fatherBean));
-        showLoading();
+
         //提交车辆信息
+        //showLoading();
+        showDialog("请稍后...");
         RequestParameters parameters1 = new RequestParameters(IFCode.IFCODE56, new Gson().toJson(fatherBean.bizContent));
         new MyRetrofit().getRetrofit().create(Api.class).message2(parameters1).enqueue(new Converter<Result>(this) {
             @SuppressLint("SetTextI18n")
             @Override
             protected void onSuccess(ResultBean resultBean, ResultBean.BizContent bizContent1) {
                 hideDialog();
-                showComplete();
+                //showComplete();
                 //二维码生成
                 Bitmap bitmap = QRCode.createQRCodeBitmap(bizContent1.getCodeUrl(), 800, 800,
                         "UTF-8", "H", "1", Color.BLACK, Color.WHITE);
@@ -92,7 +94,8 @@ public class DefrayActivity extends AppActivity implements StatusAction {
             @Override
             public void onError(String err, Response<Result> resp) {
                 super.onError(err, resp);
-                showError(layout -> initData());
+                //showError(layout -> initData());
+                hideDialog();
             }
         });
     }
@@ -157,8 +160,8 @@ public class DefrayActivity extends AppActivity implements StatusAction {
         });
     }
 
-    @Override
+    /*@Override
     public StatusLayout getStatusLayout() {
         return binding.hlStatusHint;
-    }
+    }*/
 }

app/src/main/java/com/huntersun/vkyes/etcopencard/project/ui/activity/obu/ObuActivationBLESearchActivity.java

@@ -3,6 +3,7 @@ package com.huntersun.vkyes.etcopencard.project.ui.activity.obu;
 import android.os.Bundle;
 import android.view.View;
 
+import com.blankj.utilcode.util.LogUtils;
 import com.huntersun.vky.obublelib.box.BoxManagers;
 import com.huntersun.vkyes.etcopencard.R;
 import com.huntersun.vkyes.etcopencard.databinding.ActivityObuActivationBlesearchBinding;
@@ -10,7 +11,9 @@ import com.huntersun.vkyes.etcopencard.project.bluetooth.BluetoothReadUtils;
 import com.huntersun.vkyes.etcopencard.project.copapply.ObuActivateRequester;
 import com.huntersun.vkyes.etcopencard.project.copapply.ObuActivation;
 import com.huntersun.vkyes.etcopencard.project.dialog.ConfirmDialog;
+import com.huntersun.vkyes.etcopencard.project.tool.Utils;
 import com.huntersun.vkyes.etcopencard.project.ui.activity.after.PetCardToAccountCardStep4Activity;
+import com.huntersun.vkyes.etcopencard.project.utils.FunHelper;
 import com.huntersun.vkyes.etcopencard.src.app.AppActivity;
 import com.jeremyliao.liveeventbus.LiveEventBus;
 
@@ -26,6 +29,8 @@ public class ObuActivationBLESearchActivity extends AppActivity {
 
     private String vehicleId; //车牌编号
     private String orderId; //订单ID
+    private String cardId; //卡ID
+    private String obuId;  //obuId
 
     //蓝牙链接状态
     private boolean isConnect;
@@ -43,6 +48,8 @@ public class ObuActivationBLESearchActivity extends AppActivity {
 
         vehicleId = getIntent().getStringExtra("vehicleId");
         orderId = getIntent().getStringExtra("orderId");
+        cardId = getIntent().getStringExtra("cardId");
+        obuId = getIntent().getStringExtra("obuId");
 
         LiveEventBus.get("closeActiveSearchBluetooth", Boolean.class) .observe(this, s -> {
             finish();
@@ -68,21 +75,22 @@ public class ObuActivationBLESearchActivity extends AppActivity {
             new ObuActivateRequester().start(bizContent, getContext(), new ObuActivateRequester.ActivateResultCallBack() {
                 @Override
                 public void onSuccess() {
-                    gotoNext(true);
+                    gotoNext(true,"您的ETC已激活");
                 }
 
                 @Override
                 public void onException(String msg) {
-                    gotoNext(false);
+                    gotoNext(false,msg);
                 }
             });
         });
     }
 
-    private void gotoNext(boolean isSuccess){
+    private void gotoNext(boolean isSuccess,String content){
         Bundle bundle = new Bundle();
         bundle.putBoolean("isSuccess",isSuccess);
-        jumpToPage(ObuActivationSuccessOrFailActivity.class);
+        bundle.putString("content",content);
+        jumpToPage(ObuActivationSuccessOrFailActivity.class,bundle);
     }
 
     @Override
@@ -91,6 +99,18 @@ public class ObuActivationBLESearchActivity extends AppActivity {
             BluetoothReadUtils.readCardAndObuInfo(this, new BluetoothReadUtils.INReadResultCallback() {
                 @Override
                 public void readResultSuccess(BluetoothReadUtils.CardObuIfoBean cardObuIfoBean) {//读取成功
+                    if (!FunHelper.isEmpty(cardId) && !cardObuIfoBean.cardId.equals(cardId)){
+                        new Utils().showMessDialog(ObuActivationBLESearchActivity.this,
+                                "当前连接的卡和订单绑定的卡不一致，请更换成该订单绑定的卡", dialog -> { });
+                        return;
+                    }
+
+                    if (!FunHelper.isEmpty(obuId) && !cardObuIfoBean.obuId.equals(obuId)){
+                        new Utils().showMessDialog(ObuActivationBLESearchActivity.this,
+                                "当前连接的OBU设备和订单绑定的OBU设备不一致，请更换成该订单绑定的OBU设备", dialog -> { });
+                        return;
+                    }
+
                     if (isConnect){
                         toActive();
                     }else{

app/src/main/java/com/huntersun/vkyes/etcopencard/project/ui/activity/obu/ObuActivationHintActivity.java

@@ -21,6 +21,8 @@ public class ObuActivationHintActivity extends AppActivity {
 
     private String orderId;
     private String curVehicleId;
+    private String cardId;
+    private String obuId;
 
     @Override
     protected View getLayoutView() {
@@ -35,6 +37,8 @@ public class ObuActivationHintActivity extends AppActivity {
 
         curVehicleId = getIntent().getStringExtra("vehicleId");
         orderId = getIntent().getStringExtra("orderId");
+        cardId = getIntent().getStringExtra("cardId");
+        obuId = getIntent().getStringExtra("obuId");
     }
 
     @Override
@@ -48,6 +52,8 @@ public class ObuActivationHintActivity extends AppActivity {
             Bundle bundle = new Bundle();
             bundle.putString("vehicleId",curVehicleId);
             bundle.putString("orderId",orderId);
+            bundle.putString("obuId",obuId);
+            bundle.putString("cardId",cardId);
             jumpToPage(ObuActivationUploadActivity.class,bundle);
             finish();
         }

app/src/main/java/com/huntersun/vkyes/etcopencard/project/ui/activity/obu/ObuActivationHintCheckOrderActivity.java

@@ -32,7 +32,7 @@ public class ObuActivationHintCheckOrderActivity extends AppActivity {
     protected void initView() {
         binding.LLSearchResult.setVisibility(View.GONE);
         binding.LLBottom.setVisibility(View.GONE);
-        SearchCarInfoUtils utils = new SearchCarInfoUtils(this, new SearchCarInfoUtils.OnSearchResultClick() {
+        new SearchCarInfoUtils(this, new SearchCarInfoUtils.OnSearchResultClick() {
             @Override
             public void onSearchResultSuccess(ResultBean.BizContent bizContent) {
                 curBizContent = bizContent;
@@ -50,7 +50,6 @@ public class ObuActivationHintCheckOrderActivity extends AppActivity {
                 curVehicleId = vehicleId;
             }
         });
-        utils.setParams("10");
 
         binding.btnNext.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -58,8 +57,11 @@ public class ObuActivationHintCheckOrderActivity extends AppActivity {
             public void onClick(View view) {
                 Bundle bundle = new Bundle();
                 bundle.putString("orderId", curBizContent.getOrderId());
+                bundle.putString("cardId", curBizContent.getCardId());
+                bundle.putString("obuId", curBizContent.getObuId());
                 bundle.putString("vehicleId", curVehicleId);
                 jumpToPage(ObuActivationHintActivity.class, bundle);
+                finish();
             }
         });
     }

app/src/main/java/com/huntersun/vkyes/etcopencard/project/ui/activity/obu/ObuActivationSuccessOrFailActivity.java

@@ -4,6 +4,7 @@ import android.view.View;
 
 import com.huntersun.vkyes.etcopencard.R;
 import com.huntersun.vkyes.etcopencard.databinding.ActivityObuActivationSuccessOrFailBinding;
+import com.huntersun.vkyes.etcopencard.project.utils.FunHelper;
 import com.huntersun.vkyes.etcopencard.src.app.AppActivity;
 import com.jeremyliao.liveeventbus.LiveEventBus;
 
@@ -18,6 +19,7 @@ import com.jeremyliao.liveeventbus.LiveEventBus;
 public class ObuActivationSuccessOrFailActivity extends AppActivity {
     private ActivityObuActivationSuccessOrFailBinding binding;
     private boolean isSuccess; //是否成功
+    private String content; //提示信息
 
     @Override
     protected View getLayoutView() {
@@ -29,18 +31,19 @@ public class ObuActivationSuccessOrFailActivity extends AppActivity {
     protected void initView() {
         setTitle("激活设备");
         isSuccess = getIntent().getBooleanExtra("isSuccess",true);
+        content = getIntent().getStringExtra("content");
 
         binding.btnJjjh.setOnClickListener(this);
         binding.btnBack2.setOnClickListener(this);
 
         if (isSuccess){
             binding.tvStated.setText("激活成功");
-            binding.tvContent.setText("您的ETC已激活");
+            binding.tvContent.setText(FunHelper.isEmpty(content) ? "您的ETC已激活" : content);
             binding.btnJjjh.setVisibility(View.GONE);
             binding.imgState.setImageResource(R.mipmap.ic_obu_6);
         }else{
             binding.tvStated.setText("激活失败");
-            binding.tvContent.setText("您可以选择重新激活");
+            binding.tvContent.setText(FunHelper.isEmpty(content) ? "您可以选择重新激活" : content);
             binding.btnJjjh.setVisibility(View.VISIBLE);
             binding.imgState.setImageResource(R.mipmap.ic_obu_5);
         }

app/src/main/java/com/huntersun/vkyes/etcopencard/project/ui/activity/obu/ObuActivationUploadActivity.java

@@ -19,7 +19,9 @@ import com.huntersun.vkyes.etcopencard.project.api.bean.ResultBean;
 import com.huntersun.vkyes.etcopencard.project.api.bean.SendTheVerificationCodeBean;
 import com.huntersun.vkyes.etcopencard.project.copapply.ObuActivateRequester;
 import com.huntersun.vkyes.etcopencard.project.copapply.ObuActivation;
+import com.huntersun.vkyes.etcopencard.project.tool.MyShared;
 import com.huntersun.vkyes.etcopencard.project.tool.QRCode;
+import com.huntersun.vkyes.etcopencard.project.utils.Constants;
 import com.huntersun.vkyes.etcopencard.project.utils.FunHelper;
 import com.huntersun.vkyes.etcopencard.src.app.AppActivity;
 import com.huntersun.vkyes.etcopencard.src.http.glide.GlideApp;
@@ -43,6 +45,8 @@ public class ObuActivationUploadActivity extends AppActivity {
 
     private String vehicleId; //车牌编号
     private String orderId; //订单ID
+    private String cardId; //卡ID
+    private String obuId; //签ID
 
     private String ivImg1;
     private String ivImg2;
@@ -59,6 +63,8 @@ public class ObuActivationUploadActivity extends AppActivity {
         setTitle("激活设备");
         vehicleId = getIntent().getStringExtra("vehicleId");
         orderId = getIntent().getStringExtra("orderId");
+        cardId = getIntent().getStringExtra("cardId");
+        obuId = getIntent().getStringExtra("obuId");
 
         binding.btnNext.setOnClickListener(this);
         binding.ivImg1.setOnClickListener(this);
@@ -100,20 +106,24 @@ public class ObuActivationUploadActivity extends AppActivity {
      * 上传图片信息
      */
     private void toSubmitData(){
-        showDialog("图片上传中...");
+        showDialog("信息上传中...");
         Map<String, String> params = new HashMap<>();
-        params.put("img1", ivImg1);
-        params.put("img2", ivImg2);
-        params.put("img3", ivImg3);
+        params.put("vehicleHeadImgUrl", ivImg1); //车头
+        params.put("vehicleBodyImgUrl", ivImg2); //车身45°
+        params.put("installImgUrl", ivImg3); //安装照
+        params.put("orderSource", Constants.SOURCE);
         params.put("orderId", orderId);
-        //TODO 暂时没有这个接口
-        /*MyRetrofit.newInstance(IFCode.IFCODE966, params, new MyRetrofit.ReturnResult() {
+        params.put("openId", (String) MyShared.getInstance().get(MyShared.OPENID, ""));
+        MyRetrofit.newInstance(IFCode.IFCODE_ACTIVE_OBUIMG, params, new MyRetrofit.ReturnResult() {
             @Override
             public void onSuccess(ResultBean resultBean, ResultBean.BizContent bizContent) {
                 hideDialog();
+
                 Bundle bundle = new Bundle();
                 bundle.putString("vehicleId",vehicleId);
                 bundle.putString("orderId",orderId);
+                bundle.putString("obuId",obuId);
+                bundle.putString("cardId",cardId);
                 jumpToPage(ObuActivationBLESearchActivity.class,bundle);
                 finish();
             }
@@ -121,13 +131,7 @@ public class ObuActivationUploadActivity extends AppActivity {
             public void onError(Response<Result> resp) {
                 hideDialog();
             }
-        });*/
-
-        Bundle bundle = new Bundle();
-        bundle.putString("vehicleId",vehicleId);
-        bundle.putString("orderId",orderId);
-        jumpToPage(ObuActivationBLESearchActivity.class,bundle);
-        finish();
+        });
     }
 
     /**

app/src/main/java/com/huntersun/vkyes/etcopencard/project/ui/fragment/FragmentHomeTow.java

@@ -69,11 +69,10 @@ public class FragmentHomeTow extends TitleBarFragment<MainActivity> {
             //未完成的
             {R.mipmap.card8, "设备激活"},
             {R.mipmap.card16, "ETC过户"},
-            {R.mipmap.card2, "补卡额申请"},
-            {R.mipmap.card5, "通行流水查询"},
-
             {R.mipmap.card6, "用户信息变更"},
             {R.mipmap.card7, "车辆信息变更"},
+            {R.mipmap.card5, "通行流水查询"},
+            {R.mipmap.card2, "补卡额申请"},
 
             //下面暂时隐藏
             /*

app/src/main/java/com/huntersun/vkyes/etcopencard/project/utils/SearchCarInfoUtils.java

@@ -69,6 +69,8 @@ public class SearchCarInfoUtils {
     //24-换货-签,
     //25-换货-卡签,
     private String orderStep = "11";
+    //-1-已取消，0-正常，99999-已封存
+    private String orderStatus = "0";
 
     public SearchCarInfoUtils(AppActivity mContext, OnSearchResultClick callback) {
         this.mContext = mContext;
@@ -174,7 +176,7 @@ public class SearchCarInfoUtils {
         Map<String, String> params = new HashMap<>();
         params.put("vehicleId", FunHelper.getText(etSearch) + "_" + vehiclePlateColor);
         params.put("orderStep", orderStep);
-        params.put("orderStatus", "0");
+        params.put("orderStatus", orderStatus);
         MyRetrofit.newInstance(reqCode, params, new MyRetrofit.ReturnResult() {
             @Override
             public void onSuccess(ResultBean resultBean, ResultBean.BizContent bizContent) {
@@ -182,7 +184,6 @@ public class SearchCarInfoUtils {
                 mContext.hideDialog();
                 //设置车牌颜色文字
                 bizContent.setVehiclePlateColorStr(EnumBean.backValue(bizContent.getVehiclePlateColor(), EnumBean.VehicleColorArray));
-
                 if (callback != null) {
                     callback.onSearchResultSuccess(bizContent);
                 }

app/src/main/java/com/huntersun/vkyes/etcopencard/src/app/AppActivity.java

@@ -29,6 +29,7 @@ import com.huntersun.vkyes.etcopencard.src.action.ToastAction;
 import com.huntersun.vkyes.etcopencard.src.http.model.HttpData;
 import com.huntersun.vkyes.etcopencard.src.ui.dialog.WaitDialog;
 import com.hjq.http.listener.OnHttpListener;
+import com.jeremyliao.liveeventbus.LiveEventBus;
 
 import java.util.Map;
 
@@ -368,4 +369,5 @@ public abstract class AppActivity extends BaseActivity
     public void jumpToPage(Class<?> activityClass, boolean isReturn, Bundle bundle,  int requestCode) {
         jumpToPage(activityClass, bundle, isReturn, requestCode);
     }
+
 }

app/src/main/java/com/huntersun/vkyes/etcopencard/src/app/AppApplication.java

@@ -33,6 +33,7 @@ import com.hjq.gson.factory.GsonFactory;
 import com.hjq.http.EasyConfig;
 import com.hjq.toast.ToastUtils;
 import com.hjq.umeng.UmengClient;
+import com.jeremyliao.liveeventbus.LiveEventBus;
 import com.scwang.smart.refresh.layout.SmartRefreshLayout;
 import com.tencent.bugly.crashreport.CrashReport;
 import com.tencent.mm.opensdk.constants.ConstantsAPI;
@@ -65,6 +66,8 @@ public class AppApplication extends MultiDexApplication {
         AppContext = this;
         mInstance = this;
         initSdk(this);
+
+        LiveEventBus.config().autoClear(true).lifecycleObserverAlwaysActive(true);
     }
 
     @Override

app/src/main/res/layout/activity_defray.xml

@@ -14,12 +14,12 @@
         app:lineVisible="false"
         app:titleColor="#FFFFFF" />
 
-    <com.huntersun.vkyes.etcopencard.src.widget.StatusLayout
+   <!-- <com.huntersun.vkyes.etcopencard.src.widget.StatusLayout
         android:id="@+id/hl_status_hint"
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:layout_weight="1">
-
+-->
         <FrameLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -91,7 +91,7 @@
 
         </FrameLayout>
 
-    </com.huntersun.vkyes.etcopencard.src.widget.StatusLayout>
+<!--    </com.huntersun.vkyes.etcopencard.src.widget.StatusLayout>-->
 
 
 </LinearLayout>