From 8cfbc805c8e920ed38df08078992af8e72209127 Mon Sep 17 00:00:00 2001 From: hwf452 Date: Mon, 24 Jul 2023 17:36:58 +0800 Subject: [PATCH] add list --- app/build.gradle | 19 ++++++++---- .../com/rehome/sgbaxj/base/BaseActivity.java | 30 ++++++++++++++++++- .../com/rehome/sgbaxj/base/BaseActivity3.java | 8 +++++ .../com/rehome/sgbaxj/base/BaseFragment.java | 8 +++++ 4 files changed, 59 insertions(+), 6 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 6b7afb6..836e483 100755 --- a/app/build.gradle +++ b/app/build.gradle @@ -17,27 +17,36 @@ android { } signingConfigs { release { - keyAlias 'abc123123' + keyAlias 'key0' storeFile file('../key/keystore') storePassword 'abc123123' - v1SigningEnabled true - v2SigningEnabled true + keyPassword 'abc123123' + v1SigningEnabled true //是否开启V1签名 + v2SigningEnabled true //是否开启V2签名 } } /* keypassword:abc123123 alias key0*/ buildTypes { + debug { + minifyEnabled false + buildConfigField "boolean", "LOG_ERROR", "true" + } release { lintOptions { checkReleaseBuilds false abortOnError false } - minifyEnabled false + minifyEnabled false // 是否开启打包混淆 zipAlignEnabled true // 对齐zip debuggable false // 是否debug proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - signingConfig signingConfigs.release + buildConfigField "boolean", "LOG_ERROR", "false" + signingConfig signingConfigs.release // 打包签名信息 } } + buildFeatures { + buildConfig = true + } sourceSets { main { jniLibs.srcDirs = ['libs'] diff --git a/app/src/main/java/com/rehome/sgbaxj/base/BaseActivity.java b/app/src/main/java/com/rehome/sgbaxj/base/BaseActivity.java index a42fdd3..cbce4a9 100755 --- a/app/src/main/java/com/rehome/sgbaxj/base/BaseActivity.java +++ b/app/src/main/java/com/rehome/sgbaxj/base/BaseActivity.java @@ -16,17 +16,21 @@ import android.nfc.tech.NfcF; import android.nfc.tech.NfcV; import android.os.Bundle; import android.os.Parcelable; +import android.util.Log; import android.view.View; import android.view.WindowManager; import android.widget.TextView; import android.widget.Toast; + import com.rehome.sgbaxj.R; import com.rehome.sgbaxj.utils.ControllerActivity; import com.zhy.autolayout.AutoLayoutActivity; + import java.nio.charset.StandardCharsets; + import androidx.annotation.LayoutRes; import androidx.appcompat.widget.Toolbar; - +import com.rehome.sgbaxj.BuildConfig; /** @@ -43,7 +47,9 @@ public abstract class BaseActivity extends AutoLayoutActivity { private String[][] mTechLists; private boolean isFirst = true; private IntentFilter ndef; + public abstract int getContentViewID(); + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -58,30 +64,38 @@ public abstract class BaseActivity extends AutoLayoutActivity { initView(); initData(); } + @Override public void setContentView(@LayoutRes int layoutResID) { super.setContentView(layoutResID); } + protected abstract void initView(); + public void initData() { } + @Override protected void onDestroy() { super.onDestroy(); ControllerActivity.getAppManager().finishActivity(this); context = null; } + public void showToast(String text) { if (text != null && !text.trim().equals("")) { Toast.makeText(this, text, Toast.LENGTH_SHORT).show(); } } + public void showToast(int id) { Toast.makeText(this, id, Toast.LENGTH_SHORT).show(); } + public void setTitle(String title) { this.title.setText(title); } + public void setBack() { mToolbar.setNavigationIcon(R.mipmap.back); mToolbar.setNavigationOnClickListener(new View.OnClickListener() { @@ -91,6 +105,7 @@ public abstract class BaseActivity extends AutoLayoutActivity { } }); } + private Boolean ifNFCUse() { if (nfcAdapter == null) { // Toast.makeText(this, "设备不支持NFC！", Toast.LENGTH_SHORT).show(); @@ -102,6 +117,7 @@ public abstract class BaseActivity extends AutoLayoutActivity { } return true; } + public void initNFC() { //NFC适配器，所有的关于NFC的操作从该适配器进行 @@ -140,6 +156,7 @@ public abstract class BaseActivity extends AutoLayoutActivity { isFirst = false; } } + private String ByteArrayToHexString(byte[] inarray) { //converts byte arrays to string int i, j, in; String[] hex = {"0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "A", "B", "C", "D", "E", "F"}; @@ -153,6 +170,7 @@ public abstract class BaseActivity extends AutoLayoutActivity { } return out; } + @Override protected void onPause() { super.onPause(); @@ -160,6 +178,7 @@ public abstract class BaseActivity extends AutoLayoutActivity { nfcAdapter.disableForegroundDispatch(this); } } + @Override protected void onResume() { super.onResume(); @@ -168,6 +187,7 @@ public abstract class BaseActivity extends AutoLayoutActivity { mTechLists); } } + @Override protected void onNewIntent(Intent intent) { super.onNewIntent(intent); @@ -179,6 +199,7 @@ public abstract class BaseActivity extends AutoLayoutActivity { } } } + private boolean readFromTag(Intent intent) { if (NfcAdapter.ACTION_NDEF_DISCOVERED.equals(intent.getAction())) { Parcelable[] rawArray = intent @@ -195,6 +216,13 @@ public abstract class BaseActivity extends AutoLayoutActivity { } return false; } + public void handleNfc(String result) { } + + public void showLog(String logText) { + if (BuildConfig.LOG_ERROR) { + Log.i("app", logText); + } + } } diff --git a/app/src/main/java/com/rehome/sgbaxj/base/BaseActivity3.java b/app/src/main/java/com/rehome/sgbaxj/base/BaseActivity3.java index 31ff2eb..8beb576 100755 --- a/app/src/main/java/com/rehome/sgbaxj/base/BaseActivity3.java +++ b/app/src/main/java/com/rehome/sgbaxj/base/BaseActivity3.java @@ -17,10 +17,12 @@ import android.nfc.tech.NfcF; import android.nfc.tech.NfcV; import android.os.Bundle; import android.os.Parcelable; +import android.util.Log; import android.view.View; import android.widget.EditText; import android.widget.Toast; +import com.rehome.sgbaxj.BuildConfig; import com.rehome.sgbaxj.R; import com.rehome.sgbaxj.utils.AppManager; import com.rehome.sgbaxj.utils.OAToolbar; @@ -235,4 +237,10 @@ public abstract class BaseActivity3 extends AutoLayoutActivity { return editText.getText().toString(); } + public void showLog(String logText) { + if (BuildConfig.LOG_ERROR) { + Log.i("app", logText); + } + } + } diff --git a/app/src/main/java/com/rehome/sgbaxj/base/BaseFragment.java b/app/src/main/java/com/rehome/sgbaxj/base/BaseFragment.java index 6f4b611..48243f0 100755 --- a/app/src/main/java/com/rehome/sgbaxj/base/BaseFragment.java +++ b/app/src/main/java/com/rehome/sgbaxj/base/BaseFragment.java @@ -3,6 +3,7 @@ package com.rehome.sgbaxj.base; import android.app.Activity; import android.content.Context; import android.os.Bundle; +import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -12,6 +13,8 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.fragment.app.Fragment; +import com.rehome.sgbaxj.BuildConfig; + /** * Created by Administrator on 2016/9/icon5. @@ -57,5 +60,10 @@ public abstract class BaseFragment extends Fragment { } } + public void showLog(String logText) { + if (BuildConfig.LOG_ERROR) { + Log.i("app", logText); + } + } }