diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml new file mode 100644 index 0000000..eb2873e --- /dev/null +++ b/.idea/jarRepositories.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml index 29bb906..879fdac 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -2,10 +2,10 @@ - - - - + + + + \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index bfbd771..e42479f 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -44,7 +44,6 @@ android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/AppTheme"> - diff --git a/app/src/main/java/com/fenghoo/seven/main/activity/Main2Activity.java b/app/src/main/java/com/fenghoo/seven/main/activity/Main2Activity.java index 51ff5e8..6505648 100644 --- a/app/src/main/java/com/fenghoo/seven/main/activity/Main2Activity.java +++ b/app/src/main/java/com/fenghoo/seven/main/activity/Main2Activity.java @@ -4,7 +4,7 @@ import android.os.Bundle; import com.fenghoo.seven.R; import com.fenghoo.seven.base.BaseActivity; -import com.fenghoo.seven.main.Fragment.XikeInfoFragment; +import com.fenghoo.seven.main.my.fragment.XikeInfoFragment; import com.fenghoo.seven.utils.StatusBarUtil; public class Main2Activity extends BaseActivity { diff --git a/app/src/main/java/com/fenghoo/seven/main/activity/mine/InboundHistoryActivity.java b/app/src/main/java/com/fenghoo/seven/main/activity/mine/InboundHistoryActivity.java index fab9ad7..ffc8336 100644 --- a/app/src/main/java/com/fenghoo/seven/main/activity/mine/InboundHistoryActivity.java +++ b/app/src/main/java/com/fenghoo/seven/main/activity/mine/InboundHistoryActivity.java @@ -8,8 +8,8 @@ import android.widget.TextView; import com.chad.library.adapter.base.BaseQuickAdapter; import com.fenghoo.seven.R; import com.fenghoo.seven.base.BaseActivity; -import com.fenghoo.seven.main.adapter.mine.InboundHistoryAdapter; -import com.fenghoo.seven.main.entity.mine.InboundHistoryResBean; +import com.fenghoo.seven.main.my.adapter.InboundHistoryAdapter; +import com.fenghoo.seven.main.my.entity.InboundHistoryResBean; import com.fenghoo.seven.utils.SpaceItemDecoration; import java.util.ArrayList; diff --git a/app/src/main/java/com/fenghoo/seven/main/activity/mine/MessageNoticeActivity.java b/app/src/main/java/com/fenghoo/seven/main/activity/mine/MessageNoticeActivity.java index 6a93562..ea5bc0c 100644 --- a/app/src/main/java/com/fenghoo/seven/main/activity/mine/MessageNoticeActivity.java +++ b/app/src/main/java/com/fenghoo/seven/main/activity/mine/MessageNoticeActivity.java @@ -8,8 +8,8 @@ import android.widget.TextView; import com.chad.library.adapter.base.BaseQuickAdapter; import com.fenghoo.seven.R; import com.fenghoo.seven.base.BaseActivity; -import com.fenghoo.seven.main.adapter.mine.MessageNoticeAdapter; -import com.fenghoo.seven.main.entity.mine.MessageNoticeResBean; +import com.fenghoo.seven.main.my.adapter.MessageNoticeAdapter; +import com.fenghoo.seven.main.my.entity.MessageNoticeResBean; import com.fenghoo.seven.utils.SpaceItemDecoration; import java.util.ArrayList; diff --git a/app/src/main/java/com/fenghoo/seven/main/entity/mine/InboundHistoryResBean.java b/app/src/main/java/com/fenghoo/seven/main/entity/mine/InboundHistoryResBean.java deleted file mode 100644 index bca5eb8..0000000 --- a/app/src/main/java/com/fenghoo/seven/main/entity/mine/InboundHistoryResBean.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.fenghoo.seven.main.entity.mine; - -public class InboundHistoryResBean { -} diff --git a/app/src/main/java/com/fenghoo/seven/main/entity/mine/MessageNoticeResBean.java b/app/src/main/java/com/fenghoo/seven/main/entity/mine/MessageNoticeResBean.java deleted file mode 100644 index 8eeaf79..0000000 --- a/app/src/main/java/com/fenghoo/seven/main/entity/mine/MessageNoticeResBean.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.fenghoo.seven.main.entity.mine; - - -public class MessageNoticeResBean { - - -} diff --git a/app/src/main/java/com/fenghoo/seven/main/entity/mine/OutboundHistoryResBean.java b/app/src/main/java/com/fenghoo/seven/main/entity/mine/OutboundHistoryResBean.java deleted file mode 100644 index cfa54e7..0000000 --- a/app/src/main/java/com/fenghoo/seven/main/entity/mine/OutboundHistoryResBean.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.fenghoo.seven.main.entity.mine; - -public class OutboundHistoryResBean { -} diff --git a/app/src/main/java/com/fenghoo/seven/main/entity/mine/UserHeadEntity.java b/app/src/main/java/com/fenghoo/seven/main/entity/mine/UserHeadEntity.java deleted file mode 100644 index fc90c5b..0000000 --- a/app/src/main/java/com/fenghoo/seven/main/entity/mine/UserHeadEntity.java +++ /dev/null @@ -1,68 +0,0 @@ -package com.fenghoo.seven.main.entity.mine; - -/** - * UserHeadEntity - * (๑• . •๑) - * 类描述: 修改头像成功后返回的实体类 - * Created by LeiXiaoXing on 2017/4/28 11:20 - */ - -public class UserHeadEntity { - - /** - * 图片原图路径 - * origin : /Uploads/app_user_head_img/origin/20170428/5902b4f7c2b69.png - * 主页使用的尺寸路径 - * Home_Page_Size : /Uploads/app_user_head_img/Home_Page_Size/20170428/5902b4f7c2b69.png - * 个人信息使用尺寸路径 - * info_page_size : /Uploads/app_user_head_img/info_page_size/20170428/5902b4f7c2b69.png - * 通讯录头像使用尺寸路径 - * user_list_size : /Uploads/app_user_head_img/user_list_size/20170428/5902b4f7c2b69.png - */ - - private String origin; - private String Home_Page_Size; - private String info_page_size; - private String user_list_size; - private String classThumb;//班级头像 - - public String getOrigin() { - return origin; - } - - public void setOrigin(String origin) { - this.origin = origin; - } - - public String getHome_Page_Size() { - return Home_Page_Size; - } - - public void setHome_Page_Size(String Home_Page_Size) { - this.Home_Page_Size = Home_Page_Size; - } - - public String getInfo_page_size() { - return info_page_size; - } - - public void setInfo_page_size(String info_page_size) { - this.info_page_size = info_page_size; - } - - public String getUser_list_size() { - return user_list_size; - } - - public void setUser_list_size(String user_list_size) { - this.user_list_size = user_list_size; - } - - public String getClassThumb() { - return classThumb; - } - - public void setClassThumb(String classThumb) { - this.classThumb = classThumb; - } -} diff --git a/app/src/main/java/com/fenghoo/seven/main/find/ConversationActivity.java b/app/src/main/java/com/fenghoo/seven/main/find/ConversationActivity.java index acf17c3..4857601 100644 --- a/app/src/main/java/com/fenghoo/seven/main/find/ConversationActivity.java +++ b/app/src/main/java/com/fenghoo/seven/main/find/ConversationActivity.java @@ -1,16 +1,24 @@ package com.fenghoo.seven.main.find; import android.os.Bundle; +import android.util.Log; +import android.view.View; +import android.widget.ImageView; import com.fenghoo.seven.R; import com.fenghoo.seven.base.BaseActivity; +import com.fenghoo.seven.dialog.BaseTipsDialog; +import com.fenghoo.seven.main.find.entity.SixEvent; import com.fenghoo.seven.widget.TitleBar; +import de.greenrobot.event.EventBus; + /** * 会话 */ public class ConversationActivity extends BaseActivity { private TitleBar mTitleBar; + private String issuccess="1"; @Override protected void onCreate(Bundle savedInstanceState) { @@ -18,8 +26,53 @@ public class ConversationActivity extends BaseActivity { setContentView(R.layout.activity_conversation); mTitleBar = findViewById(R.id.title_bar); initNormalBack(); + EventBus.getDefault().register(this); String private_id = getIntent().getStringExtra("private_id"); mTitleBar.setTitle("抖音昵称"+"**"); getSupportFragmentManager().beginTransaction().replace(R.id.container,new QuestionsFragment(private_id)).commit(); } + + public void onEvent(SixEvent event) { + if (null != event ) { + issuccess = event.getIssuccess(); + Log.e("添加客户成功了==",issuccess); + } + } + + /** + * 初始化一般返回按钮事件 + */ + public void initNormalBack() { + + ImageView iv_back = (ImageView) findViewById(R.id.iv_left_btn); + if (iv_back != null) { + iv_back.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if(!issuccess.equals("0")) { + //弹出对话框 + new BaseTipsDialog().showDownloadDialog(ConversationActivity.this, "您没有完成添加客户
返回将不保存您添加的信息
确定返回吗？", "确定", new BaseTipsDialog.ClickListener() { + @Override + public void confirm() { + finish(); + } + + @Override + public void cancle() { + + } + }); + }else { + finish(); + } + } + }); + } + } + + @Override + public void onDestroy() { + super.onDestroy(); + EventBus.getDefault().unregister(this); + } } diff --git a/app/src/main/java/com/fenghoo/seven/main/find/PriLetFragment.java b/app/src/main/java/com/fenghoo/seven/main/find/PriLetFragment.java index 7b4aaf0..66cfc40 100644 --- a/app/src/main/java/com/fenghoo/seven/main/find/PriLetFragment.java +++ b/app/src/main/java/com/fenghoo/seven/main/find/PriLetFragment.java @@ -16,8 +16,11 @@ import com.fenghoo.seven.base.BaseFragment; import com.fenghoo.seven.main.find.ui.PrivateletterFragment; import com.fenghoo.seven.main.kehu.Bean.industryBean; import com.fenghoo.seven.main.kehu.Dialog.HangyeSelectDialog; +import com.fenghoo.seven.okgonet.HttpConstants; import com.fenghoo.seven.okgonet.NetApi; import com.fenghoo.seven.okgonet.Observer; +import com.fenghoo.seven.utils.checkVersionsUtils.ProfileSpUtils; +import com.lzy.okgo.model.HttpParams; import com.lzy.okgo.model.Response; import com.zaaach.citypicker.CityPicker; import com.zaaach.citypicker.adapter.OnPickListener; @@ -70,7 +73,8 @@ public class PriLetFragment extends BaseFragment { view = inflater.inflate(R.layout.findfragment, container, false); initView(view); HotCity(); - new NetApi().industry().subscribe(new Observer() { + final HttpParams paramsPost = new HttpParams(); + new NetApi().getPostData(paramsPost, HttpConstants.URi_device_AppCustomer_industry).subscribe(new Observer() { @Override public void onNext(Response response) { String body = (String) response.body(); diff --git a/app/src/main/java/com/fenghoo/seven/main/find/entity/SixEvent.java b/app/src/main/java/com/fenghoo/seven/main/find/entity/SixEvent.java new file mode 100644 index 0000000..de7146e --- /dev/null +++ b/app/src/main/java/com/fenghoo/seven/main/find/entity/SixEvent.java @@ -0,0 +1,20 @@ +package com.fenghoo.seven.main.find.entity; + +/** + * Time: 2020/8/28 + * Author: jianbo + * Description: + */ +public class SixEvent { + private String issuccess;//是否添加客户成功 + + public SixEvent(String msg) { + // TODO Auto-generated constructor stub + issuccess = msg; + + } + public String getIssuccess(){ + return issuccess; + } + +} diff --git a/app/src/main/java/com/fenghoo/seven/main/kehu/activity/AddCustomerActivity.java b/app/src/main/java/com/fenghoo/seven/main/kehu/activity/AddCustomerActivity.java index 89f4681..8bd42ca 100644 --- a/app/src/main/java/com/fenghoo/seven/main/kehu/activity/AddCustomerActivity.java +++ b/app/src/main/java/com/fenghoo/seven/main/kehu/activity/AddCustomerActivity.java @@ -22,7 +22,6 @@ public class AddCustomerActivity extends BaseActivity { private String search=""; private String pagetype=""; - @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -30,15 +29,11 @@ public class AddCustomerActivity extends BaseActivity { mTitleBar = (TitleBar) findViewById(R.id.title_bar); mTitleBar.setTitle("信息完善"); initNormalBack(); -// search = getIntent().getStringExtra("search"); -// pagetype = getIntent().getStringExtra("pagetype"); CustomerListBean.ResultBean.DataBean dataBean = (CustomerListBean.ResultBean.DataBean) getIntent().getSerializableExtra("dataBean"); - customer_id = dataBean.getCustomer_id(); - source = dataBean.getSource(); - + customer_id = dataBean.getCustomer_id(); + source = dataBean.getSource(); addCusFragment = new AddCusFragment(this.customer_id, this.source,search,pagetype,dataBean); getSupportFragmentManager().beginTransaction().replace(R.id.containerrr,addCusFragment).commit(); - findViewById(R.id.btn_comit).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { diff --git a/app/src/main/java/com/fenghoo/seven/main/kehu/activity/AllocationActivity.java b/app/src/main/java/com/fenghoo/seven/main/kehu/activity/AllocationActivity.java index ef49631..c977ccb 100644 --- a/app/src/main/java/com/fenghoo/seven/main/kehu/activity/AllocationActivity.java +++ b/app/src/main/java/com/fenghoo/seven/main/kehu/activity/AllocationActivity.java @@ -16,9 +16,11 @@ import com.fenghoo.seven.main.find.entity.ThreeEvent; import com.fenghoo.seven.main.kehu.Bean.FourEvent; import com.fenghoo.seven.main.kehu.Bean.customerFPListBean; import com.fenghoo.seven.main.kehu.adapter.AllocationAdapter; +import com.fenghoo.seven.okgonet.HttpConstants; import com.fenghoo.seven.okgonet.NetApi; import com.fenghoo.seven.okgonet.Observer; import com.fenghoo.seven.utils.checkVersionsUtils.ProfileSpUtils; +import com.lzy.okgo.model.HttpParams; import com.lzy.okgo.model.Response; import java.util.ArrayList; @@ -113,7 +115,9 @@ public class AllocationActivity extends BaseActivity implements View.OnClickList } public void getData() { - new NetApi().customerFPList(ProfileSpUtils.getInstance().getUserProfie().getData().getUuid()).subscribe(new Observer() { + final HttpParams paramsPost = new HttpParams(); + paramsPost.put("uid", ProfileSpUtils.getInstance().getUserProfie().getData().getUuid()); + new NetApi().getPostData(paramsPost, HttpConstants.URi_device_AppCustomer_customerFPList).subscribe(new Observer() { @Override public void onNext(Response response) { String body = (String) response.body(); diff --git a/app/src/main/java/com/fenghoo/seven/main/kehu/activity/BudgetActivity.java b/app/src/main/java/com/fenghoo/seven/main/kehu/activity/BudgetActivity.java index 8fba7f6..694c6e7 100644 --- a/app/src/main/java/com/fenghoo/seven/main/kehu/activity/BudgetActivity.java +++ b/app/src/main/java/com/fenghoo/seven/main/kehu/activity/BudgetActivity.java @@ -18,7 +18,7 @@ import androidx.recyclerview.widget.LinearLayoutManager; import de.greenrobot.event.EventBus; /** - * + *选择预算 */ public class BudgetActivity extends MoActivity { diff --git a/app/src/main/java/com/fenghoo/seven/main/kehu/activity/CustomerDetailActivity.java b/app/src/main/java/com/fenghoo/seven/main/kehu/activity/CustomerDetailActivity.java index fd1128e..4fde22d 100644 --- a/app/src/main/java/com/fenghoo/seven/main/kehu/activity/CustomerDetailActivity.java +++ b/app/src/main/java/com/fenghoo/seven/main/kehu/activity/CustomerDetailActivity.java @@ -8,14 +8,17 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.TypeReference; import com.fenghoo.seven.R; import com.fenghoo.seven.base.BaseActivity; +import com.fenghoo.seven.okgonet.HttpConstants; import com.fenghoo.seven.okgonet.NetApi; import com.fenghoo.seven.okgonet.Observer; import com.fenghoo.seven.utils.GlideTools; import com.fenghoo.seven.utils.ToastUtils; import com.fenghoo.seven.utils.ToolsText; import com.fenghoo.seven.utils.WidgetTools; +import com.fenghoo.seven.utils.checkVersionsUtils.ProfileSpUtils; import com.fenghoo.seven.widget.CircleImageView; import com.fenghoo.seven.widget.TitleBar; +import com.lzy.okgo.model.HttpParams; import com.lzy.okgo.model.Response; import org.json.JSONException; @@ -56,7 +59,9 @@ public class CustomerDetailActivity extends BaseActivity { mTvDraInfo06 = (TextView) findViewById(R.id.tv_dra_info06); } public void getData(String customer_id) { - new NetApi().customerDetail(customer_id).subscribe(new Observer() { + final HttpParams paramsPost = new HttpParams(); + paramsPost.put("customer_id", customer_id); + new NetApi().getPostData(paramsPost, HttpConstants.URi_device_AppCustomer_customerDetail).subscribe(new Observer() { @Override public void onNext(Response response) { String body = (String) response.body(); diff --git a/app/src/main/java/com/fenghoo/seven/main/kehu/activity/DesignActivity.java b/app/src/main/java/com/fenghoo/seven/main/kehu/activity/DesignActivity.java index 956eb06..c45ec81 100644 --- a/app/src/main/java/com/fenghoo/seven/main/kehu/activity/DesignActivity.java +++ b/app/src/main/java/com/fenghoo/seven/main/kehu/activity/DesignActivity.java @@ -31,12 +31,14 @@ import com.fenghoo.seven.main.kehu.Bean.industryBean; import com.fenghoo.seven.main.kehu.activity.mvp.contract.CommitDesignContract; import com.fenghoo.seven.main.kehu.activity.mvp.presenter.CommitDesignPresenter; import com.fenghoo.seven.main.kehu.adapter.DesignAdapter; +import com.fenghoo.seven.okgonet.HttpConstants; import com.fenghoo.seven.okgonet.NetApi; import com.fenghoo.seven.okgonet.Observer; import com.fenghoo.seven.utils.StringUtils; import com.fenghoo.seven.utils.ToastUtils; import com.fenghoo.seven.widget.TitleBar; import com.google.gson.Gson; +import com.lzy.okgo.model.HttpParams; import com.lzy.okgo.model.Response; import org.json.JSONArray; @@ -90,7 +92,8 @@ public class DesignActivity extends BaseTreeActivity() { + final HttpParams paramsPost = new HttpParams(); + new NetApi().getPostData(paramsPost, HttpConstants.URi_device_AppCustomer_industry).subscribe(new Observer() { @Override public void onNext(Response response) { String body = (String) response.body(); @@ -294,7 +297,7 @@ public class DesignActivity extends BaseTreeActivity() { + final HttpParams paramsPost = new HttpParams(); + new NetApi().getPostData(paramsPost, HttpConstants.URi_device_AppCustomer_industry).subscribe(new Observer() { @Override public void onNext(Response response) { String body = (String) response.body(); diff --git a/app/src/main/java/com/fenghoo/seven/main/kehu/activity/FpOrderInfoActivitytwo.java b/app/src/main/java/com/fenghoo/seven/main/kehu/activity/FpOrderInfoActivitytwo.java deleted file mode 100644 index 1208d63..0000000 --- a/app/src/main/java/com/fenghoo/seven/main/kehu/activity/FpOrderInfoActivitytwo.java +++ /dev/null @@ -1,98 +0,0 @@ -package com.fenghoo.seven.main.kehu.activity; - -import android.os.Bundle; - -import com.fenghoo.seven.JsonUtils; -import com.fenghoo.seven.R; -import com.fenghoo.seven.main.find.adapter.FpOrderInfoAdapter; -import com.fenghoo.seven.main.kehu.Bean.CustomerListBean; -import com.fenghoo.seven.main.kehu.Dialog.RreplyDialog; -import com.fenghoo.seven.okgonet.NetApi; -import com.fenghoo.seven.okgonet.Observer; -import com.fenghoo.seven.utils.checkVersionsUtils.ProfileSpUtils; -import com.lzy.okgo.model.Response; - -import java.util.List; - -import androidx.recyclerview.widget.LinearLayoutManager; - - -public class FpOrderInfoActivitytwo extends MoActivity { - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_fp_order_info); - } - - @Override - public void initAdapter() { - mMarkingFragmentRecyclerView.setLayoutManager(new LinearLayoutManager(FpOrderInfoActivitytwo.this)); - FpOrderInfoAdapter markingtwoAdapter = new FpOrderInfoAdapter(FpOrderInfoActivitytwo.this, null); - getAdpter(markingtwoAdapter); - mMarkingFragmentRecyclerView.setAdapter(markingtwoAdapter); - markingtwoAdapter.operationListenner(new FpOrderInfoAdapter.OnViewClickListener() { - @Override - public void reply(CustomerListBean.ResultBean.DataBean item) { - new RreplyDialog(FpOrderInfoActivitytwo.this, R.style.dialog, new RreplyDialog.OnCloseListener() { - //回复 - @Override - public void reply(String content) { - - } - - }).show(); - } - - @Override - public void enterCusDetail(CustomerListBean.ResultBean.DataBean item) { - //进入查看评论 - ShowAty.CustomerDetailActivity(FpOrderInfoActivitytwo.this,item); - } - }); - } - - @Override - public void requestData() { - new NetApi().customerList(ProfileSpUtils.getInstance().getUserProfie().getData().getUuid(),"").subscribe(new Observer() { - @Override - public void onNext(Response response) { - String body = (String) response.body(); - CustomerListBean.ResultBean result = JsonUtils.fromJson(body, CustomerListBean.class).getResult(); - mSwl.setRefreshing(false); - if (result != null && String.valueOf(result.getSuccess()).equals("0")) { - - List data = result.getData(); - if (data.size() == 0) { - markingtwoAdapter.setEmptyView(notDataView); - return; - } - if (mNextRequestPage == 1) { - setData(true, data); - } else { - setData(false, data); - } - } else { - setData(true, null); - markingtwoAdapter.setEmptyView(notDataView); - mSwl.setRefreshing(false); - } - } - @Override - public void onError(Exception e) { - e.printStackTrace(); - markingtwoAdapter.setEmptyView(errorView); - mSwl.setRefreshing(false); - } - }); - } - @Override - public void onDestroy() { - super.onDestroy(); - } -} - - -/** - * 列表有5种类型 1.分配 2.回收 3.成交 4.被抢 5进店 - */ diff --git a/app/src/main/java/com/fenghoo/seven/main/kehu/activity/MoActivity.java b/app/src/main/java/com/fenghoo/seven/main/kehu/activity/MoActivity.java index 8e31fd9..83d0844 100644 --- a/app/src/main/java/com/fenghoo/seven/main/kehu/activity/MoActivity.java +++ b/app/src/main/java/com/fenghoo/seven/main/kehu/activity/MoActivity.java @@ -13,7 +13,7 @@ import android.widget.TextView; import com.chad.library.adapter.base.BaseQuickAdapter; import com.fenghoo.seven.R; import com.fenghoo.seven.base.BaseActivity; -import com.fenghoo.seven.main.entity.Savaselect; +import com.fenghoo.seven.main.my.entity.Savaselect; import java.util.List; @@ -136,8 +136,6 @@ public abstract class MoActivity extends BaseActivity { markingtwoAdapter.loadMoreComplete(); } } - - public abstract void requestData(); public void getAdpter(BaseQuickAdapter markingtwoAdapter){ @@ -146,6 +144,5 @@ public abstract class MoActivity extends BaseActivity { @Override public void onDestroy() { super.onDestroy(); - } } diff --git a/app/src/main/java/com/fenghoo/seven/main/kehu/activity/StyleActivity.java b/app/src/main/java/com/fenghoo/seven/main/kehu/activity/StyleActivity.java index 82bcc82..85440ea 100644 --- a/app/src/main/java/com/fenghoo/seven/main/kehu/activity/StyleActivity.java +++ b/app/src/main/java/com/fenghoo/seven/main/kehu/activity/StyleActivity.java @@ -7,9 +7,11 @@ import com.fenghoo.seven.R; import com.fenghoo.seven.main.find.adapter.StyleAdapter; import com.fenghoo.seven.main.find.entity.StyleBean; import com.fenghoo.seven.main.kehu.Bean.FirstEvent; +import com.fenghoo.seven.okgonet.HttpConstants; import com.fenghoo.seven.okgonet.NetApi; import com.fenghoo.seven.okgonet.Observer; import com.fenghoo.seven.widget.TitleBar; +import com.lzy.okgo.model.HttpParams; import com.lzy.okgo.model.Response; import java.util.List; @@ -51,7 +53,8 @@ public class StyleActivity extends MoActivity { @Override public void requestData() { - new NetApi().style().subscribe(new Observer() { + final HttpParams paramsPost = new HttpParams(); + new NetApi().getPostData(paramsPost, HttpConstants.URi_device_AppCustomer_style).subscribe(new Observer() { @Override public void onNext(Response response) { String body = (String) response.body(); diff --git a/app/src/main/java/com/fenghoo/seven/main/kehu/adapter/AddCusAdapter.java b/app/src/main/java/com/fenghoo/seven/main/kehu/adapter/AddCusAdapter.java index 481f996..0906fb0 100644 --- a/app/src/main/java/com/fenghoo/seven/main/kehu/adapter/AddCusAdapter.java +++ b/app/src/main/java/com/fenghoo/seven/main/kehu/adapter/AddCusAdapter.java @@ -6,7 +6,7 @@ import android.widget.TextView; import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; import com.fenghoo.seven.R; -import com.fenghoo.seven.main.entity.XikeInfoBean; +import com.fenghoo.seven.main.my.entity.XikeInfoBean; import com.fenghoo.seven.utils.WidgetTools; import java.util.List; diff --git a/app/src/main/java/com/fenghoo/seven/main/kehu/adapter/DeaListAdapter.java b/app/src/main/java/com/fenghoo/seven/main/kehu/adapter/DeaListAdapter.java index 3d33222..9b31fcb 100644 --- a/app/src/main/java/com/fenghoo/seven/main/kehu/adapter/DeaListAdapter.java +++ b/app/src/main/java/com/fenghoo/seven/main/kehu/adapter/DeaListAdapter.java @@ -9,8 +9,6 @@ import android.widget.TextView; import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; import com.fenghoo.seven.R; -import com.fenghoo.seven.main.entity.XikeInfoBean; -import com.fenghoo.seven.main.kehu.Bean.CustomerListBean; import com.fenghoo.seven.main.kehu.Bean.orderListBean; import com.fenghoo.seven.utils.GlideTools; import com.fenghoo.seven.utils.WidgetTools; diff --git a/app/src/main/java/com/fenghoo/seven/main/kehu/fragment/AddCusFragment.java b/app/src/main/java/com/fenghoo/seven/main/kehu/fragment/AddCusFragment.java index 6101006..2737e53 100644 --- a/app/src/main/java/com/fenghoo/seven/main/kehu/fragment/AddCusFragment.java +++ b/app/src/main/java/com/fenghoo/seven/main/kehu/fragment/AddCusFragment.java @@ -19,6 +19,7 @@ import com.chad.library.adapter.base.BaseViewHolder; import com.fenghoo.seven.JsonUtils; import com.fenghoo.seven.R; import com.fenghoo.seven.base.BaseBean; +import com.fenghoo.seven.main.find.entity.SixEvent; import com.fenghoo.seven.main.find.entity.ThreeEvent; import com.fenghoo.seven.main.kehu.Bean.CustomerListBean; import com.fenghoo.seven.main.kehu.Bean.FirstEvent; @@ -34,6 +35,7 @@ import com.fenghoo.seven.utils.AbImageUtil; import com.fenghoo.seven.utils.AbStrUtil; import com.fenghoo.seven.utils.GlideTools; import com.fenghoo.seven.utils.ImageUtils; +import com.fenghoo.seven.utils.PhonenNumUtil; import com.fenghoo.seven.utils.ToastUtils; import com.fenghoo.seven.utils.WidgetTools; import com.fenghoo.seven.utils.checkVersionsUtils.ProfileSpUtils; @@ -205,6 +207,11 @@ public class AddCusFragment extends MobanFragment implements View.OnClickListene ToastUtils.showToast(mContext, "请输入客户电话"); return; } + boolean mobile = PhonenNumUtil.isMobile(addCustomerBean.getPhone()); + if (!mobile) { + ToastUtils.showToast(mContext, "请输入正确的电话号码"); + return; + } // if( AbStrUtil.isEmpty(addCustomerBean.getWechat())){ // ToastUtils.showToast(mContext, "请输入客户微信"); // return; @@ -231,6 +238,8 @@ public class AddCusFragment extends MobanFragment implements View.OnClickListene if(result.getSuccess()==0){ //通知客户列表刷新数据 EventBus.getDefault().post(new ThreeEvent(pagetype,search)); + //通知会话页面添加客户是否成功 + EventBus.getDefault().post(new SixEvent("0")); getActivity().finish(); }else { String msg = result.getMsg(); diff --git a/app/src/main/java/com/fenghoo/seven/main/kehu/fragment/CustomerFragment.java b/app/src/main/java/com/fenghoo/seven/main/kehu/fragment/CustomerFragment.java index f8311db..becb413 100644 --- a/app/src/main/java/com/fenghoo/seven/main/kehu/fragment/CustomerFragment.java +++ b/app/src/main/java/com/fenghoo/seven/main/kehu/fragment/CustomerFragment.java @@ -70,7 +70,6 @@ public class CustomerFragment extends MobanFragment { new BaseTipsDialog().showDownloadDialog(getActivity(), "确认删除该客户吗？", "确定", new BaseTipsDialog.ClickListener() { @Override public void confirm() { - //Toast.makeText(getActivity(), "还没调接口", Toast.LENGTH_SHORT).show(); deleteCus(item.getCustomer_id()); } @@ -141,10 +140,10 @@ public class CustomerFragment extends MobanFragment { Log.e("刷新页面==",pagetype); Log.d("客户调拨--","刷新列表页面"); if(pagetype.equals("0")){ - search = event.getSearch(); - IS_LOADED=false; - sendMessage(); +// IS_LOADED=false; +// sendMessage(); + newrefresh(); } } } @@ -210,8 +209,7 @@ public class CustomerFragment extends MobanFragment { String body = (String) response.body(); BaseBean.ResultBean result = JsonUtils.fromJson(body, BaseBean.class).getResult(); if(result.getSuccess()==0){ - requestData(); - ToastUtils.showToast(getActivity(),"执行了刷新方法"); + newrefresh(); }else { ToastUtils.showToast(getActivity(),result.getMsg()); } diff --git a/app/src/main/java/com/fenghoo/seven/main/kehu/fragment/DealFragment.java b/app/src/main/java/com/fenghoo/seven/main/kehu/fragment/DealFragment.java index af9d053..5d6a50e 100644 --- a/app/src/main/java/com/fenghoo/seven/main/kehu/fragment/DealFragment.java +++ b/app/src/main/java/com/fenghoo/seven/main/kehu/fragment/DealFragment.java @@ -64,8 +64,9 @@ public class DealFragment extends MobanFragment { Log.e("刷新页面==",pagetype); if(pagetype.equals("2")){ search = event.getSearch(); - IS_LOADED=false; - sendMessage(); +// IS_LOADED=false; +// sendMessage(); + newrefresh(); } } } @@ -109,12 +110,6 @@ public class DealFragment extends MobanFragment { mSwl.setRefreshing(false); } }); - } - @Override - public void onDestroy() { - super.onDestroy(); - } - } diff --git a/app/src/main/java/com/fenghoo/seven/main/kehu/fragment/DistriFragment.java b/app/src/main/java/com/fenghoo/seven/main/kehu/fragment/DistriFragment.java index 5d5132b..54c846e 100644 --- a/app/src/main/java/com/fenghoo/seven/main/kehu/fragment/DistriFragment.java +++ b/app/src/main/java/com/fenghoo/seven/main/kehu/fragment/DistriFragment.java @@ -63,8 +63,9 @@ public class DistriFragment extends MobanFragment { Log.e("刷新页面==",pagetype); if(pagetype.equals("1")){ search = event.getSearch(); - IS_LOADED=false; - sendMessage(); +// IS_LOADED=false; +// sendMessage(); + newrefresh(); } } } diff --git a/app/src/main/java/com/fenghoo/seven/main/kehu/fragment/MobanFragment.java b/app/src/main/java/com/fenghoo/seven/main/kehu/fragment/MobanFragment.java index 60ba506..1d84fbc 100644 --- a/app/src/main/java/com/fenghoo/seven/main/kehu/fragment/MobanFragment.java +++ b/app/src/main/java/com/fenghoo/seven/main/kehu/fragment/MobanFragment.java @@ -8,14 +8,11 @@ import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import android.widget.RelativeLayout; import android.widget.TextView; -import android.widget.Toast; import com.chad.library.adapter.base.BaseQuickAdapter; import com.fenghoo.seven.R; import com.fenghoo.seven.base.BaseFragment; -import com.fenghoo.seven.main.entity.Savaselect; import java.util.List; @@ -165,4 +162,23 @@ public abstract class MobanFragment extends BaseFragment { EventBus.getDefault().unregister(this); } + /** + * @description 列表刷新的方法(不用new适配器) + * @param + * @return + */ + public void newrefresh(){ + mNextRequestPage=1; + requestData(); + } + /** + * @description 列表刷新的方法(new适配器) + * @param + * @return + */ + public void newrefreshtwo(){ + IS_LOADED=false; + sendMessage(); + } + } diff --git a/app/src/main/java/com/fenghoo/seven/main/kehu/fragment/TraceFragment.java b/app/src/main/java/com/fenghoo/seven/main/kehu/fragment/TraceFragment.java index 2099d46..53a4302 100644 --- a/app/src/main/java/com/fenghoo/seven/main/kehu/fragment/TraceFragment.java +++ b/app/src/main/java/com/fenghoo/seven/main/kehu/fragment/TraceFragment.java @@ -13,7 +13,7 @@ import android.widget.RelativeLayout; import android.widget.TextView; import com.fenghoo.seven.R; -import com.fenghoo.seven.main.entity.Savaselect; +import com.fenghoo.seven.main.my.entity.Savaselect; import com.fenghoo.seven.main.kehu.activity.ShowAty; import com.fenghoo.seven.test.BaseFragment; import com.google.android.material.tabs.TabLayout; @@ -25,7 +25,6 @@ import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentManager; import androidx.fragment.app.FragmentPagerAdapter; import androidx.viewpager.widget.ViewPager; -import de.greenrobot.event.EventBus; /** * 功能：客户列表 @@ -161,7 +160,7 @@ public class TraceFragment extends BaseFragment implements View.OnClickListener @Override public void onClick(View view) { //进入添加客户和完善信息 - ShowAty.AddCustDialogActivity(getActivity(),"","","",""); + ShowAty.AddCustDialogActivity(getActivity(),"","1","",""); } }); } diff --git a/app/src/main/java/com/fenghoo/seven/main/my/MyFragment.java b/app/src/main/java/com/fenghoo/seven/main/my/MyFragment.java index 4aee234..7c4c5b7 100644 --- a/app/src/main/java/com/fenghoo/seven/main/my/MyFragment.java +++ b/app/src/main/java/com/fenghoo/seven/main/my/MyFragment.java @@ -9,8 +9,8 @@ import android.widget.TextView; import com.fenghoo.seven.R; import com.fenghoo.seven.base.BaseTreeFragment; import com.fenghoo.seven.dialog.BaseTipsDialog; -import com.fenghoo.seven.main.Fragment.mvp.contract.MyContract; -import com.fenghoo.seven.main.Fragment.mvp.presenter.MyPresenterImpl; +import com.fenghoo.seven.main.my.fragment.mvp.contract.MyContract; +import com.fenghoo.seven.main.my.fragment.mvp.presenter.MyPresenterImpl; import com.fenghoo.seven.main.activity.LoginPasswordActivity; import com.fenghoo.seven.main.activity.Main2Activity; import com.fenghoo.seven.main.my.activity.PersonalProfileActivity; @@ -18,7 +18,6 @@ import com.fenghoo.seven.main.my.entity.loginInfoBean; import com.fenghoo.seven.utils.GlideTools; import com.fenghoo.seven.utils.ToolsUtils; import com.fenghoo.seven.utils.checkVersionsUtils.ProfileSpUtils; -import com.fenghoo.seven.view.webview.WebActivitytwo; import com.fenghoo.seven.view.webview.XfiveWebActivity; import com.fenghoo.seven.widget.CircleImageView; import com.fenghoo.seven.widget.ItemView; diff --git a/app/src/main/java/com/fenghoo/seven/main/adapter/GuideViewPagerAdapter.java b/app/src/main/java/com/fenghoo/seven/main/my/adapter/GuideViewPagerAdapter.java similarity index 95% rename from app/src/main/java/com/fenghoo/seven/main/adapter/GuideViewPagerAdapter.java rename to app/src/main/java/com/fenghoo/seven/main/my/adapter/GuideViewPagerAdapter.java index c83dc7e..26d0252 100644 --- a/app/src/main/java/com/fenghoo/seven/main/adapter/GuideViewPagerAdapter.java +++ b/app/src/main/java/com/fenghoo/seven/main/my/adapter/GuideViewPagerAdapter.java @@ -1,4 +1,4 @@ -package com.fenghoo.seven.main.adapter; +package com.fenghoo.seven.main.my.adapter; import android.content.Context; import android.view.View; diff --git a/app/src/main/java/com/fenghoo/seven/main/adapter/mine/InboundHistoryAdapter.java b/app/src/main/java/com/fenghoo/seven/main/my/adapter/InboundHistoryAdapter.java similarity index 79% rename from app/src/main/java/com/fenghoo/seven/main/adapter/mine/InboundHistoryAdapter.java rename to app/src/main/java/com/fenghoo/seven/main/my/adapter/InboundHistoryAdapter.java index d31b8cd..9bb5f1d 100644 --- a/app/src/main/java/com/fenghoo/seven/main/adapter/mine/InboundHistoryAdapter.java +++ b/app/src/main/java/com/fenghoo/seven/main/my/adapter/InboundHistoryAdapter.java @@ -1,12 +1,12 @@ -package com.fenghoo.seven.main.adapter.mine; +package com.fenghoo.seven.main.my.adapter; import android.content.Context; import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; import com.fenghoo.seven.R; -import com.fenghoo.seven.main.entity.mine.InboundHistoryResBean; -import com.fenghoo.seven.main.entity.mine.MessageNoticeResBean; +import com.fenghoo.seven.main.my.entity.InboundHistoryResBean; +import com.fenghoo.seven.main.my.entity.MessageNoticeResBean; import java.util.List; diff --git a/app/src/main/java/com/fenghoo/seven/main/adapter/mine/MessageNoticeAdapter.java b/app/src/main/java/com/fenghoo/seven/main/my/adapter/MessageNoticeAdapter.java similarity index 85% rename from app/src/main/java/com/fenghoo/seven/main/adapter/mine/MessageNoticeAdapter.java rename to app/src/main/java/com/fenghoo/seven/main/my/adapter/MessageNoticeAdapter.java index 94316c5..ee3a34c 100644 --- a/app/src/main/java/com/fenghoo/seven/main/adapter/mine/MessageNoticeAdapter.java +++ b/app/src/main/java/com/fenghoo/seven/main/my/adapter/MessageNoticeAdapter.java @@ -1,11 +1,11 @@ -package com.fenghoo.seven.main.adapter.mine; +package com.fenghoo.seven.main.my.adapter; import android.content.Context; import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; import com.fenghoo.seven.R; -import com.fenghoo.seven.main.entity.mine.MessageNoticeResBean; +import com.fenghoo.seven.main.my.entity.MessageNoticeResBean; import java.util.List; diff --git a/app/src/main/java/com/fenghoo/seven/main/adapter/mine/XikeInfoAdapter.java b/app/src/main/java/com/fenghoo/seven/main/my/adapter/XikeInfoAdapter.java similarity index 90% rename from app/src/main/java/com/fenghoo/seven/main/adapter/mine/XikeInfoAdapter.java rename to app/src/main/java/com/fenghoo/seven/main/my/adapter/XikeInfoAdapter.java index 3ae34b9..3d9879b 100644 --- a/app/src/main/java/com/fenghoo/seven/main/adapter/mine/XikeInfoAdapter.java +++ b/app/src/main/java/com/fenghoo/seven/main/my/adapter/XikeInfoAdapter.java @@ -1,4 +1,4 @@ -package com.fenghoo.seven.main.adapter.mine; +package com.fenghoo.seven.main.my.adapter; import android.content.Context; import android.widget.TextView; @@ -6,7 +6,7 @@ import android.widget.TextView; import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; import com.fenghoo.seven.R; -import com.fenghoo.seven.main.entity.XikeInfoBean; +import com.fenghoo.seven.main.my.entity.XikeInfoBean; import com.fenghoo.seven.utils.WidgetTools; import java.util.List; diff --git a/app/src/main/java/com/fenghoo/seven/main/my/entity/InboundHistoryResBean.java b/app/src/main/java/com/fenghoo/seven/main/my/entity/InboundHistoryResBean.java new file mode 100644 index 0000000..7b99c2e --- /dev/null +++ b/app/src/main/java/com/fenghoo/seven/main/my/entity/InboundHistoryResBean.java @@ -0,0 +1,4 @@ +package com.fenghoo.seven.main.my.entity; + +public class InboundHistoryResBean { +} diff --git a/app/src/main/java/com/fenghoo/seven/main/my/entity/MessageNoticeResBean.java b/app/src/main/java/com/fenghoo/seven/main/my/entity/MessageNoticeResBean.java new file mode 100644 index 0000000..1979085 --- /dev/null +++ b/app/src/main/java/com/fenghoo/seven/main/my/entity/MessageNoticeResBean.java @@ -0,0 +1,7 @@ +package com.fenghoo.seven.main.my.entity; + + +public class MessageNoticeResBean { + + +} diff --git a/app/src/main/java/com/fenghoo/seven/main/my/entity/OutboundHistoryResBean.java b/app/src/main/java/com/fenghoo/seven/main/my/entity/OutboundHistoryResBean.java new file mode 100644 index 0000000..8c76c8c --- /dev/null +++ b/app/src/main/java/com/fenghoo/seven/main/my/entity/OutboundHistoryResBean.java @@ -0,0 +1,4 @@ +package com.fenghoo.seven.main.my.entity; + +public class OutboundHistoryResBean { +} diff --git a/app/src/main/java/com/fenghoo/seven/main/entity/Savaselect.java b/app/src/main/java/com/fenghoo/seven/main/my/entity/Savaselect.java similarity index 90% rename from app/src/main/java/com/fenghoo/seven/main/entity/Savaselect.java rename to app/src/main/java/com/fenghoo/seven/main/my/entity/Savaselect.java index 600295a..f352865 100644 --- a/app/src/main/java/com/fenghoo/seven/main/entity/Savaselect.java +++ b/app/src/main/java/com/fenghoo/seven/main/my/entity/Savaselect.java @@ -1,4 +1,4 @@ -package com.fenghoo.seven.main.entity; +package com.fenghoo.seven.main.my.entity; public class Savaselect { private String serchuid=""; diff --git a/app/src/main/java/com/fenghoo/seven/main/entity/SendSmsBean.java b/app/src/main/java/com/fenghoo/seven/main/my/entity/SendSmsBean.java similarity index 95% rename from app/src/main/java/com/fenghoo/seven/main/entity/SendSmsBean.java rename to app/src/main/java/com/fenghoo/seven/main/my/entity/SendSmsBean.java index 7c052c8..fffbb21 100644 --- a/app/src/main/java/com/fenghoo/seven/main/entity/SendSmsBean.java +++ b/app/src/main/java/com/fenghoo/seven/main/my/entity/SendSmsBean.java @@ -1,4 +1,4 @@ -package com.fenghoo.seven.main.entity; +package com.fenghoo.seven.main.my.entity; public class SendSmsBean { diff --git a/app/src/main/java/com/fenghoo/seven/main/entity/mine/WeChatLoginEntity.java b/app/src/main/java/com/fenghoo/seven/main/my/entity/WeChatLoginEntity.java similarity index 96% rename from app/src/main/java/com/fenghoo/seven/main/entity/mine/WeChatLoginEntity.java rename to app/src/main/java/com/fenghoo/seven/main/my/entity/WeChatLoginEntity.java index 5687315..d23060d 100644 --- a/app/src/main/java/com/fenghoo/seven/main/entity/mine/WeChatLoginEntity.java +++ b/app/src/main/java/com/fenghoo/seven/main/my/entity/WeChatLoginEntity.java @@ -1,4 +1,4 @@ -package com.fenghoo.seven.main.entity.mine; +package com.fenghoo.seven.main.my.entity; /** * WeChatLoginEntity diff --git a/app/src/main/java/com/fenghoo/seven/main/entity/mine/WeChatLoginResultEntity.java b/app/src/main/java/com/fenghoo/seven/main/my/entity/WeChatLoginResultEntity.java similarity index 97% rename from app/src/main/java/com/fenghoo/seven/main/entity/mine/WeChatLoginResultEntity.java rename to app/src/main/java/com/fenghoo/seven/main/my/entity/WeChatLoginResultEntity.java index 04a64aa..59eac0e 100644 --- a/app/src/main/java/com/fenghoo/seven/main/entity/mine/WeChatLoginResultEntity.java +++ b/app/src/main/java/com/fenghoo/seven/main/my/entity/WeChatLoginResultEntity.java @@ -1,4 +1,4 @@ -package com.fenghoo.seven.main.entity.mine; +package com.fenghoo.seven.main.my.entity; /** * WeChatLoginResultEntity diff --git a/app/src/main/java/com/fenghoo/seven/main/entity/XikeInfoBean.java b/app/src/main/java/com/fenghoo/seven/main/my/entity/XikeInfoBean.java similarity index 98% rename from app/src/main/java/com/fenghoo/seven/main/entity/XikeInfoBean.java rename to app/src/main/java/com/fenghoo/seven/main/my/entity/XikeInfoBean.java index 9e884e5..dbc6920 100644 --- a/app/src/main/java/com/fenghoo/seven/main/entity/XikeInfoBean.java +++ b/app/src/main/java/com/fenghoo/seven/main/my/entity/XikeInfoBean.java @@ -1,4 +1,4 @@ -package com.fenghoo.seven.main.entity; +package com.fenghoo.seven.main.my.entity; import com.fenghoo.seven.test.BaseModel; diff --git a/app/src/main/java/com/fenghoo/seven/main/Fragment/MoFragment.java b/app/src/main/java/com/fenghoo/seven/main/my/fragment/MoFragment.java similarity index 98% rename from app/src/main/java/com/fenghoo/seven/main/Fragment/MoFragment.java rename to app/src/main/java/com/fenghoo/seven/main/my/fragment/MoFragment.java index d0f7e90..4e5a26a 100644 --- a/app/src/main/java/com/fenghoo/seven/main/Fragment/MoFragment.java +++ b/app/src/main/java/com/fenghoo/seven/main/my/fragment/MoFragment.java @@ -1,4 +1,4 @@ -package com.fenghoo.seven.main.Fragment; +package com.fenghoo.seven.main.my.fragment; import android.annotation.SuppressLint; import android.os.Bundle; @@ -14,7 +14,7 @@ import android.widget.TextView; import com.chad.library.adapter.base.BaseQuickAdapter; import com.fenghoo.seven.R; import com.fenghoo.seven.base.BaseFragment; -import com.fenghoo.seven.main.entity.Savaselect; +import com.fenghoo.seven.main.my.entity.Savaselect; import java.util.List; diff --git a/app/src/main/java/com/fenghoo/seven/main/Fragment/XikeInfoFragment.java b/app/src/main/java/com/fenghoo/seven/main/my/fragment/XikeInfoFragment.java similarity index 64% rename from app/src/main/java/com/fenghoo/seven/main/Fragment/XikeInfoFragment.java rename to app/src/main/java/com/fenghoo/seven/main/my/fragment/XikeInfoFragment.java index b103f6e..a2b2a4b 100644 --- a/app/src/main/java/com/fenghoo/seven/main/Fragment/XikeInfoFragment.java +++ b/app/src/main/java/com/fenghoo/seven/main/my/fragment/XikeInfoFragment.java @@ -1,4 +1,4 @@ -package com.fenghoo.seven.main.Fragment; +package com.fenghoo.seven.main.my.fragment; import android.annotation.SuppressLint; import android.util.Log; @@ -6,13 +6,9 @@ import android.view.View; import android.view.ViewGroup; import android.widget.TextView; -import com.fenghoo.seven.JsonUtils; import com.fenghoo.seven.R; -import com.fenghoo.seven.main.adapter.mine.XikeInfoAdapter; -import com.fenghoo.seven.main.entity.XikeInfoBean; -import com.fenghoo.seven.okgonet.NetApi; -import com.fenghoo.seven.okgonet.Observer; -import com.lzy.okgo.model.Response; +import com.fenghoo.seven.main.my.adapter.XikeInfoAdapter; +import com.fenghoo.seven.main.my.entity.XikeInfoBean; import java.util.ArrayList; import java.util.List; @@ -98,53 +94,6 @@ public class XikeInfoFragment extends MoFragment { @Override public void requestData() { -// new NetApi().xikeInfo("b886798bdce09746a787651013f2c6e6").subscribe(new Observer() { -// @Override -// public void onNext(Response response) { -// String body = (String) response.body(); -// XikeInfoBean.ResultBean esdv = JsonUtils.fromJson(body, XikeInfoBean.class).getResult(); -// mSwl.setRefreshing(false); -// if (esdv != null && String.valueOf(esdv.getSuccess()).equals("0")) { -// xike = esdv.getXike(); -// // WidgetTools.setTextfive(xike_01, "", xike); -// // List data = esdv.getData(); -// -// -// List data = new ArrayList(); -// for (int i = 0; i < 20; i++) -// { -// XikeInfoBean.ResultBean.DataBean dataBean = new XikeInfoBean.ResultBean.DataBean(); -// dataBean.setTime("2020-07-01 12:00:00"); -// dataBean.setXike_num("+89.00"); -// dataBean.setXike_remark("收益账户转入"); -// data.add(dataBean); -// } -// -// if (data.size() == 0) { -// //markingtwoAdapter.setEmptyView(notDataView); -// return; -// } -// if (mNextRequestPage == 1) { -// setData(true, data); -// } else { -// setData(false, data); -// } -// } else { -// setData(true, null); -// markingtwoAdapter.setEmptyView(notDataView); -// mSwl.setRefreshing(false); -// } -// -// } -// -// @Override -// public void onError(Exception e) { -// e.printStackTrace(); -// markingtwoAdapter.setEmptyView(errorView); -// mSwl.setRefreshing(false); -// } -// }); - List data = new ArrayList(); for (int i = 0; i < 20; i++) { @@ -154,9 +103,7 @@ public class XikeInfoFragment extends MoFragment { dataBean.setXike_remark("收益账户转入"); data.add(dataBean); } - if (data.size() == 0) { - //markingtwoAdapter.setEmptyView(notDataView); return; } if (mNextRequestPage == 1) { diff --git a/app/src/main/java/com/fenghoo/seven/main/Fragment/mvp/contract/MyContract.java b/app/src/main/java/com/fenghoo/seven/main/my/fragment/mvp/contract/MyContract.java similarity index 93% rename from app/src/main/java/com/fenghoo/seven/main/Fragment/mvp/contract/MyContract.java rename to app/src/main/java/com/fenghoo/seven/main/my/fragment/mvp/contract/MyContract.java index 4a49e4f..8d5dae2 100644 --- a/app/src/main/java/com/fenghoo/seven/main/Fragment/mvp/contract/MyContract.java +++ b/app/src/main/java/com/fenghoo/seven/main/my/fragment/mvp/contract/MyContract.java @@ -1,4 +1,4 @@ -package com.fenghoo.seven.main.Fragment.mvp.contract; +package com.fenghoo.seven.main.my.fragment.mvp.contract; import com.fenghoo.seven.base.BaseTreeView; import com.fenghoo.seven.main.my.entity.loginInfoBean; diff --git a/app/src/main/java/com/fenghoo/seven/main/Fragment/mvp/model/MyModelImpl.java b/app/src/main/java/com/fenghoo/seven/main/my/fragment/mvp/model/MyModelImpl.java similarity index 92% rename from app/src/main/java/com/fenghoo/seven/main/Fragment/mvp/model/MyModelImpl.java rename to app/src/main/java/com/fenghoo/seven/main/my/fragment/mvp/model/MyModelImpl.java index 87c05ce..c3c8031 100644 --- a/app/src/main/java/com/fenghoo/seven/main/Fragment/mvp/model/MyModelImpl.java +++ b/app/src/main/java/com/fenghoo/seven/main/my/fragment/mvp/model/MyModelImpl.java @@ -1,6 +1,6 @@ -package com.fenghoo.seven.main.Fragment.mvp.model; +package com.fenghoo.seven.main.my.fragment.mvp.model; -import com.fenghoo.seven.main.Fragment.mvp.contract.MyContract; +import com.fenghoo.seven.main.my.fragment.mvp.contract.MyContract; import com.fenghoo.seven.main.my.entity.loginInfoBean; import com.fenghoo.seven.network.ApiCallBack; import com.fenghoo.seven.network.http.ApiUtils; diff --git a/app/src/main/java/com/fenghoo/seven/main/Fragment/mvp/presenter/MyPresenterImpl.java b/app/src/main/java/com/fenghoo/seven/main/my/fragment/mvp/presenter/MyPresenterImpl.java similarity index 85% rename from app/src/main/java/com/fenghoo/seven/main/Fragment/mvp/presenter/MyPresenterImpl.java rename to app/src/main/java/com/fenghoo/seven/main/my/fragment/mvp/presenter/MyPresenterImpl.java index 859e9a6..488d5de 100644 --- a/app/src/main/java/com/fenghoo/seven/main/Fragment/mvp/presenter/MyPresenterImpl.java +++ b/app/src/main/java/com/fenghoo/seven/main/my/fragment/mvp/presenter/MyPresenterImpl.java @@ -1,7 +1,7 @@ -package com.fenghoo.seven.main.Fragment.mvp.presenter; +package com.fenghoo.seven.main.my.fragment.mvp.presenter; -import com.fenghoo.seven.main.Fragment.mvp.contract.MyContract; -import com.fenghoo.seven.main.Fragment.mvp.model.MyModelImpl; +import com.fenghoo.seven.main.my.fragment.mvp.contract.MyContract; +import com.fenghoo.seven.main.my.fragment.mvp.model.MyModelImpl; import com.fenghoo.seven.main.my.entity.loginInfoBean; import com.fenghoo.seven.network.ApiCallBack; import com.hannesdorfmann.mosby3.mvp.MvpBasePresenter; diff --git a/app/src/main/java/com/fenghoo/seven/network/WeChatApi.java b/app/src/main/java/com/fenghoo/seven/network/WeChatApi.java index 6faad22..641358e 100644 --- a/app/src/main/java/com/fenghoo/seven/network/WeChatApi.java +++ b/app/src/main/java/com/fenghoo/seven/network/WeChatApi.java @@ -1,7 +1,7 @@ package com.fenghoo.seven.network; -import com.fenghoo.seven.main.entity.mine.WeChatLoginEntity; -import com.fenghoo.seven.main.entity.mine.WeChatLoginResultEntity; +import com.fenghoo.seven.main.my.entity.WeChatLoginEntity; +import com.fenghoo.seven.main.my.entity.WeChatLoginResultEntity; import io.reactivex.Observable; import retrofit2.http.GET; diff --git a/app/src/main/java/com/fenghoo/seven/okgonet/HttpConstants.java b/app/src/main/java/com/fenghoo/seven/okgonet/HttpConstants.java index c732702..3ace43a 100644 --- a/app/src/main/java/com/fenghoo/seven/okgonet/HttpConstants.java +++ b/app/src/main/java/com/fenghoo/seven/okgonet/HttpConstants.java @@ -20,11 +20,6 @@ public class HttpConstants { * 七月七 */ - /** - * 惜客指数详情 - */ - public static String URi_device_DevPerManager_xikeInfo = URiBase + "/device/DevPerManager/xikeInfo"; - /** * 分配列表 */ @@ -49,11 +44,6 @@ public class HttpConstants { */ public static String URi_device_AppCustomer_customerDetail = URiBase + "/device/AppCustomer/customerDetail"; - /** - * 确认分配 - */ - public static String URi_device_AppCustomer_sureFP = URiBase + "/device/AppCustomer/sureFP"; - /** * 行业 */ diff --git a/app/src/main/java/com/fenghoo/seven/okgonet/NetApi.java b/app/src/main/java/com/fenghoo/seven/okgonet/NetApi.java index e37f316..1673a4d 100644 --- a/app/src/main/java/com/fenghoo/seven/okgonet/NetApi.java +++ b/app/src/main/java/com/fenghoo/seven/okgonet/NetApi.java @@ -15,9 +15,6 @@ import io.reactivex.schedulers.Schedulers; public class NetApi { -// final HttpParams paramsPost = new HttpParams(); -// paramsPost.put("customer_id", customer_id); -// paramsPost.put("industry_id", industry_id); /** * @description 简单的封装OkGo */ @@ -60,315 +57,6 @@ public class NetApi { } - /** - * 惜客指数详情 - */ - public Observable xikeInfo(final String uid) { - - return new Observable() { - @Override - public void subscribe(final Observer observer) { - - OkGo.post(HttpConstants.URi_device_DevPerManager_xikeInfo)// - .params("uid", uid) - .converter(new StringConvert())// - .cacheMode(CacheMode.NO_CACHE) //无缓存模式 CacheMode.NO_CACHE - .adapt(new ObservableResponse())// - .subscribeOn(Schedulers.io())// - .observeOn(AndroidSchedulers.mainThread())// - .subscribe(new io.reactivex.Observer>() { - - @Override - public void onSubscribe(@NonNull Disposable d) { - // addDisposable(d); - } - - @Override - public void onNext(@NonNull Response response) { - observer.onNext(response); - } - - @Override - public void onError(@NonNull Throwable e) { - e.printStackTrace(); - - } - - @Override - public void onComplete() { - - } - }); - } - }; - - } - - - /** - * 客户列表 - */ - public Observable customerList(final String uid, final String search) { - - return new Observable() { - @Override - public void subscribe(final Observer observer) { - - OkGo.post(HttpConstants.URi_device_AppCustomer_customerList)// - .params("uid", uid) - .params("search", search) - .converter(new StringConvert())// - .cacheMode(CacheMode.NO_CACHE) //无缓存模式 CacheMode.NO_CACHE - .adapt(new ObservableResponse())// - .subscribeOn(Schedulers.io())// - .observeOn(AndroidSchedulers.mainThread())// - .subscribe(new io.reactivex.Observer>() { - - @Override - public void onSubscribe(@NonNull Disposable d) { - // addDisposable(d); - } - - @Override - public void onNext(@NonNull Response response) { - observer.onNext(response); - } - - @Override - public void onError(@NonNull Throwable e) { - e.printStackTrace(); - - } - - @Override - public void onComplete() { - - } - }); - } - }; - - } - - /** - * 客户分配 - */ - public Observable customerFPList(final String uid) { - - return new Observable() { - @Override - public void subscribe(final Observer observer) { - - OkGo.post(HttpConstants.URi_device_AppCustomer_customerFPList)// - .params("uid", uid) - .converter(new StringConvert())// - .cacheMode(CacheMode.NO_CACHE) //无缓存模式 CacheMode.NO_CACHE - .adapt(new ObservableResponse())// - .subscribeOn(Schedulers.io())// - .observeOn(AndroidSchedulers.mainThread())// - .subscribe(new io.reactivex.Observer>() { - - @Override - public void onSubscribe(@NonNull Disposable d) { - // addDisposable(d); - } - - @Override - public void onNext(@NonNull Response response) { - observer.onNext(response); - } - - @Override - public void onError(@NonNull Throwable e) { - e.printStackTrace(); - - } - - @Override - public void onComplete() { - - } - }); - } - }; - - } - - /** - * 客户详情 - */ - public Observable customerDetail(final String customer_id) { - - return new Observable() { - @Override - public void subscribe(final Observer observer) { - - OkGo.post(HttpConstants.URi_device_AppCustomer_customerDetail)// - .params("customer_id", customer_id) - .converter(new StringConvert())// - .cacheMode(CacheMode.NO_CACHE) //无缓存模式 CacheMode.NO_CACHE - .adapt(new ObservableResponse())// - .subscribeOn(Schedulers.io())// - .observeOn(AndroidSchedulers.mainThread())// - .subscribe(new io.reactivex.Observer>() { - - @Override - public void onSubscribe(@NonNull Disposable d) { - // addDisposable(d); - } - - @Override - public void onNext(@NonNull Response response) { - observer.onNext(response); - } - - @Override - public void onError(@NonNull Throwable e) { - e.printStackTrace(); - - } - - @Override - public void onComplete() { - - } - }); - } - }; - - } - - /** - * 确认分配device/AppCustomer/sureFP - */ - public Observable sureFP(final String uid, final String content) { - - return new Observable() { - @Override - public void subscribe(final Observer observer) { - - OkGo.post(HttpConstants.URi_device_AppCustomer_sureFP)// - .params("uid", uid) - .params("content", content) - .converter(new StringConvert())// - .cacheMode(CacheMode.NO_CACHE) //无缓存模式 CacheMode.NO_CACHE - .adapt(new ObservableResponse())// - .subscribeOn(Schedulers.io())// - .observeOn(AndroidSchedulers.mainThread())// - .subscribe(new io.reactivex.Observer>() { - - @Override - public void onSubscribe(@NonNull Disposable d) { - // addDisposable(d); - } - - @Override - public void onNext(@NonNull Response response) { - observer.onNext(response); - } - - @Override - public void onError(@NonNull Throwable e) { - e.printStackTrace(); - - } - - @Override - public void onComplete() { - - } - }); - } - }; - - } - - - /** - * 行业 - */ - public Observable industry() { - - return new Observable() { - @Override - public void subscribe(final Observer observer) { - - OkGo.post(HttpConstants.URi_device_AppCustomer_industry)// - .converter(new StringConvert())// - .cacheMode(CacheMode.NO_CACHE) //无缓存模式 CacheMode.NO_CACHE - .adapt(new ObservableResponse())// - .subscribeOn(Schedulers.io())// - .observeOn(AndroidSchedulers.mainThread())// - .subscribe(new io.reactivex.Observer>() { - - @Override - public void onSubscribe(@NonNull Disposable d) { - // addDisposable(d); - } - - @Override - public void onNext(@NonNull Response response) { - observer.onNext(response); - } - - @Override - public void onError(@NonNull Throwable e) { - e.printStackTrace(); - - } - - @Override - public void onComplete() { - - } - }); - } - }; - - } - - /** - * style - */ - public Observable style() { - - return new Observable() { - @Override - public void subscribe(final Observer observer) { - - OkGo.post(HttpConstants.URi_device_AppCustomer_style) - .converter(new StringConvert())// - .cacheMode(CacheMode.NO_CACHE) //无缓存模式 CacheMode.NO_CACHE - .adapt(new ObservableResponse())// - .subscribeOn(Schedulers.io())// - .observeOn(AndroidSchedulers.mainThread())// - .subscribe(new io.reactivex.Observer>() { - - @Override - public void onSubscribe(@NonNull Disposable d) { - // addDisposable(d); - } - - @Override - public void onNext(@NonNull Response response) { - observer.onNext(response); - } - - @Override - public void onError(@NonNull Throwable e) { - e.printStackTrace(); - - } - - @Override - public void onComplete() { - - } - }); - } - }; - - } public Observable addCustomer(final String uid, final String headimg, final String name, final String phone, final String wechat, final String address, final String decoration, final String style_id, final String budget, final String source, final String customer_id) { diff --git a/app/src/main/java/com/fenghoo/seven/wxapi/WXEntryActivity.java b/app/src/main/java/com/fenghoo/seven/wxapi/WXEntryActivity.java index d0b304a..14ffb0e 100644 --- a/app/src/main/java/com/fenghoo/seven/wxapi/WXEntryActivity.java +++ b/app/src/main/java/com/fenghoo/seven/wxapi/WXEntryActivity.java @@ -13,8 +13,8 @@ import android.os.Bundle; import android.widget.Toast; import com.fenghoo.seven.main.my.entity.loginInfoBean; -import com.fenghoo.seven.main.entity.mine.WeChatLoginEntity; -import com.fenghoo.seven.main.entity.mine.WeChatLoginResultEntity; +import com.fenghoo.seven.main.my.entity.WeChatLoginEntity; +import com.fenghoo.seven.main.my.entity.WeChatLoginResultEntity; import com.fenghoo.seven.network.ApiUtils; import com.fenghoo.seven.network.LifeTreeAPIException; import com.fenghoo.seven.network.http.ResponseBean; diff --git a/app/src/main/res/layout/activity_fp_order_info.xml b/app/src/main/res/layout/activity_fp_order_info.xml deleted file mode 100644 index 9c5d1a0..0000000 --- a/app/src/main/res/layout/activity_fp_order_info.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - diff --git a/app/src/main/res/layout/item_base_dialog.xml b/app/src/main/res/layout/item_base_dialog.xml index ca24846..f1295e2 100644 --- a/app/src/main/res/layout/item_base_dialog.xml +++ b/app/src/main/res/layout/item_base_dialog.xml @@ -13,7 +13,7 @@ @@ -35,6 +35,7 @@ android:layout_height="wrap_content" android:layout_gravity="center_horizontal" android:layout_marginTop="15dp" + android:layout_marginBottom="15dp" android:layout_marginLeft="20dp" android:gravity="center" android:autoLink = "web" diff --git a/app/src/main/res/layout/widget_title_bar.xml b/app/src/main/res/layout/widget_title_bar.xml index 176953f..ab66953 100644 --- a/app/src/main/res/layout/widget_title_bar.xml +++ b/app/src/main/res/layout/widget_title_bar.xml @@ -25,7 +25,7 @@ android:ellipsize="end" android:gravity="center" android:lines="1" - android:maxLength="11" + android:maxLength="20" android:textColor="@color/colorBlack" android:textSize="18sp" tools:text="标题"/>