circle_app/android/app/build.gradle

@@ -46,24 +46,18 @@ android {
     signingConfigs {
 
         debug {
-            storeFile file('leyuan.jks')
+            storeFile file('../leyuan.jks')
             storePassword 'leyuan'
             keyAlias = 'leyuan'
             keyPassword 'leyuan'
         }
         release {
-            storeFile file('leyuan.jks')
+            storeFile file('../leyuan.jks')
             storePassword 'leyuan'
             keyAlias = 'leyuan'
             keyPassword 'leyuan'
         }
     }
-
-    lintOptions {
-        // 如打包出现Failed to transform libs.jar to match attributes
-        checkReleaseBuilds false
-    }
-
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "com.leyuan.app"
@@ -71,8 +65,8 @@ android {
         // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
         minSdkVersion 21
         targetSdkVersion flutter.targetSdkVersion
-        versionCode 289
-        versionName "2.8.9"
+        versionCode 14
+        versionName "1.1.4"
         manifestPlaceholders = [
                 vivo_APPID: "105669716",
                 vivo_APPKEY:"84f750207787376b310ca5b0d5969122",
@@ -91,27 +85,12 @@ android {
             //flutter build apk --no-sound-null-safety
             signingConfig signingConfigs.release
             project.ext.enableFlutterNullSafety = false
-            minifyEnabled true
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
         debug {
             signingConfig signingConfigs.release
             project.ext.enableFlutterNullSafety = false
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
-
-    applicationVariants.all { variant ->
-        variant.outputs.each { output ->
-            def versionName = variant.versionName
-            def newName = "微乐园V${versionName}.apk"
-            if (output instanceof com.android.build.gradle.internal.api.BaseVariantOutputImpl) {
-                output.outputFileName = newName
-            }
-        }
-    }
-
 }
 
 flutter {
@@ -120,5 +99,4 @@ flutter {
 
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'com.google.android.gms:play-services-location:21.0.1'
 }

circle_app/android/app/proguard-rules.pro

@@ -1,63 +0,0 @@
-# Add project specific ProGuard rules here.
-# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile
-
-##########flutter相关不混淆############
--keep class com.umeng.** {*;}
-
--keep class org.repackage.** {*;}
-
--keep class com.uyumao.** { *; }
-
--keepclassmembers class * {
-   public <init> (org.json.JSONObject);
-}
-
--keepclassmembers enum * {
-    public static **[] values();
-    public static ** valueOf(java.lang.String);
-}
-
--dontwarn com.cmic.sso.sdk.**
--keep class com.cmic.sso.**{*;}
--dontwarn com.sdk.**
--keep class com.sdk.** { *;}
--keep class cn.com.chinatelecom.account.**{*;}
--keep public class * extends android.view.View
--keep class com.netease.nis.quicklogin.entity.**{*;}
--keep class com.netease.nis.quicklogin.listener.**{*;}
--keep class com.netease.nis.quicklogin.QuickLogin{
-    public <methods>;
-    public <fields>;
-}
--keep class com.netease.nis.quicklogin.helper.UnifyUiConfig{*;}
--keep class com.netease.nis.quicklogin.helper.UnifyUiConfig$Builder{
-     public <methods>;
-     public <fields>;
- }
--keep class com.netease.nis.quicklogin.utils.LoginUiHelper$CustomViewListener{
-     public <methods>;
-     public <fields>;
-}
--keep class com.netease.nis.basesdk.**{
-    public *;
-    protected *;
-}

circle_app/android/app/src/main/AndroidManifest.xml

@@ -2,6 +2,8 @@
     package="com.leyuan.app">
     <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES"/>
     <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission
+        android:name="android.permission.INTERNET"/>
     <uses-permission
         android:name="android.permission.RECORD_AUDIO"/>
     <uses-permission
@@ -31,7 +33,7 @@
     <uses-permission android:name="com.vivo.notification.permission.BADGE_ICON" />
     <uses-permission android:name = "com.hihonor.android.launcher.permission.CHANGE_BADGE" />
 
-    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
+
     <!--小米 开始-->
     <permission
         android:name="com.leyuan.app.permission.MIPUSH_RECEIVE"
@@ -59,13 +61,9 @@
     <uses-permission android:name="com.leyuan.app.permission.C2D_MESSAGE"/>
     <!--魅族 结束-->
 
-    <!-- Provider -->
-
-
-
-
     <application
         android:label="微乐园"
+
         android:icon="@mipmap/ic_launcher">
         <activity
             android:name=".MainActivity"
@@ -90,8 +88,6 @@
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-        <!-- 底部导航栏 -->
-
         <meta-data
             android:name="io.flutter.embedding.android.NormalTheme"
             android:resource="@style/NormalTheme"
@@ -107,77 +103,5 @@
         <meta-data
             android:name="flutterEmbedding"
             android:value="2" />
-
-        <meta-data
-            android:name="com.hihonor.push.app_id"
-            android:value="40659" />
-        <!-- ********小米推送service和receiver设置start******** -->
-        <service
-            android:name="com.xiaomi.push.service.XMPushService"
-            android:enabled="true"
-            android:process=":pushservice" />
-        <service
-            android:name="com.xiaomi.push.service.XMJobService"
-            android:enabled="true"
-            android:exported="false"
-            android:permission="android.permission.BIND_JOB_SERVICE"
-            android:process=":pushservice" />
-        <!-- 注：此service必须在3.0.1版本以后（包括3.0.1版本）加入 -->
-        <service
-            android:name="com.xiaomi.mipush.sdk.PushMessageHandler"
-            android:enabled="true"
-            android:exported="true" />
-        <service
-            android:name="com.xiaomi.mipush.sdk.MessageHandleService"
-            android:enabled="true" />
-        <!-- 注：此service必须在2.2.5版本以后（包括2.2.5版本）加入 -->
-        <receiver
-            android:name="com.xiaomi.push.service.receivers.NetworkStatusReceiver"
-            android:exported="false">
-            <intent-filter>
-                <action android:name="android.net.conn.CONNECTIVITY_CHANGE" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </receiver>
-        <receiver
-            android:name="com.xiaomi.push.service.receivers.PingReceiver"
-            android:exported="false"
-            android:process=":pushservice">
-            <intent-filter>
-                <action android:name="com.xiaomi.push.PING_TIMER" />
-            </intent-filter>
-        </receiver>
-
-
-        <!-- ********荣耀推送设置start******** -->
-        <service
-            android:name="com.leyuan.app.MyHonorMessageService"
-            android:exported="false">
-            <intent-filter>
-                <action android:name="com.hihonor.push.action.MESSAGING_EVENT" />
-            </intent-filter>
-        </service>
-        <!-- ********荣耀推送设置end******** -->
-
-        <service
-            android:name="com.tencent.qcloud.tim.tuiofflinepush.oempush.MyHonorMessageService"
-            android:exported="false">
-            <intent-filter>
-                <action android:name="com.hihonor.push.action.MESSAGING_EVENT" />
-            </intent-filter>
-        </service>
-
-
-
-        <provider
-            android:name="androidx.core.content.FileProvider"
-            android:authorities="${applicationId}.fileProvider"
-            android:exported="false"
-            android:grantUriPermissions="true">
-            <meta-data
-                android:name="android.support.FILE_PROVIDER_PATHS"
-                android:resource="@xml/file_paths" />
-        </provider>
     </application>
-
 </manifest>

circle_app/android/app/src/main/kotlin/com/leyuan/app/MainActivity.kt

@@ -4,15 +4,10 @@ import android.os.Bundle
 import android.os.PersistableBundle
 import android.util.Log
 import io.flutter.embedding.android.FlutterActivity
-import com.umeng.commonsdk.UMConfigure
 
 class MainActivity: FlutterActivity() {
     override fun onCreate(savedInstanceState: Bundle?, persistentState: PersistableBundle?) {
         super.onCreate(savedInstanceState, persistentState)
         Log.e("tag","11111111111")
-        UMConfigure.setLogEnabled(true)
-        UMConfigure.preInit(this, "66c6db5ccac2a664de95a135", "Umeng")
     }
-
-
 }

circle_app/android/app/src/main/res/values-night/styles.xml

@@ -5,7 +5,6 @@
         <!-- Show a splash screen on the activity. Automatically removed when
              the Flutter engine draws its first frame -->
         <item name="android:windowBackground">@drawable/launch_background</item>
-
     </style>
     <!-- Theme applied to the Android Window as soon as the process has started.
          This theme determines the color of the Android Window while your
@@ -14,8 +13,6 @@
 
          This Theme is only used starting with V2 of Flutter's Android embedding. -->
     <style name="NormalTheme" parent="@android:style/Theme.Black.NoTitleBar">
-        <item name="android:navigationBarColor">@android:color/transparent</item>
         <item name="android:windowBackground">?android:colorBackground</item>
     </style>
-
 </resources>

circle_app/android/app/src/main/res/values/colors.xml

@@ -1,3 +0,0 @@
-<resources>
-    <color name="bottom_navigation_color">#FF5722</color> <!-- 例如橙色 -->
-</resources>

circle_app/android/app/src/main/res/values/ic_launcher_background.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="ic_launcher_background">#ffffff</color>
+    <color name="ic_launcher_background">#FFFFFF</color>
 </resources>

circle_app/android/app/src/main/res/values/styles.xml

@@ -5,7 +5,6 @@
         <!-- Show a splash screen on the activity. Automatically removed when
              the Flutter engine draws its first frame -->
         <item name="android:windowBackground">@drawable/launch_background</item>
-
     </style>
     <!-- Theme applied to the Android Window as soon as the process has started.
          This theme determines the color of the Android Window while your
@@ -15,6 +14,5 @@
          This Theme is only used starting with V2 of Flutter's Android embedding. -->
     <style name="NormalTheme" parent="@android:style/Theme.Light.NoTitleBar">
         <item name="android:windowBackground">?android:colorBackground</item>
-        <item name="android:navigationBarColor">@android:color/transparent</item>
     </style>
 </resources>

circle_app/android/app/src/main/res/xml/file_paths.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<paths>
-    <external-path path="Android/data/com.leyuan.app/" name="files_root" />
-    <external-path path="." name="external_storage_root" />
-</paths>

circle_app/android/app/src/main/res/xml/network_security_config.xml

@@ -2,4 +2,3 @@
 <network-security-config>
     <base-config cleartextTrafficPermitted="true" />
 </network-security-config>
-

circle_app/android/build.gradle

@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.9.10'
+    ext.kotlin_version = '1.7.10'
     repositories {
         google()
         mavenCentral()
@@ -9,7 +9,6 @@ buildscript {
         maven{url 'https://maven.aliyun.com/repository/jcenter' }
         maven {url 'https://developer.huawei.com/repo/'}
         maven { url 'https://developer.hihonor.com/repo/' }
-        maven { url 'https://repo1.maven.org/maven2/' }
     }
 
     dependencies {
@@ -26,7 +25,7 @@ allprojects {
         maven { url "https://storage.googleapis.com/download.flutter.io" }
         maven { url "https://jitpack.io" }
         maven { url 'https://mvn.getui.com/nexus/content/repositories/releases' }
-//        maven { url "https://mirrors.tencent.com/nexus/repository/maven-public/" }
+        maven { url "https://mirrors.tencent.com/nexus/repository/maven-public/" }
         maven { url 'https://repo1.maven.org/maven2/' }
         maven {url 'https://developer.huawei.com/repo/'}
         maven { url 'https://developer.hihonor.com/repo/' }
@@ -37,7 +36,6 @@ rootProject.buildDir = '../build'
 subprojects {
     project.buildDir = "${rootProject.buildDir}/${project.name}"
 }
-
 subprojects {
     project.evaluationDependsOn(':app')
 }

circle_app/android/gradle.properties

@@ -1,4 +1,3 @@
 org.gradle.jvmargs=-Xmx1536M
 android.useAndroidX=true
 android.enableJetifier=true
-extra-front-end-options=--no-sound-null-safety

circle_app/android/gradle/wrapper/gradle-wrapper.properties

@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip