优化构建脚本

Author: bihe0832

Application/src/main/java/com/bihe0832/android/app/message/BaseActivityWrapperForMessage.kt

@@ -21,7 +21,7 @@ import com.bihe0832.android.lib.utils.os.DisplayUtil
 private val mAutoShowMessageList = mutableListOf<String>()
 
 fun BaseActivity.addMessageAction(messageView: ImageView, unreadView: TextViewWithBackground) {
-    AAFMessageManager.getMessageLiveData().value?.let { updateMessageMenuAndShowFace(it, this, unreadView) }
+    AAFMessageManager.getMessageLiveData().value.let { updateMessageMenuAndShowFace(it, this, unreadView) }
     AAFMessageManager.getMessageLiveData().observe(this) { t ->
         updateMessageMenuAndShowFace(t, this, unreadView)
     }
@@ -35,17 +35,22 @@ fun BaseActivity.addMessageAction(messageView: ImageView, unreadView: TextViewWi
 }
 
 @Synchronized
-fun updateMessageMenuAndShowFace(noticeList: List<MessageInfoItem>, activity: BaseActivity, unreadView: TextViewWithBackground) {
-    noticeList.filter { !it.hasRead() }.let {
-        if (it.isNotEmpty()) {
-            unreadView.changeStatusWithUnreadMsg(it.size, DisplayUtil.dip2px(activity, 8f))
-        } else {
-            unreadView.changeStatusWithUnreadMsg(-1, DisplayUtil.dip2px(activity, 8f))
+fun updateMessageMenuAndShowFace(noticeList: List<MessageInfoItem>?, activity: BaseActivity, unreadView: TextViewWithBackground) {
+    if (noticeList.isNullOrEmpty()) {
+        unreadView.changeStatusWithUnreadMsg(-1, DisplayUtil.dip2px(activity, 8f))
+    } else {
+        noticeList.filter { !it.hasRead() }.let {
+            if (it.isNotEmpty()) {
+                unreadView.changeStatusWithUnreadMsg(it.size, DisplayUtil.dip2px(activity, 8f))
+            } else {
+                unreadView.changeStatusWithUnreadMsg(-1, DisplayUtil.dip2px(activity, 8f))
+            }
         }
-    }
 
-    noticeList.distinctBy { it.messageID }.filter { !mAutoShowMessageList.contains(it.messageID) && AAFMessageManager.canShowFace(it, false) }.forEach {
-        mAutoShowMessageList.add(it.messageID)
-        AAFMessageManager.showMessage(activity, it, true)
+        noticeList.distinctBy { it.messageID }.filter { !mAutoShowMessageList.contains(it.messageID) && AAFMessageManager.canShowFace(it, false) }.forEach {
+            mAutoShowMessageList.add(it.messageID)
+            AAFMessageManager.showMessage(activity, it, true)
+        }
     }
+
 }

PubGetAPKInfo/src/main/java/com/bihe0832/android/app/apk/MainActivity.kt

@@ -5,7 +5,6 @@ import android.content.pm.ApplicationInfo
 import android.content.pm.PackageManager
 import android.os.Bundle
 import android.view.View
-import android.widget.ImageView
 import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.RecyclerView
 import com.bihe0832.android.app.getapk.R
@@ -17,7 +16,7 @@ import com.bihe0832.android.base.card.apk.APPItemData
 import com.bihe0832.android.base.card.tips.TipsData
 import com.bihe0832.android.common.list.CardItemForCommonList
 import com.bihe0832.android.common.list.CommonListLiveData
-import com.bihe0832.android.common.list.easyrefresh.CommonListActivity
+import com.bihe0832.android.common.list.swiperefresh.CommonListActivity
 import com.bihe0832.android.framework.ZixieContext
 import com.bihe0832.android.lib.adapter.CardBaseModule
 import com.bihe0832.android.lib.debug.DebugTools

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

@@ -52,7 +52,7 @@
     </androidx.appcompat.widget.Toolbar>
 
 
-    <com.bihe0832.android.lib.ui.recycleview.ext.MyEasyRefreshLayout
+    <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
         android:id="@+id/activity_list_refresh"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
@@ -63,6 +63,6 @@
             android:layout_height="match_parent"
             android:clipChildren="false" />
 
-    </com.bihe0832.android.lib.ui.recycleview.ext.MyEasyRefreshLayout>
+    </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
 </LinearLayout>

build_apk.sh

@@ -104,7 +104,8 @@ cd $localPath
 if [ ! -d "$localPath/bin" ]; then
   mkdir "$localPath/bin"
 fi
-rm -fr $localPath/bin/*
+#rm -fr $localPath/bin/*
+rm -fr $localPath/bin/temp
 mkdir $localPath/bin/temp
 
 echo "********APK build touch tag *******"
@@ -260,7 +261,8 @@ if [ "$isOfficial"x = "true"x ]; then
   java -jar $localPath/AndResGuard-cli-1.2.0.jar $localPath/${appModule}/build/outputs/apk/release/${appPrefix}_V${versionWithCode}_release.apk -config $localPath/proguard-rules-resource.xml -out $localPath/bin/temp/official
   # 签名完整包
   $ANDROID_HOME/build-tools/32.0.0/zipalign -p -v 4 $localPath/bin/temp/official/${appPrefix}_V${versionWithCode}_release_unsigned.apk $localPath/bin/temp/official/${appPrefix}_V${versionWithCode}_official_unsigned_zipalign.apk
-  $ANDROID_HOME/build-tools/32.0.0/apksigner sign --ks $localPath/debug.keystore --out $localPath/bin/${appPrefix}_V${versionWithCode}_${timeinfo}_official.apk --ks-pass pass:android $localPath/bin/temp/official/${appPrefix}_V${versionWithCode}_official_unsigned_zipalign.apk
+  $ANDROID_HOME/build-tools/32.0.0/apksigner sign --ks $localPath/debug.keystore --out $localPath/bin/temp/${appPrefix}_V${versionWithCode}_${timeinfo}_official.apk --ks-pass pass:android $localPath/bin/temp/official/${appPrefix}_V${versionWithCode}_official_unsigned_zipalign.apk
+  cp -fr $localPath/bin/temp/${appPrefix}_V${versionWithCode}_${timeinfo}_official.apk $localPath/bin/${appPrefix}_V${versionWithCode}_${timeinfo}_official.apk
   checkResult
 
   echo "********APK build start add mapping and hash*******"