From 20d7acc16cabcd498e23235c13f790047c01954c Mon Sep 17 00:00:00 2001 From: 86157 <2274959664@qq.com> Date: Wed, 17 May 2023 12:54:29 +0800 Subject: [PATCH] last --- .idea/misc.xml | 7 + app/build.gradle | 19 +++ app/src/main/AndroidManifest.xml | 11 ++ .../activity/IndexActivity.java | 34 +++++ .../activity/holder/ViewHolder.java | 30 ++++ .../adapter/ShoppingcartAdapter.java | 84 ++++++++++ .../entity/OrangeShoppingcart.java | 99 ++++++++++++ .../fragment/IndexFragment.java | 47 ++++++ .../fragment/ShoppingCartFragment.java | 88 +++++++++++ .../netrequest/OkHttpClientProduct.java | 4 + .../netrequest/OkHttpMessage.java | 8 + .../orangesale_end/netrequest/OkHttpUser.java | 8 + .../example/orangesale_end/util/Constant.java | 65 ++++++++ app/src/main/res/drawable/bg_goods_num.xml | 5 + .../res/drawable/bg_increase_goods_num.xml | 7 + .../main/res/drawable/bg_reduce_goods_num.xml | 7 + app/src/main/res/drawable/bg_settlement.xml | 8 + app/src/main/res/drawable/bg_white_8.xml | 8 + app/src/main/res/drawable/button_login.xml | 8 + app/src/main/res/drawable/ic_check.xml | 10 ++ app/src/main/res/drawable/ic_checked.xml | 10 ++ app/src/main/res/layout/activity_main.xml | 6 + app/src/main/res/layout/cart_have_product.xml | 14 ++ app/src/main/res/layout/category_detail.xml | 6 + app/src/main/res/layout/content_category.xml | 6 + app/src/main/res/layout/content_index.xml | 143 ++++++++++++++++++ app/src/main/res/layout/content_nav.xml | 23 +++ app/src/main/res/layout/content_product.xml | 6 + app/src/main/res/layout/content_user.xml | 76 ++++++++++ app/src/main/res/layout/index_famous.xml | 8 + .../main/res/layout/item_review_shopping.xml | 48 ++++++ app/src/main/res/layout/user_login.xml | 25 +++ app/src/main/res/layout/user_register.xml | 27 ++++ app/src/main/res/values/colors.xml | 6 + app/src/main/res/values/strings.xml | 6 + gradle.properties | 20 +++ gradle/wrapper/gradle-wrapper.properties | 6 + second_exp.zip | Bin 0 -> 1566234 bytes settings.gradle | 4 + 39 files changed, 997 insertions(+) create mode 100644 app/src/main/java/com/example/orangesale_end/activity/holder/ViewHolder.java create mode 100644 app/src/main/java/com/example/orangesale_end/adapter/ShoppingcartAdapter.java create mode 100644 app/src/main/java/com/example/orangesale_end/entity/OrangeShoppingcart.java create mode 100644 app/src/main/java/com/example/orangesale_end/util/Constant.java create mode 100644 app/src/main/res/drawable/bg_goods_num.xml create mode 100644 app/src/main/res/drawable/bg_increase_goods_num.xml create mode 100644 app/src/main/res/drawable/bg_reduce_goods_num.xml create mode 100644 app/src/main/res/drawable/bg_settlement.xml create mode 100644 app/src/main/res/drawable/bg_white_8.xml create mode 100644 app/src/main/res/drawable/ic_check.xml create mode 100644 app/src/main/res/drawable/ic_checked.xml create mode 100644 app/src/main/res/layout/item_review_shopping.xml create mode 100644 gradle.properties create mode 100644 second_exp.zip diff --git a/.idea/misc.xml b/.idea/misc.xml index 19757db..8289a91 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,5 +1,6 @@ +<<<<<<< HEAD <<<<<<< HEAD \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 469bef4..bffbeb0 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,6 +1,7 @@ apply plugin: 'com.android.application' android { +<<<<<<< HEAD <<<<<<< HEAD compileSdkVersion 33 buildToolsVersion "29.0.2" @@ -9,13 +10,18 @@ android { minSdkVersion 26 targetSdkVersion 33 ======= +======= +>>>>>>> 76999d0 (last) compileSdkVersion 30 buildToolsVersion "30.0.2" defaultConfig { applicationId "com.example.orangesale_end" minSdkVersion 26 targetSdkVersion 30 +<<<<<<< HEAD >>>>>>> 8d271bc (end_code) +======= +>>>>>>> 76999d0 (last) versionCode 1 versionName "1.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" @@ -27,16 +33,23 @@ android { } } <<<<<<< HEAD +<<<<<<< HEAD +======= ======= +>>>>>>> 76999d0 (last) compileOptions { sourceCompatibility = 1.8 targetCompatibility = 1.8 } +<<<<<<< HEAD >>>>>>> 8d271bc (end_code) +======= +>>>>>>> 76999d0 (last) } dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) +<<<<<<< HEAD <<<<<<< HEAD implementation 'androidx.appcompat:appcompat:1.4.1' implementation 'androidx.constraintlayout:constraintlayout:2.1.3' @@ -45,6 +58,8 @@ dependencies { androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' implementation 'liji.library.dev:citypickerview:1.1.0' ======= +======= +>>>>>>> 76999d0 (last) implementation 'androidx.appcompat:appcompat:1.0.2' implementation 'androidx.constraintlayout:constraintlayout:1.1.3' testImplementation 'junit:junit:4.12' @@ -53,5 +68,9 @@ dependencies { implementation 'liji.library.dev:citypickerview:1.1.0' implementation "com.squareup.okhttp3:okhttp:4.2.2" implementation group: 'com.alibaba', name: 'fastjson', version: '1.2.12' +<<<<<<< HEAD >>>>>>> 8d271bc (end_code) +======= + implementation 'com.android.support:recyclerview-v7:28.0.0' +>>>>>>> 76999d0 (last) } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index c040658..5f7008c 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,5 +1,6 @@ @@ -7,11 +8,16 @@ package="com.example.orangesale_end"> >>>>>>> 8d271bc (end_code) +======= + package="com.example.orangesale_end"> + +>>>>>>> 76999d0 (last) @@ -27,6 +33,8 @@ ======= +======= +>>>>>>> 76999d0 (last) android:usesCleartextTraffic="true" android:supportsRtl="true" android:theme="@style/AppTheme"> @@ -45,7 +53,10 @@ +<<<<<<< HEAD >>>>>>> 8d271bc (end_code) +======= +>>>>>>> 76999d0 (last) \ No newline at end of file diff --git a/app/src/main/java/com/example/orangesale_end/activity/IndexActivity.java b/app/src/main/java/com/example/orangesale_end/activity/IndexActivity.java index e399cfb..83d5563 100644 --- a/app/src/main/java/com/example/orangesale_end/activity/IndexActivity.java +++ b/app/src/main/java/com/example/orangesale_end/activity/IndexActivity.java @@ -8,26 +8,56 @@ import android.view.View; import android.widget.LinearLayout; import androidx.annotation.Nullable; +<<<<<<< HEAD import com.example.orangesale_end.R; +======= +import androidx.recyclerview.widget.LinearLayoutManager; + +import com.example.orangesale_end.R; +import com.example.orangesale_end.adapter.ShoppingcartAdapter; +import com.example.orangesale_end.entity.OrangeShoppingcart; +>>>>>>> 76999d0 (last) import com.example.orangesale_end.fragment.IndexFragment; import com.example.orangesale_end.fragment.PearsonFragment; import com.example.orangesale_end.fragment.ProductFragment; import com.example.orangesale_end.fragment.ShoppingCartFragment; import com.example.orangesale_end.service.TimeService; +<<<<<<< HEAD +======= +import java.util.ArrayList; +import java.util.List; + +>>>>>>> 76999d0 (last) public class IndexActivity extends Activity implements View.OnClickListener { private IndexFragment indexFragment; private ProductFragment productFragment; private ShoppingCartFragment shoppingCartFragment; private PearsonFragment pearsonFragment; private LinearLayout indexLine, productLine, shoppingCartLine, pearsonLine; +<<<<<<< HEAD +======= + private Listshoppingcarts=new ArrayList<>(); +>>>>>>> 76999d0 (last) @Override public void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_main); init(); +<<<<<<< HEAD +======= + OrangeShoppingcart orangeShoppingcart = new OrangeShoppingcart(); + orangeShoppingcart.setId("商品序号：1"); + orangeShoppingcart.setNum("商品数量：1"); + orangeShoppingcart.setImgUrl(R.drawable.apple); + orangeShoppingcart.setProductId("商品编号1"); + orangeShoppingcart.setUserId("用户id：123"); + shoppingcarts.add(orangeShoppingcart); + /* shoppingcartAdapter= new ShoppingcartAdapter(shoppingcarts, this); + LinearLayoutManager linearLayoutManager=new LinearLayoutManager(this);*/ +>>>>>>> 76999d0 (last) initIndexFragment(); Thread thread = new Thread(runnable); thread.start(); @@ -98,7 +128,11 @@ public class IndexActivity extends Activity implements View.OnClickListener { //开启事务，fragment的控制是由事务来实现的 FragmentTransaction transaction = getFragmentManager().beginTransaction(); if (shoppingCartFragment == null) { +<<<<<<< HEAD shoppingCartFragment = new ShoppingCartFragment(); +======= + shoppingCartFragment = new ShoppingCartFragment(shoppingcarts); +>>>>>>> 76999d0 (last) } transaction.replace(R.id.main_content0, shoppingCartFragment); transaction.commit(); diff --git a/app/src/main/java/com/example/orangesale_end/activity/holder/ViewHolder.java b/app/src/main/java/com/example/orangesale_end/activity/holder/ViewHolder.java new file mode 100644 index 0000000..751ea2a --- /dev/null +++ b/app/src/main/java/com/example/orangesale_end/activity/holder/ViewHolder.java @@ -0,0 +1,30 @@ +package com.example.orangesale_end.activity.holder; + +import android.view.View; +import android.widget.ImageView; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import com.example.orangesale_end.R; + +public class ViewHolder extends RecyclerView.ViewHolder +{ + public TextView shproductid; + public TextView shuserid; + public ImageView imageView; + public TextView shid; + public TextView shproductnum; + + public ViewHolder(@NonNull View itemView) { + super(itemView); + shid = itemView.findViewById(R.id.shid); + shuserid=itemView.findViewById(R.id.userid); + shproductnum=itemView.findViewById(R.id.shproductnum); + imageView=itemView.findViewById(R.id.shoppingproductpicture); + shproductid=itemView.findViewById(R.id.shproductid); + + } + +} diff --git a/app/src/main/java/com/example/orangesale_end/adapter/ShoppingcartAdapter.java b/app/src/main/java/com/example/orangesale_end/adapter/ShoppingcartAdapter.java new file mode 100644 index 0000000..2fe34c4 --- /dev/null +++ b/app/src/main/java/com/example/orangesale_end/adapter/ShoppingcartAdapter.java @@ -0,0 +1,84 @@ +package com.example.orangesale_end.adapter; + +import android.content.Context; +import android.view.View; +import android.view.ViewGroup; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import com.example.orangesale_end.R; +import com.example.orangesale_end.activity.holder.ViewHolder; +import com.example.orangesale_end.entity.OrangeShoppingcart; + +import java.util.List; + +public class ShoppingcartAdapter extends RecyclerView.Adapter { + private Context context; + private List orangeShoppingcarts; + + public ShoppingcartAdapter(List orangeShoppingcarts, Context context) { + this.orangeShoppingcarts = orangeShoppingcarts; + this.context=context; + } + + + @NonNull + @Override + public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view=View.inflate(context,R.layout.item_review_shopping,null); + ViewHolder viewHolder=new ViewHolder(view); + return viewHolder; + } + + + + public void onBindViewHolder(@NonNull ViewHolder holder, int position) { + OrangeShoppingcart orangeShoppingcart=orangeShoppingcarts.get(position); + holder.imageView.setImageResource(orangeShoppingcart.getImgUrl()); + holder.shid.setText(String.valueOf(orangeShoppingcart.getId())); + holder.shproductid.setText(String.valueOf(orangeShoppingcart.getProductId())); + holder.shproductnum.setText(String.valueOf(orangeShoppingcart.getNum())); + holder.shuserid.setText(String.valueOf(orangeShoppingcart.getUserId())); + } + + @Override + public int getItemCount() { + return orangeShoppingcarts.size(); + } + + /* @Override + public View getView(int i, View view, ViewGroup viewGroup) { + + ViewHolder viewHolder; + if (view==null) + { + view=LayoutInflater.from(context).inflate(R.layout.item_gridview_shopping,null); + viewHolder=new ViewHolder(); + viewHolder.shproductid=view.findViewById(R.id.shproductid); + viewHolder.shuserid=view.findViewById(R.id.userid); + viewHolder.imageView=view.findViewById(R.id.shoppingproductpicture); + viewHolder.shid=view.findViewById(R.id.shid); + viewHolder.shproductnum=view.findViewById(R.id.shproductnum); + view.setTag(viewHolder); + } + else { + viewHolder = (ViewHolder)view.getTag(); + } + OrangeShoppingcart orangeShoppingcart = orangeShoppingcarts.get(i); + if (orangeShoppingcart!=null) + { + viewHolder.shuserid.setText(String.valueOf(orangeShoppingcart.getUserId())); + viewHolder.shproductid.setText(String.valueOf(orangeShoppingcart.getProductId())); + viewHolder.imageView.setImageResource( + orangeShoppingcart.getImgUrl()); + viewHolder.shid.setText(String.valueOf(orangeShoppingcart.getId())); + viewHolder.shproductnum.setText(String.valueOf(orangeShoppingcart.getNum())); + + } + + return view; + } +*/ + + } diff --git a/app/src/main/java/com/example/orangesale_end/entity/OrangeShoppingcart.java b/app/src/main/java/com/example/orangesale_end/entity/OrangeShoppingcart.java new file mode 100644 index 0000000..ea23012 --- /dev/null +++ b/app/src/main/java/com/example/orangesale_end/entity/OrangeShoppingcart.java @@ -0,0 +1,99 @@ +package com.example.orangesale_end.entity; + +import java.io.Serializable; + +public class OrangeShoppingcart implements Serializable { + /** + * 自增主键 + * + * @mbg.generated + */ + private String id; + + /** + * 用户id + * + * @mbg.generated + */ + private String userId; + + /** + * 商品id + * + * @mbg.generated + */ + private String productId; + + /** + * 数量 + * + * @mbg.generated + */ + private String num; + private Integer imgUrl; + private static final long serialVersionUID = 1L; + + public OrangeShoppingcart() { + + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getUserId() { + return userId; + } + + public void setUserId(String userId) { + this.userId = userId; + } + + public String getProductId() { + return productId; + } + + public void setProductId(String productId) { + this.productId = productId; + } + + public String getNum() { + return num; + } + + public void setNum(String num) { + this.num = num; + } + + @Override + public String toString() { + return "OrangeShoppingcart{" + + "id=" + id + + ", userId=" + userId + + ", productId=" + productId + + ", num=" + num + + ", imgUrl=" + imgUrl + + '}'; + } + + public OrangeShoppingcart(String id, String userId, String productId,String num, int imgUrl) { + this.id = id; + this.userId = userId; + this.productId = productId; + this.num = num; + this.imgUrl = imgUrl; + + } + + public int getImgUrl() { + return imgUrl; + } + + public void setImgUrl(int imgUrl) { + this.imgUrl = imgUrl; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/example/orangesale_end/fragment/IndexFragment.java b/app/src/main/java/com/example/orangesale_end/fragment/IndexFragment.java index 195bf55..1df1e7a 100644 --- a/app/src/main/java/com/example/orangesale_end/fragment/IndexFragment.java +++ b/app/src/main/java/com/example/orangesale_end/fragment/IndexFragment.java @@ -47,6 +47,7 @@ public class IndexFragment extends Fragment implements View.OnClickListener { private void init(View view) { searchView = view.findViewById(R.id.searchView); searchView.setOnClickListener(this); +<<<<<<< HEAD orangeLine = view.findViewById(R.id.breakfast); orangeLine.setOnClickListener(this); youziLine = view.findViewById(R.id.下午茶点); @@ -62,6 +63,23 @@ public class IndexFragment extends Fragment implements View.OnClickListener { mangguoLine = view.findViewById(R.id.fruit_tea); mangguoLine.setOnClickListener(this); appleLine = view.findViewById(R.id.birthcake); +======= + orangeLine = view.findViewById(R.id.chengzi); + orangeLine.setOnClickListener(this); + youziLine = view.findViewById(R.id.youzi); + youziLine.setOnClickListener(this); + juziLine = view.findViewById(R.id.juzi); + juziLine.setOnClickListener(this); + xiguaLine = view.findViewById(R.id.xigua); + xiguaLine.setOnClickListener(this); + liLine = view.findViewById(R.id.li); + liLine.setOnClickListener(this); + lemonLine = view.findViewById(R.id.lemon); + lemonLine.setOnClickListener(this); + mangguoLine = view.findViewById(R.id.mangguo); + mangguoLine.setOnClickListener(this); + appleLine = view.findViewById(R.id.apple); +>>>>>>> 76999d0 (last) appleLine.setOnClickListener(this); gridView = view.findViewById(R.id.index_famous_gridview); //initData(); @@ -80,6 +98,7 @@ public class IndexFragment extends Fragment implements View.OnClickListener { private void initData() { productList = new ArrayList<>(); Product product = new Product(); +<<<<<<< HEAD product.setImageUrlId(R.drawable.strawberrybread); product.setProductName("草莓蛋糕"); product.setProductPrice(new BigDecimal("29.9")); @@ -102,6 +121,30 @@ public class IndexFragment extends Fragment implements View.OnClickListener { Product product5 = new Product(); product5.setImageUrlId(R.drawable.user_cake); product5.setProductName("慕斯卷"); +======= + product.setImageUrlId(R.drawable.juzip); + product.setProductName("橘子"); + product.setProductPrice(new BigDecimal("9.9")); + Product product1 = new Product(); + product1.setImageUrlId(R.drawable.orange); + product1.setProductName("橙子"); + product1.setProductPrice(new BigDecimal("29.9")); + Product product2 = new Product(); + product2.setImageUrlId(R.drawable.youzip); + product2.setProductName("柚子"); + product2.setProductPrice(new BigDecimal("19.9")); + Product product3 = new Product(); + product3.setImageUrlId(R.drawable.xiguap); + product3.setProductName("西瓜"); + product3.setProductPrice(new BigDecimal("19.9")); + Product product4 = new Product(); + product4.setImageUrlId(R.drawable.applep); + product4.setProductName("苹果"); + product4.setProductPrice(new BigDecimal("49.9")); + Product product5 = new Product(); + product5.setImageUrlId(R.drawable.lemonp); + product5.setProductName("柠檬"); +>>>>>>> 76999d0 (last) product5.setProductPrice(new BigDecimal("9.9")); productList.add(product); productList.add(product1); @@ -109,6 +152,10 @@ public class IndexFragment extends Fragment implements View.OnClickListener { productList.add(product3); productList.add(product4); productList.add(product5); +<<<<<<< HEAD +======= + +>>>>>>> 76999d0 (last) } /** diff --git a/app/src/main/java/com/example/orangesale_end/fragment/ShoppingCartFragment.java b/app/src/main/java/com/example/orangesale_end/fragment/ShoppingCartFragment.java index f37faae..2853d73 100644 --- a/app/src/main/java/com/example/orangesale_end/fragment/ShoppingCartFragment.java +++ b/app/src/main/java/com/example/orangesale_end/fragment/ShoppingCartFragment.java @@ -1,17 +1,38 @@ package com.example.orangesale_end.fragment; +<<<<<<< HEAD import android.app.Fragment; import android.app.FragmentTransaction; +======= +import android.annotation.SuppressLint; +import android.app.AlertDialog; +import android.app.Fragment; +import android.app.FragmentTransaction; +import android.content.DialogInterface; +>>>>>>> 76999d0 (last) import android.os.Bundle; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.Button; +<<<<<<< HEAD + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + +import com.example.orangesale_end.R; +======= +import android.widget.Toast; import androidx.annotation.NonNull; import androidx.annotation.Nullable; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import com.example.orangesale_end.R; +import com.example.orangesale_end.adapter.ShoppingcartAdapter; +import com.example.orangesale_end.entity.OrangeShoppingcart; +>>>>>>> 76999d0 (last) import com.example.orangesale_end.entity.ShoppingCart; import java.util.ArrayList; @@ -19,13 +40,28 @@ import java.util.List; public class ShoppingCartFragment extends Fragment implements View.OnClickListener { private Button walkButton; +<<<<<<< HEAD private List cartList = new ArrayList<>(); private ProductFragment productFragment; +======= + private List cartList=new ArrayList<>(); + private ProductFragment productFragment; + private RecyclerView recyclerView; + + public ShoppingCartFragment() { + } + + @SuppressLint("ValidFragment") + public ShoppingCartFragment(List cartList) { + this.cartList = cartList; + } +>>>>>>> 76999d0 (last) @Nullable @Override public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { View view; +<<<<<<< HEAD if (cartList.size() > 0) { //有商品 view = LayoutInflater.from(getActivity()).inflate(R.layout.cart_have_product, container, false); @@ -33,6 +69,11 @@ public class ShoppingCartFragment extends Fragment implements View.OnClickListen view = LayoutInflater.from(getActivity()).inflate(R.layout.cart_no_product, container, false); } init(view); +======= + //有商品 + view = LayoutInflater.from(getActivity()).inflate(R.layout.cart_have_product, container, false); + init(view); +>>>>>>> 76999d0 (last) return view; } @@ -40,13 +81,25 @@ public class ShoppingCartFragment extends Fragment implements View.OnClickListen * 组件初始化 */ private void init(View view) { +<<<<<<< HEAD walkButton = view.findViewById(R.id.random_search); walkButton.setOnClickListener(this); +======= + recyclerView=view.findViewById(R.id.cart_productList); + LinearLayoutManager linearLayoutManager=new LinearLayoutManager(getActivity()); + recyclerView.setLayoutManager(linearLayoutManager); + ShoppingcartAdapter shoppingcartAdapter = new ShoppingcartAdapter(cartList, getActivity()); + recyclerView.setAdapter(shoppingcartAdapter); + onClick(view); + + +>>>>>>> 76999d0 (last) } @Override public void onClick(View v) { switch (v.getId()) { +<<<<<<< HEAD case R.id.random_search: //开启事务，fragment的控制是由事务来实现的 FragmentTransaction transaction = getFragmentManager().beginTransaction(); @@ -56,6 +109,41 @@ public class ShoppingCartFragment extends Fragment implements View.OnClickListen transaction.replace(R.id.main_content0, productFragment); transaction.commit(); break; +======= + case R.id.jiesuan: + { + Button b1=(Button) getActivity().findViewById(R.id.jiesuan); + b1.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + AlertDialog.Builder builder=new AlertDialog.Builder(getActivity());//设置图标 + builder.setTitle("确认结算商品吗");//设置对话框的标题 + builder.setMessage("请确认好自己所结算的商品");//设置对话框的内容 + builder.setPositiveButton("确定", new DialogInterface.OnClickListener() { //这个是设置确定按钮 + + @Override + public void onClick(DialogInterface arg0, int arg1) { + Toast.makeText(getActivity(), "结算成功", Toast.LENGTH_SHORT).show(); + + } + }); + builder.setNegativeButton("取消", new DialogInterface.OnClickListener() { //取消按钮 + + @Override + public void onClick(DialogInterface arg0, int arg1) { + Toast.makeText(getActivity(), "您取消结算！",Toast.LENGTH_SHORT).show(); + + } + }); + AlertDialog b=builder.create(); + b.show(); //必须show一下才能看到对话框，跟Toast一样的道理 + } + }); + break;} + + + +>>>>>>> 76999d0 (last) } } } diff --git a/app/src/main/java/com/example/orangesale_end/netrequest/OkHttpClientProduct.java b/app/src/main/java/com/example/orangesale_end/netrequest/OkHttpClientProduct.java index e7e460b..40c052b 100644 --- a/app/src/main/java/com/example/orangesale_end/netrequest/OkHttpClientProduct.java +++ b/app/src/main/java/com/example/orangesale_end/netrequest/OkHttpClientProduct.java @@ -28,7 +28,11 @@ public class OkHttpClientProduct { public List getProduct() throws IOException { OkHttpClient okHttpClient = new OkHttpClient(); Request request = new Request.Builder() +<<<<<<< HEAD .url("http://106.55.41.135:8081/orange/product/search") +======= + .url("http://192.168.18.1:8081/orange/product/search") +>>>>>>> 76999d0 (last) .build(); Response response = okHttpClient.newCall(request).execute(); JSONObject jsonObject = JSON.parseObject(Objects.requireNonNull(response.body()).string()); diff --git a/app/src/main/java/com/example/orangesale_end/netrequest/OkHttpMessage.java b/app/src/main/java/com/example/orangesale_end/netrequest/OkHttpMessage.java index e8787ab..35dfed3 100644 --- a/app/src/main/java/com/example/orangesale_end/netrequest/OkHttpMessage.java +++ b/app/src/main/java/com/example/orangesale_end/netrequest/OkHttpMessage.java @@ -21,7 +21,11 @@ public class OkHttpMessage { public OrangeMessage consumeMessage() throws IOException { OkHttpClient okHttpClient = new OkHttpClient(); Request request = new Request.Builder() +<<<<<<< HEAD .url("http://106.55.41.135:8081/orange/message/consumeMessage") +======= + .url("http://http://192.168.18.1:8081/orange/product/search/orange/message/consumeMessage") +>>>>>>> 76999d0 (last) .build(); Response response = okHttpClient.newCall(request).execute(); JSONObject jsonObject = JSON.parseObject(Objects.requireNonNull(response.body()).string()); @@ -30,7 +34,11 @@ public class OkHttpMessage { * 消费完消息以后，设置消息为已读 */ Request request1 = new Request.Builder() +<<<<<<< HEAD .url("http://106.55.41.135:8081/orange/message/updateMessage") +======= + .url("http://192.168.0.102:8081/orange/message/updateMessage") +>>>>>>> 76999d0 (last) .build(); okHttpClient.newCall(request1).execute(); return orangeMessage; diff --git a/app/src/main/java/com/example/orangesale_end/netrequest/OkHttpUser.java b/app/src/main/java/com/example/orangesale_end/netrequest/OkHttpUser.java index d84253e..b7a3006 100644 --- a/app/src/main/java/com/example/orangesale_end/netrequest/OkHttpUser.java +++ b/app/src/main/java/com/example/orangesale_end/netrequest/OkHttpUser.java @@ -29,7 +29,11 @@ public class OkHttpUser { RequestBody requestBody = RequestBody.create(jsonStr, mediaType); Request request = new Request.Builder() +<<<<<<< HEAD .url("http://106.55.41.135:8081/orange/user/login") +======= + .url("http://192.168.18.1:8081/orange/user/login") +>>>>>>> 76999d0 (last) .post(requestBody) .build(); @@ -58,7 +62,11 @@ public class OkHttpUser { String jsonStr = JSONObject.toJSONString(orangeUser); RequestBody requestBody = RequestBody.create(jsonStr, mediaType); Request request = new Request.Builder() +<<<<<<< HEAD .url("http://106.55.41.135:8081/orange/user/register") +======= + .url("http://192.168.18.1:8081/orange/user/register") +>>>>>>> 76999d0 (last) .post(requestBody) .build(); Response response = okHttpClient.newCall(request).execute(); diff --git a/app/src/main/java/com/example/orangesale_end/util/Constant.java b/app/src/main/java/com/example/orangesale_end/util/Constant.java new file mode 100644 index 0000000..51aa012 --- /dev/null +++ b/app/src/main/java/com/example/orangesale_end/util/Constant.java @@ -0,0 +1,65 @@ +package com.example.orangesale_end.util; + + +/** + * 常量 + * @author llw + */ +public class Constant { + + public static final String CAR_JSON = "{ \"code\" : 200 ,\n" + + " \"orderData\" : [\n" + + " {\n" + + "\n" + + " \"productproduce\":\"活力早餐\",\n" + + " \"cartlist\": [\n" + + " {\n" + + " \"id\": 1,\n" + + " \"productproduce\": \"活力早餐\",\n" + + " \"defaultPic\": \"https://tse2-mm.cn.bing.net/th/id/OIP-C.FKgYJy9NYrL4RZKo42VCIAHaE8?w=292&h=195&c=7&r=0&o=5&dpr=1.3&pid=1.7\",\n" + + " \"productId\": 1,\n" + + " \"productName\": \"纯奶吐司\",\n"+ + " \"price\": 10,\n" + + " \"count\":1\n" + + " },\n" + + " {\n" + + " \"id\": 2,\n" + + " \"productproduce\": \"甜品慕斯\",\n" + + " \"defaultPic\": \"https://img14.360buyimg.com/n0/jfs/t2971/15/167732091/93002/204c1016/574d9d9aNe4e6fa7a.jpg\",\n" + + " \"productId\": 2,\n" + + " \"productName\": \"草莓慕斯蛋糕\",\n"+ + " \"price\": 19.9,\n" + + " \"count\": 1\n" + + " }\n" + + " ]\n" + + " }\n" + + " ,\n" + + " {\n" + + " \"productproduce\":\"中式传统糕点\",\n" + + " \"cartlist\": [\n" + + " {\n" + + " \"id\": 1,\n" + + " \"productp\": \"中式传统糕点\",\n" + + " \"defaultPic\": \"https://img.alicdn.com/imgextra/i4/2208137990237/O1CN01ap4J4O1DcaTrhAIvA_!!2208137990237.jpg\",\n" + + " \"productId\": 1,\n" + + " \"productName\": \"桃酥\",\n" + + " \"price\": 10.9,\n" + + " \"count\":1\n" + + " }\n" + + " ]\n" + + " }\n" + + " ,\n" + + " {\n" + + " \"productproduce\":\"中式新糕点\",\n" + + " \"cartlist\": [\n" + + " {\n" + + " \"id\": 1,\n" + + " \"productproduce\":\"中式新糕点\",\n" + + " \"defaultPic\": \"https://ts1.cn.mm.bing.net/th/id/R-C.528c10e20ecf8276a0d05363506924e1?rik=wzIkFM3Eu7TH6A&riu=http%3a%2f%2fimg.zcool.cn%2fcommunity%2f011f6258d54bc5a801219c77be307c.jpg%401280w_1l_2o_100sh.jpg&ehk=fM6ac87gUuwrvLINm7jeR804iZweyvlAWbbCi2%2bEknU%3d&risl=&pid=ImgRaw&r=0\",\n" + + " \"productId\": 1,\n" + + " \"productName\": \"冰皮绿豆糕\",\n" + + " \"price\": 15.9,\n" + + " \"count\":1\n" + + " },\n" + + "}"; +} diff --git a/app/src/main/res/drawable/bg_goods_num.xml b/app/src/main/res/drawable/bg_goods_num.xml new file mode 100644 index 0000000..7ef60a2 --- /dev/null +++ b/app/src/main/res/drawable/bg_goods_num.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_increase_goods_num.xml b/app/src/main/res/drawable/bg_increase_goods_num.xml new file mode 100644 index 0000000..d049da2 --- /dev/null +++ b/app/src/main/res/drawable/bg_increase_goods_num.xml @@ -0,0 +1,7 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_reduce_goods_num.xml b/app/src/main/res/drawable/bg_reduce_goods_num.xml new file mode 100644 index 0000000..f071253 --- /dev/null +++ b/app/src/main/res/drawable/bg_reduce_goods_num.xml @@ -0,0 +1,7 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_settlement.xml b/app/src/main/res/drawable/bg_settlement.xml new file mode 100644 index 0000000..be029bd --- /dev/null +++ b/app/src/main/res/drawable/bg_settlement.xml @@ -0,0 +1,8 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_white_8.xml b/app/src/main/res/drawable/bg_white_8.xml new file mode 100644 index 0000000..be029bd --- /dev/null +++ b/app/src/main/res/drawable/bg_white_8.xml @@ -0,0 +1,8 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/button_login.xml b/app/src/main/res/drawable/button_login.xml index 1439ecb..5d3afd8 100644 --- a/app/src/main/res/drawable/button_login.xml +++ b/app/src/main/res/drawable/button_login.xml @@ -2,13 +2,21 @@ +<<<<<<< HEAD +======= + +>>>>>>> 76999d0 (last) +<<<<<<< HEAD +======= + +>>>>>>> 76999d0 (last) diff --git a/app/src/main/res/drawable/ic_check.xml b/app/src/main/res/drawable/ic_check.xml new file mode 100644 index 0000000..691bf52 --- /dev/null +++ b/app/src/main/res/drawable/ic_check.xml @@ -0,0 +1,10 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_checked.xml b/app/src/main/res/drawable/ic_checked.xml new file mode 100644 index 0000000..9f77f0a --- /dev/null +++ b/app/src/main/res/drawable/ic_checked.xml @@ -0,0 +1,10 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 049f970..e58874a 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -7,6 +7,7 @@ android:orientation="vertical" tools:context=".activity.IndexActivity"> +<<<<<<< HEAD <<<<<<< HEAD >>>>>> 8d271bc (end_code) +======= +>>>>>>> 76999d0 (last) android:layout_width="match_parent" android:layout_height="0dp" android:layout_weight="1" /> diff --git a/app/src/main/res/layout/cart_have_product.xml b/app/src/main/res/layout/cart_have_product.xml index b7362e4..34f7d34 100644 --- a/app/src/main/res/layout/cart_have_product.xml +++ b/app/src/main/res/layout/cart_have_product.xml @@ -6,10 +6,24 @@ +<<<<<<< HEAD >>>>>> 76999d0 (last) android:id="@+id/cart_productList" android:layout_width="match_parent" android:layout_height="wrap_content" android:numColumns="1" /> +<<<<<<< HEAD +======= +