yutou/pdlivexp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

11111

Browse Source
This commit is contained in:
18401019693 2022-07-26 18:52:42 +08:00
parent f00fcac663
commit 18cf3c9ba3
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config.gradle
View File

@ -9,9 +9,9 @@ ext {
] ]
manifestPlaceholders = [ manifestPlaceholders = [
//正式 //正式
// serverHost : "https://napi.yaoulive.com", serverHost : "https://napi.yaoulive.com",
//測試 //測試
serverHost : "https://ceshi.yaoulive.com", // serverHost : "https://ceshi.yaoulive.com",
//腾讯地图 //腾讯地图
txMapAppKey : "EOZBZ-ASLCU-4XPV3-BDCHZ-4E3Q7-H4BWB", txMapAppKey : "EOZBZ-ASLCU-4XPV3-BDCHZ-4E3Q7-H4BWB",

8
live/src/main/res/layout/rc_conversationlist_item.xml
View File

@ -33,21 +33,21 @@
style="@style/TextStyle.Alignment" style="@style/TextStyle.Alignment"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/rc_margin_size_12" android:layout_marginStart="15dp"
android:layout_marginTop="@dimen/rc_margin_size_16" android:layout_marginTop="@dimen/rc_margin_size_16"
android:layout_marginEnd="@dimen/rc_margin_size_12" android:layout_marginEnd="@dimen/rc_margin_size_12"
android:ellipsize="end" android:ellipsize="end"
android:singleLine="true" android:singleLine="true"
android:text="张三" android:text="张三"
android:textColor="@color/rc_text_main_color" android:textColor="@color/rc_text_main_color"
android:textSize="@dimen/rc_font_secondary_size" android:textSize="16sp"
app:layout_constraintEnd_toStartOf="@+id/rc_conversation_date" app:layout_constraintEnd_toStartOf="@+id/rc_conversation_date"
app:layout_constraintStart_toEndOf="@+id/rc_conversation_portrait_rl" app:layout_constraintStart_toEndOf="@+id/rc_conversation_portrait_rl"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
<LinearLayout <LinearLayout
android:layout_width="0dp" android:layout_width="0dp"
android:layout_marginStart="@dimen/rc_margin_size_12" android:layout_marginStart="15dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center_vertical" android:gravity="center_vertical"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
@ -77,7 +77,7 @@
android:singleLine="true" android:singleLine="true"
android:text="你好，朋友！" android:text="你好，朋友！"
android:textColor="@color/rc_secondary_color" android:textColor="@color/rc_secondary_color"
android:textSize="15dp" /> android:textSize="14sp" />
<RelativeLayout <RelativeLayout
android:id="@+id/rc_conversation_unread" android:id="@+id/rc_conversation_unread"

14
main/src/main/java/com/yunbao/main/dialog/OneLoginDialog.java
View File

@ -1,9 +1,6 @@
package com.yunbao.main.dialog; package com.yunbao.main.dialog;
import android.os.Bundle; import android.os.Bundle;
import androidx.annotation.Nullable;
import android.view.Gravity; import android.view.Gravity;
import android.view.View; import android.view.View;
import android.view.Window; import android.view.Window;
@ -11,6 +8,8 @@ import android.view.WindowManager;
import android.widget.Button; import android.widget.Button;
import android.widget.TextView; import android.widget.TextView;
import androidx.annotation.Nullable;
import com.adjust.sdk.Adjust; import com.adjust.sdk.Adjust;
import com.adjust.sdk.AdjustEvent; import com.adjust.sdk.AdjustEvent;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
@ -30,9 +29,7 @@ import com.yunbao.live.bean.LiveBean;
import com.yunbao.live.http.LiveHttpUtil; import com.yunbao.live.http.LiveHttpUtil;
import com.yunbao.live.presenter.LiveRoomCheckLivePresenter; import com.yunbao.live.presenter.LiveRoomCheckLivePresenter;
import com.yunbao.main.R; import com.yunbao.main.R;
import com.yunbao.main.activity.EntryActivity;
import com.yunbao.main.activity.MainActivity; import com.yunbao.main.activity.MainActivity;
import com.yunbao.main.activity.OneLoginActivity;
import static com.yunbao.common.CommonAppContext.logger; import static com.yunbao.common.CommonAppContext.logger;
import static com.yunbao.common.CommonAppContext.mFirebaseAnalytics; import static com.yunbao.common.CommonAppContext.mFirebaseAnalytics;
@ -121,13 +118,16 @@ public class OneLoginDialog extends AbsDialogFragment {
@Override @Override
public void onSuccess(int code, String msg, String[] info) { public void onSuccess(int code, String msg, String[] info) {
dismiss(); dismiss();
if (info[0]!=null) { if (info[0] != null) {
JSONObject obj = JSON.parseObject(info[0]); JSONObject obj = JSON.parseObject(info[0]);
MainActivity.forward(getContext(), false); MainActivity.forward(getContext(), false);
gotoLive(obj.getString("anchor_id")); gotoLive(obj.getString("anchor_id"));
IMLoginManager.get(mContext).setisNewUserOne(true); IMLoginManager.get(mContext).setisNewUserOne(true);
if (obj.containsKey("home_zdy_pop")) {
}
// OneLoginActivity.act.finish(); // OneLoginActivity.act.finish();
}else{ } else {
MainActivity.forward(getContext(), false); MainActivity.forward(getContext(), false);
// OneLoginActivity.act.finish(); // OneLoginActivity.act.finish();
} }