update

OneToOne/src/main/java/com/shayu/onetoone/activity/HomeScreenActivity.java

@@ -45,8 +45,8 @@ public class HomeScreenActivity extends AbsOTOActivity {
 
 
         apply.setOnClickListener(v -> {
-            String age = getRadioButtonValue(ageRadioGroup);
+            String age = getRadioButtonTag(ageRadioGroup);
-            String sex = getRadioButton(sexRadioGroup).getTag().toString();
+            String sex = getRadioButtonTag(sexRadioGroup);
             String auth = getRadioButtonTag(authRadioGroup);
             if (isRadioButtonEmpty(ageRadioGroup)) {
                 age = "";

OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/FriendsFragment.java

@@ -34,6 +34,7 @@ import com.yunbao.common.manager.IMLoginManager;
 import com.yunbao.common.utils.Bus;
 import com.yunbao.common.utils.SpUtil;
 import com.yunbao.common.utils.StringUtil;
+import com.yunbao.common.utils.ToastUtil;
 import com.yunbao.common.utils.WordUtil;
 import com.yunbao.common.views.weight.ViewClicksAntiShake;
 
@@ -182,11 +183,11 @@ public class FriendsFragment extends BaseFragment {
         }
         if (event.getType() == HomeBusEvent.TYPE_SHOW_MATCHING) {
             int show = event.getMatching();
-            if (show == 0) {
+           /* if (show == 0) {
                 matching.setVisibility(View.GONE);
             } else {
                 matching.setVisibility(View.VISIBLE);
-            }
+            }*/
         }
     }
 }

OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/home/RecommendFragment.java

@@ -82,7 +82,7 @@ public class RecommendFragment extends BaseFragment {
                 page = 1;
             }
             isScreen = true;
-            screen(screen);
+           // screen(screen);
             mRefreshLayout.setEnableRefresh(false);
         } else {
             if (isScreen) {
@@ -103,6 +103,11 @@ public class RecommendFragment extends BaseFragment {
                         new HttpCallback<List<HomeItemBean>>() {
                             @Override
                             public void onSuccess(List<HomeItemBean> data) {
+                                if(page==1 && data.isEmpty()){
+                                    adapter.setList(data);
+                                    mRefreshLayout.finishLoadMore();
+                                    return;
+                                }
                                 if (page != 1 && data.isEmpty()) {
                                     page--;
                                     mRefreshLayout.finishLoadMore();

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

@@ -271,13 +271,13 @@ public class ChatMessageFragment extends AbsConversationFragment {
                 }
             });
             mVoiceToggleBtn.setOnClickListener(view -> {
-                mExtensionViewModel.getInputModeLiveData().setValue(InputMode.NormalMode);
+                mExtensionViewModel.getInputModeLiveData().postValue(InputMode.NormalMode);
                 giftPanel.hide();
                 audio.show();
             });
 
             gift.setOnClickListener(v -> {
-                mExtensionViewModel.getInputModeLiveData().setValue(InputMode.NormalMode);
+                mExtensionViewModel.getInputModeLiveData().postValue(InputMode.NormalMode);
                 audio.hide();
                 giftPanel.show();
             });
@@ -285,9 +285,9 @@ public class ChatMessageFragment extends AbsConversationFragment {
                 if (mExtensionViewModel.getInputModeLiveData().getValue() == InputMode.TextInput) {
                     audio.hide();
                     giftPanel.hide();
-                    mExtensionViewModel.getInputModeLiveData().setValue(InputMode.EmoticonMode);
+                    mExtensionViewModel.getInputModeLiveData().postValue(InputMode.EmoticonMode);
                 } else {
-                    mExtensionViewModel.getInputModeLiveData().setValue(InputMode.TextInput);
+                    mExtensionViewModel.getInputModeLiveData().postValue(InputMode.TextInput);
                 }
             });
 

OneToOne/src/main/java/com/shayu/onetoone/activity/login/RegisterActivity.java

@@ -34,6 +34,7 @@ import com.sahooz.library.CountryPicker;
 import com.sahooz.library.OnPick;
 import com.shayu.onetoone.R;
 import com.shayu.onetoone.activity.MainActivity;
+import com.shayu.onetoone.manager.OTONetManager;
 import com.shayu.onetoone.manager.RouteManager;
 import com.shayu.onetoone.utils.MainHttpUtil;
 import com.yunbao.common.CommonAppConfig;
@@ -465,17 +466,22 @@ public class RegisterActivity extends AbsActivity {
      * 获取用户信息
      */
     private void getBaseUserInfo() {
-        MainHttpUtil.getBaseInfo(new CommonCallback<UserBean>() {
+        OTONetManager.getInstance(mContext).getBaseInfos(true, new com.yunbao.common.http.base.HttpCallback<com.shayu.onetoone.bean.UserBean>() {
             @Override
-            public void callback(UserBean bean) {
+            public void onSuccess(com.shayu.onetoone.bean.UserBean data) {
                 if (mDialog != null) {
                     mDialog.dismiss();
                 }
-                if (bean != null) {
+                if (data != null) {
                     netHandler.post(getRandJoinAnchor);
 //                    EventBus.getDefault().post(new RegSuccessEvent());
                 }
             }
+
+            @Override
+            public void onError(String error) {
+
+            }
         });
     }
 

OneToOne/src/main/java/com/shayu/onetoone/manager/CallClientManager.java

@@ -85,7 +85,7 @@ public class CallClientManager {
     }
 
     private void init() {
-        RongCallClient.setReceivedCallListener(new CallMeListener());
+        //RongCallClient.setReceivedCallListener(new CallMeListener());
     }
 
     public void addOnVoIPCallListener(Class zlass, OnCallStatusListener statusListener) {

OneToOne/src/main/res/layout/activity_screen.xml

@@ -74,6 +74,7 @@
                 android:button="@null"
                 android:gravity="center"
                 android:text="18-25"
+                android:tag="18-25"
                 android:textColor="@drawable/bg_home_search_text"
                 android:textSize="14sp" />
 
@@ -87,6 +88,7 @@
                 android:button="@null"
                 android:gravity="center"
                 android:text="26-30"
+                android:tag="26-30"
                 android:textColor="@drawable/bg_home_search_text"
                 android:textSize="14sp" />
 
@@ -100,6 +102,7 @@
                 android:button="@null"
                 android:gravity="center"
                 android:text="31-35"
+                android:tag="31-35"
                 android:textColor="@drawable/bg_home_search_text"
                 android:textSize="14sp" />
 
@@ -113,6 +116,7 @@
                 android:button="@null"
                 android:gravity="center"
                 android:text="36-40"
+                android:tag="36-40"
                 android:textColor="@drawable/bg_home_search_text"
                 android:textSize="14sp" />
 
@@ -126,6 +130,7 @@
                 android:button="@null"
                 android:gravity="center"
                 android:text="@string/layout_screen_tip3"
+                android:tag="40-100"
                 android:textColor="@drawable/bg_home_search_text"
                 android:textSize="14sp" />