diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 774580f..947daa9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -45,7 +45,8 @@ android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/AppTheme"> - + + diff --git a/app/src/main/java/com/fenghoo/seven/main/find/ui/FindFragmenttwo.java b/app/src/main/java/com/fenghoo/seven/main/find/ui/FindFragmenttwo.java index ee16d05..d96e654 100644 --- a/app/src/main/java/com/fenghoo/seven/main/find/ui/FindFragmenttwo.java +++ b/app/src/main/java/com/fenghoo/seven/main/find/ui/FindFragmenttwo.java @@ -1,5 +1,6 @@ package com.fenghoo.seven.main.find.ui; +import com.chad.library.adapter.base.BaseQuickAdapter; import com.fenghoo.seven.utils.JsonUtils; import com.fenghoo.seven.main.find.ConversationActivity; import com.fenghoo.seven.main.find.adapter.PrivateletAdapter; @@ -33,6 +34,12 @@ public class FindFragmenttwo extends MobanFragment { mMarkingFragmentRecyclerView.setLayoutManager(new LinearLayoutManager(getActivity())); PrivateletAdapter privateletAdapter = new PrivateletAdapter(mContext, null); getAdpter(privateletAdapter); + markingtwoAdapter.setOnLoadMoreListener(new BaseQuickAdapter.RequestLoadMoreListener() { + @Override + public void onLoadMoreRequested() { + loadMore(); + } + }); mMarkingFragmentRecyclerView.setAdapter(privateletAdapter); privateletAdapter.operationListenner(new PrivateletAdapter.OnViewClickListener() { @Override 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 5000ac6..3a4ae14 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 @@ -18,6 +18,7 @@ import com.fenghoo.seven.main.activity.Main2Activity; import com.fenghoo.seven.main.my.activity.ListActivity; import com.fenghoo.seven.main.my.activity.MainsdfdsfActivity; import com.fenghoo.seven.main.my.activity.PersonalProfileActivity; +import com.fenghoo.seven.main.my.activity.TwoWayActivity; import com.fenghoo.seven.main.my.entity.loginInfoBean; import com.fenghoo.seven.main.my.fragment.mvp.contract.MyContract; import com.fenghoo.seven.main.my.fragment.mvp.presenter.MyPresenterImpl; @@ -107,20 +108,22 @@ public class MyFragment public void onClick(View v) { // JumpUtils.gotoActivity(getActivity(), DemoActivity.class, false, "", ""); // JumpUtils.gotoActivity(getActivity(), MainsdfdsfActivity.class, false, "", ""); - JumpUtils.gotoActivity(getActivity(), ListActivity.class, false, "", ""); -// new BaseTipsDialog().showDownloadDialog(getActivity(), "确认要退出登录吗？", "确定", new BaseTipsDialog.ClickListener() { -// @Override -// public void confirm() { -// ProfileSpUtils.getInstance().saveLoginSatus(false); -// Intent intent = new Intent(getActivity(), LoginPasswordActivity.class).setFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NEW_TASK); -// startActivity(intent); -// } -// -// @Override -// public void cancle() { -// -// } -// }); + // JumpUtils.gotoActivity(getActivity(), ListActivity.class, false, "", ""); + //双向绑定 + // JumpUtils.gotoActivity(getActivity(), TwoWayActivity.class, false, "", ""); + new BaseTipsDialog().showDownloadDialog(getActivity(), "确认要退出登录吗？", "确定", new BaseTipsDialog.ClickListener() { + @Override + public void confirm() { + ProfileSpUtils.getInstance().saveLoginSatus(false); + Intent intent = new Intent(getActivity(), LoginPasswordActivity.class).setFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NEW_TASK); + startActivity(intent); + } + + @Override + public void cancle() { + + } + }); //1、初始化Dialog diff --git a/app/src/main/java/com/fenghoo/seven/main/my/activity/FormModel.java b/app/src/main/java/com/fenghoo/seven/main/my/activity/FormModel.java new file mode 100644 index 0000000..fc5ee34 --- /dev/null +++ b/app/src/main/java/com/fenghoo/seven/main/my/activity/FormModel.java @@ -0,0 +1,42 @@ +package com.fenghoo.seven.main.my.activity; + +import com.fenghoo.seven.BR; + +import androidx.databinding.BaseObservable; +import androidx.databinding.Bindable; + +/** + * Time: 2020/9/25 + * Author: jianbo + * Description: + */ +public class FormModel extends BaseObservable { + private String mName; + private String mPassword; + + + public FormModel(String name, String password) { + this.mName = name; + this.mPassword = password; + } + @Bindable + public String getName() { + return mName; + } + + + public void setName(String name) { + this.mName = name; + notifyPropertyChanged(BR.name); + } + + @Bindable + public String getPassword() { + return mPassword; + } + + public void setPassword(String password) { + this.mPassword = password; + notifyPropertyChanged(BR.password); + } +} diff --git a/app/src/main/java/com/fenghoo/seven/main/my/activity/ListActivity.java b/app/src/main/java/com/fenghoo/seven/main/my/activity/ListActivity.java index 22199ab..f291476 100644 --- a/app/src/main/java/com/fenghoo/seven/main/my/activity/ListActivity.java +++ b/app/src/main/java/com/fenghoo/seven/main/my/activity/ListActivity.java @@ -7,10 +7,18 @@ import com.fenghoo.seven.R; import com.fenghoo.seven.base.BaseActivity; import com.fenghoo.seven.databinding.ActivityListBinding; import com.fenghoo.seven.main.my.adapter.EmtemsAdapter; +import com.fenghoo.seven.main.my.entity.Emtems; import com.fenghoo.seven.main.my.entity.FastOrderDetailBean; +import com.fenghoo.seven.okgonet.HttpConstants; +import com.fenghoo.seven.okgonet.NetApi; +import com.fenghoo.seven.okgonet.Observer; import com.fenghoo.seven.utils.GetJsonDataUtil; +import com.fenghoo.seven.utils.JsonUtils; import com.fenghoo.seven.utils.ToastUtils; +import com.fenghoo.seven.utils.checkVersionsUtils.ProfileSpUtils; import com.google.gson.Gson; +import com.lzy.okgo.model.HttpParams; +import com.lzy.okgo.model.Response; import androidx.databinding.DataBindingUtil; import androidx.recyclerview.widget.LinearLayoutManager; @@ -18,6 +26,7 @@ import androidx.recyclerview.widget.LinearLayoutManager; public class ListActivity extends BaseActivity { ActivityListBinding mBinding; private EmtemsAdapter emtemsAdapter; + private FastOrderDetailBean fastOrderDetailBean; public class Presenter { // public void onClickAddItem(View view){ @@ -33,6 +42,7 @@ public class ListActivity extends BaseActivity { */ public void onClickshenhe(View view){ ToastUtils.showToast(ListActivity.this, "提交审核"); + fastSubmitAudit(); } } @@ -68,6 +78,41 @@ public class ListActivity extends BaseActivity { requestDatad(); } + /** + * @description 快速单 -- 提交审核 + * @param + * @return + */ + public void fastSubmitAudit(){ + FastOrderDetailBean.ResultBean.DataBean.OrderBean order = fastOrderDetailBean.getResult().getData().getOrder(); + + final HttpParams paramsPost = new HttpParams(); + paramsPost.put("uid", ProfileSpUtils.getInstance().getUserProfie().getData().getUuid()); + paramsPost.put("ordernum", order.getOrdernum());//单据号 + paramsPost.put("contractnum", order.getContractnum());//合同号 + paramsPost.put("custorname", order.getCustorname());//客户姓名 + paramsPost.put("custorphone", order.getCustorphone());//客户电话 + paramsPost.put("address", order.getAddress());//小区住址 + paramsPost.put("ordertype", order.getOrdertype());//订单类型3：订单，4：全款单 + paramsPost.put("recudesum", order.getRecudesum());// 收款金额 + paramsPost.put("remark", order.getRemark());//备注 + paramsPost.put("paymentpaper", "");//上传凭证 image/png;base64,1q#0123456789#image/png;base64,2w#0123456789#image/png;base64,3e#0123456789# + paramsPost.put("visitor_id", "visitor_id");//访客id + paramsPost.put("fission_id", "fission_id");//引流报名客户id + paramsPost.put("activity_type", "activity_type");//引流类型 + new NetApi().getPostData(paramsPost, HttpConstants.URi_device_AppDouyin_comment).subscribe(new Observer() { + @Override + public void onNext(Response response) { + String body = (String) response.body(); + } + @Override + public void onError(Exception e) { + e.printStackTrace(); + } + }); + } + + public void requestDatad() { // final HttpParams paramsPost = new HttpParams(); // paramsPost.put("uid", ProfileSpUtils.getInstance().getUserProfie().getData().getUuid()); @@ -88,7 +133,7 @@ public class ListActivity extends BaseActivity { //拿到json字符串，假数据 String JsonData = new GetJsonDataUtil().getJson(ListActivity.this, "yunweixin.json");//获取assets目录下的json文件数据 Gson gson = new Gson(); - FastOrderDetailBean fastOrderDetailBean = gson.fromJson(JsonData, FastOrderDetailBean.class); + fastOrderDetailBean = gson.fromJson(JsonData, FastOrderDetailBean.class); emtemsAdapter.addAll(fastOrderDetailBean); } } \ No newline at end of file diff --git a/app/src/main/java/com/fenghoo/seven/main/my/activity/TwoWayActivity.java b/app/src/main/java/com/fenghoo/seven/main/my/activity/TwoWayActivity.java new file mode 100644 index 0000000..41a2d01 --- /dev/null +++ b/app/src/main/java/com/fenghoo/seven/main/my/activity/TwoWayActivity.java @@ -0,0 +1,24 @@ +package com.fenghoo.seven.main.my.activity; + +import androidx.appcompat.app.AppCompatActivity; +import androidx.databinding.DataBindingUtil; + +import android.os.Bundle; + +import com.fenghoo.seven.R; +import com.fenghoo.seven.databinding.ActivityTwoWayBinding; + +/** + * @description 双向绑定 + * @param + * @return + */ +public class TwoWayActivity extends AppCompatActivity { + ActivityTwoWayBinding mBinding; + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + mBinding = DataBindingUtil.setContentView(this,R.layout.activity_two_way); + mBinding.setModel(new FormModel("MARK","123456")); + } +} \ No newline at end of file diff --git a/app/src/main/res/layout/activity_two_way.xml b/app/src/main/res/layout/activity_two_way.xml new file mode 100644 index 0000000..34f3324 --- /dev/null +++ b/app/src/main/res/layout/activity_two_way.xml @@ -0,0 +1,33 @@ + + + + + + + + + +