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

Merge remote-tracking branch 'origin/dev_6.5.5_语聊' into dev_6.5.5_语聊

Browse Source 
# Conflicts:
#	OneToOne/src/main/java/com/shayu/onetoone/manager/OTONetManager.java
#	OneToOne/src/main/java/com/shayu/onetoone/network/OneToOneApi.java
This commit is contained in:
zlzw 2023-10-25 18:30:37 +08:00
commit 71147b655d
7 changed files with 255 additions and 183 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -227,6 +227,12 @@
android:label="修改密码"
android:windowSoftInputMode="stateHidden|adjustResize" />
<activity
android:name=".activity.setting.WebViewActivity"
android:label="WebView"
android:windowSoftInputMode="stateHidden|adjustResize" />
<provider
android:name="androidx.core.content.FileProvider"
android:authorities="com.shayu.onetoone.fileprovider"

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

@ -17,6 +17,8 @@ import android.widget.LinearLayout;
import android.widget.TextView;
import android.widget.Toast;
import com.shayu.onetoone.bean.UserItemBean;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
@ -43,11 +45,9 @@ import com.shayu.onetoone.view.CustomMyViewHolder;
import com.yunbao.common.CommonAppConfig;
import com.yunbao.common.CommonAppContext;
import com.yunbao.common.Constants;
import com.yunbao.common.activity.WebViewActivity;
import com.yunbao.common.bean.GoogleBean;
import com.yunbao.common.bean.LevelBean;
import com.yunbao.common.bean.UserBean;
import com.yunbao.common.bean.UserItemBean;
import com.yunbao.common.glide.ImgLoader;
import com.yunbao.common.http.HttpCallback;
import com.yunbao.common.interfaces.CommonCallback;
@ -102,8 +102,7 @@ public class MyFragment extends BaseFragment implements OnItemClickListener<User
private ImageView sex;
@Override
public View createView(LayoutInflater inflater, ViewGroup container, Bundle
savedInstanceState) {
public View createView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
return inflater.inflate(R.layout.fragment_my, container, false);
}
@ -238,6 +237,17 @@ public class MyFragment extends BaseFragment implements OnItemClickListener<User
public void loadData() {
MainHttpUtil.getGoogle(mCallback1);
MainHttpUtil.getBaseInfo(mCallback);
OTONetManager.getInstance(mContext).getMenu(new com.yunbao.common.http.base.HttpCallback<List<UserItemBean>>() {
@Override
public void onSuccess(List<UserItemBean> data) {
initMenu(data);
}
@Override
public void onError(String error) {
}
});
MainHttpUtil.getBalance(new HttpCallback() {
@Override
public void onSuccess(int code, String msg, String[] info) {
@ -275,6 +285,33 @@ public class MyFragment extends BaseFragment implements OnItemClickListener<User
}
/**
* 加载菜单
*
* @param list
*/
private void initMenu(List<UserItemBean> list) {
if (list != null && list.size() > 0) {
List<UserItemBean> listNow = new ArrayList<>();
for (UserItemBean userItemBean : list) {
if (userItemBean.getId() != 21 && userItemBean.getId() != 13) {
listNow.add(userItemBean);
} else if (userItemBean.getId() == 21) {
beanKefu = userItemBean;
} else if (userItemBean.getId() == 13) {
beanStetting = userItemBean;
}
}
if (mAdapter == null) {
mAdapter = new MainMeAdapter(mContext, listNow);
mAdapter.setOnItemClickListener(this);
mRecyclerView.setAdapter(mAdapter);
} else {
mAdapter.setList(listNow);
}
}
}
//获取谷歌
//谷歌支付是否打开 1是打开 0 关闭
@ -291,16 +328,18 @@ public class MyFragment extends BaseFragment implements OnItemClickListener<User
private CommonCallback<UserBean> mCallback = new CommonCallback<UserBean>() {
@Override
public void callback(UserBean bean) {
List<UserItemBean> list = CommonAppConfig.getInstance().getUserItemList();
/*List<UserItemBean> list = CommonAppConfig.getInstance().getUserItemList();
if (bean != null) {
showData(bean, list);
}
}*/
showData(bean);
}
};
private List<SlideBean> mBannerListNew = new ArrayList<>();
private void showData(UserBean u, List<UserItemBean> list) {
private void showData(UserBean u) {
mBannerList.clear();
mBannerListNew.clear();
if (!StringUtil.isEmpty(u.getSlide())) {
@ -410,25 +449,7 @@ public class MyFragment extends BaseFragment implements OnItemClickListener<User
good_nub_ico.setVisibility(View.GONE);
mID.setText(u.getLiangNameTip());
}
if (list != null && list.size() > 0) {
List<UserItemBean> listNow = new ArrayList<>();
for (UserItemBean userItemBean : list) {
if (userItemBean.getId() != 21 && userItemBean.getId() != 13) {
listNow.add(userItemBean);
} else if (userItemBean.getId() == 21) {
beanKefu = userItemBean;
} else if (userItemBean.getId() == 13) {
beanStetting = userItemBean;
}
}
if (mAdapter == null) {
mAdapter = new MainMeAdapter(mContext, listNow);
mAdapter.setOnItemClickListener(this);
mRecyclerView.setAdapter(mAdapter);
} else {
mAdapter.setList(listNow);
}
}
if (beanKefu != null) {
}
if (beanStetting != null) {
@ -449,23 +470,28 @@ public class MyFragment extends BaseFragment implements OnItemClickListener<User
@Override
public void onItemClick(UserItemBean bean, int position) {
String url = bean.getHref();
if (!StringUtil.isEmpty(bean.getHref())) {
RouteManager.forwardWebViewActivity(bean.getName(), bean.getHref());
}
/*String url = bean.getHref();
if (TextUtils.isEmpty(url)) {
switch (bean.getId()) {
case 1:
forwardProfit();
//forwardProfit();
break;
case 2:
forwardCoin();
//forwardCoin();
break;
case 13:
forwardSetting();
//forwardSetting();
break;
case 19:
forwardMyVideo();
//forwardMyVideo();
break;
case 20:
forwardRoomManage();
//forwardRoomManage();
break;
}
} else {
@ -496,7 +522,7 @@ public class MyFragment extends BaseFragment implements OnItemClickListener<User
}
}
}
}*/
}
@ -517,7 +543,9 @@ public class MyFragment extends BaseFragment implements OnItemClickListener<User
String url = CommonAppConfig.HOST + "/index.php?g=Appapi&m=task&a=index";
// RewardActivity.forward(mContext, url);
} else if (i == R.id.rt_kefu) {
WebViewActivity.forward(mContext, beanKefu.getHref(), false);
//WebViewActivity.forward(mContext, beanKefu.getHref(), false);
RouteManager.forwardWebViewActivity(beanKefu.getName(), beanKefu.getHref());
} else if (i == R.id.rt_setting) {
forwardSetting();
} else if (i == R.id.lt_noble) {
@ -604,52 +632,43 @@ public class MyFragment extends BaseFragment implements OnItemClickListener<User
}
lt_advertisement.setVisibility(View.VISIBLE);
if (mBannerList.size() == 1) {
banner_me.setAutoPlay(false)
.setPages(mBannerList, new CustomMyViewHolder())
.setDelayTime(3000)
.setBannerStyle(BannerConfig.NOT_INDICATOR)
.setOnBannerClickListener(new OnBannerClickListener() {
@Override
public void onBannerClick(List datas, int p) {
if (mBannerList != null) {
if (p >= 0 && p < mBannerList.size()) {
SlideBean bean = mBannerList.get(p);
if (!bean.getSlide_url().equals("")) {
Constants.isTitle = true;
String url = bean.getSlide_url() + "?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken();
WebViewActivity.forward(mContext, url, false, false);
}
}
banner_me.setAutoPlay(false).setPages(mBannerList, new CustomMyViewHolder()).setDelayTime(3000).setBannerStyle(BannerConfig.NOT_INDICATOR).setOnBannerClickListener(new OnBannerClickListener() {
@Override
public void onBannerClick(List datas, int p) {
if (mBannerList != null) {
if (p >= 0 && p < mBannerList.size()) {
SlideBean bean = mBannerList.get(p);
if (!bean.getSlide_url().equals("")) {
Constants.isTitle = true;
String url = bean.getSlide_url() + "?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken();
//WebViewActivity.forward(mContext, url, false, false);
RouteManager.forwardWebViewActivity("", url);
}
}
})
.start();
}
}
}).start();
} else {
banner_me.setAutoPlay(true)
.setPages(mBannerList, new CustomMyViewHolder())
.setDelayTime(3000)
.setBannerStyle(BannerConfig.NOT_INDICATOR)
.setOnBannerClickListener(new OnBannerClickListener() {
@Override
public void onBannerClick(List datas, int p) {
if (mBannerList != null) {
if (p >= 0 && p < mBannerList.size()) {
SlideBean bean = mBannerList.get(p);
if (!bean.getSlide_url().equals("")) {
Constants.isTitle = true;
String url = bean.getSlide_url() + "?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken();
RouteUtil.forwardCustomerService(url);
banner_me.setAutoPlay(true).setPages(mBannerList, new CustomMyViewHolder()).setDelayTime(3000).setBannerStyle(BannerConfig.NOT_INDICATOR).setOnBannerClickListener(new OnBannerClickListener() {
@Override
public void onBannerClick(List datas, int p) {
if (mBannerList != null) {
if (p >= 0 && p < mBannerList.size()) {
SlideBean bean = mBannerList.get(p);
if (!bean.getSlide_url().equals("")) {
Constants.isTitle = true;
String url = bean.getSlide_url() + "?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken();
RouteUtil.forwardCustomerService(url);
/*if(bean.getSlide_id().equals("95")){
RouteUtil.forwardCustomerService(url);
}else {
ZhuangBanActivity.forward(mContext, url, false);
}*/
}
}
}
}
})
.start();
}
}
}).start();
}
}

9
OneToOne/src/main/java/com/shayu/onetoone/adapter/MainMeAdapter.java
View File

@ -1,6 +1,5 @@
package com.shayu.onetoone.adapter;
import static android.os.Build.VERSION_CODES.R;
import android.content.Context;
import android.view.LayoutInflater;
@ -12,8 +11,7 @@ import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.recyclerview.widget.RecyclerView;
import com.shayu.onetoone.R;
import com.yunbao.common.bean.UserItemBean;
import com.shayu.onetoone.bean.UserItemBean;
import com.yunbao.common.glide.ImgLoader;
import com.yunbao.common.interfaces.OnItemClickListener;
import com.yunbao.common.views.weight.ViewClicksAntiShake;
@ -48,13 +46,14 @@ public class MainMeAdapter extends RecyclerView.Adapter<MainMeAdapter.Vh> {
@Override
public int getItemViewType(int position) {
UserItemBean bean = mList.get(position);
if (bean.isGroupLast()) {
/*if (bean.isGroupLast()) {
return GROUP_LAST;
} else if (bean.isAllLast()) {
return ALL_LAST;
} else {
return NORMAL;
}
}*/
return NORMAL;
}

139
OneToOne/src/main/java/com/shayu/onetoone/bean/UserItemBean.java
View File

@ -1,24 +1,18 @@
package com.shayu.onetoone.bean;
import com.yunbao.common.bean.BaseModel;
/**
* Created by cxf on 2018/9/28.
* 我的 页面的item
*/
public class UserItemBean {
public class UserItemBean extends BaseModel {
private int id;
private int uid;
private int prop_id;
private String cn_title;
private String en_title;
private String icon;
private int status;
private int type;
private long create_time;
private long update_time;
private String callback;
private long ex_time;
private long use_time;
public UserItemBean() {
}
private String name;
private String thumb;
private String href;
private boolean mGroupLast;
private boolean mAllLast;
public int getId() {
return id;
@ -28,99 +22,66 @@ public class UserItemBean extends BaseModel {
this.id = id;
}
public int getUid() {
return uid;
public String getName() {
return name;
}
public void setUid(int uid) {
this.uid = uid;
public void setName(String name) {
this.name = name;
}
public int getProp_id() {
return prop_id;
public String getThumb() {
return thumb;
}
public void setProp_id(int prop_id) {
this.prop_id = prop_id;
public void setThumb(String thumb) {
this.thumb = thumb;
}
public String getCn_title() {
return cn_title;
public String getHref() {
return href;
}
public void setCn_title(String cn_title) {
this.cn_title = cn_title;
public void setHref(String href) {
this.href = href;
}
public String getEn_title() {
return en_title;
public boolean isGroupLast() {
return mGroupLast;
}
public void setEn_title(String en_title) {
this.en_title = en_title;
public void setGroupLast(boolean groupLast) {
mGroupLast = groupLast;
}
public String getIcon() {
return icon;
public boolean isAllLast() {
return mAllLast;
}
public void setIcon(String icon) {
this.icon = icon;
public void setAllLast(boolean allLast) {
mAllLast = allLast;
}
public int getStatus() {
return status;
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
UserItemBean bean = (UserItemBean) o;
if (id != bean.id) return false;
if (name != null ? !name.equals(bean.name) : bean.name != null) return false;
if (thumb != null ? !thumb.equals(bean.thumb) : bean.thumb != null) return false;
return href != null ? href.equals(bean.href) : bean.href == null;
}
public void setStatus(int status) {
this.status = status;
}
public int getType() {
return type;
}
public void setType(int type) {
this.type = type;
}
public long getCreate_time() {
return create_time;
}
public void setCreate_time(long create_time) {
this.create_time = create_time;
}
public long getUpdate_time() {
return update_time;
}
public void setUpdate_time(long update_time) {
this.update_time = update_time;
}
public String getCallback() {
return callback;
}
public void setCallback(String callback) {
this.callback = callback;
}
public long getEx_time() {
return ex_time;
}
public void setEx_time(long ex_time) {
this.ex_time = ex_time;
}
public long getUse_time() {
return use_time;
}
public void setUse_time(long use_time) {
this.use_time = use_time;
@Override
public int hashCode() {
int result = id;
result = 31 * result + (name != null ? name.hashCode() : 0);
result = 31 * result + (thumb != null ? thumb.hashCode() : 0);
result = 31 * result + (href != null ? href.hashCode() : 0);
return result;
}
}

27
OneToOne/src/main/java/com/shayu/onetoone/manager/OTONetManager.java
View File

@ -1355,4 +1355,31 @@ public class OTONetManager {
}
}).isDisposed();
}
public void getMenu( HttpCallback<List<UserItemBean>> callback) {
API.get().otoApi(mContext).
getMenu()
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new Consumer<ResponseModel<List<UserItemBean>>>() {
@Override
public void accept(ResponseModel<List<UserItemBean>> listResponseModel) throws Exception {
if (listResponseModel.getData().getCode() == 0) {
callback.onSuccess(listResponseModel.getData().getInfo());
} else {
callback.onError(listResponseModel.getData().getMsg());
}
}
}, new Consumer<Throwable>() {
@Override
public void accept(Throwable throwable) throws Exception {
if (callback != null) {
callback.onError(mContext.getString(com.yunbao.common.R.string.net_error));
}
}
}).isDisposed();
}
}

15
OneToOne/src/main/java/com/shayu/onetoone/network/OneToOneApi.java
View File

@ -247,6 +247,7 @@ public interface OneToOneApi {
Observable<ResponseModel<List<ExchangeModel>>> getExchangeList(
@Query("type") String type
);
/**
* 设置基本信息
*/
@ -284,6 +285,7 @@ public interface OneToOneApi {
@GET("/api/public/?service=Friendappmsg.getTips")
Observable<ResponseModel<BaseModel>> getChatTips(@Query("tuid") String tuid);
@GET("/api/public/?service=Friendappmsg.setTips")
Observable<ResponseModel<BaseModel>> updateChatTips(@Query("tuid") String tuid);
@ -308,6 +310,7 @@ public interface OneToOneApi {
@GET("/api/public/?service=Friendappinfos.getSage")
Observable<ResponseModel<AuthBloggerBean>> getBloggerInfo(
);
/**
* 收益转换星币或砖石
*/
@ -330,6 +333,7 @@ public interface OneToOneApi {
/**
* 修改密码
*
* @param oldpass
* @param pass
* @param pass2
@ -342,7 +346,6 @@ public interface OneToOneApi {
@Query("pass2") String pass2);
@GET("/api/public/?service=Friendappuser.friend")
Observable<ResponseModel<List<HomeItemBean>>> getFriends(@Query("p")String p);
@GET("/api/public/?service=Friendappuser.follow")
@ -352,6 +355,16 @@ public interface OneToOneApi {
@GET("/api/public/?service=Friendappuser.peopleNum")
Observable<ResponseModel<PeopleNum>> getPeopleNum();
Observable<ResponseModel<List<HomeItemBean>>> getFriends(@Query("p") String p);
/**
* 获取我的菜单
*
* @return
*/
@GET("/api/public/?service=Friendappinfos.getMenu")
Observable<ResponseModel<List<UserItemBean>>> getMenu();
}

83
OneToOne/src/main/res/layout/activity_webview.xml
View File

@ -1,26 +1,73 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/rootView"
android:layout_width="match_parent"
android:layout_height="match_parent"
xmlns:app="http://schemas.android.com/apk/res-auto">
android:orientation="vertical">
<include
android:id="@+id/include"
android:layout_marginTop="@dimen/activity_top"
layout="@layout/view_activity_title"
<View
android:id="@+id/v_spacing"
android:layout_width="match_parent"
android:layout_height="71dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
android:layout_height="24dp"
android:visibility="gone" />
<FrameLayout
android:id="@+id/ft_title"
android:layout_width="match_parent"
android:layout_height="72dp"
android:paddingTop="24dp"
android:background="@color/white">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<TextView
android:id="@+id/titleView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_centerHorizontal="true"
android:gravity="center"
android:textColor="@color/textColor"
android:textSize="18sp"
android:textStyle="bold" />
<ImageView
android:id="@+id/btn_back"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_centerVertical="true"
android:onClick="backClick"
android:padding="9dp"
android:src="@mipmap/icon_back"
app:tint="@color/textColor" />
<ImageView
android:id="@+id/btn_edit"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_alignParentRight="true"
android:layout_marginRight="6dp"
android:padding="11dp"
android:src="@mipmap/icon_user_home_edit"
android:visibility="gone"
app:tint="@color/white" />
</RelativeLayout>
</FrameLayout>
<ProgressBar
android:id="@+id/progressbar"
style="@android:style/Widget.ProgressBar.Horizontal"
android:layout_width="match_parent"
android:layout_height="3dp"
android:progressDrawable="@drawable/bg_horizontal_progressbar"
android:visibility="gone" />
<WebView
android:id="@+id/webView"
android:layout_width="0dp"
android:layout_height="0dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/include" />
</androidx.constraintlayout.widget.ConstraintLayout>
android:layout_width="match_parent"
android:layout_marginBottom="15dp"
android:layout_height="match_parent" />
</LinearLayout>