diff --git a/OneToOne/src/main/AndroidManifest.xml b/OneToOne/src/main/AndroidManifest.xml
index 9a425095e..90c2b2e92 100644
--- a/OneToOne/src/main/AndroidManifest.xml
+++ b/OneToOne/src/main/AndroidManifest.xml
@@ -227,6 +227,12 @@
android:label="修改密码"
android:windowSoftInputMode="stateHidden|adjustResize" />
+
+
+
>() {
+ @Override
+ public void onSuccess(List 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 list) {
+ if (list != null && list.size() > 0) {
+ List 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 mCallback = new CommonCallback() {
@Override
public void callback(UserBean bean) {
- List list = CommonAppConfig.getInstance().getUserItemList();
+ /*List list = CommonAppConfig.getInstance().getUserItemList();
if (bean != null) {
showData(bean, list);
- }
+ }*/
+
+ showData(bean);
}
};
private List mBannerListNew = new ArrayList<>();
- private void showData(UserBean u, List 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 0) {
- List 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= 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();
}
}
diff --git a/OneToOne/src/main/java/com/shayu/onetoone/adapter/MainMeAdapter.java b/OneToOne/src/main/java/com/shayu/onetoone/adapter/MainMeAdapter.java
index e9c40d6a1..9e1e0af45 100644
--- a/OneToOne/src/main/java/com/shayu/onetoone/adapter/MainMeAdapter.java
+++ b/OneToOne/src/main/java/com/shayu/onetoone/adapter/MainMeAdapter.java
@@ -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 {
@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;
}
diff --git a/OneToOne/src/main/java/com/shayu/onetoone/bean/UserItemBean.java b/OneToOne/src/main/java/com/shayu/onetoone/bean/UserItemBean.java
index d9489fcda..fffa66ac0 100644
--- a/OneToOne/src/main/java/com/shayu/onetoone/bean/UserItemBean.java
+++ b/OneToOne/src/main/java/com/shayu/onetoone/bean/UserItemBean.java
@@ -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;
}
}
diff --git a/OneToOne/src/main/java/com/shayu/onetoone/manager/OTONetManager.java b/OneToOne/src/main/java/com/shayu/onetoone/manager/OTONetManager.java
index 94fb68011..c99d160e9 100644
--- a/OneToOne/src/main/java/com/shayu/onetoone/manager/OTONetManager.java
+++ b/OneToOne/src/main/java/com/shayu/onetoone/manager/OTONetManager.java
@@ -1355,4 +1355,31 @@ public class OTONetManager {
}
}).isDisposed();
}
+
+
+ public void getMenu( HttpCallback> callback) {
+ API.get().otoApi(mContext).
+ getMenu()
+ .subscribeOn(Schedulers.io())
+ .observeOn(AndroidSchedulers.mainThread())
+ .subscribe(new Consumer>>() {
+ @Override
+ public void accept(ResponseModel> listResponseModel) throws Exception {
+ if (listResponseModel.getData().getCode() == 0) {
+ callback.onSuccess(listResponseModel.getData().getInfo());
+ } else {
+ callback.onError(listResponseModel.getData().getMsg());
+ }
+ }
+ }, new Consumer() {
+ @Override
+ public void accept(Throwable throwable) throws Exception {
+ if (callback != null) {
+ callback.onError(mContext.getString(com.yunbao.common.R.string.net_error));
+ }
+ }
+ }).isDisposed();
+ }
+
+
}
diff --git a/OneToOne/src/main/java/com/shayu/onetoone/network/OneToOneApi.java b/OneToOne/src/main/java/com/shayu/onetoone/network/OneToOneApi.java
index 3749aaae0..0f7aec528 100644
--- a/OneToOne/src/main/java/com/shayu/onetoone/network/OneToOneApi.java
+++ b/OneToOne/src/main/java/com/shayu/onetoone/network/OneToOneApi.java
@@ -247,6 +247,7 @@ public interface OneToOneApi {
Observable>> getExchangeList(
@Query("type") String type
);
+
/**
* 设置基本信息
*/
@@ -284,6 +285,7 @@ public interface OneToOneApi {
@GET("/api/public/?service=Friendappmsg.getTips")
Observable> getChatTips(@Query("tuid") String tuid);
+
@GET("/api/public/?service=Friendappmsg.setTips")
Observable> updateChatTips(@Query("tuid") String tuid);
@@ -308,6 +310,7 @@ public interface OneToOneApi {
@GET("/api/public/?service=Friendappinfos.getSage")
Observable> 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>> 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> getPeopleNum();
+ Observable>> getFriends(@Query("p") String p);
+
+
+ /**
+ * 获取我的菜单
+ *
+ * @return
+ */
+ @GET("/api/public/?service=Friendappinfos.getMenu")
+ Observable>> getMenu();
}
diff --git a/OneToOne/src/main/res/layout/activity_webview.xml b/OneToOne/src/main/res/layout/activity_webview.xml
index a362d0fee..fcfdb32b0 100644
--- a/OneToOne/src/main/res/layout/activity_webview.xml
+++ b/OneToOne/src/main/res/layout/activity_webview.xml
@@ -1,26 +1,73 @@
-
+ android:orientation="vertical">
-
+ android:layout_height="24dp"
+ android:visibility="gone" />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
\ No newline at end of file
+ android:layout_width="match_parent"
+ android:layout_marginBottom="15dp"
+ android:layout_height="match_parent" />
+
\ No newline at end of file