换wx为自己的收款码

加入2.1.0.0, 3.0.0.64
删除3.0.0.33
加圆角

app/build.gradle

@@ -3,26 +3,18 @@ plugins {
 }
 
 android {
-    signingConfigs {
-        itos {
-            storeFile file('D:\\Desktop\\py\\itos.jks')
-            keyAlias 'itos'
-            storePassword 'mqlong520'
-            keyPassword 'mqlong520'
-        }
-    }
     buildFeatures {
         // Enables Jetpack Compose for this module
         compose true
     }
     namespace 'com.itos.vivotools'
-    compileSdk 33
+    compileSdk 34
     defaultConfig {
         applicationId "com.itos.vivotools"
         minSdk 24
-        targetSdk 33
-        versionCode 50
-        versionName "1.5"
+        targetSdk 34
+        versionCode 51
+        versionName "1.8"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -31,39 +23,21 @@ android {
         release {
             minifyEnabled false
             shrinkResources false
-            versionNameSuffix getCommitId()
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_15
         targetCompatibility JavaVersion.VERSION_15
     }
-    applicationVariants.all { variant ->
-        // 遍历所有的变体
-        variant.outputs.all {
-            // 获取应用的版本名
-            def versionName = variant.versionName
-            // 设置输出文件名
-            outputFileName = "VivoTools_v${versionName}.apk"
-        }
-    }
+
 
 }
-def getCommitId() {
-    try {
-        def command = "git rev-parse --short HEAD".execute()
-        command.waitFor()
-        return "_" + command.text.trim()
-    } catch (Exception e) {
-        return "unknown"
-    }
-}
-dependencies {
 
+dependencies {
     implementation 'dev.rikka.shizuku:api:13.1.0'
     implementation 'dev.rikka.shizuku:provider:13.1.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
-    implementation 'com.google.android.material:material:1.11.0-alpha03'
+    implementation 'com.google.android.material:material:1.11.0-beta01'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
 }

app/src/main/java/com/itos/vivotools/FActivity.java

@@ -63,6 +63,8 @@ protected void onCreate(Bundle savedInstanceState) {
         // 限定一下横屏时的窗口宽度,让其不铺满屏幕。否则太丑
         if (getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE)
             getWindow().getAttributes().width = (getWindowManager().getDefaultDisplay().getHeight());
+        getWindow().setBackgroundDrawableResource(R.drawable.dialog_rounded_corners);
+
         String g_version = MainActivity.getAppVersion(context, "com.vivo.fuelsummary");
         // String g_version = com.itos.vivotools.MainActivity.getAppVersion(context,"com.itos.vivotools");
 

app/src/main/java/com/itos/vivotools/MainActivity.java

@@ -126,6 +126,8 @@ protected void onCreate(Bundle savedInstanceState) {
         getWindow().setFeatureInt(Window.FEATURE_CUSTOM_TITLE, R.layout.title_bar);
         // 设置自定义标题布局
 
+        getWindow().setBackgroundDrawableResource(R.drawable.dialog_rounded_corners);
+
         Log.d("onCreate：", "yes");
         Shizuku.addRequestPermissionResultListener(REQUEST_PERMISSION_RESULT_LISTENER);
 

app/src/main/java/com/itos/vivotools/SActivity.java

@@ -80,7 +80,8 @@ protected void onCreate(Bundle savedInstanceState) {
         //限定一下横屏时的窗口宽度,让其不铺满屏幕。否则太丑
         if (getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE)
             getWindow().getAttributes().width = (getWindowManager().getDefaultDisplay().getHeight());
-
+        getWindow().setBackgroundDrawableResource(R.drawable.dialog_rounded_corners);
+
         stextView = findViewById(R.id.st);
         String g_version = MainActivity.getAppVersion(context, "com.vivo.gamewatch");
         if (g_version != null) {
@@ -148,25 +149,25 @@ public void run() {
                             public void run() {
                                 switch (filename) {
                                     case "GW_KPL.apk" ->
-                                            Toast.makeText(SActivity.this, "降级完成,当前为KPL专版,享受狂暴的调度吧,KPL版本推荐搭配游戏优化使用", Toast.LENGTH_SHORT).show();
+                                            Toast.makeText(SActivity.this, "安装完成,当前为KPL专版,享受狂暴的调度吧,KPL版本推荐搭配游戏优化使用", Toast.LENGTH_SHORT).show();
                                     case "20123.apk" ->
-                                            Toast.makeText(SActivity.this, "降级完成,当前为2.0.1.23,老机型狂喜", Toast.LENGTH_SHORT).show();
-                                    case "30033.apk" ->
-                                            Toast.makeText(SActivity.this, "降级完成,当前为3.0.0.33,享受经典的调度和触控吧", Toast.LENGTH_SHORT).show();
+                                            Toast.makeText(SActivity.this, "安装完成,当前为2.0.1.23,老机型狂喜", Toast.LENGTH_SHORT).show();
                                     case "30046.apk" ->
-                                            Toast.makeText(SActivity.this, "降级完成,当前为3.0.0.46,享受积极的调度吧", Toast.LENGTH_SHORT).show();
+                                            Toast.makeText(SActivity.this, "安装完成,当前为3.0.0.46,享受积极的调度吧", Toast.LENGTH_SHORT).show();
                                     case "30056.apk" ->
-                                            Toast.makeText(SActivity.this, "降级完成,当前为3.0.0.56,享受丝滑的触控吧", Toast.LENGTH_SHORT).show();
+                                            Toast.makeText(SActivity.this, "安装完成,当前为3.0.0.56,享受丝滑的触控吧", Toast.LENGTH_SHORT).show();
                                     case "30057.apk" ->
-                                            Toast.makeText(SActivity.this, "降级完成,当前为3.0.0.57,提取自海外版,部分游戏效果好,值得一试", Toast.LENGTH_SHORT).show();
+                                            Toast.makeText(SActivity.this, "安装完成,当前为3.0.0.57,提取自海外版,部分游戏效果好,值得一试", Toast.LENGTH_SHORT).show();
                                     case "30058.apk" ->
-                                            Toast.makeText(SActivity.this, "降级完成,当前为3.0.0.58,享受稳定的帧率吧", Toast.LENGTH_SHORT).show();
+                                            Toast.makeText(SActivity.this, "安装完成,当前为3.0.0.58,享受稳定的帧率吧", Toast.LENGTH_SHORT).show();
                                     case "30061.apk" ->
-                                            Toast.makeText(SActivity.this, "降级完成,当前为3.0.0.61,享受优化后的线程放置吧(主要王者原神)", Toast.LENGTH_SHORT).show();
+                                            Toast.makeText(SActivity.this, "安装完成,当前为3.0.0.61,享受优化后的线程放置吧(主要王者原神)", Toast.LENGTH_SHORT).show();
                                     case "30062.apk" ->
-                                            Toast.makeText(SActivity.this, "降级完成,当前为3.0.0.62,享受最新的调度思路吧", Toast.LENGTH_SHORT).show();
+                                            Toast.makeText(SActivity.this, "安装完成,当前为3.0.0.62,享受最新的调度思路吧", Toast.LENGTH_SHORT).show();
+                                    case "30064.apk" ->
+                                            Toast.makeText(SActivity.this, "安装完成,当前为3.0.0.64,享受丝滑流畅的日用体验吧", Toast.LENGTH_SHORT).show();
                                     default ->
-                                            Toast.makeText(SActivity.this, "降级完成,当前为" + filename, Toast.LENGTH_SHORT).show();
+                                            Toast.makeText(SActivity.this, "安装完成,当前为" + filename, Toast.LENGTH_SHORT).show();
                                 }
                                 String g_version = MainActivity.getAppVersion(context, "com.vivo.gamewatch");
                                 //String g_version = MainActivity.getAppVersion(context, "com.example.myapplication1");
@@ -213,8 +214,8 @@ public synchronized void install_20123(View view) {
         install_apk("20123.apk");
     }
 
-    public synchronized void install_30033(View view) {
-        install_apk("30033.apk");
+    public synchronized void install_30064(View view) {
+        install_apk("30064.apk");
     }
 
 

app/src/main/res/drawable/dialog_rounded_corners.xml

@@ -0,0 +1,4 @@
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners android:radius="20dp" /> <!-- 设置圆角半径，根据需要调整 -->
+    <solid android:color="#191c1e" /> <!-- 设置背景颜色 -->
+</shape>

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

@@ -65,17 +65,27 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center"
         android:textSize="15sp"
-        android:text="2.0-主打均衡"
+        android:text="2.0-主打均衡(120W ↓)"
         android:onClick="install_20"
         />
+    <Button
+        android:id="@+id/fbutton8"
+        style="@android:style/Widget.Material.Button.Borderless.Colored"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:textSize="15sp"
+        android:text="2.1-平衡充电触控(120W)"
+        android:onClick="install_21"
+        />
     <Button
         android:id="@+id/fbutton5"
         style="@android:style/Widget.Material.Button.Borderless.Colored"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
         android:textSize="15sp"
-        android:text="2.3-极致触控"
+        android:text="2.3-极致触控(200W)"
         android:onClick="install_23"
         />
 

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

@@ -66,7 +66,7 @@
         android:textSize="17sp"
         android:textColor="@android:color/holo_orange_light"
         android:onClick="zanzhu"
-        android:text="点击有惊喜"
+        android:text="捐赠"
         />
 
 </LinearLayout>

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

@@ -26,16 +26,6 @@
         android:onClick="install_20123"
         />
 
-    <Button
-        android:id="@+id/sbutton2"
-        style="@android:style/Widget.Material.Button.Borderless.Colored"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:textSize="15sp"
-        android:text="30033-跟随经典"
-        android:onClick="install_30033"
-        />
     <Button
         android:id="@+id/sbutton3"
         style="@android:style/Widget.Material.Button.Borderless.Colored"
@@ -98,14 +88,24 @@
         android:onClick="install_30062"
         />
 
+    <Button
+        android:id="@+id/sbutton_2"
+        style="@android:style/Widget.Material.Button.Borderless.Colored"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:textSize="15sp"
+        android:text="30064-日用丝滑"
+        android:onClick="install_30064"
+        />
     <Button
         android:id="@+id/sbutton8"
         style="@android:style/Widget.Material.Button.Borderless.Colored"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
         android:textSize="15sp"
-        android:text="KPL赛事版-释放性能"
+        android:text="KPL赛事版-极致性能"
         android:onClick="install_KPL"
         />