diff --git a/app/src/main/java/com/fenghoo/seven/dialog/DishesVoBean.java b/app/src/main/java/com/fenghoo/seven/dialog/DishesVoBean.java new file mode 100644 index 0000000..ac0a352 --- /dev/null +++ b/app/src/main/java/com/fenghoo/seven/dialog/DishesVoBean.java @@ -0,0 +1,9 @@ +package com.fenghoo.seven.dialog; + +/** + * Time: 2020/9/15 + * Author: jianbo + * Description: + */ +class DishesVoBean { +} diff --git a/app/src/main/java/com/fenghoo/seven/dialog/HomeShopDialog.java b/app/src/main/java/com/fenghoo/seven/dialog/HomeShopDialog.java new file mode 100644 index 0000000..7b737b5 --- /dev/null +++ b/app/src/main/java/com/fenghoo/seven/dialog/HomeShopDialog.java @@ -0,0 +1,51 @@ +package com.fenghoo.seven.dialog; + + +import android.app.Dialog; +import android.content.Context; +import android.os.Bundle; +import android.view.View; + +import com.fenghoo.seven.R; + +import androidx.annotation.NonNull; + +/** + * Time: 2020/9/15 + * Author: jianbo + * Description: + */ +public class HomeShopDialog extends Dialog { + public HomeShopDialog(@NonNull Context context) { + super(context); + } + private Context context; + private DishesVoBean dishesVo; + private OnItemClickListener onItemClickListener; + private String strShop; + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.onItemClickListener = onItemClickListener; + } + + public HomeShopDialog(@NonNull Context context, DishesVoBean dishesVos) { + super(context); + this.context=context; + this.dishesVo=dishesVo; + } + public HomeShopDialog(@NonNull Context context, int themeResId, DishesVoBean dishesVo) { + super(context, themeResId); + this.context=context; + this.dishesVo=dishesVo; + } + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + //设置布局 + setContentView(R.layout.dialog_home_shop); + } + public interface OnItemClickListener{ + void onBtnPlusClick(View view, ShoppingCartBean data, DishesVoBean datas); + } + +} diff --git a/app/src/main/java/com/fenghoo/seven/dialog/ShoppingCartBean.java b/app/src/main/java/com/fenghoo/seven/dialog/ShoppingCartBean.java new file mode 100644 index 0000000..caed1f4 --- /dev/null +++ b/app/src/main/java/com/fenghoo/seven/dialog/ShoppingCartBean.java @@ -0,0 +1,10 @@ +package com.fenghoo.seven.dialog; + + +/** + * Time: 2020/9/15 + * Author: jianbo + * Description: + */ +class ShoppingCartBean { +} 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 d7018aa..d905c2f 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 @@ -166,30 +166,30 @@ public class AddCusFragment extends MobanFragment implements View.OnClickListene if(addCustomerBeans.size()>0){ - addCustomerBean addCustomerBean = addCustomerBeans.get(0); - Log.e("数据的个数==", addCustomerBeans.size()+""); - WidgetTools.setTextsix(textView0, "", addCustomerBean.getName()); - WidgetTools.setTextsix(textView4, "", addCustomerBean.getPhone()); - WidgetTools.setTextsix(textView6, "", addCustomerBean.getWechat()); - WidgetTools.setTextsix(textView8, "", addCustomerBean.getAddress()); - GlideTools.init(mContext).displaypic(imageView, addCustomerBean.getHeadimg(), R.mipmap.icon_default_head); - this.addCustomerBean.setHeadimg(addCustomerBean.getHeadimg()); - String decoration = addCustomerBean.getDecoration(); - switch (decoration) { - case "1": - label = addData("1","0","0"); - break; - case "2": - label = addData("0","1","0"); - break; - case "3": - label = addData("0","0","1"); - break; - } - WidgetTools.setTextsix(textView12, "", addCustomerBean.getStyle_name()); - this.addCustomerBean.setStyle_id(addCustomerBean.getStyle_id()); - WidgetTools.setTextsix(textView14, "", addCustomerBean.getBudget()); - this.addCustomerBean.setBudget(addCustomerBean.getBudget()); + addCustomerBean addCustomerBean = addCustomerBeans.get(0); + Log.e("数据的个数==", addCustomerBeans.size()+""); + WidgetTools.setTextsix(textView0, "", addCustomerBean.getName()); + WidgetTools.setTextsix(textView4, "", addCustomerBean.getPhone()); + WidgetTools.setTextsix(textView6, "", addCustomerBean.getWechat()); + WidgetTools.setTextsix(textView8, "", addCustomerBean.getAddress()); + GlideTools.init(mContext).displaypic(imageView, addCustomerBean.getHeadimg(), R.mipmap.icon_default_head); + this.addCustomerBean.setHeadimg(addCustomerBean.getHeadimg()); + String decoration = addCustomerBean.getDecoration(); + switch (decoration) { + case "1": + label = addData("1","0","0"); + break; + case "2": + label = addData("0","1","0"); + break; + case "3": + label = addData("0","0","1"); + break; + } + WidgetTools.setTextsix(textView12, "", addCustomerBean.getStyle_name()); + this.addCustomerBean.setStyle_id(addCustomerBean.getStyle_id()); + WidgetTools.setTextsix(textView14, "", addCustomerBean.getBudget()); + this.addCustomerBean.setBudget(addCustomerBean.getBudget()); } } }else { 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 44f5287..a84f3cd 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 @@ -1,6 +1,7 @@ package com.fenghoo.seven.main.kehu.fragment; import android.util.Log; +import android.view.View; import android.view.ViewParent; import android.widget.FrameLayout; 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 bbce901..04264c7 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 @@ -2,23 +2,24 @@ package com.fenghoo.seven.main.my; import android.content.Intent; +import android.view.Gravity; import android.view.View; +import android.view.Window; +import android.view.WindowManager; import android.widget.RelativeLayout; 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.dialog.HomeShopDialog; import com.fenghoo.seven.main.activity.LoginPasswordActivity; 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.main.my.fragment.mvp.contract.MyContract; +import com.fenghoo.seven.main.my.fragment.mvp.presenter.MyPresenterImpl; 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; @@ -101,20 +102,38 @@ public class MyFragment view.findViewById(R.id.lay_out).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - 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() { -// -// } -// }); + // 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() { + + } + }); + + + //1、初始化Dialog +// HomeShopDialog dialog=new HomeShopDialog(getActivity(),R.style.DialogTheme,null); +// //获取Dialogwindow对象 +// Window window=dialog.getWindow(); +// //设置弹出位置 +// window.setGravity(Gravity.BOTTOM); +// //设置动画 +// window.setWindowAnimations(R.style.dialog_menu_animStyle); +// //设置对话框大小 +// window.getDecorView().setPadding(0,0,0,0); +// WindowManager.LayoutParams layoutParams=window.getAttributes(); +// //设置宽度和高度 +// layoutParams.width= WindowManager.LayoutParams.MATCH_PARENT; +// layoutParams.height=WindowManager.LayoutParams.WRAP_CONTENT; +// //显示Dialog +// dialog.show(); } }); } diff --git a/app/src/main/res/anim/dialog_in_anim.xml b/app/src/main/res/anim/dialog_in_anim.xml new file mode 100644 index 0000000..0426808 --- /dev/null +++ b/app/src/main/res/anim/dialog_in_anim.xml @@ -0,0 +1,18 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/anim/dialog_out_anim.xml b/app/src/main/res/anim/dialog_out_anim.xml new file mode 100644 index 0000000..b3ce409 --- /dev/null +++ b/app/src/main/res/anim/dialog_out_anim.xml @@ -0,0 +1,9 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/dialog_home_shop.xml b/app/src/main/res/layout/dialog_home_shop.xml new file mode 100644 index 0000000..59a5d58 --- /dev/null +++ b/app/src/main/res/layout/dialog_home_shop.xml @@ -0,0 +1,165 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +