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

同步ios接听界面

Browse Source
This commit is contained in:
zlzw
2023-11-06 18:24:57 +08:00
parent 23a2a2efb3
commit 48b30868f4
212 changed files with 17437 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
OneToOne/src/main/java/com/shayu/onetoone/activity/DiamondExchangeActivity.java
View File

@@ -33,7 +33,7 @@ import java.util.List;
public class DiamondExchangeActivity extends AbsOTOActivity {
private RecyclerView diamondExchangeList;
private DiamondExchangeAdapter exchangeAdapter;
private TextView title, totalConvertibility;
private TextView title, totalConvertibility,totalConvertibilityDes;
private String type = "yuanbao";
private EditText diamondExchangeInput;
@@ -63,6 +63,7 @@ public class DiamondExchangeActivity extends AbsOTOActivity {
title = findViewById(R.id.title);
diamondExchangeInput = findViewById(R.id.diamond_exchange_input);
totalConvertibility = findViewById(R.id.total_convertibility);
totalConvertibilityDes = findViewById(R.id.total_convertibility_des);
diamondExchangeList.addItemDecoration(new ItemDecoration(mContext, Color.parseColor("#ffffff"), 10, 2));
diamondExchangeList.setLayoutManager(new GridLayoutManager(mContext, 3));
exchangeAdapter = new DiamondExchangeAdapter();
@@ -114,15 +115,15 @@ public class DiamondExchangeActivity extends AbsOTOActivity {
if (data.size() > 0) {
if ((data.size() - 1) > index && index > 0) {
data.get(index).setSelect(true);
totalConvertibility.setText(String.valueOf(data.get(0).getNum()));
totalConvertibility.setText(String.valueOf(data.get(0).getSum()));
number = data.get(index).getNum();
} else {
if (TextUtils.isEmpty(diamondExchangeInput.getText().toString())) {
data.get(0).setSelect(true);
totalConvertibility.setText(String.valueOf(data.get(0).getNum()));
totalConvertibility.setText(String.valueOf(data.get(0).getSum()));
number = data.get(0).getNum();
} else {
totalConvertibility.setText(String.valueOf(data.get(0).getNum()));
totalConvertibility.setText(String.valueOf(data.get(0).getSum()));
for (int i = 0; i < data.size(); i++) {
data.get(i).setSelect(false);
}
@@ -188,7 +189,7 @@ public class DiamondExchangeActivity extends AbsOTOActivity {
public void onSuccess(List<ExchangeModel> data) {
if (data.size() > 0) {
data.get(0).setSelect(true);
totalConvertibility.setText(String.valueOf(data.get(0).getNum()));
totalConvertibility.setText(String.valueOf(data.get(0).getSum()));
number = data.get(0).getNum();
exchangeAdapter.addData(data);
}

2
OneToOne/src/main/java/com/shayu/onetoone/activity/ExchangeRecordActivity.java
View File

@@ -83,7 +83,7 @@ public class ExchangeRecordActivity extends AbsOTOActivity {
private void initData() {
OTONetManager.getInstance(mContext).
getExchangeRecord(type, "3", "2", page, new HttpCallback<List<ExchangeRecordModel>>() {
getExchangeRecord("10,11", "3", "2", page, new HttpCallback<List<ExchangeRecordModel>>() {
@Override
public void onSuccess(List<ExchangeRecordModel> data) {
if (page != 1 && data.isEmpty()) {

8
OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/message/ChatMessageFragment.java
View File

@@ -552,7 +552,13 @@ public class ChatMessageFragment extends AbsConversationFragment {
ViewClicksAntiShake.clicksAntiShake(home, new ViewClicksAntiShake.ViewClicksCallBack() {
@Override
public void onViewClicks() {
UserManager.toHomePage(targetId);
UserManager.toHomePage(targetId,true);
}
});
ViewClicksAntiShake.clicksAntiShake(avatar, new ViewClicksAntiShake.ViewClicksCallBack() {
@Override
public void onViewClicks() {
UserManager.toHomePage(targetId,true);
}
});
follow.setOnClickListener(v -> {

2
OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/message/MessageInteractiveFragment.java
View File

@@ -43,7 +43,7 @@ public class MessageInteractiveFragment extends AbsConversationFragment {
@Override
public void main() {
setTitle(noticeBean.getTitle());
mList.setLayoutManager(new LinearLayoutManager(mContext, LinearLayoutManager.VERTICAL, true));
mList.setLayoutManager(new LinearLayoutManager(mContext, LinearLayoutManager.VERTICAL, false));
initData();
}

2
OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/message/MsgMessageFragment.java
View File

@@ -375,8 +375,8 @@ public class MsgMessageFragment extends BaseFragment implements BaseAdapter.OnIt
this.mRefreshLayout.setOnRefreshListener(new OnRefreshListener() {
public void onRefresh(@NonNull RefreshLayout refreshLayout) {
initSystemNotice();
MsgMessageFragment.this.onConversationListRefresh(refreshLayout);
updateUserInfo();
MsgMessageFragment.this.onConversationListRefresh(refreshLayout);
}
});
this.mRefreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() {

6
OneToOne/src/main/java/com/shayu/onetoone/activity/message/CallAudioActivity.java
View File

@@ -2,6 +2,7 @@ package com.shayu.onetoone.activity.message;
import android.Manifest;
import android.app.Dialog;
import android.content.Intent;
import android.os.Bundle;
import android.util.Log;
import android.view.MotionEvent;
@@ -42,6 +43,7 @@ import com.shayu.onetoone.manager.OTONetManager;
import com.shayu.onetoone.manager.RouteManager;
import com.shayu.onetoone.utils.ConversationUtils;
import com.shayu.onetoone.utils.HtmlUrlUtils;
import com.yunbao.common.activity.MyWalletActivity;
import com.yunbao.common.glide.ImgLoader;
import com.yunbao.common.http.base.HttpCallback;
import com.yunbao.common.interfaces.OnItemClickListener;
@@ -345,8 +347,8 @@ public class CallAudioActivity extends AbsOTOActivity implements View.OnClickLis
finish();
if (toPay) {
Log.e(TAG, "调起支付界面");
// RouteManager.forwardWebViewActivity(null, "https://www.baidu.com");
RouteManager.forwardWebViewActivity(null, HtmlUrlUtils.getPayUrl(mContext,false,HtmlUrlUtils.URL_PAY_COIN));
// RouteManager.forwardWebViewActivity(null, HtmlUrlUtils.getPayUrl(mContext,false,HtmlUrlUtils.URL_PAY_COIN));
mContext.startActivity(new Intent(mContext, MyWalletActivity.class).putExtra("p", 1));
}
if (toChatView) {
ConversationUtils.startConversation(mContext, targetId);

5
OneToOne/src/main/java/com/shayu/onetoone/activity/message/CallVideoActivity.java
View File

@@ -3,6 +3,7 @@ package com.shayu.onetoone.activity.message;
import android.Manifest;
import android.annotation.SuppressLint;
import android.app.Dialog;
import android.content.Intent;
import android.graphics.Color;
import android.os.Bundle;
import android.os.Handler;
@@ -44,6 +45,7 @@ import com.shayu.onetoone.manager.OTONetManager;
import com.shayu.onetoone.manager.RouteManager;
import com.shayu.onetoone.utils.ConversationUtils;
import com.shayu.onetoone.utils.HtmlUrlUtils;
import com.yunbao.common.activity.MyWalletActivity;
import com.yunbao.common.glide.ImgLoader;
import com.yunbao.common.http.base.HttpCallback;
import com.yunbao.common.interfaces.OnItemClickListener;
@@ -455,7 +457,8 @@ public class CallVideoActivity extends AbsOTOActivity {
}
}).show();
if (toPay) {
RouteManager.forwardWebViewActivity(null, HtmlUrlUtils.getPayUrl(mContext, false, HtmlUrlUtils.URL_PAY_COIN));
// RouteManager.forwardWebViewActivity(null, HtmlUrlUtils.getPayUrl(mContext, false, HtmlUrlUtils.URL_PAY_COIN));
mContext.startActivity(new Intent(mContext, MyWalletActivity.class).putExtra("p", 1));
}
if (toChatView) {
ConversationUtils.startConversation(mContext, targetId);

5
OneToOne/src/main/java/com/shayu/onetoone/activity/message/ChatActivity.java
View File

@@ -65,6 +65,11 @@ public class ChatActivity extends AbsOTOActivity {
return R.layout.activity_msg_chat;
}
@Override
protected boolean onCreate() {
return false;
}
@Override
protected void main(Bundle savedInstanceState) {
int type = getIntent().getIntExtra("model", 0);

3
OneToOne/src/main/java/com/shayu/onetoone/adapter/MsgMessageRecyclerViewAdapter.java
View File

@@ -5,6 +5,7 @@ import android.text.SpannableString;
import com.shayu.onetoone.R;
import com.shayu.onetoone.bean.MessageChatAuthContent;
import com.shayu.onetoone.bean.MessageChatGiftContent;
import com.shayu.onetoone.bean.MessageChatTipsContent;
import com.yanzhenjie.recyclerview.SwipeRecyclerView;
import com.yunbao.common.utils.WordUtil;
@@ -75,6 +76,8 @@ public class MsgMessageRecyclerViewAdapter extends ConversationListAdapter {
datum.mConversationContent = new SpannableString(WordUtil.getNewString(R.string.gift));
} else if (datum.mCore.getLatestMessage() instanceof MessageChatAuthContent) {
datum.mConversationContent = new SpannableString(WordUtil.getNewString(R.string.authentication));
}else if(datum.mCore.getLatestMessage() instanceof MessageChatTipsContent){
datum.mConversationContent = new SpannableString(WordUtil.getNewString(R.string.system_tips));
}
if (datum.mCore.isTop()) {
top.add(datum);

11
OneToOne/src/main/java/com/shayu/onetoone/bean/ExchangeModel.java
View File

@@ -13,6 +13,9 @@ public class ExchangeModel extends BaseModel {
private String title;
@SerializedName("num")
private String num;
@SerializedName("sum")
private String sum;
private boolean select = false;
public boolean isSelect() {
@@ -24,6 +27,14 @@ public class ExchangeModel extends BaseModel {
return this;
}
public String getSum() {
return sum;
}
public void setSum(String sum) {
this.sum = sum;
}
public String getTop() {
return top;
}

5
OneToOne/src/main/java/com/shayu/onetoone/dialog/GiftDialog.java
View File

@@ -2,6 +2,7 @@ package com.shayu.onetoone.dialog;
import android.app.Dialog;
import android.content.Context;
import android.content.Intent;
import android.widget.Button;
import android.widget.TextView;
@@ -28,6 +29,7 @@ import com.shayu.onetoone.view.MsgInputPanelForGift;
import com.shayu.onetoone.widget.PagerConfig;
import com.shayu.onetoone.widget.PagerGridLayoutManager;
import com.shayu.onetoone.widget.PagerGridSnapHelper;
import com.yunbao.common.activity.MyWalletActivity;
import com.yunbao.common.dialog.AbsDialogPopupWindow;
import com.yunbao.common.http.base.HttpCallback;
import com.yunbao.common.interfaces.OnItemClickListener;
@@ -133,7 +135,8 @@ public class GiftDialog extends AbsDialogPopupWindow {
ViewClicksAntiShake.clicksAntiShake(topUpBtn, new ViewClicksAntiShake.ViewClicksCallBack() {
@Override
public void onViewClicks() {
RouteManager.forwardWebViewActivity(null, HtmlUrlUtils.getPayUrl(mContext, false, HtmlUrlUtils.URL_PAY_COIN));
//RouteManager.forwardWebViewActivity(null, HtmlUrlUtils.getPayUrl(mContext, false, HtmlUrlUtils.URL_PAY_COIN));
mContext.startActivity(new Intent(mContext, MyWalletActivity.class).putExtra("p", 1));
}
});
}

5
OneToOne/src/main/java/com/shayu/onetoone/dialog/TipsDialog.java
View File

@@ -1,6 +1,7 @@
package com.shayu.onetoone.dialog;
import android.content.Context;
import android.content.Intent;
import android.view.View;
import android.view.ViewGroup;
import android.widget.Button;
@@ -13,6 +14,7 @@ import com.shayu.onetoone.R;
import com.shayu.onetoone.listener.OnDialogClickListener;
import com.shayu.onetoone.manager.RouteManager;
import com.shayu.onetoone.utils.HtmlUrlUtils;
import com.yunbao.common.activity.MyWalletActivity;
import com.yunbao.common.dialog.AbsDialogCenterPopupWindow;
import com.yunbao.common.utils.StringUtil;
import com.yunbao.common.utils.WordUtil;
@@ -113,7 +115,8 @@ public class TipsDialog extends AbsDialogCenterPopupWindow {
if (!StringUtil.isEmpty(applyText)&&(
applyText.equals(WordUtil.getNewString(R.string.money_apply))
|| applyText.equals(WordUtil.getNewString(R.string.dialog_to_money_tip)))) {
RouteManager.forwardWebViewActivity(null, HtmlUrlUtils.getPayUrl(mContext, false, HtmlUrlUtils.URL_PAY_COIN));
// RouteManager.forwardWebViewActivity(null, HtmlUrlUtils.getPayUrl(mContext, false, HtmlUrlUtils.URL_PAY_COIN));
mContext.startActivity(new Intent(mContext, MyWalletActivity.class).putExtra("p", 1));
}
if (onDialogClickListener != null) {
onDialogClickListener.onApply(dialog);

6
OneToOne/src/main/java/com/shayu/onetoone/provider/CustomConversationProvider.java
View File

@@ -33,10 +33,10 @@ public class CustomConversationProvider extends BaseConversationProvider {
try {
if (json.getInteger("sex") == -1) {
holder.getView(R.id.sex).setVisibility(View.GONE);
} else if (json.getInteger("sex") == 2) {
holder.setImageResource(R.id.sex, R.mipmap.ic_message_tab_woman);
} else {
} else if (json.getInteger("sex") == 1) {
holder.setImageResource(R.id.sex, R.mipmap.ic_message_tab_man);
} else {
holder.setImageResource(R.id.sex, R.mipmap.ic_message_tab_woman);
}
} catch (Exception e) {
e.printStackTrace();

2
OneToOne/src/main/java/com/shayu/onetoone/utils/UserManager.java
View File

@@ -120,6 +120,8 @@ public class UserManager {
}
public static void toHomePage(int userId) {
}
public static void toHomePage(String userId,boolean isGoto) {
toHomePage(userId+"");
}
public static void toHomePage(String userId) {

5
OneToOne/src/main/java/com/shayu/onetoone/view/MsgInputPanelForGift.java
View File

@@ -1,6 +1,7 @@
package com.shayu.onetoone.view;
import android.app.Dialog;
import android.content.Intent;
import android.view.View;
import android.widget.Button;
import android.widget.TextView;
@@ -27,6 +28,7 @@ import com.shayu.onetoone.utils.UserManager;
import com.shayu.onetoone.widget.PagerConfig;
import com.shayu.onetoone.widget.PagerGridLayoutManager;
import com.shayu.onetoone.widget.PagerGridSnapHelper;
import com.yunbao.common.activity.MyWalletActivity;
import com.yunbao.common.http.base.HttpCallback;
import com.yunbao.common.interfaces.OnItemClickListener;
import com.yunbao.common.manager.IMLoginManager;
@@ -117,7 +119,8 @@ public class MsgInputPanelForGift extends AbsInputPanel {
ViewClicksAntiShake.clicksAntiShake(topUpBtn, new ViewClicksAntiShake.ViewClicksCallBack() {
@Override
public void onViewClicks() {
RouteManager.forwardWebViewActivity(null, HtmlUrlUtils.getPayUrl(mContext, false, HtmlUrlUtils.URL_PAY_COIN));
//RouteManager.forwardWebViewActivity(null, HtmlUrlUtils.getPayUrl(mContext, false, HtmlUrlUtils.URL_PAY_COIN));
mContext.startActivity(new Intent(mContext, MyWalletActivity.class).putExtra("p", 1));
}
});
}

1
OneToOne/src/main/res/layout/activity_diamond_exchange.xml
View File

@@ -84,6 +84,7 @@
android:textSize="22sp" />
<TextView
android:id="@+id/total_convertibility_des"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="3dp"

4
OneToOne/src/main/res/layout/activity_msg_chat.xml
View File

@@ -2,8 +2,8 @@
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="26dp">
android:background="@color/rc_white_color"
android:layout_height="match_parent">
<FrameLayout

2
OneToOne/src/main/res/layout/fragment_interaction.xml
View File

@@ -46,7 +46,7 @@
android:textSize="12dp"
app:layout_constraintBottom_toBottomOf="@id/rc_refresh"
app:layout_constraintEnd_toEndOf="parent"
tools:visibility="gone" />
android:visibility="gone" />
<TextView
android:id="@+id/rc_unread_message_count"

2
OneToOne/src/main/res/layout/fragment_notice.xml
View File

@@ -46,7 +46,7 @@
android:textSize="12dp"
app:layout_constraintBottom_toBottomOf="@id/rc_refresh"
app:layout_constraintEnd_toEndOf="parent"
tools:visibility="gone" />
android:visibility="gone" />
<TextView
android:id="@+id/rc_unread_message_count"

1
OneToOne/src/main/res/values-zh-rHK/strings.xml
View File

@@ -97,6 +97,7 @@
<string name="money_apply">前往充值</string>
<string name="gift">[禮物]</string>
<string name="authentication">[邀請認證]</string>
<string name="system_tips">[系統提示]</string>
<string name="call_tips1">等待對方接受邀請…</string>
<string name="call_tips2">連接成功</string>
<string name="permission_request_title">需要獲取您的權限</string>

1
OneToOne/src/main/res/values-zh-rTW/strings.xml
View File

@@ -97,6 +97,7 @@
<string name="money_apply">前往充值</string>
<string name="gift">[禮物]</string>
<string name="authentication">[邀請認證]</string>
<string name="system_tips">[系統提示]</string>
<string name="call_tips1">等待對方接受邀請…</string>
<string name="call_tips2">連接成功</string>
<string name="permission_request_title">需要獲取您的權限</string>

1
OneToOne/src/main/res/values/strings.xml
View File

@@ -99,6 +99,7 @@
<string name="money_apply">前往充值</string>
<string name="gift">[禮物]</string>
<string name="authentication">[邀請認證]</string>
<string name="system_tips">[系統提示]</string>
<string name="call_tips1">等待對方接受邀請…</string>
<string name="call_tips2">連接成功</string>
<string name="permission_request_title">需要獲取您的權限</string>