diff --git a/app/build.gradle b/app/build.gradle index 28c2a4b..a21e0cf 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -96,4 +96,5 @@ dependencies { // api 'com.airbnb.android:lottie:1.0.1' implementation 'com.airbnb.android:lottie:3.4.0' + implementation 'com.github.paradoxie:AutoVerticalTextview:0.1' } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 8ebb170..4c48d65 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -10,8 +10,7 @@ - - + @@ -34,8 +33,6 @@ - - !--声明SD卡读写权限--> @@ -48,14 +45,14 @@ android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/AppTheme"> - + + - - + - + android:theme="@style/DefaultCityPickerTheme"> - + android:screenOrientation="portrait"> - - + + - - + + android:resource="@xml/file_paths_public" /> + \ No newline at end of file diff --git a/app/src/main/java/com/fenghoo/seven/main/find/ui/PrivateletterFragment.java b/app/src/main/java/com/fenghoo/seven/main/find/ui/PrivateletterFragment.java index ce9f021..37330ec 100644 --- a/app/src/main/java/com/fenghoo/seven/main/find/ui/PrivateletterFragment.java +++ b/app/src/main/java/com/fenghoo/seven/main/find/ui/PrivateletterFragment.java @@ -98,6 +98,7 @@ public class PrivateletterFragment extends MobanFragment { FrameLayout mFrameLayout = (FrameLayout)parent; if(mFrameLayout!=null){ mFrameLayout.removeView(notDataView);} + setData(true, null); markingtwoAdapter.setEmptyView(notDataView); return; } 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 fd8cc40..e8f2084 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 @@ -37,16 +37,18 @@ public class CustomerFragment extends MobanFragment { private static int mSerial = 0; private int mTabPos = 0; - public String search=""; + public String search = ""; public CustomerFragment(int serial) { super(); mSerial = serial; EventBus.getDefault().register(this); } + public void setTabPos(int mTabPos) { this.mTabPos = mTabPos; } + @Override public void initAdapter() { mMarkingFragmentRecyclerView.setLayoutManager(new LinearLayoutManager(getActivity())); @@ -83,7 +85,7 @@ public class CustomerFragment extends MobanFragment { @Override public void uploadAvatar() { //进入添加客户和完善信息 - ShowAty.AddCustomerActivity(getActivity(),item,search,""); + ShowAty.AddCustomerActivity(getActivity(), item, search, ""); } }).show(); @@ -92,7 +94,7 @@ public class CustomerFragment extends MobanFragment { @Override public void enterCusDetail(CustomerListBean.ResultBean.DataBean item) { //进入客户详情 - ShowAty.CustomerDetailActivity(getActivity(),item); + ShowAty.CustomerDetailActivity(getActivity(), item); } }); } @@ -126,27 +128,28 @@ public class CustomerFragment extends MobanFragment { } }); } + /** - * @description 重写下拉刷新方法，让刷新全部数据 * @param * @return + * @description 重写下拉刷新方法，让刷新全部数据 */ public void initRefreshLayout() { mSwl.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() { @Override public void onRefresh() { - search=""; + search = ""; refresh(); } }); } public void onEvent(ThreeEvent event) { - if (null != event ) { + if (null != event) { String pagetype = event.getPagetype(); - Log.e("刷新页面==",pagetype); - Log.d("客户调拨--","刷新列表页面"); - if(pagetype.equals("0")){ + Log.e("刷新页面==", pagetype); + Log.d("客户调拨--", "刷新列表页面"); + if (pagetype.equals("0")) { search = event.getSearch(); newrefresh(); } @@ -157,7 +160,7 @@ public class CustomerFragment extends MobanFragment { public void requestData() { final HttpParams paramsPost = new HttpParams(); String uuid = ProfileSpUtils.getInstance().getUserProfie().getData().getUuid(); - Log.e("uuid==",uuid); + Log.e("uuid==", uuid); paramsPost.put("uid", ProfileSpUtils.getInstance().getUserProfie().getData().getUuid()); paramsPost.put("search", search); new NetApi().getPostData(paramsPost, HttpConstants.URi_device_AppCustomer_customerList).subscribe(new Observer() { @@ -171,9 +174,11 @@ public class CustomerFragment extends MobanFragment { if (mNextRequestPage == 1) { if (data.size() == 0) { ViewParent parent = notDataView.getParent(); - FrameLayout mFrameLayout = (FrameLayout)parent; - if(mFrameLayout!=null){ - mFrameLayout.removeView(notDataView);} + FrameLayout mFrameLayout = (FrameLayout) parent; + if (mFrameLayout != null) { + mFrameLayout.removeView(notDataView); + } + setData(true, null); markingtwoAdapter.setEmptyView(notDataView); return; } @@ -187,6 +192,7 @@ public class CustomerFragment extends MobanFragment { mSwl.setRefreshing(false); } } + @Override public void onError(Exception e) { e.printStackTrace(); @@ -196,17 +202,18 @@ public class CustomerFragment extends MobanFragment { }); } + @Override public void onDestroy() { super.onDestroy(); } /** - * @description 删除客户 * @param * @return + * @description 删除客户 */ - private void deleteCus(String customer_id){ + private void deleteCus(String customer_id) { final HttpParams paramsPost = new HttpParams(); paramsPost.put("uid", ProfileSpUtils.getInstance().getUserProfie().getData().getUuid()); paramsPost.put("customer_id", customer_id); @@ -215,12 +222,13 @@ public class CustomerFragment extends MobanFragment { public void onNext(Response response) { String body = (String) response.body(); BaseBean.ResultBean result = JsonUtils.fromJson(body, BaseBean.class).getResult(); - if(result.getSuccess()==0){ + if (result.getSuccess() == 0) { newrefresh(); - }else { - ToastUtils.showToast(getActivity(),result.getMsg()); + } else { + ToastUtils.showToast(getActivity(), result.getMsg()); } } + @Override public void onError(Exception e) { e.printStackTrace(); 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 6b5479a..44f5287 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 @@ -33,14 +33,17 @@ public class DealFragment extends MobanFragment { private static int mSerial = 0; private int mTabPos = 0; private String search; + public DealFragment(int serial) { super(); mSerial = serial; EventBus.getDefault().register(this); } + public void setTabPos(int mTabPos) { this.mTabPos = mTabPos; } + @Override public void initAdapter() { mMarkingFragmentRecyclerView.setLayoutManager(new LinearLayoutManager(getActivity())); @@ -59,7 +62,7 @@ public class DealFragment extends MobanFragment { List industry = item.getIndustry(); IndustryBeantwo industryBean = new IndustryBeantwo(); List dataBeans = new ArrayList<>(); - for(int i=0;i industry = item.getIndustry(); IndustryBeantwo industryBean = new IndustryBeantwo(); List dataBeans = new ArrayList<>(); - for(int i=0;i() { @Override public void onNext(Response response) { @@ -111,9 +116,11 @@ public class DistriFragment extends MobanFragment { if (mNextRequestPage == 1) { if (data.size() == 0) { ViewParent parent = notDataView.getParent(); - FrameLayout mFrameLayout = (FrameLayout)parent; - if(mFrameLayout!=null){ - mFrameLayout.removeView(notDataView);} + FrameLayout mFrameLayout = (FrameLayout) parent; + if (mFrameLayout != null) { + mFrameLayout.removeView(notDataView); + } + setData(true, null); markingtwoAdapter.setEmptyView(notDataView); return; } @@ -127,6 +134,7 @@ public class DistriFragment extends MobanFragment { mSwl.setRefreshing(false); } } + @Override public void onError(Exception e) { e.printStackTrace(); 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 39ec79c..bbce901 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,6 +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.find.ConversationActivity; +import com.fenghoo.seven.main.my.activity.DemoActivity; 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; @@ -16,6 +18,7 @@ import com.fenghoo.seven.main.activity.Main2Activity; import com.fenghoo.seven.main.my.activity.PersonalProfileActivity; import com.fenghoo.seven.main.my.entity.loginInfoBean; import com.fenghoo.seven.utils.GlideTools; +import com.fenghoo.seven.utils.JumpUtils; import com.fenghoo.seven.utils.ToastUtils; import com.fenghoo.seven.utils.ToolsUtils; import com.fenghoo.seven.utils.checkVersionsUtils.ProfileSpUtils; @@ -98,20 +101,20 @@ public class MyFragment view.findViewById(R.id.lay_out).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - - 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(), DemoActivity.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() { +// +// } +// }); } }); } diff --git a/app/src/main/java/com/fenghoo/seven/main/my/activity/DemoActivity.java b/app/src/main/java/com/fenghoo/seven/main/my/activity/DemoActivity.java new file mode 100644 index 0000000..df98cb8 --- /dev/null +++ b/app/src/main/java/com/fenghoo/seven/main/my/activity/DemoActivity.java @@ -0,0 +1,60 @@ +package com.fenghoo.seven.main.my.activity; + +import android.os.Bundle; + +import com.fenghoo.seven.R; + +import java.util.ArrayList; +import java.util.concurrent.Executors; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.TimeUnit; + +import androidx.appcompat.app.AppCompatActivity; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +public class DemoActivity extends AppCompatActivity { + private RvAdapterPrizeInfo adapter; + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_demo); + initView(); + } + + private void initView() { + + RecyclerView recyclerView = (RecyclerView) findViewById(R.id.rv_prize_info); + recyclerView.setLayoutManager(new LinearLayoutManager(this)); + recyclerView.setHasFixedSize(true); + + ArrayList strings = new ArrayList<>(); +// for (int i=0; i<10; i++) { +// +// strings.add("客户李**已在西安开单成交 13:48:19"); +// } + strings.add("1客户李**已在西安开单成交 13:48:19"); + strings.add("2客户李**已在西安开单成交 13:48:19"); + strings.add("3客户李**已在西安开单成交 13:48:19"); + strings.add("4客户李**已在西安开单成交 13:48:19"); + strings.add("5客户李**已在西安开单成交 13:48:19"); + strings.add("6客户李**已在西安开单成交 13:48:19"); + strings.add("7客户李**已在西安开单成交 13:48:19"); + strings.add("8客户李**已在西安开单成交 13:48:19"); + strings.add("9客户李**已在西安开单成交 13:48:19"); + strings.add("10客户李**已在西安开单成交 13:48:19"); + + adapter = new RvAdapterPrizeInfo(this); + recyclerView.setAdapter(adapter); + adapter.setList(strings); + + ScheduledExecutorService ses = Executors.newSingleThreadScheduledExecutor(); + ses.scheduleAtFixedRate(new Runnable() { + @Override + public void run() { + + adapter.updateList(); + } + }, 2000, 2000, TimeUnit.MILLISECONDS); + } +} \ No newline at end of file diff --git a/app/src/main/java/com/fenghoo/seven/main/my/activity/RvAdapterPrizeInfo.java b/app/src/main/java/com/fenghoo/seven/main/my/activity/RvAdapterPrizeInfo.java new file mode 100644 index 0000000..8705f3a --- /dev/null +++ b/app/src/main/java/com/fenghoo/seven/main/my/activity/RvAdapterPrizeInfo.java @@ -0,0 +1,79 @@ +package com.fenghoo.seven.main.my.activity; + + +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +import com.fenghoo.seven.R; + +import java.util.ArrayList; + +import androidx.recyclerview.widget.RecyclerView; + +/** + * Time: 2020/9/14 + * Author: jianbo + * Description: + */ +class RvAdapterPrizeInfo extends RecyclerView.Adapter { + + private Context mContext; + private ArrayList prizeList = new ArrayList<>(); + + public RvAdapterPrizeInfo(Context context) { + + this.mContext = context; + } + + public void setList(ArrayList list) { + + if (list != null && !list.isEmpty()) { + + this.prizeList = list; + notifyDataSetChanged(); + } + } + + public void updateList() { + + if (!prizeList.isEmpty()) { + + prizeList.add(prizeList.get(0)); + prizeList.remove(0); + notifyItemRangeRemoved(0, 1); + } + } + + @Override + public PrizeInfoViewHolder onCreateViewHolder(ViewGroup viewGroup, int i) { + + View view = LayoutInflater.from(viewGroup.getContext()) + .inflate(R.layout.item_prize_info, viewGroup, false); + return new PrizeInfoViewHolder(view); + } + + @Override + public void onBindViewHolder(PrizeInfoViewHolder holder, int i) { + + String info = prizeList.get(i); + holder.tv.setText(info); + + } + + @Override + public int getItemCount() { + return 3; + } + + class PrizeInfoViewHolder extends RecyclerView.ViewHolder{ + + private TextView tv; + PrizeInfoViewHolder(View itemView) { + super(itemView); + tv = (TextView) itemView.findViewById(R.id.tv_prize_info); + } + } +} diff --git a/app/src/main/res/layout/activity_demo.xml b/app/src/main/res/layout/activity_demo.xml new file mode 100644 index 0000000..af2bf84 --- /dev/null +++ b/app/src/main/res/layout/activity_demo.xml @@ -0,0 +1,12 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_prize_info.xml b/app/src/main/res/layout/item_prize_info.xml new file mode 100644 index 0000000..313b65b --- /dev/null +++ b/app/src/main/res/layout/item_prize_info.xml @@ -0,0 +1,16 @@ + + + + + + \ No newline at end of file