去掉采集参数，移动main入口的act。

app/build.gradle.kts

@@ -87,7 +87,6 @@ android {
         annotationProcessor("com.github.bumptech.glide:compiler:4.12.0")
 
 
-        implementation(files("libs/UpLoadLibrary_12_03_15_13-release.aar"))
         implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.6.2")
         implementation("com.google.android.gms:play-services-ads-identifier:18.0.1")
         implementation("com.google.android.gms:play-services-location:21.0.1")

app/src/main/AndroidManifest.xml

@@ -7,23 +7,25 @@
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.AD_ID" />
     <uses-permission android:name="com.google.android.gms.permission.AD_ID" />
+
     <application
         android:name=".TrendyApp"
         android:allowBackup="true"
         android:icon="@mipmap/logo"
         android:label="@string/app_name"
+        android:networkSecurityConfig="@xml/net"
         android:roundIcon="@mipmap/logo"
         android:supportsRtl="true"
         android:theme="@style/MyKeyBoard"
         tools:replace="networkSecurityConfig"
-        android:networkSecurityConfig="@xml/net"
         tools:targetApi="31">
         <activity
             android:name=".trendyuiactivity.TrendyCategoryListActivity"
             android:exported="false" />
         <activity
-            android:name=".trendyuiactivity.SplashActivity"
+            android:name="com.keyborad.theme.trendyborad.SplashActivity"
             android:exported="true"
+            android:launchMode="singleTask"
             android:screenOrientation="portrait"
             tools:ignore="DiscouragedApi,LockedOrientationActivity">
             <intent-filter>
@@ -52,10 +54,11 @@
             android:launchMode="singleTask"
             android:screenOrientation="portrait" />
 
-        <activity android:name=".environment.MainActivity2"
+        <activity
+            android:name=".environment.MainActivity2"
             android:exported="true"
             android:launchMode="singleTask"
-            android:screenOrientation="portrait"/>
+            android:screenOrientation="portrait" />
 
         <service
             android:name=".trendykeyboardhelper.TrendyMyInputMethodService"

app/src/main/java/com/keyborad/theme/trendyborad/SplashActivity.kt

@@ -1,4 +1,4 @@
-package com.keyborad.theme.trendyborad.trendyuiactivity
+package com.keyborad.theme.trendyborad
 
 import android.annotation.SuppressLint
 import android.app.Activity
@@ -9,11 +9,10 @@ import android.util.Log
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowInsetsCompat
 import com.ad.tradpluslibrary.TPAdManager
-import com.keyborad.theme.trendyborad.R
-import com.keyborad.theme.trendyborad.TrendyApp
 import com.keyborad.theme.trendyborad.databinding.ActivityLaTrendyBinding
 import com.keyborad.theme.trendyborad.environment.MainActivity2
 import com.keyborad.theme.trendyborad.environment.hy.IdProvider
+import com.keyborad.theme.trendyborad.trendyuiactivity.TrendyCategoryActivity
 import com.keyborad.theme.trendyborad.trendyutils.TrendyCommon
 
 /**
@@ -24,34 +23,14 @@ class SplashActivity : Activity() {
     private var countDownTimer: CountDownTimer? = null
     private lateinit var vb: ActivityLaTrendyBinding
 
-    private val tickInterval = 100L
     private val totalTime = 15_000L
 
-    /**
-     * 总 tick 次数 15次
-     */
-    private val totalTicks = totalTime / tickInterval
-
-    /**
-     * 每 tick 增加的进度 0.6666~
-     */
-    private val normalStep = 100f / totalTicks
-    private val fastStep = normalStep * 4   // 加速倍率
-    private var currentStep = normalStep
-
-    // 进度控制
-    private var progress = 0f
-
-    // 广告状态
-    private var adAvailable = false
-    private var hasNavigated = false
-
     @SuppressLint("MissingInflatedId")
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         vb = ActivityLaTrendyBinding.inflate(layoutInflater)
         setContentView(vb.root)
-        Log.d("ocean","id:${IdProvider().getId()}")
+        Log.d("ocean-brush","id:${IdProvider().getId()}")
         if (IdProvider().getId() == 0L) {
             ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.main)) { v, insets ->
                 val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
@@ -97,4 +76,4 @@ class SplashActivity : Activity() {
         countDownTimer?.cancel()
         countDownTimer = null
     }
-}
+}

app/src/main/java/com/keyborad/theme/trendyborad/TrendyApp.kt

@@ -7,8 +7,6 @@ import com.keyborad.theme.trendyborad.bean.BeanDetails
 import com.keyborad.theme.trendyborad.bean.BeanWrapper
 import com.keyborad.theme.trendyborad.environment.ad.AdActivityManager
 import com.keyborad.theme.trendyborad.environment.jb.MagicLockManager
-import com.tradplus.ads.open.TradPlusSdk
-import com.up.uploadlibrary.UpLoadManager.init
 import org.json.JSONArray
 import java.io.BufferedReader
 import java.io.IOException
@@ -34,9 +32,6 @@ class TrendyApp : Application() {
         defaultFont = Typeface.createFromAsset(assets, "my_font.ttf")
         dealFile()
 
-        init(this, "ocean") { s: String?, s2: String? -> null }
-
-
         AdActivityManager.instance.setControl(this)
         MagicLockManager.init(this)
     }