diff --git a/.idea/.name b/.idea/.name index 1e71aa94..a8c55747 100644 --- a/.idea/.name +++ b/.idea/.name @@ -1 +1 @@ -秘地 \ No newline at end of file +羽声语音 \ No newline at end of file diff --git a/.idea/AndroidProjectSystem.xml b/.idea/AndroidProjectSystem.xml new file mode 100644 index 00000000..4a53bee8 --- /dev/null +++ b/.idea/AndroidProjectSystem.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 00000000..a1757ae5 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml new file mode 100644 index 00000000..b268ef36 --- /dev/null +++ b/.idea/deploymentTargetSelector.xml @@ -0,0 +1,10 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 00000000..33ec9f76 --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,12 @@ + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 00000000..1f3b3514 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml new file mode 100644 index 00000000..16660f1d --- /dev/null +++ b/.idea/runConfigurations.xml @@ -0,0 +1,17 @@ + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 00000000..94a25f7f --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index f9872c1b..b504d094 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,230 +1,235 @@ + 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 b6e8f669..409eb280 100644 --- a/app/src/main/java/com/qxcm/qxlive/AppContext.java +++ b/app/src/main/java/com/qxcm/qxlive/AppContext.java @@ -39,6 +39,7 @@ public class AppContext extends CommonAppContext { // }); // L.setDeBug(BuildConfig.DEBUG); } + public static void initSdk() { // CommonAppContext context = CommonAppContext.getInstance(); @@ -72,7 +73,6 @@ 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 de4a7447..089f56e7 100644 --- a/app/src/main/java/com/qxcm/qxlive/LaunchPageActivity.java +++ b/app/src/main/java/com/qxcm/qxlive/LaunchPageActivity.java @@ -20,38 +20,39 @@ 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 f95ad366..dfd09344 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 842d9f99..45a4206c 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,5 +106,4 @@ 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 aef240ad..98aa1d08 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 456bd4be..a5086742 100644 --- a/app/src/main/res/drawable/bg_launcher_skip.xml +++ b/app/src/main/res/drawable/bg_launcher_skip.xml @@ -1,4 +1,5 @@ - + \ 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 411b0805..5c432df4 100644 --- a/app/src/main/res/drawable/bg_launcher_skip_2.xml +++ b/app/src/main/res/drawable/bg_launcher_skip_2.xml @@ -1,6 +1,8 @@ - + \ 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 76372c38..31903513 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="@color/transparent"> + android:id="@+id/container" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="#000"/> + + + + 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 0c7b2f3b..3aacc5b3 100644 --- a/app/src/main/res/layout/activity_password_login.xml +++ b/app/src/main/res/layout/activity_password_login.xml @@ -1,380 +1,379 @@ + 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_marginStart="@dimen/dp_16" + android:layout_marginTop="@dimen/dp_67" + android:gravity="left|center" + android:orientation="vertical"> - - - - - - - + + + + + + + + + + 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:id="@+id/iv_user" + 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_user_new"/> + android:id="@+id/ed_phone" + android:layout_width="match_parent" + android:layout_height="@dimen/dp_28" + android:layout_marginLeft="13dp" + android:layout_marginRight="25dp" + android:layout_toRightOf="@+id/iv_user" + android:background="@android:color/transparent" + android:hint="@string/login_hint_phion" + android:inputType="phone" + android:layout_centerInParent="true" + android:maxLength="11" + android:singleLine="true" + android:textColor="@color/black" + android:textColorHint="@color/color_FFCCCCCC" + android:textSize="@dimen/sp_17"/> + android:id="@+id/rl_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:background="@drawable/bg_r16_ffeff2f8"> + 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/moduleroom/src/main/java/com/example/moduleroom/presenter/RoomPresenter.java b/moduleroom/src/main/java/com/example/moduleroom/presenter/RoomPresenter.java index cb9316be..40c9dcef 100644 --- a/moduleroom/src/main/java/com/example/moduleroom/presenter/RoomPresenter.java +++ b/moduleroom/src/main/java/com/example/moduleroom/presenter/RoomPresenter.java @@ -16,6 +16,7 @@ import com.xscm.moduleutil.http.RetrofitClient; import com.xscm.moduleutil.listener.MessageListenerSingleton; import com.xscm.moduleutil.presenter.BasePresenter; import com.xscm.moduleutil.rtc.AgoraManager; +import com.xscm.moduleutil.rtc.VolumeManager; import com.xscm.moduleutil.utils.SpUtil; import java.lang.ref.WeakReference; @@ -70,7 +71,7 @@ public class RoomPresenter extends BasePresenter implements R AgoraManager.getInstance(mContext.getApplicationContext()) .joinRoom(token, roomId, uid, enableMic,enableJs); } - + VolumeManager.getInstance().clearCurrentVolumes(); // 初始化 Agora 并加入房间