Revert "修复若干小问题"

.gitignore

@@ -139,4 +139,3 @@ app.*.symbols
 !/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages
 !/dev/ci/**/Gemfile.lock
 !.vscode/settings.json
-/Android-kotlin-Code/core/.cxx

Android-kotlin-Code/README.md

@@ -8,8 +8,6 @@
 - Android 7.0+ (recommend)
 - `armeabi-v7a` , `arm64-v8a`, `x86` or `x86_64` Architecture
 
-
-
 ### Build
 
 1. Update submodules
@@ -69,15 +67,6 @@ Please read 服务器配置+Kotlin-Android 文档教程.docx
 }
 ```
 
-![alt text](telegram-cloud-photo-size-5-6327623898581027724-y.jpg)
-
-```
-测试的 URL 配置地址： https://vungles.com/api/test/config 
-测试账号：
-binance3980@gmail.com
-Tinkl123
-```
-
 上面字段的意思：
 以下是您提供的 JSON 配置文件的字段解释：
 

Android-kotlin-Code/core/build.gradle.kts

@@ -45,10 +45,7 @@ android {
 
     externalNativeBuild {
         cmake {
-            // 设置cmake版本
-//            version = "3.31.6"  //macos下不需要指定 cmake 的版本信息
             path = file("src/main/cpp/CMakeLists.txt")
-
         }
     }
 }

Android-kotlin-Code/core/src/main/cpp/CMakeLists.txt

@@ -1,57 +1,47 @@
 cmake_minimum_required(VERSION 3.0)
 
 # 获取git hash
+
 message(STATUS "CMAKE_CURRENT_SOURCE_DIR= ${CMAKE_CURRENT_SOURCE_DIR}")
 execute_process(
   COMMAND git submodule foreach git log -1 --format=%H   
   WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} 
   OUTPUT_VARIABLE COMMIT_HASH
 )
+string(REPLACE "\n" ";" COMMIT_HASH "${COMMIT_HASH}")
+list(GET COMMIT_HASH 1 COMMIT_HASH)
+string (REGEX REPLACE "[\n\t\r]" "" COMMIT_HASH ${COMMIT_HASH})
+string(SUBSTRING ${COMMIT_HASH} 0 7 COMMIT_HASH)
+message(STATUS "git hash= ${COMMIT_HASH}")
 
-# 判断是否获取到了git hash值(规避如因项目目录非git repository等原因产生的获取异常而中断build)
-string(LENGTH ${COMMIT_HASH} OUTPUT_VARIABLE COMMIT_HASH_LENGTH)
-string(COMPARE LESS ${COMMIT_HASH_LENGTH} "40" OUTPUT_VARIABLE GIT_HASH_COMPARISON_RESULT)
-if(NOT ${GIT_HASH_COMPARISON_RESULT})
-    string(REPLACE "\n" ";" COMMIT_HASH "${COMMIT_HASH}")
-    list(GET COMMIT_HASH 1 COMMIT_HASH)
-    string (REGEX REPLACE "[\n\t\r]" "" COMMIT_HASH ${COMMIT_HASH})
-    #string(SUBSTRING ${COMMIT_HASH} 0 7 COMMIT_HASH)
-    message(STATUS "git hash= ${COMMIT_HASH}")
-
-    # 获取git分支名称
-    execute_process(
+# 获取分支名称
+execute_process(
   COMMAND git submodule foreach git branch -r --contains ${COMMIT_HASH}
   WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} 
   OUTPUT_VARIABLE CURRENT_BRANCH
-    )
+)
+string(REPLACE "\n" ";" CURRENT_BRANCH "${CURRENT_BRANCH}")
+list(GET CURRENT_BRANCH 1 CURRENT_BRANCH)
+string (REGEX REPLACE "origin/" "" CURRENT_BRANCH ${CURRENT_BRANCH} "")
+string (REGEX REPLACE "[\n\t\r]" "" CURRENT_BRANCH ${CURRENT_BRANCH} "")
+#string(SUBSTRING ${CURRENT_BRANCH} 0 8 CURRENT_BRANCH)
+message(STATUS "git current branch = ${CURRENT_BRANCH}")
 
-    string(REPLACE "\n" ";" CURRENT_BRANCH "${CURRENT_BRANCH}")
-    list(GET CURRENT_BRANCH 1 CURRENT_BRANCH)
-    string (REGEX REPLACE "origin/" "" CURRENT_BRANCH ${CURRENT_BRANCH} "")
-    string (REGEX REPLACE "[\n\t\r]" "" CURRENT_BRANCH ${CURRENT_BRANCH} "")
-    string(SUBSTRING ${CURRENT_BRANCH} 0 8 CURRENT_BRANCH)
-    message(STATUS "git current branch = ${CURRENT_BRANCH}")
+# 获取生成时间
+string(TIMESTAMP COMPILE_TIME "%y%m%d")
+string (REGEX REPLACE "[\n\t\r]" "" COMPILE_TIME ${COMPILE_TIME})
+string(REGEX REPLACE "\"" "" COMPILE_TIME ${COMPILE_TIME})
 
-    # 获取生成时间
-    string(TIMESTAMP COMPILE_TIME "%y%m%d")
-    string (REGEX REPLACE "[\n\t\r]" "" COMPILE_TIME ${COMPILE_TIME})
-    string(REGEX REPLACE "\"" "" COMPILE_TIME ${COMPILE_TIME})
+# 生成版本信息
+set(GIT_VERSION "${CURRENT_BRANCH}_${COMMIT_HASH}_${COMPILE_TIME}")
+message(STATUS "version info = ${GIT_VERSION}")
 
-    # 生成版本信息
-    set(GIT_VERSION "${CURRENT_BRANCH}_${COMMIT_HASH}_${COMPILE_TIME}")
-    message(STATUS "version info = ${GIT_VERSION}")
-
-    # 去除空格
-    string(REGEX REPLACE "[ ]+" "" GIT_VERSION "${GIT_VERSION}")
-else()
-  message(AUTHOR_WARNING "Unable to get git hash, but build will continue.")
-
-endif()
+# 去除空格
+string(REGEX REPLACE "[ ]+" "" GIT_VERSION "${GIT_VERSION}")
 
 # 保存变量到文件
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/version.h.in ${CMAKE_CURRENT_SOURCE_DIR}/version.h @ONLY)
 
-#设置项目名称与语言类别(必)
 project(clash-bridge C)
 
 

Android-kotlin-Code/core/src/main/cpp/version.h

@@ -5,7 +5,7 @@
  * 当前编译core版本号
  */
  
-#define GIT_VERSION 
+#define GIT_VERSION _920e728_241219
 #define make_Str(x) #x 
 #define make_String(x) make_Str(x)
 

Android-kotlin-Code/design/build.gradle.kts

@@ -32,6 +32,6 @@ dependencies {
     implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0")
 
     implementation("com.github.bumptech.glide:glide:4.16.0")
-    kapt("com.github.bumptech.glide:compiler:4.15.1")
+    annotationProcessor("com.github.bumptech.glide:compiler:4.15.1")
     
 }

Android-kotlin-Code/design/src/main/java/com/github/kr328/clash/design/BaseListActivity.kt

@@ -5,7 +5,7 @@ import android.content.res.Configuration
 import android.os.Build
 import android.os.Bundle
 import android.view.View
-// import android.view.WindowManager
+import android.view.WindowManager
 import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -20,16 +20,16 @@ import com.github.kr328.clash.design.adapter.PlanDataAdapter
 import com.github.kr328.clash.design.adapter.TicketDetailAdapter
 import com.github.kr328.clash.design.adapter.TicketsDataAdapter
 import com.github.kr328.clash.design.databinding.ActivityBaseListBinding
-// import com.github.kr328.clash.design.databinding.DesignSettingsCommonBinding
+import com.github.kr328.clash.design.databinding.DesignSettingsCommonBinding
 import com.github.kr328.clash.design.ui.DayNight
 import com.github.kr328.clash.design.ui.Surface
 import com.github.kr328.clash.design.util.applyFrom
-// import com.github.kr328.clash.design.util.layoutInflater
+import com.github.kr328.clash.design.util.layoutInflater
 import com.github.kr328.clash.design.util.resolveThemedBoolean
 import com.github.kr328.clash.design.util.resolveThemedColor
 import com.github.kr328.clash.design.util.root
 import com.github.kr328.clash.design.util.setOnInsertsChangedListener
-// import com.github.kr328.clash.design.view.ActivityBarLayout
+import com.github.kr328.clash.design.view.ActivityBarLayout
 import com.github.kr328.clash.network.OrderData
 import com.github.kr328.clash.network.PlanData
 import com.github.kr328.clash.network.TicketMessage
@@ -190,61 +190,65 @@ abstract class BaseListActivity<T> : AppCompatActivity() {
         this.dayNight =  DayNight.Night //dayNight
     }
 
-   
-    /**
-     * 初始化列表数据。
-     * 如果数据为空，显示提示信息；否则，在UI线程上更新适配器数据。
-     *
-     * @param data 要显示的数据列表，可能为null
-     */
     @SuppressLint("NotifyDataSetChanged")
     private fun initList(data: List<T>?) {
-        if (data.isNullOrEmpty()) {
-            showEmptyDataToast()
-        } else {
-            updateAdapterDataOnUiThread(data)
-        }
-    }
 
-    /**
-     * 在UI线程上显示"没有更多数据"的Toast提示。
-     */
-    private fun showEmptyDataToast() {
+        if (data.isNullOrEmpty()) {
             runOnUiThread {
                 Toast.makeText(this, "没有更多数据", Toast.LENGTH_SHORT).show()
             }
-    }
-
-    /**
-     * 在UI线程上更新适配器数据。
-     * 这个方法作为一个中间层，避免在runOnUiThread的lambda中直接捕获外部变量。
-     *
-     * @param data 要更新到适配器的数据列表
-     */
-    private fun updateAdapterDataOnUiThread(data: List<T>) {
+        } else {
+            // 更新列表
             runOnUiThread {
-            doUpdateAdapterData(data)
+                // 更新适配器的数据
+
+                when (adapter) {
+                    is PlanDataAdapter -> {
+                        // 使用 PlanDataAdapter 类型进行操作
+                        val planDataAdapter = adapter as  PlanDataAdapter
+                        // 执行 PlanDataAdapter 的操作
+                        planDataAdapter.setData(data as List<PlanData>)
+                    }
+
+
+                    is OrdersDataAdapter -> {
+                        // 使用 PlanDataAdapter 类型进行操作
+                        val ordersDataAdapter = adapter as  OrdersDataAdapter
+                        // 执行 PlanDataAdapter 的操作
+                        ordersDataAdapter.setData(data as List<OrderData>)
+
+                    }
+
+                    is TicketsDataAdapter->{
+                        val ordersDataAdapter = adapter as  TicketsDataAdapter
+                        ordersDataAdapter.setData(data as List<TicketsData>)
+                    }
+
+                    is TicketDetailAdapter ->{
+
+                        val ordersDataAdapter = adapter as  TicketDetailAdapter
+                        ordersDataAdapter.setData(data as List<TicketMessage>)
+
+                    }
+                    else -> {
+                        // 处理不匹配的适配器类型
+                        println( "Unknown adapter type.")
                     }
                 }
 
-    /**
-     * 执行实际的适配器数据更新操作。
-     * 根据适配器类型，将数据设置到相应的适配器中，并通知数据集变化。
-     *
-     * @param data 要更新到适配器的数据列表
-     */
-    @SuppressLint("NotifyDataSetChanged")
-    @Suppress("UNCHECKED_CAST")
-    private fun doUpdateAdapterData(data: List<T>) {
-        when (adapter) {
-            is PlanDataAdapter -> (adapter as PlanDataAdapter).setData(data as List<PlanData>)
-            is OrdersDataAdapter -> (adapter as OrdersDataAdapter).setData(data as List<OrderData>)
-            is TicketsDataAdapter -> (adapter as TicketsDataAdapter).setData(data as List<TicketsData>)
-            is TicketDetailAdapter -> (adapter as TicketDetailAdapter).setData(data as List<TicketMessage>)
-            else -> println("Unknown adapter type.")
+
+                val subscriptionAdapter = adapter as? PlanDataAdapter
+
+                if ( subscriptionAdapter != null ){
+                    subscriptionAdapter.setData(data as List<PlanData>)  // 假设你实现了一个 setData 方法来更新适配器的数据
                 }
+
                 adapter.notifyDataSetChanged()
             }
+        }
+
+    }
+
     @SuppressLint("NotifyDataSetChanged")
     private fun updateList(data: List<T>?) {
 

Android-kotlin-Code/design/src/main/java/com/github/kr328/clash/design/network/ApiClient.kt

@@ -34,7 +34,7 @@ object ApiClient {
 }
 
 object ApiClientConfig {
-    private const val ConfigURL = "https://vungles.com/api/test/" // BASE 请求配置文件地址 见说明文档
+    private const val ConfigURL = "https://api.xxxx.com/api/" // BASE 请求配置文件地址 见说明文档
     //const val ConfigNodeURL = "https://api.xxxx.com/api/parseyamlclash.php?target=clashmeta&url=" //通过香港服务器转接一次Clash转化的订阅地址
     const val ConfigNodeURL = ""
 

Android-kotlin-Code/design/src/main/res/layout/design_main.xml

@@ -194,8 +194,8 @@
                     app:layout_constraintTop_toTopOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
-                    android:layout_marginTop="0dp"
-                    android:layout_marginHorizontal="0dp"/>
+                    android:layout_marginTop="16dp"
+                    android:layout_marginHorizontal="16dp"/>
                 </androidx.cardview.widget.CardView>
                 <!-- TabLayout作为页指示器 -->
                 <com.google.android.material.tabs.TabLayout

Android-kotlin-Code/gradle.properties

@@ -6,8 +6,7 @@
 # http://www.gradle.org/docs/current/userguide/build_environment.html
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
-#org.gradle.jvmargs=-Xmx4g -XX:+UseZGC -Dfile.encoding=UTF-8
-org.gradle.jvmargs=-Xmx4g -XX:+UseG1GC
+org.gradle.jvmargs=-Xmx4g -XX:+UseZGC -Dfile.encoding=UTF-8
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects

Android-kotlin-Code/local.properties

@@ -4,7 +4,5 @@
 # Location of the SDK. This is only used by Gradle.
 # For customization when using a Version Control System, please read the
 # header note.
-#Fri Jul 18 13:36:50 CST 2025
-#cmake.dir=/Volumes/WD/androidstudio/sdk/cmake/3.22.1
-# C\:\\Users\\Administrator\\AppData\\Local\\Android\\Sdk\\cmake\\3.31.6
-sdk.dir=/Volumes/WD/androidstudio/sdk
+#Wed Dec 11 11:56:02 CST 2024
+sdk.dir=/Volumes/TOSHIBA/androidstudio/sdk

Android-kotlin-Code/settings.gradle.kts

@@ -51,7 +51,7 @@ dependencyResolutionManagement {
             library("androidx-activity", "androidx.activity:activity:$activity")
             library("androidx-fragment", "androidx.fragment:fragment:$fragment")
             library("androidx-appcompat", "androidx.appcompat:appcompat:$appcompat")
-            library("androidx-appcompat-resources", "androidx.appcompat:appcompat-resources:$appcompatres")
+            library("androidx-appcompat", "androidx.appcompat:appcompat-resources:$appcompatres")
             library("androidx-coordinator", "androidx.coordinatorlayout:coordinatorlayout:$coordinator")
             library("androidx-recyclerview", "androidx.recyclerview:recyclerview:$recyclerview")
             library("androidx-viewpager", "androidx.viewpager2:viewpager2:$viewpager")

README.md

@@ -3,7 +3,6 @@
 The original UUVPN was built using Flutter, which led to increasing challenges in maintaining the codebase due to performance issues, subpar UI quality, and a lack of stability. To address these concerns, UUVPN has been completely redeveloped for native performance on iOS/macOS and Android, utilizing the powerful SINGBOX and CLASH cores.
 
 
-
 ![](screenshots/android/combined_image11-19_12-04-1.jpeg)
 
 
@@ -19,9 +18,6 @@ The original UUVPN was built using Flutter, which led to increasing challenges i
 - V2Board Compatibility: Fully supports V2Board protocols, offering smooth integration for backend management.
 - Refined UI: A completely redesigned interface with a modern look and feel, providing a user-friendly experience.
 
-### Server :
-- https://github.com/cedar2025/Xboard
-
 
 ### Download iOS and android 
 - [iOS TestFlight (Beta)](https://t.me/dcgzeus)