From c42c757001d8b17e7999e363b16a0d84fbd1c61c Mon Sep 17 00:00:00 2001
From: zlzw <583819556@qq.com>
Date: Fri, 3 Nov 2023 16:28:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=BE=A9=E4=B8=80=E4=BA=9B=E6=B8=AC?=
 =?UTF-8?q?=E8=A9=A6=E5=8F=8D=E9=A5=8B=E5=95=8F=E9=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 OneToOne/src/main/AndroidManifest.xml                         | 4 ++++
 .../com/shayu/onetoone/activity/DiamondExchangeActivity.java  | 2 ++
 .../main/java/com/shayu/onetoone/activity/MainActivity.java   | 2 +-
 .../com/shayu/onetoone/activity/fragments/MyFragment.java     | 2 +-
 .../shayu/onetoone/activity/message/CallAudioActivity.java    | 3 ++-
 .../java/com/shayu/onetoone/manager/CallClientManager.java    | 2 +-
 OneToOne/src/main/res/layout/activity_entry.xml               | 2 ++
 OneToOne/src/main/res/values-zh-rHK/strings.xml               | 1 +
 OneToOne/src/main/res/values-zh-rTW/strings.xml               | 1 +
 OneToOne/src/main/res/values/strings.xml                      | 1 +
 10 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/OneToOne/src/main/AndroidManifest.xml b/OneToOne/src/main/AndroidManifest.xml
index 6eb771fbf..798ae73e3 100644
--- a/OneToOne/src/main/AndroidManifest.xml
+++ b/OneToOne/src/main/AndroidManifest.xml
@@ -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
diff --git a/OneToOne/src/main/java/com/shayu/onetoone/activity/DiamondExchangeActivity.java b/OneToOne/src/main/java/com/shayu/onetoone/activity/DiamondExchangeActivity.java
index 74eca7dcb..415931e1b 100644
--- a/OneToOne/src/main/java/com/shayu/onetoone/activity/DiamondExchangeActivity.java
+++ b/OneToOne/src/main/java/com/shayu/onetoone/activity/DiamondExchangeActivity.java
@@ -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>>() {
diff --git a/OneToOne/src/main/java/com/shayu/onetoone/activity/MainActivity.java b/OneToOne/src/main/java/com/shayu/onetoone/activity/MainActivity.java
index 767b4603b..26437f61c 100644
--- a/OneToOne/src/main/java/com/shayu/onetoone/activity/MainActivity.java
+++ b/OneToOne/src/main/java/com/shayu/onetoone/activity/MainActivity.java
@@ -323,6 +323,6 @@ public class MainActivity extends AbsOTOActivity {
         IMLoginManager.get(mContext).logout(this);
         UserManager.logout();
         CommonAppConfig.getInstance().clearLoginInfo();
-        RouteManager.forwardLoginActivity();
+        RouteManager.forwardEntryActivity();
     }
 }
\ No newline at end of file
diff --git a/OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/MyFragment.java b/OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/MyFragment.java
index 11eabcbb4..b1273a7bd 100644
--- a/OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/MyFragment.java
+++ b/OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/MyFragment.java
@@ -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");
diff --git a/OneToOne/src/main/java/com/shayu/onetoone/activity/message/CallAudioActivity.java b/OneToOne/src/main/java/com/shayu/onetoone/activity/message/CallAudioActivity.java
index f976eaff9..5c75fbd41 100644
--- a/OneToOne/src/main/java/com/shayu/onetoone/activity/message/CallAudioActivity.java
+++ b/OneToOne/src/main/java/com/shayu/onetoone/activity/message/CallAudioActivity.java
@@ -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)) {
diff --git a/OneToOne/src/main/java/com/shayu/onetoone/manager/CallClientManager.java b/OneToOne/src/main/java/com/shayu/onetoone/manager/CallClientManager.java
index 8154e3e6e..1a5ed58f7 100644
--- a/OneToOne/src/main/java/com/shayu/onetoone/manager/CallClientManager.java
+++ b/OneToOne/src/main/java/com/shayu/onetoone/manager/CallClientManager.java
@@ -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) {
diff --git a/OneToOne/src/main/res/layout/activity_entry.xml b/OneToOne/src/main/res/layout/activity_entry.xml
index ba9737ad4..b9efb98cd 100644
--- a/OneToOne/src/main/res/layout/activity_entry.xml
+++ b/OneToOne/src/main/res/layout/activity_entry.xml
@@ -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"
diff --git a/OneToOne/src/main/res/values-zh-rHK/strings.xml b/OneToOne/src/main/res/values-zh-rHK/strings.xml
index 2154c49cb..840783a81 100644
--- a/OneToOne/src/main/res/values-zh-rHK/strings.xml
+++ b/OneToOne/src/main/res/values-zh-rHK/strings.xml
@@ -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>
 
diff --git a/OneToOne/src/main/res/values-zh-rTW/strings.xml b/OneToOne/src/main/res/values-zh-rTW/strings.xml
index 2154c49cb..840783a81 100644
--- a/OneToOne/src/main/res/values-zh-rTW/strings.xml
+++ b/OneToOne/src/main/res/values-zh-rTW/strings.xml
@@ -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>
 
diff --git a/OneToOne/src/main/res/values/strings.xml b/OneToOne/src/main/res/values/strings.xml
index 5b207f5c7..9dda19ecb 100644
--- a/OneToOne/src/main/res/values/strings.xml
+++ b/OneToOne/src/main/res/values/strings.xml
@@ -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>