feat 一些改进

app/build.gradle

@@ -14,7 +14,8 @@ android {
         minSdkVersion 25
         targetSdkVersion 30
         versionCode 1
-        versionName "1.0.0"
+        versionName "1.0.0" + "." + getTime()
+        archivesBaseName = versionName
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
@@ -29,6 +30,10 @@ android {
     }
 
     buildTypes {
+        debug {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
@@ -44,7 +49,6 @@ android {
 }
 
 dependencies {
-
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     implementation 'androidx.core:core-ktx:1.3.2'
     implementation 'androidx.appcompat:appcompat:1.2.0'
@@ -94,4 +98,8 @@ dependencies {
     def leakcanaryVersion = '1.6.3'
     debugImplementation "com.squareup.leakcanary:leakcanary-android:$leakcanaryVersion"
     releaseImplementation "com.squareup.leakcanary:leakcanary-android-no-op:$leakcanaryVersion"
+}
+
+static String getTime() {
+    return new Date().format("yyyyMMddHHmmss")
 }

app/src/main/java/com/doverfuelingsolutions/issp/api/SystemApi.kt

@@ -8,6 +8,7 @@ import com.doverfuelingsolutions.issp.api.basic.RetrofitUtil
 import com.doverfuelingsolutions.issp.api.dto.*
 import com.doverfuelingsolutions.issp.api.service.*
 import com.doverfuelingsolutions.issp.data.GlobalData
+import com.doverfuelingsolutions.issp.utils.AppUtil
 import com.doverfuelingsolutions.issp.utils.StringUtil
 import com.doverfuelingsolutions.issp.utils.thread.ThreadUtil
 import com.doverfuelingsolutions.issp.utils.log.DFSLog
@@ -102,7 +103,7 @@ object SystemApi {
         clientRingUpPosItem.setFuelItemPumpTotalizerVolume(dc.volumeTotalizer)
         clientRingUpPosItem.setFuelItemTransactionEndTime(dc.saleEndTime)
         clientRingUpPosItem.setFuelItemFdcReleaseTokenAttribute(dc.releaseTokenAttribute.toInt())
-        clientRingUpPosItem.setFuelItemOriginalGrossAmount(if (BuildConfig.DEBUG) BigDecimal("0.01") else dc.amount)
+        clientRingUpPosItem.setFuelItemOriginalGrossAmount(if (AppUtil.isDebug()) BigDecimal("0.01") else dc.amount)
         clientPosTrx.addClientRingUpPosItem(clientRingUpPosItem)
         DFSLog.d(clientPosTrx)
 

app/src/main/java/com/doverfuelingsolutions/issp/bugly/BuglyUtil.kt

@@ -5,6 +5,7 @@ import android.content.Intent
 import com.doverfuelingsolutions.issp.BuildConfig
 import com.doverfuelingsolutions.issp.DFSApplication
 import com.doverfuelingsolutions.issp.R
+import com.doverfuelingsolutions.issp.utils.AppUtil
 import com.doverfuelingsolutions.issp.utils.DFSToastUtil
 import com.doverfuelingsolutions.issp.view.UpgradeActivity
 import com.tencent.bugly.Bugly
@@ -39,7 +40,8 @@ object BuglyUtil : UpgradeListener, UpgradeStateListener {
         Beta.autoCheckUpgrade = false
         Beta.upgradeCheckPeriod = 5 * 60_000
         Beta.upgradeListener = this
-        Bugly.init(applicationContext, "789ca54e1f", BuildConfig.DEBUG)
+        val appId = if (AppUtil.isDebug()) "789ca54e1f" else "7bb19916d9"
+        Bugly.init(applicationContext, appId, BuildConfig.DEBUG)
     }
 
     fun checkUpgrade() {

app/src/main/java/com/doverfuelingsolutions/issp/utils/AppUtil.kt

@@ -8,11 +8,15 @@ class AppUtil {
     companion object {
 
         /* 版本相关 */
+        fun isDebug() = BuildConfig.DEBUG
 
         /**
          * 获取版本代号
          */
-        fun getVersionName(): String = BuildConfig.VERSION_NAME
+        fun getVersionName(): String {
+            val buildType = if (BuildConfig.DEBUG) "D" else "R"
+            return "${BuildConfig.VERSION_NAME}$buildType"
+        }
 
         /**
          * 获取版本代号

app/src/main/java/com/doverfuelingsolutions/issp/view/adapter/ChooseListAdapter.kt

@@ -25,7 +25,7 @@ class ChooseListAdapter(private val chooseList: List<String>, private val handle
             val color = if (!chooseEffect || selectedIndex == position)
                 ResourcesCompat.getColor(DFSApplication.instance.applicationContext.resources, R.color.colorPrimary, null)
             else
-                ResourcesCompat.getColor(DFSApplication.instance.applicationContext.resources, R.color.colorBBB, null)
+                ResourcesCompat.getColor(DFSApplication.instance.applicationContext.resources, R.color.colorPrimaryTransparent, null)
             holder.itemView.chooseItemView.setBackgroundColor(color)
         }
         holder.itemView.chooseItemView.setOnClickListener {

app/src/main/java/com/doverfuelingsolutions/issp/view/fragment/FragmentSelect.kt

@@ -13,6 +13,7 @@ import com.doverfuelingsolutions.issp.R
 import com.doverfuelingsolutions.issp.data.GlobalData
 import com.doverfuelingsolutions.issp.databinding.FragmentSearchTypeBinding
 import com.doverfuelingsolutions.issp.fusion.FusionManager
+import com.doverfuelingsolutions.issp.utils.AppUtil
 import com.doverfuelingsolutions.issp.view.MainActivity
 import com.doverfuelingsolutions.issp.view.PreferenceActivity
 
@@ -61,13 +62,6 @@ class FragmentSelect : FragmentBasic(),
 
     class SearchTypeViewModel : ViewModel() {
         val deviceNum = MutableLiveData(GlobalData.serialNumber.get())
-        val version: MutableLiveData<String> by lazy {
-            val pm = DFSApplication.instance.applicationContext.packageManager
-            val info = pm.getPackageInfo(
-                DFSApplication.instance.applicationContext.packageName,
-                android.content.pm.PackageManager.GET_ACTIVITIES
-            )
-            MutableLiveData(info.versionName)
-        }
+        val version = MutableLiveData(AppUtil.getVersionName())
     }
 }

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

@@ -92,6 +92,7 @@
                     android:id="@+id/fragmentToolbar"
                     android:layout_width="0dp"
                     app:countdownTime="60"
+                    android:visibility="invisible"
                     android:layout_height="wrap_content"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"

app/src/main/res/values/colors.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <color name="colorPrimary">#FF6200EE</color>
+    <color name="colorPrimaryTransparent">#806200EE</color>
     <color name="colorPrimaryVariant">#FF3700B3</color>
     <color name="colorOnPrimary">#FFFFFFFF</color>