1.修复两个工程因layout名字一样导致的bug

zuoxiao

2024-05-06 e79ced190337222c7475409363c8071c976c7de9

 henanlibrary/src/main/java/com/dayu/henanlibrary/activity/MyActivity.java

@@ -11,15 +11,15 @@
import android.view.LayoutInflater;
import android.view.View;

import com.dayu.baselibrary.view.PassWordDialog;
import com.dayu.henanlibrary.utils.DeviceNumberUtils;
import com.dayu.henanlibrary.utils.ExcelUtil;
import com.dayu.baselibrary.utils.TipUtil;
import com.dayu.henanlibrary.databinding.ActivityMyBinding;
import com.dayu.henanlibrary.dbBean.AdminDataBean;
import com.dayu.henanlibrary.net.SocketNet;
import com.dayu.baselibrary.view.PassWordDialog;
import com.dayu.baselibrary.view.datepicker.CustomDatePicker;
import com.dayu.baselibrary.view.datepicker.DateFormatUtils;
import com.dayu.henanlibrary.databinding.ActivityMyHnBinding;
import com.dayu.henanlibrary.dbBean.AdminDataBean;
import com.dayu.henanlibrary.net.SocketNet;
import com.dayu.henanlibrary.utils.DeviceNumberUtils;
import com.dayu.henanlibrary.utils.ExcelUtil;

import java.io.File;
import java.util.ArrayList;
@@ -41,12 +41,12 @@
    long endTime;

    boolean isRechargeList = false;
    ActivityMyBinding myBinding;
    ActivityMyHnBinding myBinding;

    @Override
    protected void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
        myBinding = ActivityMyBinding.inflate(LayoutInflater.from(this));
        myBinding = ActivityMyHnBinding.inflate(LayoutInflater.from(this));
        setContentView(myBinding.getRoot());
        getVersion(this);
        setData();