1.修复河南版本不能自动连接服务器的bug 2.添加重新选择版本的功能

zuoxiao

2024-05-09 9d57ea9c1ca983a8990dfb3791165c6bae28f483

1.修复河南版本不能自动连接服务器的bug
2.添加重新选择版本的功能

 app/src/main/java/com/dayu/recharge/MyApplication.java

@@ -13,6 +13,8 @@
import com.dayu.qihealonelibrary.QHAloneApplication;
import com.tencent.bugly.crashreport.CrashReport;

import java.io.File;

public class MyApplication extends Application {
    public static String TAG = "MyApplication";

@@ -24,6 +26,14 @@
    public void onCreate() {
        super.onCreate();
        myApplication = this;
        try {
            File file = new File(HNBaseDaoSingleton.SqlitePath);
            if (!file.exists()) {
                file.mkdirs();
            }
        } catch (Exception e) {
            e.printStackTrace();
        }
        initApplication();
        BaseApplication.getInstance().onCreat(this);
        CrashReport.initCrashReport(getApplicationContext(), "45551598b8", true);
@@ -32,23 +42,36 @@

    public void initApplication() {
        //兼容老版的，认为有addressCode并且LibraryBean为null的为河南版本的
        AdminDataBean adminDataBean = HNBaseDaoSingleton.getInstance(this).adminDao().findFirst();
        LibraryBean libraryBean = BaseDaoSingleton.getInstance(this).libraryDao().findFirst();
        if (adminDataBean != null && libraryBean == null && !TextUtils.isEmpty(adminDataBean.addressCode)) {
            libraryType = BaseCommon.HeNanLibrary;
            HeNanApplication.getInstance().application = this;
        } else if (libraryBean != null) {
            libraryType = libraryBean.getType();
            switch (libraryType) {
                case BaseCommon.HeNanLibrary:
                    HeNanApplication.getInstance().application = this;
                    break;
                case BaseCommon.QHAloneLibrary:
                    QHAloneApplication.getInstance().application = this;
                    break;
        try {
            AdminDataBean adminDataBean = HNBaseDaoSingleton.getInstance(this).adminDao().findFirst();
            LibraryBean libraryBean = BaseDaoSingleton.getInstance(this).libraryDao().findFirst();
            if (adminDataBean != null && libraryBean == null && !TextUtils.isEmpty(adminDataBean.addressCode)) {
                libraryType = BaseCommon.HeNanLibrary;
                initHeNan();
            } else if (libraryBean != null) {
                libraryType = libraryBean.getType();
                switch (libraryType) {
                    case BaseCommon.HeNanLibrary:
                        initHeNan();
                        break;
                    case BaseCommon.QHAloneLibrary:
                        QHAloneApplication.getInstance().application = this;
                        break;
                }
            }
        } catch (Exception e) {
            e.printStackTrace();
            CrashReport.postCatchedException(e);
        }
    }

    /**
     * 初始化河南
     */
    private void initHeNan() {
        HeNanApplication.getInstance().application = this;
        HeNanApplication.getInstance().initEasySocket(false, null);
    }


}

 app/src/main/java/com/dayu/recharge/activity/LoginActivity.java

@@ -41,6 +41,7 @@

    ActivityLoginBinding binding;
    PassWordBean passWordBean;
    int clickNumber;

    @Override
    protected void onCreate(Bundle savedInstanceState) {
@@ -52,36 +53,27 @@
    }

    private void initView() {
        binding.title.setOnClickListener(v -> {
            clickNumber++;
            if (clickNumber == 20) {
                choesLibrary();
            }

        });
        binding.loginBtn.setOnClickListener(v -> {
            String psStr = binding.loginPw.getText().toString();

            if (TextUtils.isEmpty(psStr)) {
                TipUtil.show("请输入密码");
                return;
            }
            if ((passWordBean == null && psStr.equals("123456"))
                    || passWordBean != null && passWordBean.getPassWord().equalsIgnoreCase(WSMD5.getMD5Str(psStr))) {


                if (MyApplication.myApplication.libraryType == BaseCommon.NoLibrary) {
                    //选择版本
                    LibraryDialog dialog = new LibraryDialog(this, type -> {
                        if (type == BaseCommon.HeNanLibrary) {
                            getHNPermission();
                        } else if (type == BaseCommon.QHAloneLibrary) {
                            getQHAlonePermission();
                        }
                        MyApplication.myApplication.initApplication();
                        startToHomeActivity();
                    });
                    dialog.show();
                    choesLibrary();
                    //没有选择版本先选择版本
                    return;
                } else {
                    startToHomeActivity();
                }


            } else {
                Toast.makeText(LoginActivity.this, "密码错误", Toast.LENGTH_SHORT).show();
            }
@@ -94,6 +86,22 @@
        }
    }

    /**
     * 选择版本
     */
    private void choesLibrary() {

        LibraryDialog dialog = new LibraryDialog(this, type -> {
            if (type == BaseCommon.HeNanLibrary) {
                getHNPermission();
            } else if (type == BaseCommon.QHAloneLibrary) {
                getQHAlonePermission();
            }
            MyApplication.myApplication.initApplication();
            startToHomeActivity();
        });
        dialog.show();
    }

    private void startToHomeActivity() {
        if (MyApplication.myApplication.libraryType == BaseCommon.HeNanLibrary) {

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

@@ -7,6 +7,7 @@


    <TextView
        android:id="@+id/title"
        android:layout_width="match_parent"
        android:layout_height="0dp"
        android:layout_marginLeft="20dp"
@@ -63,7 +64,6 @@
        android:id="@+id/versionName"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:text="v2.0"
        />
        android:text="v2.0" />

</LinearLayout>

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

@@ -169,11 +169,13 @@
            adminData = baseDao.adminDao().findFirst();
            if (adminData.isHasAddressCode()) {
                myBinding.myAdminName.setText(adminData.getSheng() + adminData.getShi() + adminData.getXian() + adminData.getZhen() + adminData.getCun());
                myBinding.myVillageNum.setText(adminData.getSerial());
            } else {
                myBinding.myAdminName.setText("请点击地址信息设置");
                myBinding.myVillageNum.setText("请点击地址信息设置");
            }
            if (!TextUtils.isEmpty(adminData.getSerial())) {
                myBinding.myVillageNum.setText(adminData.getSerial());
            }

            StringBuilder msgData = new StringBuilder();

            String initCode = DeviceNumberUtils.getDeviceNumber();

 henanlibrary/src/main/res/layout/activity_my_hn.xml

@@ -35,12 +35,14 @@
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:text="设备序列号："
                    android:textColor="@color/picker_text_color"
                    android:textSize="@dimen/text_size" />

                <TextView
                    android:id="@+id/my_villageNum"
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
                    android:textColor="@color/picker_text_color"
                    android:textSize="@dimen/text_size" />

            </LinearLayout>
@@ -121,8 +123,6 @@
                    android:textSize="@dimen/text_size" />

            </RelativeLayout>




            <TextView

 qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/NFCWreatActivity.java

@@ -323,7 +323,7 @@
        super.onNewIntent(intent);
        try {
            this.intent = intent;
            startAnim();
//            startAnim();
            Log.i("NFCWreatActivity", "isUser:" + isUser);
            if (isUser) {
                //新卡注册逻辑

 qihealonelibrary/src/main/res/layout/activity_my_qha.xml

@@ -26,10 +26,10 @@

            <LinearLayout
                android:id="@+id/my_village"
                android:visibility="gone"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                android:orientation="horizontal">
                android:orientation="horizontal"
                android:visibility="gone">

                <TextView

@@ -130,9 +130,9 @@
                android:layout_height="wrap_content"
                android:layout_marginTop="15dp"
                android:text="IP设置"
                android:visibility="gone"
                android:textColor="@color/text_selecter"
                android:textSize="@dimen/text_size" />
                android:textSize="@dimen/text_size"
                android:visibility="gone" />

            <TextView
                android:id="@+id/card_replacement"
@@ -140,9 +140,9 @@
                android:layout_height="wrap_content"
                android:layout_marginTop="15dp"
                android:text="用户补卡"
                android:visibility="gone"
                android:textColor="@color/text_selecter"
                android:textSize="@dimen/text_size" />
                android:textSize="@dimen/text_size"
                android:visibility="gone" />


            <TextView
@@ -150,7 +150,7 @@
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                android:layout_marginTop="15dp"
                android:text="密码设置"
                android:text="登录密码设置"
                android:textColor="@color/text_selecter"
                android:textSize="@dimen/text_size" />

@@ -160,9 +160,9 @@
                android:layout_height="wrap_content"
                android:layout_marginTop="15dp"
                android:text="未连接数据中心"
                android:visibility="gone"
                android:textColor="@color/text_selecter"
                android:textSize="@dimen/text_size" />
                android:textSize="@dimen/text_size"
                android:visibility="gone" />
        </LinearLayout>

    </ScrollView>