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

修復一些測試反饋問題

Browse Source
This commit is contained in:
zlzw 2023-11-03 16:28:27 +08:00
parent 83758f39b1
commit c42c757001
10 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OneToOne/src/main/AndroidManifest.xml
View File

@ -199,6 +199,10 @@
android:name=".activity.MyFriendListActivity"
android:screenOrientation="portrait"
android:windowSoftInputMode="stateHidden|adjustResize" />
<activity
android:name=".activity.setting.BindUserActivity"
android:screenOrientation="portrait"
android:windowSoftInputMode="stateHidden|adjustResize" />
<activity

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

@ -177,8 +177,10 @@ public class DiamondExchangeActivity extends AbsOTOActivity {
type = getIntent().getExtras().getString("type");
if (TextUtils.equals(type, "yuanbao")) {
title.setText(getString(R.string.my_arnings_exchange_star));
diamondExchangeInput.setText(R.string.diamond_exchange_input_hint);
} else {
title.setText(getString(R.string.my_arnings_exchange_diamond));
diamondExchangeInput.setText(R.string.diamond_exchange_input_hint2);
}
}
OTONetManager.getInstance(mContext).getExchangeList(type, new HttpCallback<List<ExchangeModel>>() {

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

@ -323,6 +323,6 @@ public class MainActivity extends AbsOTOActivity {
IMLoginManager.get(mContext).logout(this);
UserManager.logout();
CommonAppConfig.getInstance().clearLoginInfo();
RouteManager.forwardLoginActivity();
RouteManager.forwardEntryActivity();
}
}

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

@ -490,7 +490,7 @@ public class MyFragment extends BaseFragment implements OnItemClickListener<User
// mContext.startActivity(new Intent(mContext, EditProfileActivity.class));
} else if (i == R.id.lt_star_coin) {
mContext.startActivity(new Intent(mContext, MyWalletActivity.class).putExtra("p", 1));
RouteManager.forwardWebViewActivity(null, HtmlUrlUtils.getPayUrl(mContext, false, HtmlUrlUtils.URL_PAY_GOLD));
// RouteManager.forwardWebViewActivity(null, HtmlUrlUtils.getPayUrl(mContext, false, HtmlUrlUtils.URL_PAY_GOLD));
// mContext.startActivity(new Intent(mContext, MyWalletActivity.class).putExtra("p", 1)) ;
// Bundle bundle = new Bundle();
// bundle.putString("type", "yuanbao");

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

@ -241,10 +241,11 @@ public class CallAudioActivity extends AbsOTOActivity implements View.OnClickLis
//((ViewGroup) EasyFloat.getFloatView("call").getParent()).removeAllViews();
EasyFloat.dismiss("call");
String sessionId = CallClientManager.getManager().getSessionId();
if (StringUtil.isEmpty(sessionId)) {
if (!CallClientManager.getManager().isCalling()) {
model = CallClientManager.AUDIO_CALL;
gift.setVisibility(View.INVISIBLE);
money.setVisibility(View.INVISIBLE);
callMsg.setImageResource(R.mipmap.ic_call_audio_msg);
return;
}
if (sessionId.equals(targetId)) {

2
OneToOne/src/main/java/com/shayu/onetoone/manager/CallClientManager.java
View File

@ -236,7 +236,7 @@ public class CallClientManager {
}
public boolean isCalling() {
return RongCallClient.getInstance() != null && RongCallClient.getInstance().getCallSession() != null;
return RongCallClient.getInstance() != null && RongCallClient.getInstance().getCallSession().getSessionId() != null;
}
public boolean isCallVideo(RongCallSession callSession) {

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

@ -53,6 +53,7 @@
android:layout_width="match_parent"
android:layout_height="54dp"
android:layout_marginLeft="42dp"
android:visibility="gone"
android:layout_marginRight="42dp"
android:background="@drawable/background_8f7cdf"
android:gravity="center">
@ -204,6 +205,7 @@
<ImageView
android:layout_width="57dp"
android:visibility="gone"
android:layout_height="57dp"
android:layout_gravity="center"
android:layout_weight="1"

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

@ -30,6 +30,7 @@
<string name="my_arnings_toggle">切換</string>
<string name="my_arnings_wait">敬請期待</string>
<string name="diamond_exchange_input_hint">請輸入需兌換的星幣金額</string>
<string name="diamond_exchange_input_hint2">請輸入需兌換的鑽石金額</string>
<string name="diamond_exchange_immediate_exchange">立即兌換</string>
<string name="diamond_exchange_full_conversion">全額兌換</string>

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

@ -30,6 +30,7 @@
<string name="my_arnings_toggle">切換</string>
<string name="my_arnings_wait">敬請期待</string>
<string name="diamond_exchange_input_hint">請輸入需兌換的星幣金額</string>
<string name="diamond_exchange_input_hint2">請輸入需兌換的鑽石金額</string>
<string name="diamond_exchange_immediate_exchange">立即兌換</string>
<string name="diamond_exchange_full_conversion">全額兌換</string>

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

@ -30,6 +30,7 @@
<string name="my_arnings_toggle">切換</string>
<string name="my_arnings_wait">敬請期待</string>
<string name="diamond_exchange_input_hint">請輸入需兌換的星幣金額</string>
<string name="diamond_exchange_input_hint2">請輸入需兌換的鑽石金額</string>
<string name="diamond_exchange_immediate_exchange">立即兌換</string>
<string name="diamond_exchange_full_conversion">全額兌換</string>