修复测试反馈问题
This commit is contained in:
parent
74bcde8911
commit
08445012e8
@ -86,7 +86,7 @@
|
|||||||
<application
|
<application
|
||||||
android:name=".AppContext"
|
android:name=".AppContext"
|
||||||
android:allowBackup="true"
|
android:allowBackup="true"
|
||||||
android:icon="@mipmap/ic_launcher"
|
android:icon="@mipmap/app_logo"
|
||||||
android:label="@string/app_name"
|
android:label="@string/app_name"
|
||||||
android:largeHeap="true"
|
android:largeHeap="true"
|
||||||
android:preserveLegacyExternalStorage="true"
|
android:preserveLegacyExternalStorage="true"
|
||||||
@ -279,7 +279,7 @@
|
|||||||
|
|
||||||
<meta-data
|
<meta-data
|
||||||
android:name="SERVER_HOST"
|
android:name="SERVER_HOST"
|
||||||
android:value="https://ceshi.yyouou.com" />
|
android:value="${otoServerHost}" />
|
||||||
<meta-data
|
<meta-data
|
||||||
android:name="com.facebook.sdk.ApplicationId"
|
android:name="com.facebook.sdk.ApplicationId"
|
||||||
android:value="@string/facebook_app_id" />
|
android:value="@string/facebook_app_id" />
|
||||||
|
@ -23,6 +23,7 @@ import com.yunbao.common.utils.AppManager;
|
|||||||
import com.yunbao.common.utils.StringUtil;
|
import com.yunbao.common.utils.StringUtil;
|
||||||
import com.yunbao.common.utils.ToastUtil;
|
import com.yunbao.common.utils.ToastUtil;
|
||||||
import com.yunbao.common.utils.WordUtil;
|
import com.yunbao.common.utils.WordUtil;
|
||||||
|
import com.yunbao.common.views.weight.ViewClicksAntiShake;
|
||||||
|
|
||||||
@Route(path = RouteManager.ACTIVITY_END_CALL)
|
@Route(path = RouteManager.ACTIVITY_END_CALL)
|
||||||
public class EndCallActivity extends AbsOTOActivity {
|
public class EndCallActivity extends AbsOTOActivity {
|
||||||
@ -74,14 +75,16 @@ public class EndCallActivity extends AbsOTOActivity {
|
|||||||
followButton.setOnClickListener(view -> {
|
followButton.setOnClickListener(view -> {
|
||||||
follow();
|
follow();
|
||||||
});
|
});
|
||||||
|
ViewClicksAntiShake.clicksAntiShake(cancelButton, new ViewClicksAntiShake.ViewClicksCallBack() {
|
||||||
cancelButton.setOnClickListener(v -> {
|
@Override
|
||||||
|
public void onViewClicks() {
|
||||||
OTONetManager.getInstance(mContext)
|
OTONetManager.getInstance(mContext)
|
||||||
.getTargetUserInfo(user.getUser().getId(), new HttpCallback<UserBean>() {
|
.getTargetUserInfo(user.getUser().getId(), new HttpCallback<UserBean>() {
|
||||||
@Override
|
@Override
|
||||||
public void onSuccess(UserBean data) {
|
public void onSuccess(UserBean data) {
|
||||||
if (data.getInfo().getName_auth() == 2) {
|
if (data.getInfo().getName_auth() == 2) {
|
||||||
RouteManager.forwardActivity(extras.getString("path"), extras);
|
RouteManager.forwardActivity(extras.getString("path"), extras);
|
||||||
|
EndCallActivity.this.finish();
|
||||||
} else {
|
} else {
|
||||||
ToastUtil.show(R.string.end_resume_call_not_auth);
|
ToastUtil.show(R.string.end_resume_call_not_auth);
|
||||||
}
|
}
|
||||||
@ -93,10 +96,13 @@ public class EndCallActivity extends AbsOTOActivity {
|
|||||||
Log.e(TAG, "onError: " + error);
|
Log.e(TAG, "onError: " + error);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
}
|
||||||
});
|
});
|
||||||
applyButton.setOnClickListener(v -> {
|
ViewClicksAntiShake.clicksAntiShake(applyButton, 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));
|
||||||
|
}
|
||||||
});
|
});
|
||||||
findViewById(R.id.close).setOnClickListener(v -> finish());
|
findViewById(R.id.close).setOnClickListener(v -> finish());
|
||||||
}
|
}
|
||||||
|
@ -58,6 +58,9 @@ public class WebViewActivity extends AbsOTOActivity {
|
|||||||
if (!StringUtil.isEmpty(titleString)) {
|
if (!StringUtil.isEmpty(titleString)) {
|
||||||
setTitle(titleString);
|
setTitle(titleString);
|
||||||
}
|
}
|
||||||
|
if (!StringUtil.isEmpty(titleString) && titleString.equals("NoTitle")) {
|
||||||
|
findViewById(R.id.ft_title).setVisibility(View.GONE);
|
||||||
|
}
|
||||||
initWebView();
|
initWebView();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -133,6 +136,7 @@ public class WebViewActivity extends AbsOTOActivity {
|
|||||||
cm.setPrimaryClip(clipData);
|
cm.setPrimaryClip(clipData);
|
||||||
ToastUtil.show(getString(R.string.copy_success));
|
ToastUtil.show(getString(R.string.copy_success));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Subscribe(threadMode = ThreadMode.MAIN)
|
@Subscribe(threadMode = ThreadMode.MAIN)
|
||||||
public void event(JavascriptInterfaceEvent event) {
|
public void event(JavascriptInterfaceEvent event) {
|
||||||
if (event.getMethod().equals("androidInviteShare")) {
|
if (event.getMethod().equals("androidInviteShare")) {
|
||||||
|
@ -36,6 +36,7 @@ import com.shayu.onetoone.activity.setting.SettingActivity;
|
|||||||
import com.shayu.onetoone.adapter.MainMeAdapter;
|
import com.shayu.onetoone.adapter.MainMeAdapter;
|
||||||
import com.shayu.onetoone.bean.AuthBean;
|
import com.shayu.onetoone.bean.AuthBean;
|
||||||
import com.shayu.onetoone.bean.PeopleNum;
|
import com.shayu.onetoone.bean.PeopleNum;
|
||||||
|
import com.shayu.onetoone.bean.SlideBean;
|
||||||
import com.shayu.onetoone.bean.UserBean;
|
import com.shayu.onetoone.bean.UserBean;
|
||||||
import com.shayu.onetoone.bean.UserItemBean;
|
import com.shayu.onetoone.bean.UserItemBean;
|
||||||
import com.shayu.onetoone.manager.OTONetManager;
|
import com.shayu.onetoone.manager.OTONetManager;
|
||||||
@ -51,12 +52,12 @@ import com.yunbao.common.activity.MyWalletActivity;
|
|||||||
import com.yunbao.common.bean.GoogleBean;
|
import com.yunbao.common.bean.GoogleBean;
|
||||||
import com.yunbao.common.bean.IMLoginModel;
|
import com.yunbao.common.bean.IMLoginModel;
|
||||||
import com.yunbao.common.bean.LevelBean;
|
import com.yunbao.common.bean.LevelBean;
|
||||||
import com.yunbao.common.bean.SlideModel;
|
|
||||||
import com.yunbao.common.glide.ImgLoader;
|
import com.yunbao.common.glide.ImgLoader;
|
||||||
import com.yunbao.common.http.HttpCallback;
|
import com.yunbao.common.http.HttpCallback;
|
||||||
import com.yunbao.common.interfaces.CommonCallback;
|
import com.yunbao.common.interfaces.CommonCallback;
|
||||||
import com.yunbao.common.interfaces.OnItemClickListener;
|
import com.yunbao.common.interfaces.OnItemClickListener;
|
||||||
import com.yunbao.common.manager.APKManager;
|
import com.yunbao.common.manager.APKManager;
|
||||||
|
import com.yunbao.common.manager.IMLoginManager;
|
||||||
import com.yunbao.common.utils.SVGAViewUtils;
|
import com.yunbao.common.utils.SVGAViewUtils;
|
||||||
import com.yunbao.common.utils.StringUtil;
|
import com.yunbao.common.utils.StringUtil;
|
||||||
import com.yunbao.common.utils.ToastUtil;
|
import com.yunbao.common.utils.ToastUtil;
|
||||||
@ -299,7 +300,10 @@ public class MyFragment extends BaseFragment implements OnItemClickListener<User
|
|||||||
|
|
||||||
public void loadData() {
|
public void loadData() {
|
||||||
MainHttpUtil.getGoogle(mCallback1);
|
MainHttpUtil.getGoogle(mCallback1);
|
||||||
|
MainHttpUtil.getBaseInfo(UserManager.getUserBean().getUser().getId() + "", UserManager.getUserBean().getUser().getToken(), new CommonCallback<com.yunbao.common.bean.UserBean>() {
|
||||||
|
@Override
|
||||||
|
public void callback(com.yunbao.common.bean.UserBean oldUser) {
|
||||||
|
CommonAppConfig.getInstance().setUserBean(oldUser);
|
||||||
OTONetManager.getInstance(mContext).getBaseInfos(true, new com.yunbao.common.http.base.HttpCallback<com.shayu.onetoone.bean.UserBean>() {
|
OTONetManager.getInstance(mContext).getBaseInfos(true, new com.yunbao.common.http.base.HttpCallback<com.shayu.onetoone.bean.UserBean>() {
|
||||||
@Override
|
@Override
|
||||||
public void onSuccess(UserBean data) {
|
public void onSuccess(UserBean data) {
|
||||||
@ -311,6 +315,9 @@ public class MyFragment extends BaseFragment implements OnItemClickListener<User
|
|||||||
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
|
||||||
OTONetManager.getInstance(mContext).getAuthInfo(new com.yunbao.common.http.base.HttpCallback<AuthBean>() {
|
OTONetManager.getInstance(mContext).getAuthInfo(new com.yunbao.common.http.base.HttpCallback<AuthBean>() {
|
||||||
@Override
|
@Override
|
||||||
@ -371,6 +378,7 @@ public class MyFragment extends BaseFragment implements OnItemClickListener<User
|
|||||||
public void onError(String error) {
|
public void onError(String error) {
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -422,7 +430,7 @@ public class MyFragment extends BaseFragment implements OnItemClickListener<User
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
private List<SlideModel> mBannerListNew = new ArrayList<>();
|
private List<SlideBean> mBannerListNew = new ArrayList<>();
|
||||||
|
|
||||||
@SuppressLint("SetTextI18n")
|
@SuppressLint("SetTextI18n")
|
||||||
private void showData(UserBean u) {
|
private void showData(UserBean u) {
|
||||||
@ -431,10 +439,11 @@ public class MyFragment extends BaseFragment implements OnItemClickListener<User
|
|||||||
if (u == null) {
|
if (u == null) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (u.getUser().getSlide() != null) {
|
com.yunbao.common.bean.UserBean oldUser = CommonAppConfig.getInstance().getUserBean();
|
||||||
mBannerListNew.addAll(u.getUser().getSlide());
|
if (oldUser.getSlide() != null) {
|
||||||
for (SlideModel bean : mBannerListNew) {
|
mBannerListNew.addAll(JSON.parseArray(oldUser.getSlide(), SlideBean.class));
|
||||||
if (bean.getSlideStatus() == 1) {
|
for (SlideBean bean : mBannerListNew) {
|
||||||
|
if (bean.getSlide_status().equals("1")) {
|
||||||
mBannerList.add(bean);
|
mBannerList.add(bean);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -579,7 +588,7 @@ public class MyFragment extends BaseFragment implements OnItemClickListener<User
|
|||||||
mContext.startActivity(new Intent(mContext, SettingActivity.class));
|
mContext.startActivity(new Intent(mContext, SettingActivity.class));
|
||||||
}
|
}
|
||||||
|
|
||||||
public static List<SlideModel> mBannerList = new ArrayList<>();
|
public static List<SlideBean> mBannerList = new ArrayList<>();
|
||||||
|
|
||||||
private void showBanner() {
|
private void showBanner() {
|
||||||
if (mBannerList == null || mBannerList.size() <= 0 || banner_me == null) {
|
if (mBannerList == null || mBannerList.size() <= 0 || banner_me == null) {
|
||||||
@ -593,10 +602,10 @@ public class MyFragment extends BaseFragment implements OnItemClickListener<User
|
|||||||
public void onBannerClick(List datas, int p) {
|
public void onBannerClick(List datas, int p) {
|
||||||
if (mBannerList != null) {
|
if (mBannerList != null) {
|
||||||
if (p >= 0 && p < mBannerList.size()) {
|
if (p >= 0 && p < mBannerList.size()) {
|
||||||
SlideModel bean = mBannerList.get(p);
|
SlideBean bean = mBannerList.get(p);
|
||||||
if (!bean.getSlideUrl().equals("")) {
|
if (!bean.getSlide_url().equals("")) {
|
||||||
Constants.isTitle = true;
|
Constants.isTitle = true;
|
||||||
String url = bean.getSlideUrl() + "?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken();
|
String url = bean.getSlide_url() + "?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken();
|
||||||
//WebViewActivity.forward(mContext, url, false, false);
|
//WebViewActivity.forward(mContext, url, false, false);
|
||||||
RouteManager.forwardWebViewActivity("", url);
|
RouteManager.forwardWebViewActivity("", url);
|
||||||
}
|
}
|
||||||
@ -610,10 +619,10 @@ public class MyFragment extends BaseFragment implements OnItemClickListener<User
|
|||||||
public void onBannerClick(List datas, int p) {
|
public void onBannerClick(List datas, int p) {
|
||||||
if (mBannerList != null) {
|
if (mBannerList != null) {
|
||||||
if (p >= 0 && p < mBannerList.size()) {
|
if (p >= 0 && p < mBannerList.size()) {
|
||||||
SlideModel bean = mBannerList.get(p);
|
SlideBean bean = mBannerList.get(p);
|
||||||
if (!bean.getSlideUrl().equals("")) {
|
if (!bean.getSlide_url().equals("")) {
|
||||||
Constants.isTitle = true;
|
Constants.isTitle = true;
|
||||||
String url = bean.getSlideUrl() + "?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken();
|
String url = bean.getSlide_url() + "?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken();
|
||||||
RouteManager.forwardWebViewActivity("", url);
|
RouteManager.forwardWebViewActivity("", url);
|
||||||
/*if(bean.getSlide_id().equals("95")){
|
/*if(bean.getSlide_id().equals("95")){
|
||||||
RouteUtil.forwardCustomerService(url);
|
RouteUtil.forwardCustomerService(url);
|
||||||
|
@ -199,14 +199,14 @@ public class HomeRankFragment extends BaseFragment {
|
|||||||
getItem(position, diamond1, diamond2, diamond3).setVisibility(View.VISIBLE);
|
getItem(position, diamond1, diamond2, diamond3).setVisibility(View.VISIBLE);
|
||||||
getItem(position, mName1, mName2, mName3).setText(user.getUserNicename());
|
getItem(position, mName1, mName2, mName3).setText(user.getUserNicename());
|
||||||
getItem(position, mVotes1, mVotes2, mVotes3).setText(user.getMoney());
|
getItem(position, mVotes1, mVotes2, mVotes3).setText(user.getMoney());
|
||||||
if (user.isFollow()) {
|
|
||||||
getItem(position, mBtnFollow1, mBtnFollow2, mBtnFollow3).setVisibility(View.GONE);
|
|
||||||
}
|
|
||||||
if (user.getUid().equals(UserManager.getUserBean().getUser().getId() + "")) {
|
if (user.getUid().equals(UserManager.getUserBean().getUser().getId() + "")) {
|
||||||
getItem(position, mBtnFollow1, mBtnFollow2, mBtnFollow3).setVisibility(View.GONE);
|
getItem(position, mBtnFollow1, mBtnFollow2, mBtnFollow3).setVisibility(View.GONE);
|
||||||
} else {
|
} else {
|
||||||
getItem(position, mBtnFollow1, mBtnFollow2, mBtnFollow3).setVisibility(View.VISIBLE);
|
getItem(position, mBtnFollow1, mBtnFollow2, mBtnFollow3).setVisibility(View.VISIBLE);
|
||||||
}
|
}
|
||||||
|
if (user.isFollow()) {
|
||||||
|
getItem(position, mBtnFollow1, mBtnFollow2, mBtnFollow3).setVisibility(View.GONE);
|
||||||
|
}
|
||||||
if (user.getSex() == 1) {
|
if (user.getSex() == 1) {
|
||||||
getItem(position, mSex1, mSex2, mSex3).setImageResource(R.mipmap.ic_message_tab_man);
|
getItem(position, mSex1, mSex2, mSex3).setImageResource(R.mipmap.ic_message_tab_man);
|
||||||
} else {
|
} else {
|
||||||
|
@ -136,6 +136,9 @@ public class CallAudioActivity extends AbsOTOActivity implements View.OnClickLis
|
|||||||
@Override
|
@Override
|
||||||
protected void onDestroy() {
|
protected void onDestroy() {
|
||||||
super.onDestroy();
|
super.onDestroy();
|
||||||
|
if(!CallClientManager.getManager().isCalling()) {
|
||||||
|
EasyFloat.dismiss("call");
|
||||||
|
}
|
||||||
CallRingingUtil.getInstance().stopRinging();
|
CallRingingUtil.getInstance().stopRinging();
|
||||||
CallClientManager.getManager().removeOnVoIPCallListener(CallAudioActivity.class);
|
CallClientManager.getManager().removeOnVoIPCallListener(CallAudioActivity.class);
|
||||||
}
|
}
|
||||||
@ -264,6 +267,9 @@ public class CallAudioActivity extends AbsOTOActivity implements View.OnClickLis
|
|||||||
}
|
}
|
||||||
|
|
||||||
private void showWindow(boolean toChatView, boolean toPay) {
|
private void showWindow(boolean toChatView, boolean toPay) {
|
||||||
|
if(!CallClientManager.getManager().isCalling()){
|
||||||
|
return;
|
||||||
|
}
|
||||||
if (!PermissionUtils.checkPermission(this)) {
|
if (!PermissionUtils.checkPermission(this)) {
|
||||||
new TipsDialog(mContext)
|
new TipsDialog(mContext)
|
||||||
.setTitle(WordUtil.getNewString(R.string.permission_hint))
|
.setTitle(WordUtil.getNewString(R.string.permission_hint))
|
||||||
@ -293,7 +299,7 @@ public class CallAudioActivity extends AbsOTOActivity implements View.OnClickLis
|
|||||||
icon.setLayoutParams(new ViewGroup.LayoutParams(DpUtil.dp2px(40), DpUtil.dp2px(40)));
|
icon.setLayoutParams(new ViewGroup.LayoutParams(DpUtil.dp2px(40), DpUtil.dp2px(40)));
|
||||||
EasyFloat.with(this)
|
EasyFloat.with(this)
|
||||||
.setLayout(icon)
|
.setLayout(icon)
|
||||||
.setShowPattern(ShowPattern.FOREGROUND)
|
.setShowPattern(ShowPattern.ALL_TIME)
|
||||||
.setTag("call")
|
.setTag("call")
|
||||||
.setDragEnable(true)
|
.setDragEnable(true)
|
||||||
.setBorder()
|
.setBorder()
|
||||||
@ -479,6 +485,13 @@ public class CallAudioActivity extends AbsOTOActivity implements View.OnClickLis
|
|||||||
public void onStartFirstFrame() {
|
public void onStartFirstFrame() {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@Override
|
||||||
|
protected void onPause() {
|
||||||
|
super.onPause();
|
||||||
|
if (!EasyFloat.isShow("call")) {
|
||||||
|
showWindow(false, false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onClick(View v) {
|
public void onClick(View v) {
|
||||||
|
@ -364,6 +364,9 @@ public class CallVideoActivity extends AbsOTOActivity {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private void showWindow(boolean toChatView, boolean toPay) {
|
private void showWindow(boolean toChatView, boolean toPay) {
|
||||||
|
if(!CallClientManager.getManager().isCalling()){
|
||||||
|
return;
|
||||||
|
}
|
||||||
if (!PermissionUtils.checkPermission(this)) {
|
if (!PermissionUtils.checkPermission(this)) {
|
||||||
new TipsDialog(mContext)
|
new TipsDialog(mContext)
|
||||||
.setTitle(WordUtil.getNewString(R.string.permission_hint))
|
.setTitle(WordUtil.getNewString(R.string.permission_hint))
|
||||||
@ -403,7 +406,7 @@ public class CallVideoActivity extends AbsOTOActivity {
|
|||||||
floatWindows.setTag(getIntent().getExtras());
|
floatWindows.setTag(getIntent().getExtras());
|
||||||
EasyFloat.with(this)
|
EasyFloat.with(this)
|
||||||
.setLayout(floatWindows)
|
.setLayout(floatWindows)
|
||||||
.setShowPattern(ShowPattern.FOREGROUND)
|
.setShowPattern(ShowPattern.ALL_TIME)
|
||||||
.setTag("call")
|
.setTag("call")
|
||||||
.setDragEnable(true)
|
.setDragEnable(true)
|
||||||
.setBorder()
|
.setBorder()
|
||||||
@ -437,7 +440,6 @@ public class CallVideoActivity extends AbsOTOActivity {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void dismiss() {
|
public void dismiss() {
|
||||||
ToastUtil.showDebug("浮窗移除监听");
|
|
||||||
CallClientManager.getManager().removeOnVoIPCallListener(EasyFloat.class);
|
CallClientManager.getManager().removeOnVoIPCallListener(EasyFloat.class);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -705,10 +707,21 @@ public class CallVideoActivity extends AbsOTOActivity {
|
|||||||
@Override
|
@Override
|
||||||
protected void onDestroy() {
|
protected void onDestroy() {
|
||||||
super.onDestroy();
|
super.onDestroy();
|
||||||
|
if(!CallClientManager.getManager().isCalling()) {
|
||||||
|
EasyFloat.dismiss("call");
|
||||||
|
}
|
||||||
CallClientManager.getManager().removeOnVoIPCallListener(CallVideoActivity.class);
|
CallClientManager.getManager().removeOnVoIPCallListener(CallVideoActivity.class);
|
||||||
CallRingingUtil.getInstance().stopRinging();
|
CallRingingUtil.getInstance().stopRinging();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void onPause() {
|
||||||
|
super.onPause();
|
||||||
|
if (!EasyFloat.isShow("call")) {
|
||||||
|
showWindow(false, false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onBackPressed() {
|
public void onBackPressed() {
|
||||||
}
|
}
|
||||||
|
@ -94,7 +94,7 @@ public class HomeRecommendListAdapter extends RecyclerView.Adapter<HomeRecommend
|
|||||||
}
|
}
|
||||||
|
|
||||||
private void setData(HomeItemBean itemBean, int position) {
|
private void setData(HomeItemBean itemBean, int position) {
|
||||||
star.setText(itemBean.getStar() + "·" + itemBean.getStar_name());
|
star.setText(itemBean.getAge() + "·" + itemBean.getStar_name());
|
||||||
sign.setText(itemBean.getSignature());
|
sign.setText(itemBean.getSignature());
|
||||||
userName.setText(itemBean.getUser_nicename());
|
userName.setText(itemBean.getUser_nicename());
|
||||||
level.setText("Lv."+itemBean.getLevel());
|
level.setText("Lv."+itemBean.getLevel());
|
||||||
|
@ -78,7 +78,7 @@ public class MyFriendListAdapter extends RecyclerView.Adapter<MyFriendListAdapte
|
|||||||
void setDate(HomeItemBean bean, int position) {
|
void setDate(HomeItemBean bean, int position) {
|
||||||
ImgLoader.display(context, bean.getAvatar(), avatar);
|
ImgLoader.display(context, bean.getAvatar(), avatar);
|
||||||
uname.setText(bean.getUser_nicename());
|
uname.setText(bean.getUser_nicename());
|
||||||
starUp.setText(bean.getStar() + "·" + bean.getStar_name());
|
starUp.setText(bean.getAge() + "·" + bean.getStar_name());
|
||||||
if (bean.getSex() == 1) {
|
if (bean.getSex() == 1) {
|
||||||
sex.setImageResource(R.mipmap.ic_message_tab_man);
|
sex.setImageResource(R.mipmap.ic_message_tab_man);
|
||||||
} else {
|
} else {
|
||||||
|
@ -52,7 +52,7 @@ public class MsgMoreDialog extends AttachPopupView{
|
|||||||
});
|
});
|
||||||
UserBean bean = UserManager.getUserBean();
|
UserBean bean = UserManager.getUserBean();
|
||||||
if (bean.getInfo().getSage_auth()!=2) {
|
if (bean.getInfo().getSage_auth()!=2) {
|
||||||
// config.setVisibility(GONE);
|
config.setVisibility(GONE);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -74,7 +74,7 @@ public class CallClientManager {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public SurfaceView getRemoteVideo() {
|
public SurfaceView getRemoteVideo() {
|
||||||
if (RongCallClient.getInstance() != null) {
|
if (RongCallClient.getInstance() != null && RongCallClient.getInstance().getCallSession() != null) {
|
||||||
for (CallUserProfile profile : RongCallClient.getInstance().getCallSession().getParticipantProfileList()) {
|
for (CallUserProfile profile : RongCallClient.getInstance().getCallSession().getParticipantProfileList()) {
|
||||||
if (!profile.getUserId().equals(IMLoginManager.get(AppContext.getTopActivity()).getUserInfo().getId() + "")) {
|
if (!profile.getUserId().equals(IMLoginManager.get(AppContext.getTopActivity()).getUserInfo().getId() + "")) {
|
||||||
return profile.getVideoView();
|
return profile.getVideoView();
|
||||||
@ -281,9 +281,9 @@ public class CallClientManager {
|
|||||||
time = 10;
|
time = 10;
|
||||||
}
|
}
|
||||||
if (isCallVideo) {
|
if (isCallVideo) {
|
||||||
SendMessageManager.pingVideoMessage(targetId, time + "", new SendMessageListener());
|
SendMessageManager.endVideoMessage(targetId, time + "", new SendMessageListener());
|
||||||
} else {
|
} else {
|
||||||
SendMessageManager.pingAudioMessage(targetId, time + "", new SendMessageListener());
|
SendMessageManager.endAudioMessage(targetId, time + "", new SendMessageListener());
|
||||||
}
|
}
|
||||||
return super.cancel();
|
return super.cancel();
|
||||||
}
|
}
|
||||||
|
@ -101,6 +101,35 @@ public class SendMessageManager {
|
|||||||
);
|
);
|
||||||
send(sendData, listener);
|
send(sendData, listener);
|
||||||
}
|
}
|
||||||
|
public static void endVideoMessage(String toUid, String time, OnSendMessageListener listener) {
|
||||||
|
if ("0".equals(time)) {
|
||||||
|
listener.onError(504,"时间错误");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
SendData sendData = new SendData(toUid,
|
||||||
|
2,
|
||||||
|
"not",
|
||||||
|
"视频消息",
|
||||||
|
time,
|
||||||
|
1,
|
||||||
|
"after",
|
||||||
|
false
|
||||||
|
);
|
||||||
|
send(sendData, listener);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void endAudioMessage(String toUid, String time, OnSendMessageListener listener) {
|
||||||
|
SendData sendData = new SendData(toUid,
|
||||||
|
5,
|
||||||
|
"not",
|
||||||
|
"音频消息",
|
||||||
|
time,
|
||||||
|
1,
|
||||||
|
"after",
|
||||||
|
false
|
||||||
|
);
|
||||||
|
send(sendData, listener);
|
||||||
|
}
|
||||||
|
|
||||||
public static void matching(OnSendMessageListener listener) {
|
public static void matching(OnSendMessageListener listener) {
|
||||||
SendData sendData = new SendData("not",
|
SendData sendData = new SendData("not",
|
||||||
|
@ -135,7 +135,7 @@ public class UserManager {
|
|||||||
System.currentTimeMillis() + "",
|
System.currentTimeMillis() + "",
|
||||||
WordUtil.isNewZh() ? "1" : "0"
|
WordUtil.isNewZh() ? "1" : "0"
|
||||||
);
|
);
|
||||||
RouteManager.forwardWebViewActivity(null, url);
|
RouteManager.forwardWebViewActivity("NoTitle", url);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void logout() {
|
public static void logout() {
|
||||||
|
@ -66,7 +66,12 @@
|
|||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/user_info"
|
android:id="@+id/user_info"
|
||||||
android:layout_marginTop="9dp"
|
android:layout_marginTop="9dp"
|
||||||
android:layout_width="wrap_content"
|
tools:text="长文本测试长文本测试长文本测试长文本测试长文本测试长文本测试"
|
||||||
|
tools:textColor="#000"
|
||||||
|
android:gravity="center"
|
||||||
|
android:layout_marginStart="30dp"
|
||||||
|
android:layout_marginEnd="30dp"
|
||||||
|
android:layout_width="0dp"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:textColor="#FFFFFF"
|
android:textColor="#FFFFFF"
|
||||||
android:textSize="12sp"
|
android:textSize="12sp"
|
||||||
|
@ -59,12 +59,11 @@
|
|||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/user_name"
|
android:id="@+id/user_name"
|
||||||
android:layout_width="0dp"
|
android:layout_width="wrap_content"
|
||||||
android:layout_weight="1"
|
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:ellipsize="end"
|
android:ellipsize="end"
|
||||||
android:singleLine="true"
|
android:singleLine="true"
|
||||||
tools:text="用户——1234567890"
|
tools:text="用户——123456789012345"
|
||||||
android:textColor="#333333"
|
android:textColor="#333333"
|
||||||
android:textSize="16sp"
|
android:textSize="16sp"
|
||||||
android:textStyle="bold" />
|
android:textStyle="bold" />
|
||||||
|
BIN
OneToOne/src/main/res/mipmap-xxhdpi/app_logo.png
Normal file
BIN
OneToOne/src/main/res/mipmap-xxhdpi/app_logo.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 103 KiB |
@ -1,6 +1,6 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<resources>
|
<resources>
|
||||||
<string name="app_name">1v1</string>
|
<string name="app_name">友聊</string>
|
||||||
<string name="title_activity_tag_selection">選擇活動</string>
|
<string name="title_activity_tag_selection">選擇活動</string>
|
||||||
<string name="message_chat_tip1">【安全提示】為保障您的權益,慶提高警惕,不要輕易添加或提供第三方聯繫方式</string>
|
<string name="message_chat_tip1">【安全提示】為保障您的權益,慶提高警惕,不要輕易添加或提供第三方聯繫方式</string>
|
||||||
<string name="system_tip_success">成功</string>
|
<string name="system_tip_success">成功</string>
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<resources>
|
<resources>
|
||||||
<string name="app_name">1v1</string>
|
<string name="app_name">友聊</string>
|
||||||
<string name="title_activity_tag_selection">選擇活動</string>
|
<string name="title_activity_tag_selection">選擇活動</string>
|
||||||
<string name="message_chat_tip1">【安全提示】為保障您的權益,慶提高警惕,不要輕易添加或提供第三方聯繫方式</string>
|
<string name="message_chat_tip1">【安全提示】為保障您的權益,慶提高警惕,不要輕易添加或提供第三方聯繫方式</string>
|
||||||
<string name="system_tip_success">成功</string>
|
<string name="system_tip_success">成功</string>
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
<resources>
|
<resources>
|
||||||
<string name="app_name">1v1</string>
|
<string name="app_name">友聊</string>
|
||||||
<string name="title_activity_tag_selection">TagSelection_Activity</string>
|
<string name="title_activity_tag_selection">TagSelection_Activity</string>
|
||||||
<string name="message_chat_tip1">[Safety Tips]</string>
|
<string name="message_chat_tip1">[Safety Tips]</string>
|
||||||
<string name="system_tip_success">success</string>
|
<string name="system_tip_success">success</string>
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
package io.rong.callkit;
|
package io.rong.callkit;
|
||||||
|
|
||||||
import android.annotation.TargetApi;
|
import android.annotation.TargetApi;
|
||||||
|
import android.app.Dialog;
|
||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
import android.content.Intent;
|
import android.content.Intent;
|
||||||
import android.media.AudioManager;
|
import android.media.AudioManager;
|
||||||
@ -23,7 +24,10 @@ import android.widget.RelativeLayout;
|
|||||||
import android.widget.TextView;
|
import android.widget.TextView;
|
||||||
import android.widget.Toast;
|
import android.widget.Toast;
|
||||||
|
|
||||||
|
import com.lzf.easyfloat.interfaces.OnPermissionResult;
|
||||||
|
import com.lzf.easyfloat.permission.PermissionUtils;
|
||||||
import com.yunbao.common.utils.ToastUtil;
|
import com.yunbao.common.utils.ToastUtil;
|
||||||
|
import com.yunbao.common.utils.WordUtil;
|
||||||
|
|
||||||
import cn.rongcloud.rtc.api.RCRTCEngine;
|
import cn.rongcloud.rtc.api.RCRTCEngine;
|
||||||
import cn.rongcloud.rtc.audioroute.RCAudioRouteType;
|
import cn.rongcloud.rtc.audioroute.RCAudioRouteType;
|
||||||
@ -49,6 +53,7 @@ import io.rong.imkit.userinfo.RongUserInfoManager;
|
|||||||
import io.rong.imlib.RongIMClient;
|
import io.rong.imlib.RongIMClient;
|
||||||
import io.rong.imlib.model.Conversation;
|
import io.rong.imlib.model.Conversation;
|
||||||
import io.rong.imlib.model.UserInfo;
|
import io.rong.imlib.model.UserInfo;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Locale;
|
import java.util.Locale;
|
||||||
@ -294,7 +299,8 @@ public class SingleCallActivity extends BaseCallActivity implements Handler.Call
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onError(int errorCode) {}
|
public void onError(int errorCode) {
|
||||||
|
}
|
||||||
});
|
});
|
||||||
} else if (callAction.equals(RongCallAction.ACTION_OUTGOING_CALL)) {
|
} else if (callAction.equals(RongCallAction.ACTION_OUTGOING_CALL)) {
|
||||||
if (intent.getAction().equals(RongVoIPIntent.RONG_INTENT_ACTION_VOIP_SINGLEAUDIO)) {
|
if (intent.getAction().equals(RongVoIPIntent.RONG_INTENT_ACTION_VOIP_SINGLEAUDIO)) {
|
||||||
@ -401,11 +407,28 @@ public class SingleCallActivity extends BaseCallActivity implements Handler.Call
|
|||||||
protected void onPause() {
|
protected void onPause() {
|
||||||
super.onPause();
|
super.onPause();
|
||||||
RLog.d(TAG, "---single activity onPause---");
|
RLog.d(TAG, "---single activity onPause---");
|
||||||
|
if (isCalling()) {
|
||||||
|
if (!PermissionUtils.checkPermission(this)) {
|
||||||
|
PermissionUtils.requestPermission(SingleCallActivity.this, new OnPermissionResult() {
|
||||||
|
@Override
|
||||||
|
public void permissionResult(boolean b) {
|
||||||
|
if (b) {
|
||||||
|
setShouldShowFloat(true);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
if (pickupDetector != null) {
|
if (pickupDetector != null) {
|
||||||
pickupDetector.unRegister();
|
pickupDetector.unRegister();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public boolean isCalling() {
|
||||||
|
return RongCallClient.getInstance() != null && RongCallClient.getInstance().getCallSession() != null && RongCallClient.getInstance().getCallSession().getSessionId() != null;
|
||||||
|
}
|
||||||
|
|
||||||
private void initView(RongCallCommon.CallMediaType mediaType, RongCallAction callAction) {
|
private void initView(RongCallCommon.CallMediaType mediaType, RongCallAction callAction) {
|
||||||
RelativeLayout buttonLayout =
|
RelativeLayout buttonLayout =
|
||||||
(RelativeLayout)
|
(RelativeLayout)
|
||||||
@ -622,7 +645,9 @@ public class SingleCallActivity extends BaseCallActivity implements Handler.Call
|
|||||||
int userType;
|
int userType;
|
||||||
SurfaceView remoteVideo;
|
SurfaceView remoteVideo;
|
||||||
String remoteUserId;
|
String remoteUserId;
|
||||||
/** 远端首帧是否到来, 音频帧跟视频帧其中一个到来就更改该标记, 从而更新连接状态 */
|
/**
|
||||||
|
* 远端首帧是否到来, 音频帧跟视频帧其中一个到来就更改该标记, 从而更新连接状态
|
||||||
|
*/
|
||||||
boolean isFirstRemoteFrame = false;
|
boolean isFirstRemoteFrame = false;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@ -855,7 +880,9 @@ public class SingleCallActivity extends BaseCallActivity implements Handler.Call
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/** 视频转语音 * */
|
/**
|
||||||
|
* 视频转语音 *
|
||||||
|
*/
|
||||||
private void initAudioCallView() {
|
private void initAudioCallView() {
|
||||||
mLPreviewContainer.removeAllViews();
|
mLPreviewContainer.removeAllViews();
|
||||||
mLPreviewContainer.setVisibility(View.GONE);
|
mLPreviewContainer.setVisibility(View.GONE);
|
||||||
|
@ -15,6 +15,13 @@ ext {
|
|||||||
// 测试
|
// 测试
|
||||||
serverHost : "https://ceshi.yaoulive.com",
|
serverHost : "https://ceshi.yaoulive.com",
|
||||||
|
|
||||||
|
//1v1社交正式服
|
||||||
|
//otoServerHost : "https://napi.yaoulive.com",
|
||||||
|
//1v1社交测试服
|
||||||
|
otoServerHost : "https://ceshi.yyouou.com",
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
//百度语音识别
|
//百度语音识别
|
||||||
|
Loading…
x
Reference in New Issue
Block a user