diff --git a/app/releas/release/output-metadata.json b/app/releas/release/output-metadata.json new file mode 100644 index 00000000..d79590fa --- /dev/null +++ b/app/releas/release/output-metadata.json @@ -0,0 +1,37 @@ +{ + "version": 3, + "artifactType": { + "type": "APK", + "kind": "Directory" + }, + "applicationId": "com.qxcm.qxlive", + "variantName": "releasRelease", + "elements": [ + { + "type": "SINGLE", + "filters": [], + "attributes": [], + "versionCode": 51, + "versionName": "1.0.6.1", + "outputFile": "羽声_1.0.6.1_51.apk" + } + ], + "elementType": "File", + "baselineProfiles": [ + { + "minApi": 28, + "maxApi": 30, + "baselineProfiles": [ + "baselineProfiles/1/羽声_1.0.6.1_51.dm" + ] + }, + { + "minApi": 31, + "maxApi": 2147483647, + "baselineProfiles": [ + "baselineProfiles/0/羽声_1.0.6.1_51.dm" + ] + } + ], + "minSdkVersionForDexing": 24 +} \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b504d094..f9872c1b 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,235 +1,230 @@ + xmlns:tools="http://schemas.android.com/tools" + package="com.qxcm.qxlive"> + android:name="android.hardware.telephony" + android:required="false" /> + android:name="android.hardware.camera" + android:required="false" /> - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + - + - + - - - + + + - - + + - - - - - + + + + + - - - - + + + + - + android:name="com.qxcm.qxlive.AppContext" + android:allowBackup="true" + android:extractNativeLibs="true" + android:largeHeap="true" + android:dataExtractionRules="@xml/data_extraction_rules" + android:fullBackupContent="@xml/backup_rules" + android:requestLegacyExternalStorage="true" + android:resizeableActivity="true" + android:icon="@mipmap/ic_launcher_app" + android:label="@string/app_name" + android:roundIcon="@mipmap/ic_launcher_foreground" + android:supportsRtl="true" + android:theme="@style/AppTheme_MAIN" + android:networkSecurityConfig="@xml/network_security_config" + android:usesCleartextTraffic="true" + tools:ignore="SelectedPhotoAccess" + tools:replace="android:theme,android:allowBackup,android:roundIcon,android:icon" + android:enableOnBackInvokedCallback="true" + android:requestRawExternalStorageAccess="true" + tools:targetApi="tiramisu" + > + android:name=".LaunchPageActivity" + android:configChanges="orientation|keyboardHidden|screenSize" + android:exported="true" + android:screenOrientation="behind" + android:theme="@style/main_SplashThemeImage"> - - + + - - + + - - - - - - - - + android:name="BUGLY_APPID" + android:value="b45883f58f" /> + + + + + + + + + android:name="BUGLY_ENABLE_DEBUG" + android:value="false" /> + android:name="com.mobile.auth.gatewayauth.LoginAuthActivity" + android:configChanges="orientation|keyboardHidden|screenSize" + android:exported="false" + android:launchMode="singleTask" + android:screenOrientation="behind" + android:theme="@style/authsdk_activity_dialog" /> - - - - - - + + + + + + + android:name="com.cmic.sso.sdk.activity.LoginAuthActivity" + android:configChanges="orientation|keyboardHidden|screenSize" + android:launchMode="singleTop" + android:screenOrientation="behind" + android:theme="@style/authsdk_activity_dialog" /> + android:name=".wxapi.WXEntryActivity" + android:theme="@android:style/Theme.Translucent.NoTitleBar" + android:exported="true" + android:taskAffinity="com.qxcm.qxlive" + android:launchMode="singleTask"> + android:name=".wxapi.WXPayEntryActivity" + android:exported="true" + android:launchMode="singleTop" /> + android:name="com.example.modulevocal.activity.RealNameActivity" + android:exported="false" /> + android:name=".PasswordLoginActivity" + android:exported="true" + /> - - - - - - + + + + + + - - - - - - + + + + + + \ No newline at end of file diff --git a/app/src/main/java/com/qxcm/qxlive/AppContext.java b/app/src/main/java/com/qxcm/qxlive/AppContext.java index 409eb280..b6e8f669 100644 --- a/app/src/main/java/com/qxcm/qxlive/AppContext.java +++ b/app/src/main/java/com/qxcm/qxlive/AppContext.java @@ -39,7 +39,6 @@ public class AppContext extends CommonAppContext { // }); // L.setDeBug(BuildConfig.DEBUG); } - public static void initSdk() { // CommonAppContext context = CommonAppContext.getInstance(); @@ -73,6 +72,7 @@ public class AppContext extends CommonAppContext { // OpenInstall.init(context); + } /** diff --git a/app/src/main/java/com/qxcm/qxlive/LaunchPageActivity.java b/app/src/main/java/com/qxcm/qxlive/LaunchPageActivity.java index 089f56e7..de4a7447 100644 --- a/app/src/main/java/com/qxcm/qxlive/LaunchPageActivity.java +++ b/app/src/main/java/com/qxcm/qxlive/LaunchPageActivity.java @@ -20,39 +20,38 @@ import com.xscm.moduleutil.base.CommonAppContext; import com.xscm.moduleutil.dialog.PolicyDialog; import com.xscm.moduleutil.utils.ARouteConstants; import com.xscm.moduleutil.utils.SpUtil; - /** - * APP准备启动 - *

- * _oo0oo_ - * o8888888o - * 88" . "88 - * (| -_- |) - * 0\ = /0 - * ___/`---'\___ - * .' \\| |// '. - * / \\||| : |||// \ - * / _||||| -卍-|||||- \ - * | | \\\ - /// | | - * | \_| ''\---/'' |_/ | - * \ .-\__ '-' ___/-. / - * ___'. .' /--.--\ `. .'___ - * ."" '< `.___\_<|>_/___.' >' "". + APP准备启动 + * + * _oo0oo_ + * o8888888o + * 88" . "88 + * (| -_- |) + * 0\ = /0 + * ___/`---'\___ + * .' \\| |// '. + * / \\||| : |||// \ + * / _||||| -卍-|||||- \ + * | | \\\ - /// | | + * | \_| ''\---/'' |_/ | + * \ .-\__ '-' ___/-. / + * ___'. .' /--.--\ `. .'___ + * ."" '< `.___\_<|>_/___.' >' "". * | | : `- \`.;`\ _ /`;.`/ - ` : | | * \ \ `_. \_ __\ /__ _/ .-` / / - * =====`-.____`.___ \_____/___.-`___.-'===== - * `=---=' - *

+ *=====`-.____`.___ \_____/___.-`___.-'===== + * `=---=' + * * 佛祖保佑 永无BUG * 佛曰: - * 写字楼里写字间，写字间里程序员； - * 程序人员写程序，又拿程序换酒钱。 - * 酒醒只在网上坐，酒醉还来网下眠； - * 酒醉酒醒日复日，网上网下年复年。 - * 但愿老死电脑间，不愿鞠躬老板前； - * 奔驰宝马贵者趣，公交自行程序员。 - * 别人笑我忒疯癫，我笑自己命太贱； - * 不见满街漂亮妹，哪个归得程序员？ + * 写字楼里写字间，写字间里程序员； + * 程序人员写程序，又拿程序换酒钱。 + * 酒醒只在网上坐，酒醉还来网下眠； + * 酒醉酒醒日复日，网上网下年复年。 + * 但愿老死电脑间，不愿鞠躬老板前； + * 奔驰宝马贵者趣，公交自行程序员。 + * 别人笑我忒疯癫，我笑自己命太贱； + * 不见满街漂亮妹，哪个归得程序员？ */ public class LaunchPageActivity extends BaseAppCompatActivity { private Handler handler; diff --git a/app/src/main/java/com/qxcm/qxlive/LaunchPresenter.java b/app/src/main/java/com/qxcm/qxlive/LaunchPresenter.java index dfd09344..f95ad366 100644 --- a/app/src/main/java/com/qxcm/qxlive/LaunchPresenter.java +++ b/app/src/main/java/com/qxcm/qxlive/LaunchPresenter.java @@ -57,11 +57,11 @@ public class LaunchPresenter extends BasePresenter userBean) { - if (userBean == null) { + if (userBean==null) { ToastUtils.showShort("登录失败请重试"); return; } - if (userBean.size() == 1) { + if (userBean.size()==1) { CommonAppContext.getInstance().setUser(userBean.get(0)); @@ -84,9 +84,9 @@ public class LaunchPresenter extends BasePresenter result = authTask.authV2(authInfo, true); LogUtils.e(result); - if (result.get("resultStatus").equals("9000")) { + if (result.get("resultStatus").equals("9000")){ Pattern pattern = Pattern.compile("auth_code=([^&]*)"); Matcher matcher = pattern.matcher(result.get("result")); if (matcher.find()) { String authCode = matcher.group(1); LogUtils.e("AuthCode", authCode); - MvpPre.oauthLogin(authCode, 2); + MvpPre.oauthLogin(authCode,2); } } } diff --git a/app/src/main/java/com/qxcm/qxlive/presenter/BasePresenter.java b/app/src/main/java/com/qxcm/qxlive/presenter/BasePresenter.java index 45a4206c..842d9f99 100644 --- a/app/src/main/java/com/qxcm/qxlive/presenter/BasePresenter.java +++ b/app/src/main/java/com/qxcm/qxlive/presenter/BasePresenter.java @@ -15,8 +15,8 @@ import io.reactivex.disposables.Disposable; public abstract class BasePresenter implements IPresenter { protected CompositeDisposable mDisposables = new CompositeDisposable(); - // private RemoteDataSource api; - protected Reference MvpRef; +// private RemoteDataSource api; + protected Reference MvpRef; protected Context mContext; @Deprecated @@ -74,7 +74,7 @@ public abstract class BasePresenter implements IPresenter { if (MvpRef != null) { MvpRef.clear(); } - mContext = null; + mContext=null; } /** @@ -106,4 +106,5 @@ public abstract class BasePresenter implements IPresenter { } + } diff --git a/app/src/main/java/com/qxcm/qxlive/wxapi/WXEntryActivity.java b/app/src/main/java/com/qxcm/qxlive/wxapi/WXEntryActivity.java index 98aa1d08..aef240ad 100644 --- a/app/src/main/java/com/qxcm/qxlive/wxapi/WXEntryActivity.java +++ b/app/src/main/java/com/qxcm/qxlive/wxapi/WXEntryActivity.java @@ -13,7 +13,7 @@ import com.tencent.mm.opensdk.openapi.WXAPIFactory; import org.greenrobot.eventbus.EventBus; -public class WXEntryActivity extends Activity implements IWXAPIEventHandler { +public class WXEntryActivity extends Activity implements IWXAPIEventHandler{ // private static String TAG = "MicroMsg.WXEntryActivity"; // // private IWXAPI api; @@ -158,76 +158,76 @@ public class WXEntryActivity extends Activity implements IWXAPIEventHandler { // finish(); // } // - /// / private void goToGetMsg() { - /// / Intent intent = new Intent(this, GetFromWXActivity.class); - /// / intent.putExtras(getIntent()); - /// / startActivity(intent); - /// / finish(); - /// / } - /// / - /// / private void goToShowMsg(ShowMessageFromWX.Req showReq) { - /// / WXMediaMessage wxMsg = showReq.message; - /// / WXAppExtendObject obj = (WXAppExtendObject) wxMsg.mediaObject; - /// / - /// / StringBuffer msg = new StringBuffer(); - /// / msg.append("description: "); - /// / msg.append(wxMsg.description); - /// / msg.append("\n"); - /// / msg.append("extInfo: "); - /// / msg.append(obj.extInfo); - /// / msg.append("\n"); - /// / msg.append("filePath: "); - /// / msg.append(obj.filePath); - /// / - /// / Intent intent = new Intent(this, ShowFromWXActivity.class); - /// / intent.putExtra(Constants.ShowMsgActivity.STitle, wxMsg.title); - /// / intent.putExtra(Constants.ShowMsgActivity.SMessage, msg.toString()); - /// / intent.putExtra(Constants.ShowMsgActivity.BAThumbData, wxMsg.thumbData); - /// / startActivity(intent); - /// / finish(); - /// / } +//// private void goToGetMsg() { +//// Intent intent = new Intent(this, GetFromWXActivity.class); +//// intent.putExtras(getIntent()); +//// startActivity(intent); +//// finish(); +//// } +//// +//// private void goToShowMsg(ShowMessageFromWX.Req showReq) { +//// WXMediaMessage wxMsg = showReq.message; +//// WXAppExtendObject obj = (WXAppExtendObject) wxMsg.mediaObject; +//// +//// StringBuffer msg = new StringBuffer(); +//// msg.append("description: "); +//// msg.append(wxMsg.description); +//// msg.append("\n"); +//// msg.append("extInfo: "); +//// msg.append(obj.extInfo); +//// msg.append("\n"); +//// msg.append("filePath: "); +//// msg.append(obj.filePath); +//// +//// Intent intent = new Intent(this, ShowFromWXActivity.class); +//// intent.putExtra(Constants.ShowMsgActivity.STitle, wxMsg.title); +//// intent.putExtra(Constants.ShowMsgActivity.SMessage, msg.toString()); +//// intent.putExtra(Constants.ShowMsgActivity.BAThumbData, wxMsg.thumbData); +//// startActivity(intent); +//// finish(); +//// } - private final String TAG = this.getClass().getSimpleName(); - public static final String APP_ID = CommonAppContext.getInstance().getCurrentEnvironment().getWxAppId(); - public static final String APP_SECRET = "请自己填写"; - private IWXAPI mApi; + private final String TAG = this.getClass().getSimpleName(); + public static final String APP_ID = CommonAppContext.getInstance().getCurrentEnvironment().getWxAppId(); + public static final String APP_SECRET = "请自己填写"; + private IWXAPI mApi; - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - mApi = WXAPIFactory.createWXAPI(this, APP_ID, true); - mApi.handleIntent(this.getIntent(), this); - } + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + mApi = WXAPIFactory.createWXAPI(this, APP_ID, true); + mApi.handleIntent(this.getIntent(), this); + } - //微信发送的请求将回调到onReq方法 - @Override - public void onReq(BaseReq baseReq) { - } + //微信发送的请求将回调到onReq方法 + @Override + public void onReq(BaseReq baseReq) { + } - //发送到微信请求的响应结果 - @Override - public void onResp(BaseResp resp) { - switch (resp.errCode) { - case BaseResp.ErrCode.ERR_OK: - //发送成功 - ToastUtils.showShort("发送成功", resp.transaction); - EventBus.getDefault().post(resp); - break; - case BaseResp.ErrCode.ERR_USER_CANCEL: - //发送取消 - ToastUtils.showShort("发送取消", resp); - break; - case BaseResp.ErrCode.ERR_AUTH_DENIED: - ToastUtils.showShort("发送被拒绝", resp); - //发送被拒绝 - break; - default: - //发送返回 - break; - } - finish(); + //发送到微信请求的响应结果 + @Override + public void onResp(BaseResp resp) { + switch (resp.errCode) { + case BaseResp.ErrCode.ERR_OK: + //发送成功 + ToastUtils.showShort("发送成功",resp.transaction); + EventBus.getDefault().post(resp); + break; + case BaseResp.ErrCode.ERR_USER_CANCEL: + //发送取消 + ToastUtils.showShort("发送取消",resp); + break; + case BaseResp.ErrCode.ERR_AUTH_DENIED: + ToastUtils.showShort("发送被拒绝",resp); + //发送被拒绝 + break; + default: + //发送返回 + break; + } + finish(); - } + } } \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_launcher_skip.xml b/app/src/main/res/drawable/bg_launcher_skip.xml index a5086742..456bd4be 100644 --- a/app/src/main/res/drawable/bg_launcher_skip.xml +++ b/app/src/main/res/drawable/bg_launcher_skip.xml @@ -1,5 +1,4 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_launcher_skip_2.xml b/app/src/main/res/drawable/bg_launcher_skip_2.xml index 5c432df4..411b0805 100644 --- a/app/src/main/res/drawable/bg_launcher_skip_2.xml +++ b/app/src/main/res/drawable/bg_launcher_skip_2.xml @@ -1,8 +1,6 @@ - + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_launch_page.xml b/app/src/main/res/layout/activity_launch_page.xml index 31903513..76372c38 100644 --- a/app/src/main/res/layout/activity_launch_page.xml +++ b/app/src/main/res/layout/activity_launch_page.xml @@ -1,102 +1,102 @@ + xmlns:app="http://schemas.android.com/apk/res-auto"> + + + + android:background="#000" /> - - - + android:id="@+id/btn_skip_img" + android:layout_width="40dp" + android:layout_height="40dp" + android:layout_gravity="right" + android:layout_marginTop="37dp" + android:layout_marginRight="15dp" + android:background="@drawable/bg_launcher_skip" + android:visibility="invisible"> + android:id="@+id/progress" + android:layout_width="match_parent" + android:layout_height="match_parent" + app:cp_bg_color="@color/white" + app:cp_cur_progress="0" + app:cp_fg_color="#ff7200" + app:cp_stroke_width="2dp" /> + android:layout_width="match_parent" + android:layout_height="match_parent" + android:gravity="center" + android:text="@string/recommend_skip" + android:textColor="@color/white" + android:textSize="11sp" /> + android:id="@+id/btn_skip_video" + android:layout_width="44dp" + android:layout_height="26dp" + android:layout_gravity="right" + android:layout_marginTop="37dp" + android:layout_marginRight="15dp" + android:background="@drawable/bg_launcher_skip_2" + android:gravity="center" + android:text="@string/recommend_skip" + android:textColor="@color/white" + android:textSize="11sp" + android:visibility="invisible" /> + android:id="@+id/ad_tip" + android:layout_width="wrap_content" + android:layout_height="40dp" + android:layout_gravity="bottom|center_horizontal" + android:layout_marginBottom="50dp" + android:background="@drawable/bg_launcher_ad_tip" + android:gravity="center_vertical" + android:orientation="horizontal" + android:paddingLeft="20dp" + android:paddingRight="20dp" + android:visibility="invisible"> + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/a_067" + android:textColor="@color/white" + android:textSize="13sp" /> + android:layout_width="13dp" + android:layout_height="13dp" + android:src="@mipmap/icon_arrow_right_3" /> + android:id="@+id/cover" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:clickable="true" + android:src="@mipmap/screen" + android:scaleType="centerCrop" + android:visibility="visible" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_password_login.xml b/app/src/main/res/layout/activity_password_login.xml index 3aacc5b3..0c7b2f3b 100644 --- a/app/src/main/res/layout/activity_password_login.xml +++ b/app/src/main/res/layout/activity_password_login.xml @@ -1,379 +1,380 @@ + xmlns:tools="http://schemas.android.com/tools"> + android:layout_width="match_parent" + android:layout_height="match_parent"> + android:layout_width="match_parent" + android:layout_height="match_parent" + android:scaleType="centerCrop" + android:src="@mipmap/log_bj" /> + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="left|top|center" + android:orientation="vertical"> + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="@dimen/dp_16" + android:layout_marginTop="@dimen/dp_67" + android:gravity="left|center" + android:orientation="vertical"> + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:src="@mipmap/login_title" /> - - - - - - - + + + + + + + + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/dp_20" + > + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical"> + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="@dimen/dp_16"> + android:id="@+id/tv_login_text" + android:layout_width="wrap_content" + android:layout_height="@dimen/dp_27" + android:layout_centerVertical="true" + android:text="@string/login_title" + android:textColor="@color/black" + android:textSize="18sp" + android:textStyle="bold" /> + android:id="@+id/rel_phone" + android:layout_width="match_parent" + android:layout_height="@dimen/dp_44" + android:layout_gravity="center" + android:gravity="center" + android:layout_marginLeft="@dimen/dp_16" + android:layout_marginTop="@dimen/dp_17" + android:layout_marginRight="@dimen/dp_16" + android:background="@drawable/bg_r16_ffeff2f8"> - - - - - - + android:src="@mipmap/icon_login_user_new" /> + + + + + + + android:id="@+id/iv_code" + android:layout_width="@dimen/dp_20" + android:layout_height="@dimen/dp_20" + android:layout_centerVertical="true" + android:layout_marginLeft="20dp" + android:src="@mipmap/icon_login_code" /> + android:id="@+id/ed_password" + android:layout_width="match_parent" + android:layout_height="@dimen/dp_28" + android:layout_marginLeft="13dp" + android:layout_marginRight="25dp" + android:layout_toRightOf="@+id/iv_code" + android:layout_centerInParent="true" + android:background="@android:color/transparent" + android:hint="@string/login_hint_code" + android:inputType="number" + android:maxLength="20" + android:singleLine="true" + android:textColor="@color/black" + android:textColorHint="@color/color_FFCCCCCC" + android:textSize="@dimen/sp_16" /> + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:layout_alignParentRight="true" + android:gravity="center" + > + android:id="@+id/tv_send_code" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginRight="@dimen/dp_13" + android:gravity="right" + android:text="@string/login_send_code" + android:textColor="#22BB79" + android:textSize="@dimen/sp_16" + tools:visibility="visible" /> + android:id="@+id/rl_pass_code" + android:layout_width="match_parent" + android:layout_height="@dimen/dp_44" + android:layout_marginLeft="20dp" + android:layout_marginTop="15dp" + android:layout_marginRight="20dp" + android:visibility="gone" + android:background="@drawable/bg_r16_ffeff2f8"> + android:id="@+id/iv_pass_code" + android:layout_width="@dimen/dp_20" + android:layout_height="@dimen/dp_20" + android:layout_centerVertical="true" + android:layout_marginLeft="20dp" + android:src="@mipmap/icon_login_lick" /> + android:id="@+id/ed_password_code" + android:layout_width="match_parent" + android:layout_height="@dimen/dp_28" + android:layout_marginLeft="13dp" + android:layout_marginRight="25dp" + android:layout_toRightOf="@+id/iv_pass_code" + android:layout_centerInParent="true" + android:background="@android:color/transparent" + android:hint="@string/login_hint_pass" + android:inputType="textPassword" + android:maxLength="20" + android:singleLine="true" + android:textColor="@color/black" + android:textColorHint="@color/color_FFCCCCCC" + android:textSize="@dimen/sp_16" /> + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:layout_alignParentRight="true" + android:gravity="center" + android:orientation="horizontal"> > + android:id="@+id/iv_eye" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:src="@mipmap/eye_close" + android:visibility="gone"/> + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/dp_10"> + android:id="@+id/tv_code_text" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentEnd="true" + android:layout_marginRight="16dp" + android:drawableLeft="@mipmap/common_switch_login_icon" + android:drawablePadding="@dimen/dp_3" + android:gravity="center" + android:text="@string/login_btn_switch" + android:textColor="#666666" + android:textSize="12sp" + android:textStyle="bold" /> + + android:id="@+id/fl_login" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginLeft="@dimen/dp_38" + android:layout_marginTop="@dimen/dp_23" + android:layout_marginBottom="@dimen/dp_150" + android:layout_marginRight="@dimen/dp_38" + > + android:id="@+id/iv_login_bg" + android:layout_width="match_parent" + android:layout_height="@dimen/dp_42" + android:src="@drawable/theme_bg" /> + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:enabled="false" + android:gravity="center" + android:text="@string/login_btn_login" + android:textColor="@color/color_white" + android:textSize="14sp" /> + > + android:id="@+id/tv_login_error" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_alignParentTop="true" + android:layout_marginBottom="@dimen/dp_7" + android:gravity="center" + android:text="@string/login_btn_qt" + android:textColor="@color/color_666666" + android:textSize="@dimen/sp_12" + tools:visibility="visible" /> + android:id="@+id/ll_other_login" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_below="@+id/tv_login_error" + android:gravity="center_horizontal" + android:layout_marginBottom="@dimen/dp_55" + android:orientation="horizontal" + android:visibility="visible" + tools:visibility="visible"> + android:id="@+id/iv_weixin" + android:layout_width="@dimen/dp_44" + android:layout_height="44dp" + android:src="@mipmap/sign_icon_wechat" /> + android:id="@+id/iv_zfb" + android:layout_width="@dimen/dp_44" + android:layout_height="@dimen/dp_44" + android:layout_marginLeft="@dimen/dp_33" + android:src="@mipmap/sign_icon_zfb" + /> + android:id="@+id/ll_agreement" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_below="@+id/ll_other_login" + android:layout_gravity="center_horizontal" + android:layout_marginBottom="@dimen/dp_25" + android:gravity="center" + android:orientation="horizontal"> + android:id="@+id/cb_privacy" + android:layout_width="@dimen/dp_15" + android:layout_height="@dimen/dp_15" + android:layout_marginEnd="@dimen/dp_5" + android:background="@drawable/selector_login_agreement" + android:button="@null" /> + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="我已阅读并同意" + android:textColor="@color/color_FFA8A8A8" + android:textSize="@dimen/sp_11" + android:textStyle="bold" /> + android:id="@+id/tv_ysxy" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="《用户协议》" + android:textColor="#22BB79" + android:textSize="@dimen/sp_11" + android:textStyle="bold" /> + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="和" + android:textColor="@color/color_FFA8A8A8" + android:textSize="@dimen/sp_11" + android:textStyle="bold" /> + android:id="@+id/tv_yhxy" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="《隐私协议》" + android:textColor="#22BB79" + android:textSize="@dimen/sp_11" + android:textStyle="bold" /> diff --git a/gradle.properties b/gradle.properties index 11db06a7..53a66531 100644 --- a/gradle.properties +++ b/gradle.properties @@ -28,8 +28,8 @@ isBuildModule=false #org.gradle.deamon=false android.injected.testOnly=false -APP_VERSION_NAME=1.0.5.9 -APP_VERSION_CODE=49 +APP_VERSION_NAME=1.0.6.2 +APP_VERSION_CODE=52 org.gradle.jvm.toolchain.useLegacyAdapters=false #org.gradle.java.home=C\:\\Users\\qx\\.jdks\\ms-17.0.15 diff --git a/moduleUtil/src/main/java/com/xscm/moduleutil/base/CommonAppContext.java b/moduleUtil/src/main/java/com/xscm/moduleutil/base/CommonAppContext.java index 20a1341f..1ee5ee80 100644 --- a/moduleUtil/src/main/java/com/xscm/moduleutil/base/CommonAppContext.java +++ b/moduleUtil/src/main/java/com/xscm/moduleutil/base/CommonAppContext.java @@ -165,11 +165,11 @@ public class CommonAppContext extends MultiDexApplication implements Applicatio adjustFontScale(getResources().getConfiguration()); CrashHandler.init(this); - if (currentEnvironment.getShelf()==1){ - if (SpUtil.getShelf()!=1) { +// if (currentEnvironment.getShelf()==1){ + if (SpUtil.getShelf()!=0) { SpUtil.setShelf(1); } - } +// } } @@ -457,8 +457,8 @@ public class CommonAppContext extends MultiDexApplication implements Applicatio // } // mqttConnect=MqttConnect.getInstance(this,"tcp://1.13.181.248","android-"+ MqttClient.generateClientId()); - mqttConnect=MqttConnect.getInstance(this,"tcp://1.13.101.98","android-"+ MqttClient.generateClientId()); - mqttConnect.mqttClient(); +// mqttConnect=MqttConnect.getInstance(this,"tcp://1.13.101.98","android-"+ MqttClient.generateClientId()); +// mqttConnect.mqttClient(); // 每次启动应用时重置状态 SpUtil.getInstance().setBooleanValue("youth_model_shown", false); diff --git a/moduleUtil/src/main/java/com/xscm/moduleutil/utils/CrashHandler.java b/moduleUtil/src/main/java/com/xscm/moduleutil/utils/CrashHandler.java index 98b608d4..de06982a 100644 --- a/moduleUtil/src/main/java/com/xscm/moduleutil/utils/CrashHandler.java +++ b/moduleUtil/src/main/java/com/xscm/moduleutil/utils/CrashHandler.java @@ -1,10 +1,13 @@ package com.xscm.moduleutil.utils; import android.content.Context; +import android.content.Intent; import android.util.Log; import com.alibaba.android.arouter.launcher.ARouter; +import static com.blankj.utilcode.util.ActivityUtils.startActivity; + public class CrashHandler implements Thread.UncaughtExceptionHandler { private static CrashHandler instance; private Thread.UncaughtExceptionHandler defaultHandler; @@ -36,6 +39,10 @@ public class CrashHandler implements Thread.UncaughtExceptionHandler { private void restartApp() { // 实现应用重启逻辑 - ARouter.getInstance().build(ARouteConstants.ME).navigation(); +// ARouter.getInstance().build(ARouteConstants.ME).navigation(); + + Intent intent = new Intent("com.qxcm.qxlive.LAUNCH_PAGE"); + intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NEW_TASK); + startActivity(intent); } } diff --git a/moduleUtil/src/main/java/com/xscm/moduleutil/utils/ImageUtils.java b/moduleUtil/src/main/java/com/xscm/moduleutil/utils/ImageUtils.java index 2183d6c5..ace5cd22 100644 --- a/moduleUtil/src/main/java/com/xscm/moduleutil/utils/ImageUtils.java +++ b/moduleUtil/src/main/java/com/xscm/moduleutil/utils/ImageUtils.java @@ -196,6 +196,21 @@ public class ImageUtils { } Glide.with(mImageView).load(path).error(R.mipmap.default_avatar).placeholder(R.mipmap.default_avatar).centerCrop().diskCacheStrategy(DiskCacheStrategy.ALL).into(mImageView); + } + public static void loadHeadCCTask(String path, ImageView mImageView,int errorImage) { + if (mImageView == null) { + return; + } + + Context context = mImageView.getContext(); + if (context instanceof android.app.Activity) { + android.app.Activity activity = (android.app.Activity) context; + if (activity.isFinishing() || (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1 && activity.isDestroyed())) { + return; + } + } + Glide.with(mImageView).load(path).error(errorImage).placeholder(errorImage).centerCrop().diskCacheStrategy(DiskCacheStrategy.ALL).into(mImageView); + } public static void loadCompressImg(String path, ImageView mImageView, int width, int height) { diff --git a/moduleUtil/src/main/java/com/xscm/moduleutil/utils/config/EnvironmentEnum.java b/moduleUtil/src/main/java/com/xscm/moduleutil/utils/config/EnvironmentEnum.java index a5afa0f2..bac57a61 100644 --- a/moduleUtil/src/main/java/com/xscm/moduleutil/utils/config/EnvironmentEnum.java +++ b/moduleUtil/src/main/java/com/xscm/moduleutil/utils/config/EnvironmentEnum.java @@ -15,7 +15,7 @@ public enum EnvironmentEnum { "3e8f3add448d4692bc1d04c75ffe801b", "tcp://81.70.45.221", "https://vespa.qxyushen.top/h5", - 1), + 0), TEST(//测试环境 "https://test.vespa.qxyushen.top/", "6rdWuz058oq5OahdbFiGEybUcdahd12J83L34Uc7MrPIrxtFG+rXiwDvRcqNvjwbClbbmvMrmxKVkIysFByBsl0Qe9kqd2w8T/nhK5G6eXXlk2V9AjYCieIU+jRnjZBB+Cfechr6rCGJ2aeBARIsXcRPW7wm9WFK9euh5T+v6Pyte68yNaNdcYCll3+U4/uCEog7HygCnMIbAU+kqoPdmn2H+51YOHW+VsnsHd4w1+I3f8Tt0xLIXGM4GWnQueZ5GR46GTWiSYMy8dCIh9SPIMRyC91GosVcfGPMJSdcXqc=", diff --git a/moduleUtil/src/main/java/com/xscm/moduleutil/utils/logger/BaseUrlSwitcherInterceptor.java b/moduleUtil/src/main/java/com/xscm/moduleutil/utils/logger/BaseUrlSwitcherInterceptor.java new file mode 100644 index 00000000..fb4ae847 --- /dev/null +++ b/moduleUtil/src/main/java/com/xscm/moduleutil/utils/logger/BaseUrlSwitcherInterceptor.java @@ -0,0 +1,57 @@ +package com.xscm.moduleutil.utils.logger; + +import okhttp3.HttpUrl; +import okhttp3.Interceptor; +import okhttp3.Request; +import okhttp3.Response; + +import java.io.IOException; +import java.util.List; + +/** + * com.xscm.moduleutil.utils.logger + * qx + * 2025/11/6 + */ +public class BaseUrlSwitcherInterceptor implements Interceptor { + private List baseUrls; + private int currentIndex = 0; + + public BaseUrlSwitcherInterceptor(List baseUrls) { + this.baseUrls = baseUrls; + } + + @Override + public Response intercept(Chain chain) throws IOException { + Request request = chain.request(); + HttpUrl originalHttpUrl = request.url(); + + // 获取当前应该使用的 baseUrl + String currentBaseUrl = baseUrls.get(currentIndex); + HttpUrl newBaseUrl = HttpUrl.parse(currentBaseUrl); + + if (newBaseUrl == null) { + throw new IllegalArgumentException("Invalid base url: " + currentBaseUrl); + } + + // 构建新的 HttpUrl + HttpUrl newUrl = originalHttpUrl.newBuilder() + .scheme(newBaseUrl.scheme()) + .host(newBaseUrl.host()) + .port(newBaseUrl.port()) + .build(); + + Request.Builder builder = request.newBuilder().url(newUrl); + Request newRequest = builder.build(); + + // 尝试执行请求 + try { + return chain.proceed(newRequest); + } catch (IOException e) { + // 如果请求失败，则切换到下一个 baseUrl 并重试 + currentIndex = (currentIndex + 1) % baseUrls.size(); + return intercept(chain); // 递归调用重新构建请求 + } + } +} + diff --git a/moduleUtil/src/main/res/mipmap-hdpi/cp_tx_k.png b/moduleUtil/src/main/res/mipmap-hdpi/cp_tx_k.png deleted file mode 100644 index 85e5f003..00000000 Binary files a/moduleUtil/src/main/res/mipmap-hdpi/cp_tx_k.png and /dev/null differ diff --git a/moduleUtil/src/main/res/mipmap-hdpi/cp_tx_k.webp b/moduleUtil/src/main/res/mipmap-hdpi/cp_tx_k.webp new file mode 100644 index 00000000..596d5af1 Binary files /dev/null and b/moduleUtil/src/main/res/mipmap-hdpi/cp_tx_k.webp differ diff --git a/moduleUtil/src/main/res/mipmap-hdpi/ranking_user_cp_k.png b/moduleUtil/src/main/res/mipmap-hdpi/ranking_user_cp_k.png index 03abeb87..e69de29b 100644 Binary files a/moduleUtil/src/main/res/mipmap-hdpi/ranking_user_cp_k.png and b/moduleUtil/src/main/res/mipmap-hdpi/ranking_user_cp_k.png differ diff --git a/moduleUtil/src/main/res/mipmap-xhdpi/cp_tx_k.png b/moduleUtil/src/main/res/mipmap-xhdpi/cp_tx_k.png deleted file mode 100644 index a13d19d4..00000000 Binary files a/moduleUtil/src/main/res/mipmap-xhdpi/cp_tx_k.png and /dev/null differ diff --git a/moduleUtil/src/main/res/mipmap-xhdpi/cp_tx_k.webp b/moduleUtil/src/main/res/mipmap-xhdpi/cp_tx_k.webp new file mode 100644 index 00000000..56109ed1 Binary files /dev/null and b/moduleUtil/src/main/res/mipmap-xhdpi/cp_tx_k.webp differ diff --git a/moduleUtil/src/main/res/mipmap-xhdpi/hourly_d.png b/moduleUtil/src/main/res/mipmap-xhdpi/hourly_d.png index b3c8c528..e69de29b 100644 Binary files a/moduleUtil/src/main/res/mipmap-xhdpi/hourly_d.png and b/moduleUtil/src/main/res/mipmap-xhdpi/hourly_d.png differ diff --git a/moduleUtil/src/main/res/mipmap-xhdpi/hourly_xlh_status.png b/moduleUtil/src/main/res/mipmap-xhdpi/hourly_xlh_status.png index 551d1088..e69de29b 100644 Binary files a/moduleUtil/src/main/res/mipmap-xhdpi/hourly_xlh_status.png and b/moduleUtil/src/main/res/mipmap-xhdpi/hourly_xlh_status.png differ diff --git a/moduleUtil/src/main/res/mipmap-xhdpi/ranking_user_cp_k.png b/moduleUtil/src/main/res/mipmap-xhdpi/ranking_user_cp_k.png index 83de7d45..e69de29b 100644 Binary files a/moduleUtil/src/main/res/mipmap-xhdpi/ranking_user_cp_k.png and b/moduleUtil/src/main/res/mipmap-xhdpi/ranking_user_cp_k.png differ diff --git a/moduleUtil/src/main/res/mipmap-xhdpi/top1.png b/moduleUtil/src/main/res/mipmap-xhdpi/top1.png index d72b1dd6..e69de29b 100644 Binary files a/moduleUtil/src/main/res/mipmap-xhdpi/top1.png and b/moduleUtil/src/main/res/mipmap-xhdpi/top1.png differ diff --git a/moduleUtil/src/main/res/mipmap-xhdpi/top2.png b/moduleUtil/src/main/res/mipmap-xhdpi/top2.png index 1f22194b..e69de29b 100644 Binary files a/moduleUtil/src/main/res/mipmap-xhdpi/top2.png and b/moduleUtil/src/main/res/mipmap-xhdpi/top2.png differ diff --git a/moduleUtil/src/main/res/mipmap-xhdpi/top3.png b/moduleUtil/src/main/res/mipmap-xhdpi/top3.png index 1722d49b..e69de29b 100644 Binary files a/moduleUtil/src/main/res/mipmap-xhdpi/top3.png and b/moduleUtil/src/main/res/mipmap-xhdpi/top3.png differ diff --git a/moduleUtil/src/main/res/mipmap-xxhdpi/cp_tx_k.png b/moduleUtil/src/main/res/mipmap-xxhdpi/cp_tx_k.png deleted file mode 100644 index 36b86ae2..00000000 Binary files a/moduleUtil/src/main/res/mipmap-xxhdpi/cp_tx_k.png and /dev/null differ diff --git a/moduleUtil/src/main/res/mipmap-xxhdpi/cp_tx_k.webp b/moduleUtil/src/main/res/mipmap-xxhdpi/cp_tx_k.webp new file mode 100644 index 00000000..adb60f0f Binary files /dev/null and b/moduleUtil/src/main/res/mipmap-xxhdpi/cp_tx_k.webp differ diff --git a/moduleUtil/src/main/res/mipmap-xxhdpi/dcl.png b/moduleUtil/src/main/res/mipmap-xxhdpi/dcl.png index c481a850..e69de29b 100644 Binary files a/moduleUtil/src/main/res/mipmap-xxhdpi/dcl.png and b/moduleUtil/src/main/res/mipmap-xxhdpi/dcl.png differ diff --git a/moduleUtil/src/main/res/mipmap-xxhdpi/dcl2.png b/moduleUtil/src/main/res/mipmap-xxhdpi/dcl2.png index 2e39dad4..e69de29b 100644 Binary files a/moduleUtil/src/main/res/mipmap-xxhdpi/dcl2.png and b/moduleUtil/src/main/res/mipmap-xxhdpi/dcl2.png differ diff --git a/moduleUtil/src/main/res/mipmap-xxhdpi/dcl3.png b/moduleUtil/src/main/res/mipmap-xxhdpi/dcl3.png index 3b8f44c0..e69de29b 100644 Binary files a/moduleUtil/src/main/res/mipmap-xxhdpi/dcl3.png and b/moduleUtil/src/main/res/mipmap-xxhdpi/dcl3.png differ diff --git a/moduleUtil/src/main/res/mipmap-xxhdpi/dcl4.png b/moduleUtil/src/main/res/mipmap-xxhdpi/dcl4.png index fd420efa..e69de29b 100644 Binary files a/moduleUtil/src/main/res/mipmap-xxhdpi/dcl4.png and b/moduleUtil/src/main/res/mipmap-xxhdpi/dcl4.png differ diff --git a/moduleUtil/src/main/res/mipmap-xxhdpi/dcl5.png b/moduleUtil/src/main/res/mipmap-xxhdpi/dcl5.png index 3b8f44c0..e69de29b 100644 Binary files a/moduleUtil/src/main/res/mipmap-xxhdpi/dcl5.png and b/moduleUtil/src/main/res/mipmap-xxhdpi/dcl5.png differ diff --git a/moduleUtil/src/main/res/mipmap-xxhdpi/dcl6.png b/moduleUtil/src/main/res/mipmap-xxhdpi/dcl6.png index 2e39dad4..e69de29b 100644 Binary files a/moduleUtil/src/main/res/mipmap-xxhdpi/dcl6.png and b/moduleUtil/src/main/res/mipmap-xxhdpi/dcl6.png differ diff --git a/moduleUtil/src/main/res/mipmap-xxhdpi/hourly_djs.png b/moduleUtil/src/main/res/mipmap-xxhdpi/hourly_djs.png index 9cde5882..e69de29b 100644 Binary files a/moduleUtil/src/main/res/mipmap-xxhdpi/hourly_djs.png and b/moduleUtil/src/main/res/mipmap-xxhdpi/hourly_djs.png differ diff --git a/moduleUtil/src/main/res/mipmap-xxhdpi/hourly_num.png b/moduleUtil/src/main/res/mipmap-xxhdpi/hourly_num.png index dc600c80..e69de29b 100644 Binary files a/moduleUtil/src/main/res/mipmap-xxhdpi/hourly_num.png and b/moduleUtil/src/main/res/mipmap-xxhdpi/hourly_num.png differ diff --git a/moduleUtil/src/main/res/mipmap-xxhdpi/hourly_wh.png b/moduleUtil/src/main/res/mipmap-xxhdpi/hourly_wh.png index dff1bf39..e69de29b 100644 Binary files a/moduleUtil/src/main/res/mipmap-xxhdpi/hourly_wh.png and b/moduleUtil/src/main/res/mipmap-xxhdpi/hourly_wh.png differ diff --git a/moduleUtil/src/main/res/mipmap-xxhdpi/ranking_user_cp_k.png b/moduleUtil/src/main/res/mipmap-xxhdpi/ranking_user_cp_k.png index d2344065..e69de29b 100644 Binary files a/moduleUtil/src/main/res/mipmap-xxhdpi/ranking_user_cp_k.png and b/moduleUtil/src/main/res/mipmap-xxhdpi/ranking_user_cp_k.png differ diff --git a/moduleUtil/src/main/res/mipmap-xxxhdpi/me_edit.webp b/moduleUtil/src/main/res/mipmap-xxxhdpi/me_edit.webp index b79e252d..e69de29b 100644 Binary files a/moduleUtil/src/main/res/mipmap-xxxhdpi/me_edit.webp and b/moduleUtil/src/main/res/mipmap-xxxhdpi/me_edit.webp differ diff --git a/modulemain/src/main/java/com/xscm/modulemain/activity/MainActivity.java b/modulemain/src/main/java/com/xscm/modulemain/activity/MainActivity.java index 1c1c76db..33de91e6 100644 --- a/modulemain/src/main/java/com/xscm/modulemain/activity/MainActivity.java +++ b/modulemain/src/main/java/com/xscm/modulemain/activity/MainActivity.java @@ -331,7 +331,7 @@ public class MainActivity extends BaseMvpActivity - - - - - \ No newline at end of file diff --git a/modulemain/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/modulemain/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml deleted file mode 100644 index 6f3b755b..00000000 --- a/modulemain/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/modulemain/src/main/res/mipmap-hdpi/ic_launcher.webp b/modulemain/src/main/res/mipmap-hdpi/ic_launcher.webp deleted file mode 100644 index c209e78e..00000000 Binary files a/modulemain/src/main/res/mipmap-hdpi/ic_launcher.webp and /dev/null differ diff --git a/modulemain/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/modulemain/src/main/res/mipmap-hdpi/ic_launcher_round.webp deleted file mode 100644 index b2dfe3d1..00000000 Binary files a/modulemain/src/main/res/mipmap-hdpi/ic_launcher_round.webp and /dev/null differ diff --git a/modulemain/src/main/res/mipmap-mdpi/ic_launcher.webp b/modulemain/src/main/res/mipmap-mdpi/ic_launcher.webp deleted file mode 100644 index 4f0f1d64..00000000 Binary files a/modulemain/src/main/res/mipmap-mdpi/ic_launcher.webp and /dev/null differ diff --git a/modulemain/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/modulemain/src/main/res/mipmap-mdpi/ic_launcher_round.webp deleted file mode 100644 index 62b611da..00000000 Binary files a/modulemain/src/main/res/mipmap-mdpi/ic_launcher_round.webp and /dev/null differ diff --git a/modulemain/src/main/res/mipmap-xhdpi/ic_launcher.webp b/modulemain/src/main/res/mipmap-xhdpi/ic_launcher.webp deleted file mode 100644 index 948a3070..00000000 Binary files a/modulemain/src/main/res/mipmap-xhdpi/ic_launcher.webp and /dev/null differ diff --git a/modulemain/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/modulemain/src/main/res/mipmap-xhdpi/ic_launcher_round.webp deleted file mode 100644 index 1b9a6956..00000000 Binary files a/modulemain/src/main/res/mipmap-xhdpi/ic_launcher_round.webp and /dev/null differ diff --git a/modulemain/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/modulemain/src/main/res/mipmap-xxhdpi/ic_launcher.webp deleted file mode 100644 index 28d4b77f..00000000 Binary files a/modulemain/src/main/res/mipmap-xxhdpi/ic_launcher.webp and /dev/null differ diff --git a/modulemain/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/modulemain/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp deleted file mode 100644 index 9287f508..00000000 Binary files a/modulemain/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp and /dev/null differ diff --git a/modulemain/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/modulemain/src/main/res/mipmap-xxxhdpi/ic_launcher.webp deleted file mode 100644 index aa7d6427..00000000 Binary files a/modulemain/src/main/res/mipmap-xxxhdpi/ic_launcher.webp and /dev/null differ diff --git a/modulemain/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/modulemain/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp deleted file mode 100644 index 9126ae37..00000000 Binary files a/modulemain/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp and /dev/null differ diff --git a/moduleroom/src/main/java/com/example/moduleroom/activity/RoomActivity.kt b/moduleroom/src/main/java/com/example/moduleroom/activity/RoomActivity.kt index 76bfe92b..c957f2c2 100644 --- a/moduleroom/src/main/java/com/example/moduleroom/activity/RoomActivity.kt +++ b/moduleroom/src/main/java/com/example/moduleroom/activity/RoomActivity.kt @@ -108,8 +108,8 @@ import java.util.* import java.util.stream.Collectors @Route(path = ARouteConstants.ROOM_DETAILS) -class RoomActivity : BaseMvpActivity(), - RoomContacts.View, PermissionCallbacks, OnMessageReceivedListener, QXRedPacketManager.QXRedPacketManagerDelegate { +class RoomActivity : BaseMvpActivity(), RoomContacts.View, PermissionCallbacks, + OnMessageReceivedListener, QXRedPacketManager.QXRedPacketManagerDelegate { private var roomFragment: RoomFragment? = null var commonPageAdapter: CommonPageAdapter? = null private var mRoomBean: RoomBean? = null @@ -1184,7 +1184,7 @@ class RoomActivity : BaseMvpActivity(), override fun initData() { if (!EasyPermissions.hasPermissions(this, *permissions)) { - PermissionDescriptionHelper.addPermissionDescription(false,mBinding?.root as ViewGroup,permissions) + PermissionDescriptionHelper.addPermissionDescription(false, mBinding?.root as ViewGroup, permissions) EasyPermissions.requestPermissions( this, "请开启录音使用权限", 1, *permissions @@ -1702,9 +1702,10 @@ class RoomActivity : BaseMvpActivity(), toPitNumber: String, messageEvent: RoomMessageEvent ) { - mRoomInfoResp!!.user_info.pit_number = Integer.parseInt(toPitNumber) - if ("9" == toPitNumber && messageEvent.text.user_id.equals(SpUtil.getUserId().toString())) { + if ("9" == toPitNumber && messageEvent.text.fromUserInfo.user_id == SpUtil.getUserId()) { + mRoomInfoResp!!.user_info.pit_number = Integer.parseInt(toPitNumber) + mBinding!!.roomTop.rl.visibility = View.VISIBLE ivSoundEffects(true) } else { @@ -1740,6 +1741,7 @@ class RoomActivity : BaseMvpActivity(), if (mRoomInfoResp!!.user_info.pit_number == 9) { mBinding!!.roomTop.rl.visibility = View.VISIBLE ivSoundEffects(true) + setRoleType(3, 9) } } @@ -1943,9 +1945,8 @@ class RoomActivity : BaseMvpActivity(), aBoolean = true ivWheatFeeding(com.xscm.moduleutil.R.mipmap.room_wheat_feeding) setBoolean(aBoolean) - if (mRoomInfoResp!!.user_info != null) { - mRoomInfoResp!!.user_info.pit_number = 0 - } + + mRoomInfoResp?.user_info?.pit_number = 0 setRoleType(0, 0) switchMic(2) } @@ -1969,9 +1970,9 @@ class RoomActivity : BaseMvpActivity(), if ("9" == pitNumber) { if (userId == currentUserId) { mRoomInfoResp!!.room_info.pit_list[0] = getPitBean2(messageEvent, "9") - if (mRoomInfoResp!!.user_info != null) { - mRoomInfoResp!!.user_info.pit_number = 0 - } +// if (mRoomInfoResp!!.user_info != null) { +// mRoomInfoResp!!.user_info.pit_number = 0 +// } } } else if ("888" == pitNumber) { mRoomInfoResp!!.room_auction = null @@ -2658,13 +2659,13 @@ class RoomActivity : BaseMvpActivity(), // if (mRoomInfoResp!!.room_info.label_id == "1") { // queren() // } else { - val fragment = RequestDialogFragment.show( - roomId, mRoomInfoResp, 1, - supportFragmentManager - ) - if (fragment != null) { - addActiveDialogFragment(fragment) // 添加到管理列表 - } + val fragment = RequestDialogFragment.show( + roomId, mRoomInfoResp, 1, + supportFragmentManager + ) + if (fragment != null) { + addActiveDialogFragment(fragment) // 添加到管理列表 + } // } } else if (id == R.id.rl_gift) { //礼物 // RoomGiftDialogFragment.show(mRoomInfoResp, null, roomId, 0, "", getSupportFragmentManager()); @@ -2916,7 +2917,7 @@ class RoomActivity : BaseMvpActivity(), * * @param type */ - // @Override +// @Override fun switchMic(type: Int) { if (type == 1) { mBinding!!.ivMic.setImageResource(com.xscm.moduleutil.R.mipmap.room_microphone) @@ -3078,14 +3079,17 @@ class RoomActivity : BaseMvpActivity(), switchMic(2) // 关闭麦克风 } } + pit_number == 888 -> { rl_mic?.visibility = View.VISIBLE switchMic(2) // 关闭麦克风 } + pit_number == -1 -> { rl_mic?.visibility = View.VISIBLE switchMic(1) // 打开麦克风 } + else -> { rl_mic?.visibility = View.GONE switchMic(2) // 关闭麦克风 @@ -3102,7 +3106,7 @@ class RoomActivity : BaseMvpActivity(), if ("1" != typeId) { rl_more?.visibility = View.GONE } - if ("1"==typeId && "2" == labelId){ + if ("1" == typeId && "2" == labelId) { rl_misc?.visibility = View.VISIBLE } } @@ -4565,6 +4569,4 @@ class RoomActivity : BaseMvpActivity(), } } } - - } \ No newline at end of file diff --git a/moduleroom/src/main/java/com/example/moduleroom/dialog/RoomSettingFragment.java b/moduleroom/src/main/java/com/example/moduleroom/dialog/RoomSettingFragment.java index bd400ae4..9991fea8 100644 --- a/moduleroom/src/main/java/com/example/moduleroom/dialog/RoomSettingFragment.java +++ b/moduleroom/src/main/java/com/example/moduleroom/dialog/RoomSettingFragment.java @@ -380,11 +380,11 @@ public class RoomSettingFragment extends BaseMvpDialogFragment implements R AgoraManager.getInstance(mContext.getApplicationContext()) .joinRoom(token, roomId, uid, enableMic,enableJs); } - VolumeManager.getInstance().clearCurrentVolumes(); + // 初始化 Agora 并加入房间 diff --git a/modulevocal/src/main/java/com/example/modulevocal/adapter/TaskBoxAdapter.java b/modulevocal/src/main/java/com/example/modulevocal/adapter/TaskBoxAdapter.java index 059d5944..09742314 100644 --- a/modulevocal/src/main/java/com/example/modulevocal/adapter/TaskBoxAdapter.java +++ b/modulevocal/src/main/java/com/example/modulevocal/adapter/TaskBoxAdapter.java @@ -38,8 +38,9 @@ public class TaskBoxAdapter extends BaseQuickAdapter diff --git a/modulevocal/src/main/res/layout/activity_recharge.xml b/modulevocal/src/main/res/layout/activity_recharge.xml index ca44b954..52ae263b 100644 --- a/modulevocal/src/main/res/layout/activity_recharge.xml +++ b/modulevocal/src/main/res/layout/activity_recharge.xml @@ -60,7 +60,7 @@ android:layout_marginStart="@dimen/dp_4" android:layout_toRightOf="@+id/im_1" android:gravity="left|center" - android:text="111111000" + tools:text="111111000" android:textColor="@color/colorWhite100" android:textSize="@dimen/sp_28" /> diff --git a/modulevocal/src/main/res/layout/activity_withdrawal.xml b/modulevocal/src/main/res/layout/activity_withdrawal.xml index 22352b3c..e10ab851 100644 --- a/modulevocal/src/main/res/layout/activity_withdrawal.xml +++ b/modulevocal/src/main/res/layout/activity_withdrawal.xml @@ -65,7 +65,7 @@ android:layout_marginStart="@dimen/dp_4" android:layout_toRightOf="@+id/im_1" android:gravity="left|center" - android:text="111111000" + tools:text="111111000" android:textColor="@color/colorWhite100" android:textSize="@dimen/sp_28" /> diff --git a/timcommon/build/generated/source/buildConfig/debug/com/tencent/qcloud/tuikit/timcommon/BuildConfig.java b/timcommon/build/generated/source/buildConfig/debug/com/tencent/qcloud/tuikit/timcommon/BuildConfig.java deleted file mode 100644 index 0ac4ed6c..00000000 --- a/timcommon/build/generated/source/buildConfig/debug/com/tencent/qcloud/tuikit/timcommon/BuildConfig.java +++ /dev/null @@ -1,10 +0,0 @@ -/** - * Automatically generated file. DO NOT MODIFY - */ -package com.tencent.qcloud.tuikit.timcommon; - -public final class BuildConfig { - public static final boolean DEBUG = Boolean.parseBoolean("true"); - public static final String LIBRARY_PACKAGE_NAME = "com.tencent.qcloud.tuikit.timcommon"; - public static final String BUILD_TYPE = "debug"; -} diff --git a/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/page/TUIC2CChatFragment.java b/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/page/TUIC2CChatFragment.java index 0f107959..553e0948 100644 --- a/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/page/TUIC2CChatFragment.java +++ b/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/page/TUIC2CChatFragment.java @@ -119,7 +119,7 @@ public class TUIC2CChatFragment extends TUIBaseChatFragment { @Override public boolean onMenuItemClick(android.view.MenuItem item) { if ("举报".equals(item.getTitle())) { - ARouter.getInstance().build("/moduleUtil/WebViewActivity").withString("url", "https://vespa.qxyushen.top/h5/web/index.html#/pages/feedback/report?id="+getToken()+"&fromType=1&fromId="+ getUserInfo().getUser_id()).navigation(); + ARouter.getInstance().build("/moduleUtil/WebViewActivity").withString("url", "http://1.13.101.98/h5/web/index.html#/pages/feedback/report?id="+getToken()+"&fromType=1&fromId="+ getUserInfo().getUser_id()).navigation(); return true; } return false; diff --git a/tuiconversation/build/generated/source/buildConfig/debug/com/tencent/qcloud/tuikit/tuiconversation/BuildConfig.java b/tuiconversation/build/generated/source/buildConfig/debug/com/tencent/qcloud/tuikit/tuiconversation/BuildConfig.java deleted file mode 100644 index 62f9e9e0..00000000 --- a/tuiconversation/build/generated/source/buildConfig/debug/com/tencent/qcloud/tuikit/tuiconversation/BuildConfig.java +++ /dev/null @@ -1,10 +0,0 @@ -/** - * Automatically generated file. DO NOT MODIFY - */ -package com.tencent.qcloud.tuikit.tuiconversation; - -public final class BuildConfig { - public static final boolean DEBUG = Boolean.parseBoolean("true"); - public static final String LIBRARY_PACKAGE_NAME = "com.tencent.qcloud.tuikit.tuiconversation"; - public static final String BUILD_TYPE = "debug"; -}