build: 添加 3.7.0 版本的 sentry plugin 缓存

Signed-off-by: chenjuntao <chenjuntao@ghzhushou.com>

.gitlab-ci.yml

@@ -1,34 +1,161 @@
+# commit_sha 文件记录上一次成功流水线的commit sha，用于定时计划检测是否有新代码提交，有就执行流水线，没有就终止流水线
+cache:
+# 不同的分支采用不同的 cache，防止分支之间相互影响
+   key: "${CI_COMMIT_REF_SLUG}_commit_sha"
+   paths:
+     - commit_sha
+   policy: pull
+
+# 将打包&发送apk包邮件job 和代码分析job 并行执行
 stages:
-    - docker-build && sendmail
-    - deploy-trigger
+  - build&analyze
+  - oss-upload&send-email
+  - ci_sonar_mail
 
-# 构建推送docker镜像
-docker-build:
+# 阻止了 合并请求 或 push（分支和标签）的流水线。 最后的 when: always 规则运行所有其他流水线类型，包括定时计划流水线。
+workflow:
+ rules:
+   - if: '$CI_PIPELINE_SOURCE == "push"'
+     when: always
+   - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
+     when: never
+   - when: always
+
+before_script:
+   # 检查是否存在 commit_sha 文件
+   - if [ -f commit_sha ]; then cat commit_sha; else echo "0000000" > commit_sha; fi
+   - export BEFORE_COMMIT_SHA=$(cat commit_sha)
+   # 比较commit sha ,若与上一次成功流水线的commit sha 相同，则退出流水线
+   - if [ "$CI_COMMIT_SHA" == "$BEFORE_COMMIT_SHA" ] && [ "$CI_PIPELINE_SOURCE" != "web" ]; then exit 137; fi
+
+# 使用 .post 阶段使作业在流水线的末尾运行。.post 始终是流水线的最后阶段。
+change_commit:
+   tags:
+     - offline-test
+   stage: .post
+   # 此job 跳过拉取git代码
+   variables:
+     GIT_STRATEGY: none
+   script:
+     # 更新 commit_sha
+     - if [ "$CI_COMMIT_SHA" != "$BEFORE_COMMIT_SHA" ]; then echo $CI_COMMIT_SHA > commit_sha; fi
+   cache:
+     # 不同的分支采用不同的 cache，防止分支之间相互影响
+     key: "${CI_COMMIT_REF_SLUG}_commit_sha"
+     paths:
+       - commit_sha
+     policy: pull-push
+   allow_failure:
+     exit_codes: 137
+
+android_build:
+  tags:
+    # - local-runner
+    - offline-test
+  stage: build&analyze
+  image: hub.shanqu.cc/library/ci-android:jdk11-sdk31-33
+  resource_group: android_build
+  variables:
+    GIT_SUBMODULE_STRATEGY: recursive
+    KUBERNETES_CPU_LIMIT: "10"
+  script:
+    - export GRADLE_USER_HOME=/home/gitlab-runner/ci-build-cache/$CI_PROJECT_PATH/.gradle
+    - chmod +x ./gradlew
+    - ./scripts/jenkins_build.sh $CI_COMMIT_REF_NAME $BEFORE_COMMIT_SHA $CI_COMMIT_SHA
+  #设置打包后的产物，用于job之间共享
+  artifacts:
+      paths:
+          - app/build/tmp/*.apk
+      expire_in: 48 hrs       # 指定附件上载后保存的时间24h，默认永久在Gitlab保存
+  allow_failure:
+    exit_codes: 137
+  only:
+    - dev
+    - release
+    - pack/update_sentry_plugin_cache
+
+# 代码检查
+sonarqube_analysis:
+   tags:
+     - offline-test
+   stage: build&analyze
+   image: hub.shanqu.cc/library/sonar-scanner-cli:latest
+   dependencies: []    #禁止传递来的artifact
+   script:
+     ## 获取项目的一级组和二级组和项目名作为projectKey，例如projectKey=platform-backend-eci-monitor
+     - group=`echo $CI_PROJECT_PATH | sed 's#/#-#g'`
+     - sonar-scanner
+       -Dsonar.host.url=http://sonarqube-server.sonarqube:9000/
+       -Dsonar.login=be43de7264ce4c4766eb0c020373c3e74e6df257
+       -Dsonar.jacoco.reportPaths=target/jacoco.exec
+       -Dsonar.projectKey=$group
+       -Dsonar.projectName=$CI_PROJECT_PATH
+       -Dsonar.sourceEncoding=UTF-8
+       -Dsonar.exclusions=**/vendor/**,**/errcode/**
+       -Dsonar.gitlab.project_id=$CI_PROJECT_ID
+       -Dsonar.gitlab.commit_sha=$CI_COMMIT_SHA
+       -Dsonar.gitlab.ref_name=$CI_COMMIT_REF_NAME
+       -Dsonar.gitlab.ci_merge_request_iid=$CI_MERGE_REQUEST_IID
+       -Dsonar.gitlab.merge_request_discussion=true
+       -Dsonar.java.binaries=.
+       -Dsonar.branch.name=$CI_COMMIT_REF_NAME
+   allow_failure:
+     exit_codes: 137
+   only:
+     - dev
+     - release
+
+## 发送简易检测结果报告
+send_sonar_report:
+   tags:
+     - offline-test
+   stage: ci_sonar_mail
+   image: hub.shanqu.cc/library/docker:latest
+   # 此job 跳过拉取git代码
+   variables:
+     GIT_STRATEGY: none
+   script:
+     - group=`echo $CI_PROJECT_PATH | sed 's#/#-#g'`
+     - docker run -e PROJECTKEY=$group -e EMAIL=$GITLAB_USER_EMAIL -e BRANCH=$CI_COMMIT_REF_NAME --name send-email --rm hub.shanqu.cc/platform/send-sonar-report:latest
+   allow_failure:
+     exit_codes: 137
+   only:
+     - dev
+     - release
+
+oss-upload&send-email:
     tags:
-        - offline-test
-    stage: docker-build && sendmail
-    image: hub.shanqu.cc/library/docker:latest
-    script:
-        - projectPath=`echo $CI_PROJECT_PATH | sed 's#/#-#g'`
-        - date
-        - cp -R /home/gitlab-runner/ci-build-cache/$CI_PROJECT_PATH/.gradle .
-        - date
-        - docker build -t hub-vol.shanqu.cc/ghzs/$projectPath:latest .
-        - date
-        - docker push hub-vol.shanqu.cc/ghzs/$projectPath:latest
-        - date
-        - docker run -e PROJECTKEY=$projectPath -e EMAIL=$GITLAB_USER_EMAIL -e BRANCH=$CI_COMMIT_REF_NAME --name send-email --rm hub.shanqu.cc/platform/send-sonar-report:latest
-    resource_group: android_build
-    only:
-        - feature-meta_build
-
-## 触发多项目构建
-trigger_job:
-    stage: deploy-trigger
+        - sysadm-devops
+    stage: oss-upload&send-email
+    image: hub.shanqu.cc/devops/android-apk-oss-upload:latest
+    id_tokens:
+      VAULT_ID_TOKEN:
+        aud: https://vault.shanqu.cc
     variables:
-        BUILD_PROJECT_NAME: $CI_PROJECT_PATH
-    trigger:
-        project: devops/automation/build-eci
-        branch: dev
+        GIT_STRATEGY: none
+        VAULT_ADDR: https://vault.shanqu.cc                         # 固定值
+        VAULT_SECRET_PATH: prod/devops/android-apk-oss-upload       # 固定值
+        VAULT_ROLE: android-apk-oss-upload                          # 固定值
+        ENDPOINT: "tos-cn-guangzhou.ivolces.com"                    # 固定值
+        BUCKET: "sysadm-public"                                     # 固定值
+        FILE_PATH: "app/build/tmp/"                                 # APK 存放路径
+        Email_To_List: $EMAIL_TO_LIST                               # 邮件接受人列表
+        Email_Title: "光环助手 $CI_COMMIT_BRANCH"                    # 邮件标题
+        PIPELINE_ID: $CI_PIPELINE_ID                                # 流水线id
+        COMMIT_BRANCH: $CI_COMMIT_BRANCH                            # 提交分支
+        MAIL_MESSAGE: "[$CI_COMMIT_AUTHOR] $CI_COMMIT_MESSAGE"
+    needs:
+        - job: android_build
+          artifacts: true
+    script:
+        ### 绑定上传参数 ###
+
+        - export OSS_PATH="release/dev/${CI_PROJECT_NAME}/$(date "+%Y/%m/%d")"
+        ### 开启上传 ###
+        - /usr/local/bin/python /upload.py
+        ### 发送邮件
+        - /usr/local/bin/python /ci-android-mail-jira-comment.py
     only:
-        - feature-meta_build
+        - dev
+        - release
+        - pack/update_sentry_plugin_cache

Dockerfile

@@ -1,21 +1,15 @@
-FROM hub.shanqu.cc/library/openjdk:11-jdk
-
+FROM openjdk:11-jdk
 WORKDIR /project
-
 SHELL ["/bin/bash", "-c"]
-
 #配置SDK环境变量
 ENV ANDROID_SDK_ROOT /usr/lib/sdk
 ENV ANDROID_HOME /usr/lib/sdk
 ENV PATH $ANDROID_SDK_ROOT:$PATH
 ENV PATH=$PATH:${ANDROID_HOME}/cmdline-tools/cmdline-tools/bin/
 ENV GRADLE_USER_HOME /project/.gradle
-
 RUN source ~/.bashrc
-
 RUN sed -i "s@http://\(deb\|security\).debian.org@https://mirrors.aliyun.com@g" /etc/apt/sources.list \
     && apt-get --quiet update --yes \
     && apt-get --quiet install --yes lib32stdc++6 lib32z1 libncurses5 util-linux bash tzdata librdkafka-dev pkgconf \
     && rm -rf /var/lib/apt/lists/*
-
-COPY .gradle /project/.gradle
+COPY .gradle /project/.gradle

app/src/main/assets/rich_editor.js

@@ -588,7 +588,7 @@ document.addEventListener("selectionchange", function(e) {
 });
 
 document.addEventListener("selectionchange", function(e) {
-   RE.enabledEditingItems(e)
+   setTimeout(() => RE.enabledEditingItems(e), 10)
 });
 
 RE.recursion = function(dom) {

app/src/main/java/com/gh/common/util/InstallUtils.java

@@ -1,9 +1,6 @@
 package com.gh.common.util;
 
-
 import android.content.Context;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.os.Handler;
 import android.os.Message;
@@ -19,10 +16,8 @@ import org.greenrobot.eventbus.EventBus;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
-
 /**
  * 下载完成跳安装，
  */
@@ -49,15 +44,15 @@ public class InstallUtils {
             @Override
             public void handleMessage(Message msg) {
                 if (msg.what == INSTALL_WHAT && packageManager != null) {
-                    List<String> packageNameList = PackageHelper.INSTANCE.getInstalledPackageNameList(context, 0);
-                    ArrayList<String> list = new ArrayList<>(packageNameList);
                     if (installMap != null && installMap.size() != 0) {
                         ArrayList<String> keys = new ArrayList<>();
                         for (String packageName : installMap.keySet()) {
+                            if (TextUtils.isEmpty(packageName)) continue;
+
                             long time = installMap.get(packageName);
                             if (System.currentTimeMillis() - time >= MAX_TIME) {
                                 keys.add(packageName);
-                            } else if (list.contains(packageName)) {
+                            } else if (PackageUtils.isInstalled(context, packageName)) {
                                 keys.add(packageName);
 
                                 DownloadEntity downloadEntity = DownloadManager.getInstance().getDownloadEntityByPackageName(packageName);
@@ -80,7 +75,7 @@ public class InstallUtils {
                             long time = uninstallMap.get(packageName);
                             if (System.currentTimeMillis() - time >= MAX_TIME) {
                                 keys.add(packageName);
-                            } else if (!list.contains(packageName)) {
+                            } else if (!PackageUtils.isInstalled(context, packageName)) {
                                 keys.add(packageName);
                                 EventBus.getDefault().post(new EBPackage("卸载", packageName, "", false));
                             }
@@ -105,6 +100,8 @@ public class InstallUtils {
     }
 
     public void addInstall(String packageName) {
+        if (TextUtils.isEmpty(packageName)) return;
+
         if (installMap == null) {
             installMap = Collections.synchronizedMap(new HashMap<String, Long>());
         }

app/src/main/java/com/gh/common/util/PackageHelper.kt

@@ -814,7 +814,7 @@ object PackageHelper {
             uploadUIDGapLog = false
 
             val uidGap = (android.os.Process.LAST_APPLICATION_UID - lastValidUid) / 100 * 100
-            SentryHelper.onEvent("UID_GAP", "gap", uidGap.toString())
+//            SentryHelper.onEvent("UID_GAP", "gap", uidGap.toString())
         }
 
         return packageList

app/src/main/java/com/gh/common/util/PackageUtils.java

@@ -225,17 +225,6 @@ public class PackageUtils {
             }
         } catch (Exception e) {
             e.printStackTrace();
-
-            if (e instanceof AndroidException) {
-                // 有些设备会出现 DeadSystemException
-                SentryHelper.INSTANCE.onEvent(
-                        "GET_META_DATA_ERROR",
-                        "packageName",
-                        packageName,
-                        "exception_digest",
-                        e.getLocalizedMessage()
-                );
-            }
         }
         return null;
     }
@@ -497,7 +486,6 @@ public class PackageUtils {
             }
         } catch (Exception e) {
             e.printStackTrace();
-            SentryHelper.INSTANCE.onEvent("GET_PACKAGE_INFO_ERROR", "path", path);
         }
 
         return null;
@@ -640,17 +628,6 @@ public class PackageUtils {
                     PackageManager.COMPONENT_ENABLED_STATE_DEFAULT).versionName;
         } catch (Exception e) {
             e.printStackTrace();
-
-            if (e instanceof AndroidException) {
-                // 有些设备会出现 DeadSystemException
-                SentryHelper.INSTANCE.onEvent(
-                        "GET_VERSION_NAME_ERROR",
-                        "packageName",
-                        packageName,
-                        "exception_digest",
-                        e.getLocalizedMessage()
-                );
-            }
         }
         return null;
     }
@@ -664,16 +641,6 @@ public class PackageUtils {
                     PackageManager.COMPONENT_ENABLED_STATE_DEFAULT).versionCode;
         } catch (Exception e) {
             e.printStackTrace();
-            if (e instanceof AndroidException) {
-                // 有些设备会出现 DeadSystemException
-                SentryHelper.INSTANCE.onEvent(
-                        "GET_VERSION_CODE_ERROR",
-                        "packageName",
-                        packageName,
-                        "exception_digest",
-                        e.getLocalizedMessage()
-                );
-            }
         }
         return 0;
     }
@@ -688,16 +655,6 @@ public class PackageUtils {
             return packageManager.getApplicationIcon(packageName);
         } catch (Exception e) {
             e.printStackTrace();
-            if (e instanceof AndroidException) {
-                // 有些设备会出现 DeadSystemException
-                SentryHelper.INSTANCE.onEvent(
-                        "GET_ICON_ERROR",
-                        "packageName",
-                        packageName,
-                        "exception_digest",
-                        e.getLocalizedMessage()
-                );
-            }
         }
         return null;
     }
@@ -731,17 +688,6 @@ public class PackageUtils {
             return jsonObject;
         } catch (Exception e) {
             e.printStackTrace();
-            if (e instanceof AndroidException) {
-                // 有些设备会出现 DeadSystemException
-                SentryHelper.INSTANCE.onEvent(
-                        "GET_APP_BASIC_INFO_BY_PACKAGE_NAME",
-                        "packageName",
-                        packageName,
-                        "exception_digest",
-                        e.getLocalizedMessage()
-                );
-            }
-
             return jsonObject;
         }
     }

app/src/main/java/com/gh/download/simple/SimpleDownloadManager.kt

@@ -27,12 +27,24 @@ object SimpleDownloadManager {
         val downloadStatus = mDownloadQueue.getStatus(config.uniqueId)
 
         if (downloadStatus != DownloadStatus.PAUSED) {
-            ExecutorProvider.getInstance().backgroundExecutor.execute {
-                DownloadMessageHandler.insertDownloadToDatabase(getDownloadEntity(config))
-                mDownloadQueue.submitNewTask(config)
-            }
+            createNewTaskAndDownload(config)
         } else {
-            resume(config.uniqueId)
+            try {
+                resume(config.uniqueId)
+            } catch (e: IllegalArgumentException) {
+                createNewTaskAndDownload(config)
+            }
+        }
+    }
+
+    /**
+     * 创建新任务并下载
+     */
+    private fun createNewTaskAndDownload(config: DownloadConfig) {
+        ExecutorProvider.getInstance().backgroundExecutor.execute {
+            mDownloadQueue.cancel(config.uniqueId)
+            DownloadMessageHandler.insertDownloadToDatabase(getDownloadEntity(config))
+            mDownloadQueue.submitNewTask(config)
         }
     }
 

app/src/main/java/com/gh/vspace/VGameInstalledLaunchDialog.kt

@@ -8,6 +8,7 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.fragment.app.FragmentTransaction
 import androidx.recyclerview.widget.*
 import androidx.viewpager2.widget.ViewPager2.OnPageChangeCallback
 import androidx.viewpager2.widget.ViewPager2.PageTransformer
@@ -80,6 +81,26 @@ class VGameInstalledLaunchDialog : DialogFragment() {
         }
     }
 
+    @Deprecated("Deprecated in Java")
+    override fun show(manager: FragmentManager?, tag: String?) {
+        try {
+            val clazz: Class<*> = DialogFragment::class.java
+            val dismissed = clazz.getDeclaredField("mDismissed")
+            dismissed.isAccessible = true
+            dismissed[this] = false
+
+            val shownByMe = clazz.getDeclaredField("mShownByMe")
+            shownByMe.isAccessible = true
+            shownByMe[this] = true
+            val transaction = manager!!.beginTransaction()
+            transaction.add(this, tag)
+            transaction.commitAllowingStateLoss()
+        } catch (e: Exception) {
+            super.show(manager, tag)
+            e.printStackTrace()
+        }
+    }
+
     @Deprecated("Deprecated in Java")
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
         return super.onCreateDialog(savedInstanceState).apply {

app/src/main/java/com/halo/assistant/fragment/WebFragment.kt

@@ -145,7 +145,7 @@ class WebFragment : LazyFragment(), IScrollable {
             }
         } else if (requestCode == REQUEST_PICK_IMAGE) {
             if (mSelectPicCallback == null && mSelectPicCallbackAboveL == null) return
-            if (resultCode == Activity.RESULT_OK) {
+            if (resultCode == Activity.RESULT_OK && data != null) {
                 val uriList = Matisse.obtainResult(data)
                 if (uriList.size == 0) return
                 if (mSelectPicCallbackAboveL != null) {

dependencies.gradle

@@ -7,8 +7,8 @@ ext {
     targetSdkVersion = 30
 
     // application info (每个大版本之间的 versionCode 增加 20)
-    versionCode = 1110
-    versionName = "5.38.0"
+    versionCode = 1112
+    versionName = "5.38.2"
     applicationId = "com.gh.gamecenter"
     applicationIdGat = "com.gh.gamecenter.intl"
 

feature/new_feedback/src/main/java/com/gh/gamecenter/feedback/view/suggest/SuggestAppFragment.kt

@@ -480,6 +480,8 @@ open class SuggestAppFragment : ToolbarFragment() {
 
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         super.onActivityResult(requestCode, resultCode, data)
+        if (data == null) return
+
         if (requestCode == MEDIA_STORE_REQUEST || requestCode == MEDIA_STORE_CREDENTIALS_REQUEST || requestCode == MEDIA_STORE_SCREENSHOT_REQUEST) {
             val selectedPaths = Matisse.obtainResult(data) ?: return
             val picturePath = PathUtils.getPath(requireContext(), selectedPaths[0])

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Mon Oct 30 17:29:06 CST 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://mirrors.cloud.tencent.com/gradle/gradle-7.4-all.zip
+distributionUrl=https\://mirrors.cloud.tencent.com/gradle/gradle-7.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

module_common/src/main/java/com/gh/gamecenter/common/utils/ImageUtils.kt

@@ -438,7 +438,13 @@ object ImageUtils {
         controllerListener: BaseControllerListener<ImageInfo>? = null,
     ) {
         val lifecycleObserver = view?.getTag(R.id.lifecycle_observer) as? LifecycleObserver
-        val lifecycle = if (lifecycleObserver != null) view.findFragment()?.viewLifecycleOwner?.lifecycle else null
+        val lifecycle = if (lifecycleObserver != null) {
+            try {
+                view.findFragment()?.viewLifecycleOwner?.lifecycle
+            } catch (e: Exception) {
+                null
+            }
+        } else null
         lifecycleObserver?.let {
             lifecycle?.removeObserver(it)
             view.setTag(R.id.lifecycle_observer, null)
@@ -487,7 +493,12 @@ object ImageUtils {
             super.onFinalImageSet(id, imageInfo, animatable)
             controllerListener?.onFinalImageSet(id, imageInfo, animatable)
             animatable?.let {
-                (lifecycle ?: view?.findFragment()?.viewLifecycleOwner?.lifecycle)?.run {
+                val viewLifecycle = try {
+                    lifecycle ?: view?.findFragment()?.viewLifecycleOwner?.lifecycle
+                } catch (e: Exception) {
+                    null
+                }
+                viewLifecycle?.run {
                     val observer = object : DefaultLifecycleObserver {
                         override fun onPause(owner: LifecycleOwner) {
                             super.onPause(owner)

module_common/src/main/java/com/gh/gamecenter/common/view/NavigationBarView.kt

@@ -18,13 +18,7 @@ class NavigationBarView @JvmOverloads constructor(
         val height = if (Build.VERSION.SDK_INT < Build.VERSION_CODES.KITKAT) {
             0
         } else {
-            val navigationHeight = DisplayUtils.retrieveNavigationHeight(context)
-            // 小于 100px 的其实不是按键形式的 navigationBar 而是条状的 navigationBar，把它当成是 0 处理
-            if (navigationHeight > 100) {
-                navigationHeight
-            } else {
-                0
-            }
+            DisplayUtils.retrieveNavigationHeight(context)
         }
         setMeasuredDimension(MeasureSpec.getSize(widthMeasureSpec), height)
     }

module_va_impl/build.gradle

@@ -7,7 +7,7 @@ plugins {
 
 android {
     // 在 DEFAULT_PLUGIN_URL 中提取插件版本号
-    def defaultPluginUrl = "https://dev-app-static.796697.com/va/plugin/2024/09/02/1.0.3_64_1725265812586.zip"
+    def defaultPluginUrl = "https://app-static.796697.com/va/plugin/2024/10/17/1.0.3_64_1729148903919.zip"
     def versionText = defaultPluginUrl.substring(defaultPluginUrl.lastIndexOf("/") + 1)
     def pluginVersionPattern = ~/^\d+.\d+.\d+/
     def matcher = versionText =~ pluginVersionPattern

scripts/jenkins_build.sh

@@ -9,6 +9,13 @@ build_time_without_divider=$(TZ=Asia/Shanghai date +'%Y%m%d%H%M')L
 
 post_init_script=init.internal.gradle
 
+# 开启 mapping 上传
+if [[ "$OSTYPE" == "darwin"* ]]; then
+  sed -i '' '1 a plugins { id "io.sentry.android.gradle" version "3.7.0" } ' app/build.gradle
+else
+  sed -i '1 a plugins { id "io.sentry.android.gradle" version "3.7.0" }' app/build.gradle
+fi
+
 git checkout module_common/build.gradle
 git checkout gradle.properties