修复测试反馈问题

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

@@ -32,6 +32,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Timer;
 import java.util.TimerTask;
+import java.util.UUID;
 
 @Route(path = RouteManager.ACTIVITY_MATCHING)
 public class MatchingActivity extends AbsOTOActivity {
@@ -81,31 +82,17 @@ public class MatchingActivity extends AbsOTOActivity {
         imageViewList.add(user4);
         imageViewList.add(user5);
         back.setOnClickListener(v -> {
-            new TipsDialog(mContext)
+            onBack();
-                    .setTitle(WordUtil.getNewString(R.string.matching_quit_title))
-                    .setApplyText(WordUtil.getNewString(R.string.matching_quit_cancel))
-                    .setCancelText(WordUtil.getNewString(R.string.matching_quit_apply))
-                    .setOnDialogClickListener(new OnDialogClickListener() {
-                        @Override
-                        public void onCancel(Dialog dialog) {
-                            super.onCancel(dialog);
-                            task.cancel();
-                            task = null;
-                            MatchingActivity.this.finish();
-                        }
-                    }).showDialog();
         });
         Bundle bundle = getIntent().getExtras();
         if (bundle != null) {
             String data = bundle.getString("data");
-            bundle.putInt("type",ChatActivity.CALL_CHAT_TYPE_MATCH);
+            bundle.putInt("type", ChatActivity.CALL_CHAT_TYPE_MATCH);
             if (data != null) {
-                SendConsumeBean bean = JSONObject.parseObject(data, SendConsumeBean.class);
+                bean = JSONObject.parseObject(data, SendConsumeBean.class);
                 if (bean != null) {
-                    new Handler(Looper.getMainLooper()).postDelayed(() -> {
+                    MatchingActivity.this.bundle=bundle;
-                        ConversationUtils.startConversation(mContext, bean.getMateUser().getUser().getId() + "", bundle);
+                    new Handler(Looper.getMainLooper()).postDelayed(toCallRunnable, 5000);
-                        MatchingActivity.this.finish();
-                    }, 5000);
                     return false;
                 }
             }
@@ -113,6 +100,26 @@ public class MatchingActivity extends AbsOTOActivity {
         return true;
     }
 
+    private void onBack() {
+        new TipsDialog(mContext)
+                .setTitle(WordUtil.getNewString(R.string.matching_quit_title))
+                .setApplyText(WordUtil.getNewString(R.string.matching_quit_cancel))
+                .setCancelText(WordUtil.getNewString(R.string.matching_quit_apply))
+                .setOnDialogClickListener(new OnDialogClickListener() {
+                    @Override
+                    public void onCancel(Dialog dialog) {
+                        super.onCancel(dialog);
+                        bean = null;
+                        handler.removeCallbacks(toCallRunnable);
+                        if (task != null) {
+                            task.cancel();
+                            task = null;
+                        }
+                        MatchingActivity.this.finish();
+                    }
+                }).showDialog();
+    }
+
     private void initData() {
         OTONetManager.getInstance(mContext)
                 .getMatchingInfo(new HttpCallback<MatchingInfoBean>() {
@@ -132,20 +139,32 @@ public class MatchingActivity extends AbsOTOActivity {
                 });
     }
 
+    private Bundle bundle;
+    private Runnable toCallRunnable = new Runnable() {
+        @Override
+        public void run() {
+            if (bean == null) {
+                return;
+            }
+            ConversationUtils.startConversation(mContext, bean.getMateUser().getUser().getId() + "", bundle);
+            MatchingActivity.this.finish();
+        }
+    };
+    SendConsumeBean bean;
+
     private void call() {
         handler.post(() -> ToastUtil.showDebug("匹配"));
         SendMessageManager.matching(new OnSendMessageListener() {
             @Override
-            public void onSuccess(String token, SendConsumeBean bean) {
+            public void onSuccess(String token, SendConsumeBean b) {
-                super.onSuccess(token, bean);
+                super.onSuccess(token, b);
+                bean = b;
                 task.cancel();
-                new Handler(Looper.getMainLooper()).postDelayed(() -> {
+                Bundle bundle = new Bundle();
-                    Bundle bundle = new Bundle();
+                bundle.putInt("type", ChatActivity.CALL_CHAT_TYPE_MATCH);
-                    bundle.putInt("type",ChatActivity.CALL_CHAT_TYPE_MATCH);
+                bundle.putString("data", JSONObject.toJSONString(bean));
-                    bundle.putString("data", JSONObject.toJSONString(bean));
+                MatchingActivity.this.bundle = bundle;
-                    ConversationUtils.startConversation(mContext, bean.getMateUser().getUser().getId() + "", bundle);
+                handler.postDelayed(toCallRunnable, 5000);
-                    MatchingActivity.this.finish();
-                }, 5000);
             }
 
             @Override
@@ -153,7 +172,7 @@ public class MatchingActivity extends AbsOTOActivity {
                 super.onError(status, msg, bean);
                 if (bean.getCode() == 503) {
                     handler.post(() -> ToastUtil.showDebug("没人，继续"));
-                }else if(status==OnSendMessageListener.STATUS_NOT_PRICE){
+                } else if (status == OnSendMessageListener.STATUS_NOT_PRICE) {
                     task.cancel();
                     handler.post(() -> ToastUtil.showDebug("价格不足"));
                     MatchingActivity.this.finish();
@@ -186,6 +205,8 @@ public class MatchingActivity extends AbsOTOActivity {
                                 @Override
                                 public void onApply(Dialog dialog) {
                                     super.onApply(dialog);
+                                    bean = null;
+                                    handler.removeCallbacks(toCallRunnable);
                                     task.cancel();
                                     task = null;
                                     MatchingActivity.this.finish();
@@ -203,4 +224,9 @@ public class MatchingActivity extends AbsOTOActivity {
             return super.cancel();
         }
     }
+
+    @Override
+    public void onBackPressed() {
+        onBack();
+    }
 }

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

@@ -21,11 +21,14 @@ import com.alibaba.android.arouter.facade.annotation.Route;
 import com.shayu.onetoone.R;
 import com.shayu.onetoone.manager.RouteManager;
 import com.yunbao.common.Constants;
+import com.yunbao.common.bean.IMLoginModel;
+import com.yunbao.common.manager.IMLoginManager;
 import com.yunbao.common.utils.AndroidBug5497Workaround;
 import com.yunbao.common.utils.JavascriptInterfaceUtils;
 import com.yunbao.common.utils.L;
 import com.yunbao.common.utils.StringUtil;
 import com.yunbao.common.utils.ToastUtil;
+import com.yunbao.common.utils.WordUtil;
 
 import androidx.annotation.RequiresApi;
 
@@ -60,7 +63,16 @@ public class WebViewActivity extends AbsOTOActivity {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
             settings.setMixedContentMode(WebSettings.MIXED_CONTENT_ALWAYS_ALLOW);
         }
-        webView.loadUrl(getIntent().getStringExtra("url"));
+        String url = getIntent().getStringExtra("url");
+        if(StringUtil.isEmpty(url)){
+            finish();
+            return;
+        }
+        if (!url.contains("token")) {
+            IMLoginModel userInfo = IMLoginManager.get(mContext).getUserInfo();
+            url += "&uid=" + userInfo.getId() + "&token=" + userInfo.getToken() + "&isZh=" + (WordUtil.isNewZh() ? "1" : "0");
+        }
+        webView.loadUrl(url);
         AndroidBug5497Workaround.assistActivity(this);
 
         webView.setWebViewClient(new WebViewClient() {

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

@@ -1,25 +1,98 @@
 package com.shayu.onetoone.activity.fragments;
 
 
+import static android.content.Context.CLIPBOARD_SERVICE;
+
+import android.content.ClipData;
+import android.content.ClipboardManager;
+import android.os.Build;
 import android.os.Bundle;
+import android.text.TextUtils;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.webkit.WebResourceRequest;
+import android.webkit.WebResourceResponse;
+import android.webkit.WebSettings;
+import android.webkit.WebView;
+import android.webkit.WebViewClient;
 
 import com.shayu.onetoone.R;
+import com.yunbao.common.CommonAppConfig;
+import com.yunbao.common.Constants;
+import com.yunbao.common.bean.IMLoginModel;
+import com.yunbao.common.manager.IMLoginManager;
+import com.yunbao.common.utils.AndroidBug5497Workaround;
+import com.yunbao.common.utils.JavascriptInterfaceUtils;
+import com.yunbao.common.utils.L;
+import com.yunbao.common.utils.ToastUtil;
+import com.yunbao.common.utils.WordUtil;
 
 /**
  * 动态主页面
  */
 public class DynamicFragment extends BaseFragment {
+    private WebView webView;
 
     @Override
     public void initView(View itemView) {
+        webView = itemView.findViewById(R.id.webView);
+        WebSettings settings = webView.getSettings();
+        settings.setJavaScriptEnabled(true); // 是否开启JS支持
+        settings.setJavaScriptCanOpenWindowsAutomatically(true); // 是否允许JS打开新窗口
+        settings.setDomStorageEnabled(true);
+        webView.addJavascriptInterface(JavascriptInterfaceUtils.getInstance().setmContext(getActivity(), webView)
+                .setPageClose(true)
+                .setLiveZhuangBana(false), "androidObject");
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            settings.setMixedContentMode(WebSettings.MIXED_CONTENT_ALWAYS_ALLOW);
+        }
+        AndroidBug5497Workaround.assistActivity(getActivity());
 
+        webView.setWebViewClient(new WebViewClient() {
+            @Override
+            public boolean shouldOverrideUrlLoading(WebView view, String url) {
+                Log.e("H5-------->" , url);
+                if (url.startsWith(Constants.COPY_PREFIX)) {
+                    String content = url.substring(Constants.COPY_PREFIX.length());
+                    if (!TextUtils.isEmpty(content)) {
+                        copy(content);
+                    }
+                } else {
+                    view.loadUrl(url);
+                }
+                return true;
+            }
+
+            @Override
+            public void onPageFinished(WebView view, String url) {
+                int height = view.getMeasuredHeight();
+                Log.e("网页高度", height + "");
+            }
+
+            @Override
+            public void onReceivedHttpError(WebView view, WebResourceRequest request, WebResourceResponse errorResponse) {
+                super.onReceivedHttpError(view, request, errorResponse);
+            }
+        });
+        IMLoginModel userInfo = IMLoginManager.get(mContext).getUserInfo();
+        String url=CommonAppConfig.HOST + "/h5/shequ/index.html#/h5/shequ?stack-key-1=698c5f85%20&uid="
+                + userInfo.getId() + "&token=" + userInfo.getToken() + "&isZh=" + (WordUtil.isNewZh() ? "1" : "0");
+        Log.i("Web",url);
+        webView.loadUrl(url);
+    }
+    /**
+     * 复制到剪贴板
+     */
+    private void copy(String content) {
+        ClipboardManager cm = (ClipboardManager) getActivity().getSystemService(CLIPBOARD_SERVICE);
+        ClipData clipData = ClipData.newPlainText("text", content);
+        cm.setPrimaryClip(clipData);
+        ToastUtil.show(getString(R.string.copy_success));
     }
-
     @Override
     public View createView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        return  inflater.inflate(R.layout.fragment_dynamic, container, false);
+        return inflater.inflate(R.layout.fragment_dynamic, container, false);
     }
 }

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

@@ -152,6 +152,7 @@ public class ChatMessageFragment extends AbsConversationFragment {
                         new TipsDialog(mContext)
                                 .setTitle(WordUtil.getNewString(R.string.not_money))
                                 .setContent(String.format(WordUtil.getNewString(R.string.not_money_tips), msg))
+                                .setApplyText(WordUtil.getNewString(R.string.dialog_apply))
                                 .setOnDialogClickListener(new OnDialogClickListener() {
 
                                     @Override

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

@@ -24,6 +24,7 @@ import com.sahooz.library.Country;
 import com.sahooz.library.CountryPicker;
 import com.sahooz.library.OnPick;
 import com.shayu.onetoone.R;
+import com.shayu.onetoone.manager.RouteManager;
 import com.shayu.onetoone.utils.MainHttpUtil;
 import com.yunbao.common.CommonAppConfig;
 import com.yunbao.common.activity.AbsActivity;
@@ -365,6 +366,7 @@ public class FindPwdActivity extends AbsActivity {
                     String uid = obj.getString("id");
                     String token = obj.getString("token");
                     IMLoginModel model = GsonUtils.fromJson(info[0], IMLoginModel.class);
+                    IMLoginManager.get(mContext).setupLoginUser(model);
                     CommonAppConfig.getInstance().setLoginInfo(uid, token, true);
                     getBaseUserInfo();
                 } else {
@@ -394,6 +396,8 @@ public class FindPwdActivity extends AbsActivity {
                     mDialog.dismiss();
                 }
                 if (bean != null) {
+                    RouteManager.forwardMainActivity();
+                    finish();
 //                    MainActivity.forward(mContext);
 //                    EventBus.getDefault().post(new RegSuccessEvent());
                 }

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

@@ -1,7 +1,5 @@
 package com.shayu.onetoone.activity.login;
 
-import static com.yunbao.common.CommonAppContext.home_zdy_img_cn;
-import static com.yunbao.common.CommonAppContext.home_zdy_img_us;
 
 import android.animation.ObjectAnimator;
 import android.app.Activity;
@@ -286,33 +284,13 @@ public class LoginActivity extends AbsOTOActivity {
             @Override
             public void onSuccess(com.shayu.onetoone.bean.UserBean data) {
                 RongcloudIMManager.connectIM(mContext);
-                OTONetManager.getInstance(mContext).getRandJoinAnchor(new com.yunbao.common.http.base.HttpCallback<JoinAnchorBean>() {
+                if (mFirstLogin) {
-                    @Override
+                    IMLoginManager.get(mContext).setNewUserGif(true);
-                    public void onSuccess(JoinAnchorBean data) {
+                    IMLoginManager.get(mContext).setisNewUserOne(true);
-                        if (mFirstLogin) {
+                }
-                            IMLoginManager.get(mContext).setNewUserGif(true);
+                loadingDialog.dismiss();
-                            IMLoginManager.get(mContext).setisNewUserOne(true);
+                RouteManager.forwardMainActivity();
-//                                            MainActivity.forward(EntryActivity.this, false);
+                finish();
-                            if (!StringUtil.isEmpty(data.getHome_zdy_img_us())) {
-                                home_zdy_img_us = data.getHome_zdy_img_us();
-                                home_zdy_img_cn = data.getHome_zdy_img_cn();
-                            }
-                            if (!StringUtil.isEmpty(data.getHome_zdy_pop())) {
-                                NoviceInstructorManager.get(mContext).setHomeZdyPop(data.getHome_zdy_pop());
-                            }
-                            IMLoginManager.get(mContext).setisNewUserOne(true);
-                            IMLoginManager.get(mContext).setNewUserGif(true);
-                        }
-                        loadingDialog.dismiss();
-                        RouteManager.forwardMainActivity();
-                        finish();
-                    }
-
-                    @Override
-                    public void onError(String error) {
-                        ToastUtil.show(error);
-                    }
-                });
             }
 
             @Override

OneToOne/src/main/java/com/shayu/onetoone/activity/setting/ModifyPwdActivity.java

@@ -79,7 +79,7 @@ public class ModifyPwdActivity extends AbsActivity implements View.OnClickListen
 
             @Override
             public void onError(String error) {
-
+                ToastUtil.show(error);
             }
         });
     }

OneToOne/src/main/java/com/shayu/onetoone/bean/PropBean.java

@@ -1,15 +1,20 @@
 package com.shayu.onetoone.bean;
 
+import com.google.gson.annotations.SerializedName;
 import com.yunbao.common.bean.BaseModel;
 
 public class PropBean extends BaseModel {
     int id;
+    @SerializedName("cn_title")
     String cnTitle;
+    @SerializedName("en_title")
     String enTitle;
     String icon;
     int status;
     int type;
+    @SerializedName("create_time")
     long createTime;
+    @SerializedName("update_time")
     long updateTime;
     String callback;
     long exTime;

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

@@ -17,6 +17,7 @@ import com.yunbao.common.CommonAppContext;
 import com.yunbao.common.manager.IMLoginManager;
 import com.yunbao.common.utils.StringUtil;
 import com.yunbao.common.utils.ToastUtil;
+import com.yunbao.faceunity.FaceManager;
 
 import java.util.ArrayList;
 import java.util.HashMap;

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

@@ -3,13 +3,14 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto">
-    <Button
+
-        android:id="@+id/button2"
+    <WebView
-        android:layout_width="wrap_content"
+        android:id="@+id/webView"
-        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/activity_top"
-        android:layout_marginTop="357dp"
+        android:layout_width="match_parent"
-        android:layout_marginEnd="142dp"
+        android:layout_height="match_parent"
-        android:text="动态"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -105,7 +105,6 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginLeft="10dp"
-                            android:layout_marginRight="10dp"
                             android:ellipsize="end"
                             android:lines="1"
                             android:maxEms="4"
@@ -241,7 +240,6 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginLeft="10dp"
-                            android:layout_marginRight="10dp"
                             android:ellipsize="end"
                             android:lines="1"
                             android:maxEms="4"
@@ -375,7 +373,6 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginLeft="10dp"
-                            android:layout_marginRight="10dp"
                             android:ellipsize="end"
                             android:lines="1"
                             android:maxEms="4"

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

@@ -98,6 +98,8 @@
             android:id="@+id/user_sign"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:ellipsize="end"
+            android:singleLine="true"
             tools:text="TextView"
             android:textColor="#888888"
             android:textSize="12sp" />

common/src/main/java/com/yunbao/common/utils/WordUtil.java

@@ -43,7 +43,7 @@ public class WordUtil {
         return language.endsWith("zh");
     }
     public static boolean isNewZh(){
-        return  IMLoginManager.get(CommonAppContext.sInstance).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE;
+        return  IMLoginManager.get(CommonAppContext.sInstance).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE || IMLoginManager.get(CommonAppContext.sInstance).getLocaleLanguage() == Locale.TRADITIONAL_CHINESE;
     }
 
     /**