pk房完成，剩余禁止对方麦未完成

拍卖房完成
点歌房完成，音乐播放需要测试

app/build.gradle

@@ -5,7 +5,7 @@ plugins {
 
 android {
     namespace 'com.qxcm.qxlive'
-    compileSdk 34
+    compileSdk 35
 
     defaultConfig {
         applicationId "com.qxcm.qxlive"
@@ -17,7 +17,7 @@ android {
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
         ndk {
-            //设置支持的so库框架
+            //设置支持的so库
             abiFilters 'armeabi-v7a', 'arm64-v8a'
         }
 
@@ -29,7 +29,11 @@ android {
             }
         }
 
+//        signingConfig signingConfigs.release
+//        proguardFiles 'proguard-rules.pro'
+
     }
+
     signingConfigs {
 
         debug {
@@ -92,8 +96,8 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_17
-        targetCompatibility JavaVersion.VERSION_17
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
     }
     buildFeatures {
         dataBinding true

app/lint-baseline.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<issues format="6" by="lint 8.8.0" type="baseline" client="gradle" dependencies="false" name="AGP (8.8.0)" variant="fatal" version="8.8.0">
+
+    <issue
+        id="ExpiredTargetSdkVersion"
+        message="Google Play requires that apps target API level 33 or higher."
+        errorLine1="        targetSdk 28"
+        errorLine2="        ~~~~~~~~~~~~">
+        <location
+            file="build.gradle"
+            line="13"
+            column="9"/>
+    </issue>
+
+</issues>

app/proguard-rules.pro

@@ -876,3 +876,25 @@ public static java.lang.String TABLENAME;
 -dontwarn com.tencent.cloud.huiyansdkface.okhttp3.OkHttpClient$Builder
 
 ####################### normal混淆规则-END#############################
+
+# 保留 BaseModel 和其子类的字段名
+-keep class com.qxcm.moduleutil.http.BaseModel { *; }
+-keep class com.qxcm.moduleutil.bean.** { *; }
+
+# 保留所有作为 API 响应体的类
+-keep class com.qxcm.moduleutil.bean.**.*Response { *; }
+
+# 保留 Gson 使用的字段
+-keepclassmembers class * {
+    @com.google.gson.annotations.SerializedName <fields>;
+}
+
+# 避免 Retrofit 接口被混淆
+-keep interface com.qxcm.moduleutil.http.ApiServer { *; }
+
+# 保留 retrofit 相关类
+-keep class retrofit2.** { *; }
+-keep class okhttp3.** { *; }
+
+-keep class com.qxcm.moduleutil.utils.location.** { *; }
+-keep class io.agora.**{*;}

app/release/output-metadata.json

@@ -11,9 +11,9 @@
       "type": "SINGLE",
       "filters": [],
       "attributes": [],
-      "versionCode": 1,
-      "versionName": "1.0",
-      "outputFile": "羽声_1.0_1.apk"
+      "versionCode": 3,
+      "versionName": "1.0.2",
+      "outputFile": "羽声_1.0.2_3.apk"
     }
   ],
   "elementType": "File",
@@ -22,14 +22,14 @@
       "minApi": 28,
       "maxApi": 30,
       "baselineProfiles": [
-        "baselineProfiles/1/羽声_1.0_1.dm"
+        "baselineProfiles/1/羽声_1.0.2_3.dm"
       ]
     },
     {
       "minApi": 31,
       "maxApi": 2147483647,
       "baselineProfiles": [
-        "baselineProfiles/0/羽声_1.0_1.dm"
+        "baselineProfiles/0/羽声_1.0.2_3.dm"
       ]
     }
   ],

app/src/main/AndroidManifest.xml

@@ -65,12 +65,9 @@
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.FLASHLIGHT" />
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"
-      />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"
         android:maxSdkVersion="32"
-        tools:ignore="ScopedStorage" />
-    <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />
+         />
     <uses-permission android:name="android.permission.GET_TASKS" />
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
@@ -94,6 +91,14 @@
         <package android:name="com.tencent.mm" />
     </queries>
 
+    <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"
+        tools:ignore="ProtectedPermissions"/>
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.CAMERA"/>
+    <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE"
+        android:required="false"
+        android:maxSdkVersion="32"/>
+
 
     <application
         android:name="AppContext"
@@ -110,9 +115,10 @@
         android:theme="@style/AppTheme"
         android:networkSecurityConfig="@xml/network_security_config"
         android:usesCleartextTraffic="true"
-        tools:targetApi="31"
+        tools:targetApi="tiramisu"
         tools:ignore="SelectedPhotoAccess"
         tools:replace="android:theme,android:allowBackup"
+        android:enableOnBackInvokedCallback="true"
         >
         <activity
             android:name=".LaunchPageActivity"

app/src/main/java/com/qxcm/qxlive/AppContext.java

@@ -29,7 +29,7 @@ public class AppContext extends CommonAppContext {
 //        L.setDeBug(BuildConfig.DEBUG);
     }
     public static void initSdk() {
-        CommonAppContext context = CommonAppContext.getInstance();
+//        CommonAppContext context = CommonAppContext.getInstance();
 
 //        if (BuildConfig.DEBUG) {
 //            L.e("应用签名：" + context.getAppSignature());

app/src/main/java/com/qxcm/qxlive/LaunchContacter.java

@@ -14,5 +14,7 @@ public final class LaunchContacter {
     public interface ILoginPre extends IPresenter {
 
         void oauthLogin(String login_token);
+
+        void address_ip(String address_ip);
     }
 }

app/src/main/java/com/qxcm/qxlive/LaunchPageActivity.java

@@ -1,7 +1,10 @@
 package com.qxcm.qxlive;
 
 
+import android.Manifest;
+import android.app.Activity;
 import android.content.Intent;
+import android.content.pm.PackageManager;
 import android.graphics.Color;
 import android.os.Build;
 import android.os.Bundle;
@@ -10,10 +13,16 @@ import android.text.TextUtils;
 import android.view.Gravity;
 import android.view.View;
 import android.widget.ImageView;
+import android.widget.Toast;
+
+import androidx.annotation.NonNull;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
 
 import com.alibaba.fastjson.JSON;
 import com.blankj.utilcode.util.LogUtils;
 import com.blankj.utilcode.util.ThreadUtils;
+import com.blankj.utilcode.util.ToastUtils;
 import com.mobile.auth.gatewayauth.AuthUIConfig;
 import com.mobile.auth.gatewayauth.PhoneNumberAuthHelper;
 import com.mobile.auth.gatewayauth.PreLoginResultListener;
@@ -29,6 +38,8 @@ import com.qxcm.moduleutil.base.CommonAppContext;
 import com.qxcm.moduleutil.bean.UserBean;
 import com.qxcm.moduleutil.dialog.PolicyDialog;
 import com.qxcm.moduleutil.utils.SpUtil;
+import com.qxcm.moduleutil.utils.location.LocationProvider;
+import com.qxcm.moduleutil.utils.location.LocationServiceFactory;
 import com.qxcm.moduleutil.utils.logger.Logger;
 import com.qxcm.qxlive.databinding.ActivityLaunchPageBinding;
 import com.tencent.qcloud.tuicore.TUILogin;
@@ -42,7 +53,7 @@ public class LaunchPageActivity extends BaseMvpActivity<LaunchPresenter, Activit
     private TokenResultListener tokenResultListener;
     private boolean canOnePass;
     private boolean isCanOnePass = true;
-
+    private String city1="";
     @Override
     protected void initData() {
         handler = new Handler();
@@ -86,12 +97,16 @@ public class LaunchPageActivity extends BaseMvpActivity<LaunchPresenter, Activit
             });
             policyDialog.show();
         }
+
+
     }
 
     private void initLogin() {
-
+        EventBus.getDefault().register(this);
         initQuickLogin();
         checkOnePass();
+
+//
     }
 
     private void checkOnePass() {
@@ -163,16 +178,18 @@ public class LaunchPageActivity extends BaseMvpActivity<LaunchPresenter, Activit
             Logger.e("SplashEnd", "ARouters.MAIN");
 
             UserBean userBean = CommonAppContext.getInstance().getUser();
-            TUILogin.login(getBaseContext(), CommonAppContext.getInstance().getCurrentEnvironment().getSdkAppId(), "u"+userBean.getUser_id(), userBean.getTencent_im(), new TUICallback() {
-                @Override
-                public void onError(final int code, final String desc) {
-                    LogUtils.e("@@@",code,"描述：",desc);
-                }
-                @Override
-                public void onSuccess() {
-                    LogUtils.e("@@@","成功");
-                }
-            });
+
+//            TUILogin.login(getBaseContext(), CommonAppContext.getInstance().getCurrentEnvironment().getSdkAppId(), "u"+userBean.getUser_id(), userBean.getTencent_im(), new TUICallback() {
+//                @Override
+//                public void onError(final int code, final String desc) {
+//                    LogUtils.e("@@@",code,"描述：",desc);
+//                }
+//                @Override
+//                public void onSuccess() {
+//                    LogUtils.e("@@@","成功");
+//
+//                }
+//            });
             if (userBean.getSex() == 0) {
                 Intent intent = new Intent(this, ImproveInfoActivity.class);
                 Bundle bundle = new Bundle();
@@ -180,7 +197,7 @@ public class LaunchPageActivity extends BaseMvpActivity<LaunchPresenter, Activit
                 intent.putExtras(bundle);
                 startActivity(intent);
             } else {
-
+                EventBus.getDefault().post(userBean);
                 startActivity(new Intent(this, MainActivity.class));
             }
             finish();
@@ -324,5 +341,25 @@ public class LaunchPageActivity extends BaseMvpActivity<LaunchPresenter, Activit
         return new LaunchPresenter(this, this);
     }
 
+//    @Override
+//    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+//        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
+//
+//        if (requestCode == 1001) {
+//            LocationProvider provider = LocationServiceFactory.createBestProvider(this);
+//            provider.getLastKnownLocation(this, new LocationProvider.LocationCallback() {
+//                @Override
+//                public void onLocationReceived(double latitude, double longitude, String city) {
+//                    ToastUtils.showShort("当前位置：" + city);
+//                    city1=city;
+//                }
+//
+//                @Override
+//                public void onFailed(String errorMessage) {
+//                    ToastUtils.showShort("定位失败");
+//                }
+//            });
+//        }
+//    }
 
 }

app/src/main/java/com/qxcm/qxlive/LaunchPresenter.java

@@ -14,6 +14,8 @@ import com.qxcm.moduleutil.bean.UserBean;
 import com.qxcm.moduleutil.http.BaseObserver;
 import com.qxcm.moduleutil.presenter.BasePresenter;
 
+import org.greenrobot.eventbus.EventBus;
+
 import java.util.List;
 
 import io.reactivex.disposables.Disposable;
@@ -40,6 +42,21 @@ public class LaunchPresenter extends BasePresenter<LaunchContacter.View> impleme
         });
     }
 
+    @Override
+    public void address_ip(String address_ip) {
+        api.address_ip(address_ip, new BaseObserver<String>() {
+            @Override
+            public void onSubscribe(Disposable d) {
+//                addDisposable(d);
+            }
+
+            @Override
+            public void onNext(String s) {
+
+            }
+        });
+    }
+
     public void loginSuccess(List<UserBean> userBean) {
         if (userBean==null) {
             ToastUtils.showShort("登录失败请重试");
@@ -76,7 +93,7 @@ public class LaunchPresenter extends BasePresenter<LaunchContacter.View> impleme
             com.blankj.utilcode.util.ActivityUtils.startActivity(intent);
 
         }
-//        EventBus.getDefault().post(new LoginFinishEvent());
+        EventBus.getDefault().post(userBean);
 //        EventBus.getDefault().post(new SplashFinishEvent());
 //        AppLog.setUserUniqueID(userBean.getUser_id()); // 设置您自己的账号体系ID, 并保证其唯一性 ！
     }

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

@@ -8,7 +8,8 @@
     <FrameLayout
         android:id="@+id/root"
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:background="@color/transparent">
 
 
         <FrameLayout
@@ -93,8 +94,8 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:clickable="true"
-            android:scaleType="centerCrop"
             android:src="@mipmap/screen"
+            android:scaleType="centerCrop"
             android:visibility="visible" />
 
     </FrameLayout>