update agp

Author: REBOOTERS

build.gradle

@@ -1,8 +1,8 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 plugins {
-    id 'com.android.application' version '8.11.1' apply false
-    id 'com.android.library' version '8.11.1' apply false
+    id 'com.android.application' version '8.12.0' apply false
+    id 'com.android.library' version '8.12.0' apply false
     id 'org.jetbrains.kotlin.android' version '2.2.0' apply false
     id 'com.google.devtools.ksp' version '2.2.0-2.0.2' apply false
     id 'org.jetbrains.kotlin.plugin.compose' version '2.2.0' apply false

buildSrc/.gitignore

@@ -2,4 +2,5 @@
 /bin
 *.project
 *.settings/
-*.classpath
+*.classpath
+.kotlin/

buildSrc/build.gradle

@@ -9,7 +9,7 @@ dependencies {
 //    implementation localGroovy()
     implementation 'org.jetbrains.kotlin:kotlin-stdlib:2.2.0'
     // 添加了这个，就可以看 Android Gradle 插件的源码了
-    implementation 'com.android.tools.build:gradle-api:8.11.1'
+    implementation 'com.android.tools.build:gradle-api:8.12.0'
 //    implementation "org.jetbrains.kotlin:kotlin-script-runtime:1.3.40"
     implementation 'com.google.code.gson:gson:2.13.1'
     implementation 'com.android.tools:common:31.11.1'

config.gradle

@@ -1,8 +1,8 @@
 ext {
-    compileSdk = 35
+    compileSdk = 36
 
     minSdk = 26
-    targetSdk = 35
+    targetSdk = 36
 
 
     support_version = '1.4.0'

imitate/build.gradle

@@ -150,7 +150,7 @@ dependencies {
 
     implementation "com.alibaba:arouter-api:$ext.arouter_api"
     kapt "com.alibaba:arouter-compiler:$ext.arouter_compiler"
-    implementation('com.facebook.fresco:fresco:3.2.0') {
+    implementation('com.facebook.fresco:fresco:3.6.0') {
         exclude group: 'com.facebook.soloader', module: 'soloader'
         exclude group: 'com.facebook.fresco', module: 'soloader'
         exclude group: 'com.facebook.fresco', module: 'nativeimagefilters'
@@ -191,10 +191,10 @@ dependencies {
     // robolectric
 
     implementation group: 'commons-io', name: 'commons-io', version: '20030203.000550'
-//    implementation project(path: ':subs:game')
+    implementation project(path: ':subs:game')
     implementation project(path: ':subs:gif-revert')
     implementation project(path: ':subs:ai')
-//    implementation project(path: ':subs:cpp_native')
+    implementation project(path: ':subs:cpp_native')
     implementation project(path: ':subs:compose')
 
     implementation 'com.jaredrummler:simple-mvp:1.0.2'

imitate/src/main/java/com/engineer/imitate/KotlinRootActivity.kt

@@ -28,11 +28,13 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.alibaba.android.arouter.facade.annotation.Route
 import com.alibaba.android.arouter.launcher.ARouter
+import com.engineer.compose.ui.MainComposeActivity
 import com.engineer.imitate.databinding.ActivityKotlinRootBinding
 import com.engineer.imitate.model.FragmentItem
 import com.engineer.imitate.room.SchoolDatabase
 import com.engineer.imitate.ui.activity.ReverseGifActivity
 import com.engineer.imitate.util.*
+import com.example.cpp_native.app.NativeRoot
 import com.gyf.immersionbar.ImmersionBar
 import io.reactivex.Observable
 import io.reactivex.android.schedulers.AndroidSchedulers
@@ -70,8 +72,8 @@ class KotlinRootActivity : AppCompatActivity() {
 
 //        autoStartPage()
 
-//        NativeRoot.init()
-//        NativeRoot.test()
+        NativeRoot.init()
+        NativeRoot.test()
         val patchViewModel = ViewModelProvider(this)[PatchViewModel::class.java]
         patchViewModel.copyFile()
 

imitate/src/main/java/com/engineer/imitate/ui/fragments/EntranceFragment.kt

@@ -21,6 +21,7 @@ import com.alibaba.android.arouter.facade.annotation.Route
 import com.andrefrsousa.superbottomsheet.SuperBottomSheetFragment
 import com.bumptech.glide.Glide
 import com.engineer.ai.AIHomeActivity
+import com.engineer.android.game.ui.GameRootActivity
 import com.engineer.imitate.R
 import com.engineer.imitate.databinding.FragmentEntranceBinding
 import com.engineer.imitate.ui.activity.CLActivity
@@ -168,7 +169,7 @@ class EntranceFragment : Fragment() {
         }
 
         viewBinding.game.setOnClickListener {
-//            startActivity(Intent(context, GameRootActivity::class.java))
+            startActivity(Intent(context, GameRootActivity::class.java))
         }
 
         viewBinding.shell.setOnClickListener {

imitate/src/main/java/com/engineer/imitate/util/PatchPlayground.kt

@@ -5,6 +5,7 @@ import android.content.Context
 import android.util.Log
 import androidx.lifecycle.AndroidViewModel
 import androidx.lifecycle.viewModelScope
+import com.example.cpp_native.internal.PatchUtil
 import kotlinx.coroutines.CoroutineExceptionHandler
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -77,7 +78,7 @@ suspend fun mergeFile(context: Context): Boolean {
     val oldFile = baseDir + "lastest.txt"
     val patchFile = baseDir + "diff.patch"
     withContext(Dispatchers.IO) {
-//        PatchUtil.patchAPK(oldFile, result, patchFile)
+        PatchUtil.patchAPK(oldFile, result, patchFile)
     }
 
     val mergeResult = FileUtils.fileRead(result)

subs/compose/src/main/java/com/engineer/compose/ui/ComposeView.kt

@@ -120,7 +120,7 @@ fun MessageCard(msg: Message) {
             .verticalScroll(rememberScrollState())
     ) {
         CircularProgressIndicator()
-        NetImage()
+//        NetImage()
         val context = LocalContext.current
         Row(
             modifier = Modifier

subs/compose/src/main/java/com/engineer/compose/ui/VideoPlayerActivity.kt

@@ -107,7 +107,6 @@ fun VideoPlayer(videoUri: Uri) {
                                     it.isLooping = true
                                     it.start()
                                 }
-                                setVideoScalingMode(MediaPlayer.VIDEO_SCALING_MODE_SCALE_TO_FIT)
                             }
                         }
 
@@ -127,7 +126,6 @@ fun VideoPlayer(videoUri: Uri) {
                 }
             },
             modifier = Modifier
-                .fillMaxWidth()
                 .aspectRatio(if (videoSize.height > 0) videoSize.width.toFloat() / videoSize.height.toFloat() else 1f)
         )