lastcode
86157 2 years ago
parent 0d7b507235
commit 20d7acc16c

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<<<<<<< HEAD
<<<<<<< HEAD
<component name="NullableNotNullManager">
<option name="myDefaultNullable" value="org.jetbrains.annotations.Nullable" />
@ -73,11 +74,15 @@
=======
<component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="1.8" project-jdk-type="JavaSDK">
>>>>>>> 8d271bc (end_code)
=======
<component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="1.8" project-jdk-type="JavaSDK">
>>>>>>> 76999d0 (last)
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
<component name="ProjectType">
<option name="id" value="Android" />
</component>
<<<<<<< HEAD
<<<<<<< HEAD
<component name="VisualizationToolProject">
<option name="state">
@ -88,4 +93,6 @@
</component>
=======
>>>>>>> 8d271bc (end_code)
=======
>>>>>>> 76999d0 (last)
</project>

@ -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)
}

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
<<<<<<< HEAD
<<<<<<< HEAD
package="com.yemamacake.cn">
@ -7,11 +8,16 @@
package="com.example.orangesale_end">
<uses-permission android:name="android.permission.INTERNET" />
>>>>>>> 8d271bc (end_code)
=======
package="com.example.orangesale_end">
<uses-permission android:name="android.permission.INTERNET" />
>>>>>>> 76999d0 (last)
<application
android:allowBackup="true"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher_round"
<<<<<<< HEAD
<<<<<<< HEAD
android:supportsRtl="true"
android:theme="@style/AppTheme">
@ -27,6 +33,8 @@
<activity android:name="com.yemamacake.cn.activity.CategoryActivity"/>
<activity android:name=".activity.IndexActivity"/>
=======
=======
>>>>>>> 76999d0 (last)
android:usesCleartextTraffic="true"
android:supportsRtl="true"
android:theme="@style/AppTheme">
@ -45,7 +53,10 @@
<service
android:name=".service.TimeService"
android:enabled="true" />
<<<<<<< HEAD
>>>>>>> 8d271bc (end_code)
=======
>>>>>>> 76999d0 (last)
</application>
</manifest>

@ -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 List<OrangeShoppingcart>shoppingcarts=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("用户id123");
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();

@ -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);
}
}

@ -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<ViewHolder> {
private Context context;
private List <OrangeShoppingcart> orangeShoppingcarts;
public ShoppingcartAdapter(List<OrangeShoppingcart> 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;
}
*/
}

@ -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;
}
}

@ -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)
}
/**

@ -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<ShoppingCart> cartList = new ArrayList<>();
private ProductFragment productFragment;
=======
private List<OrangeShoppingcart> cartList=new ArrayList<>();
private ProductFragment productFragment;
private RecyclerView recyclerView;
public ShoppingCartFragment() {
}
@SuppressLint("ValidFragment")
public ShoppingCartFragment(List<OrangeShoppingcart> 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)
}
}
}

@ -28,7 +28,11 @@ public class OkHttpClientProduct {
public List<OrangeProduct> 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());

@ -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;

@ -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();

@ -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" +
"}";
}

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<stroke android:color="#000"
android:width="0.5dp"/>
</shape>

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<stroke android:color="#000"
android:width="0.5dp"/>
<corners android:topRightRadius="4dp"
android:bottomRightRadius="4dp" />
</shape>

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<stroke android:color="#000"
android:width="0.5dp"/>
<corners android:topLeftRadius="4dp"
android:bottomLeftRadius="4dp" />
</shape>

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="20dp"/>
<gradient
android:startColor="#FF5C13"
android:endColor="#FC7D0B"
android:angle="90" />
</shape>

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="20dp"/>
<gradient
android:startColor="#FF5C13"
android:endColor="#FC7D0B"
android:angle="90" />
</shape>

@ -2,13 +2,21 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="false">
<shape>
<<<<<<< HEAD
<solid android:color="#cac0ff" />
=======
<solid android:color="#EFB81C" />
>>>>>>> 76999d0 (last)
<corners android:radius="5dp" />
</shape>
</item>
<item android:state_pressed="true">
<shape>
<<<<<<< HEAD
<solid android:color="#f5ffc0" />
=======
<solid android:color="#c0c0c0" />
>>>>>>> 76999d0 (last)
<corners android:radius="5dp" />
</shape>
</item>

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:pathData="M12,22.5c-5.79,0 -10.5,-4.71 -10.5,-10.5S6.21,1.5 12,1.5 22.5,6.21 22.5,12 17.79,22.5 12,22.5zM12,3c-4.963,0 -9,4.037 -9,9s4.037,9 9,9 9,-4.037 9,-9S16.963,3 12,3z"
android:fillColor="#a9b7b7"/>
</vector>

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#eb4f38"
android:pathData="M12,1.546c-5.764,0 -10.454,4.69 -10.454,10.454 0,5.765 4.689,10.454 10.454,10.454S22.454,17.765 22.454,12C22.454,6.236 17.765,1.546 12,1.546zM17.044,10.276 L11.039,16.346c-0.001,0.001 -0.005,0.002 -0.006,0.005 -0.002,0.001 -0.002,0.005 -0.005,0.006 -0.048,0.046 -0.107,0.075 -0.163,0.107 -0.028,0.016 -0.05,0.04 -0.08,0.051 -0.09,0.036 -0.185,0.055 -0.28,0.055 -0.096,0 -0.193,-0.019 -0.284,-0.056 -0.03,-0.013 -0.054,-0.038 -0.082,-0.054 -0.056,-0.031 -0.113,-0.059 -0.161,-0.107 -0.001,-0.001 -0.002,-0.005 -0.004,-0.006 -0.001,-0.002 -0.005,-0.002 -0.006,-0.005l-2.954,-3.035c-0.289,-0.297 -0.282,-0.772 0.015,-1.061 0.297,-0.288 0.771,-0.283 1.061,0.015l2.42,2.487 5.467,-5.527c0.291,-0.295 0.767,-0.298 1.061,-0.006C17.333,9.506 17.335,9.981 17.044,10.276z" />
</vector>

@ -7,6 +7,7 @@
android:orientation="vertical"
tools:context=".activity.IndexActivity">
<<<<<<< HEAD
<<<<<<< HEAD
<!-- <LinearLayout
android:layout_width="match_parent"
@ -18,6 +19,8 @@
<FrameLayout
android:id="@+id/main_content"
=======
=======
>>>>>>> 76999d0 (last)
<!-- <LinearLayout
android:layout_width="match_parent"
android:layout_height="0dp"
@ -27,7 +30,10 @@
</LinearLayout>-->
<FrameLayout
android:id="@+id/main_content0"
<<<<<<< HEAD
>>>>>>> 8d271bc (end_code)
=======
>>>>>>> 76999d0 (last)
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1" />

@ -6,10 +6,24 @@
<include layout="@layout/shoppingcart_title" />
<!--有商品时的布局-->
<<<<<<< HEAD
<GridView
=======
<androidx.recyclerview.widget.RecyclerView
>>>>>>> 76999d0 (last)
android:id="@+id/cart_productList"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:numColumns="1" />
<<<<<<< HEAD
=======
<Button
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@color/colorAccent"
android:text="结算商品"
android:id="@+id/jiesuan"
/>
>>>>>>> 76999d0 (last)
</LinearLayout>

@ -4,6 +4,7 @@
android:layout_height="match_parent"
android:orientation="vertical">
<<<<<<< HEAD
<<<<<<< HEAD
<TextView
android:layout_width="331dp"
@ -19,6 +20,8 @@
android:verticalSpacing="30dp"
android:horizontalSpacing="20dp"
=======
=======
>>>>>>> 76999d0 (last)
<GridView
android:id="@+id/category_detail_list"
android:layout_width="wrap_content"
@ -26,7 +29,10 @@
android:numColumns="3"
android:verticalSpacing="10dp"
android:horizontalSpacing="10dp"
<<<<<<< HEAD
>>>>>>> 8d271bc (end_code)
=======
>>>>>>> 76999d0 (last)
android:gravity="center"/>
</LinearLayout>

@ -2,6 +2,7 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
<<<<<<< HEAD
<<<<<<< HEAD
android:background="#ffeff2"
android:layout_marginTop="20dp"
@ -44,6 +45,8 @@
android:id="@+id/category_detail"/>
</LinearLayout>
=======
=======
>>>>>>> 76999d0 (last)
android:background="#E8E8E8"
android:orientation="vertical">
@ -68,5 +71,8 @@
android:layout_weight="3" />
</LinearLayout>
<<<<<<< HEAD
>>>>>>> 8d271bc (end_code)
=======
>>>>>>> 76999d0 (last)
</LinearLayout>

@ -1,6 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<<<<<<< HEAD
xmlns:tools="http://schemas.android.com/tools"
=======
>>>>>>> 76999d0 (last)
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#E8E8E8"
@ -31,7 +34,11 @@
android:orientation="horizontal">
<LinearLayout
<<<<<<< HEAD
android:id="@+id/breakfast"
=======
android:id="@+id/chengzi"
>>>>>>> 76999d0 (last)
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
@ -39,6 +46,7 @@
android:orientation="vertical">
<ImageView
<<<<<<< HEAD
android:layout_width="69dp"
android:layout_height="82dp"
android:adjustViewBounds="true"
@ -99,12 +107,27 @@
android:layout_height="50dp"
android:layout_marginTop="5dp"
android:text="西式蛋糕"
=======
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/chengzi" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:text="橙子"
>>>>>>> 76999d0 (last)
android:textColor="#696969"
android:textSize="20sp" />
</LinearLayout>
<LinearLayout
<<<<<<< HEAD
android:id="@+id/chinese_tradional_cake"
=======
android:id="@+id/youzi"
>>>>>>> 76999d0 (last)
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
@ -112,6 +135,7 @@
android:orientation="vertical">
<ImageView
<<<<<<< HEAD
android:layout_width="match_parent"
android:layout_height="82dp"
android:src="@drawable/taosu" />
@ -121,6 +145,61 @@
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:text="中式传统糕点"
=======
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/youzi" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:text="柚子"
android:textColor="#696969"
android:textSize="20sp" />
</LinearLayout>
<LinearLayout
android:id="@+id/juzi"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:orientation="vertical">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/juzi" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:text="橘子"
android:textColor="#696969"
android:textSize="20sp" />
</LinearLayout>
<LinearLayout
android:id="@+id/xigua"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:orientation="vertical">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/xigua" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:text="西瓜"
>>>>>>> 76999d0 (last)
android:textColor="#696969"
android:textSize="20sp" />
</LinearLayout>
@ -134,7 +213,11 @@
android:orientation="horizontal">
<LinearLayout
<<<<<<< HEAD
android:id="@+id/chinese_newcake"
=======
android:id="@+id/li"
>>>>>>> 76999d0 (last)
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
@ -142,6 +225,7 @@
android:orientation="vertical">
<ImageView
<<<<<<< HEAD
android:layout_width="77dp"
android:layout_height="102dp"
android:src="@drawable/lvdou" />
@ -167,18 +251,31 @@
android:layout_width="79dp"
android:layout_height="117dp"
android:src="@drawable/naiyoubread" />
=======
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/li" />
>>>>>>> 76999d0 (last)
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
<<<<<<< HEAD
android:text="吐司餐包"
=======
android:text="香梨"
>>>>>>> 76999d0 (last)
android:textColor="#696969"
android:textSize="20sp" />
</LinearLayout>
<LinearLayout
<<<<<<< HEAD
android:id="@+id/fruit_tea"
=======
android:id="@+id/apple"
>>>>>>> 76999d0 (last)
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
@ -186,21 +283,35 @@
android:orientation="vertical">
<ImageView
<<<<<<< HEAD
android:layout_width="72dp"
android:layout_height="119dp"
android:src="@drawable/peachtea" />
=======
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/apple" />
>>>>>>> 76999d0 (last)
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
<<<<<<< HEAD
android:text="鲜果茶饮"
=======
android:text="苹果"
>>>>>>> 76999d0 (last)
android:textColor="#696969"
android:textSize="20sp" />
</LinearLayout>
<LinearLayout
<<<<<<< HEAD
android:id="@+id/birthcake"
=======
android:id="@+id/lemon"
>>>>>>> 76999d0 (last)
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
@ -208,15 +319,47 @@
android:orientation="vertical">
<ImageView
<<<<<<< HEAD
android:layout_width="89dp"
android:layout_height="107dp"
android:src="@drawable/birthcake" />
=======
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/lemon" />
>>>>>>> 76999d0 (last)
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
<<<<<<< HEAD
android:text="生日蛋糕"
=======
android:text="柠檬"
android:textColor="#696969"
android:textSize="20sp" />
</LinearLayout>
<LinearLayout
android:id="@+id/mangguo"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:orientation="vertical">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/mangguo" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:text="芒果"
>>>>>>> 76999d0 (last)
android:textColor="#696969"
android:textSize="20sp" />
</LinearLayout>

@ -4,22 +4,31 @@
android:layout_height="match_parent"
android:orientation="horizontal">
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8d271bc (end_code)
=======
>>>>>>> 76999d0 (last)
<!--首页-->
<LinearLayout
android:id="@+id/content_index"
android:layout_width="0dp"
<<<<<<< HEAD
<<<<<<< HEAD
android:layout_height="wrap_content"
=======
android:layout_height="74dp"
>>>>>>> 8d271bc (end_code)
=======
android:layout_height="wrap_content"
>>>>>>> 76999d0 (last)
android:layout_weight="1"
android:orientation="vertical">
<ImageView
<<<<<<< HEAD
<<<<<<< HEAD
android:layout_width="match_parent"
android:layout_height="43dp"
@ -27,6 +36,10 @@
android:layout_width="71dp"
android:layout_height="49dp"
>>>>>>> 8d271bc (end_code)
=======
android:layout_width="wrap_content"
android:layout_height="wrap_content"
>>>>>>> 76999d0 (last)
android:layout_gravity="center"
android:layout_marginTop="2dp"
android:src="@drawable/index" />
@ -83,17 +96,23 @@
android:orientation="vertical">
<ImageView
<<<<<<< HEAD
<<<<<<< HEAD
android:layout_width="match_parent"
android:layout_height="45dp"
android:layout_gravity="center"
android:src="@drawable/shopping" />
=======
=======
>>>>>>> 76999d0 (last)
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:src="@drawable/shoppingcart" />
<<<<<<< HEAD
>>>>>>> 8d271bc (end_code)
=======
>>>>>>> 76999d0 (last)
<TextView
android:layout_width="wrap_content"
@ -134,8 +153,12 @@
android:textSize="18sp" />
</LinearLayout>
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8d271bc (end_code)
=======
>>>>>>> 76999d0 (last)
</LinearLayout>

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<<<<<<< HEAD
<<<<<<< HEAD
android:orientation="vertical" android:layout_width="match_parent"
android:layout_height="match_parent">
@ -10,6 +11,8 @@
android:layout_height="wrap_content"
android:text="product" />
=======
=======
>>>>>>> 76999d0 (last)
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
@ -34,5 +37,8 @@
android:layout_marginRight="10dp"
android:numColumns="2"/>
<<<<<<< HEAD
>>>>>>> 8d271bc (end_code)
=======
>>>>>>> 76999d0 (last)
</LinearLayout>

@ -1,9 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<<<<<<< HEAD
<<<<<<< HEAD
xmlns:tools="http://schemas.android.com/tools"
=======
>>>>>>> 8d271bc (end_code)
=======
>>>>>>> 76999d0 (last)
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#E8E8E8"
@ -27,22 +30,30 @@
android:orientation="horizontal">
<TextView
<<<<<<< HEAD
<<<<<<< HEAD
android:layout_height="35dp"
=======
android:layout_height="45dp"
>>>>>>> 8d271bc (end_code)
=======
android:layout_height="45dp"
>>>>>>> 76999d0 (last)
android:layout_weight="1"
android:drawableLeft="@drawable/user_pay"
android:textColor="#000"
android:text="卡券"
android:gravity="center_vertical"
android:drawablePadding="8dp"
<<<<<<< HEAD
<<<<<<< HEAD
android:textSize="14sp"
=======
android:textSize="16sp"
>>>>>>> 8d271bc (end_code)
=======
android:textSize="16sp"
>>>>>>> 76999d0 (last)
android:layout_marginLeft="5dp"
android:layout_width="0dp" />
@ -64,22 +75,30 @@
<TextView
android:id="@+id/user_username"
<<<<<<< HEAD
<<<<<<< HEAD
android:layout_height="35dp"
=======
android:layout_height="45dp"
>>>>>>> 8d271bc (end_code)
=======
android:layout_height="45dp"
>>>>>>> 76999d0 (last)
android:layout_weight="1"
android:drawableLeft="@drawable/user_account"
android:textColor="#000"
android:text="账号:"
android:gravity="center_vertical"
android:drawablePadding="8dp"
<<<<<<< HEAD
<<<<<<< HEAD
android:textSize="14sp"
=======
android:textSize="16sp"
>>>>>>> 8d271bc (end_code)
=======
android:textSize="16sp"
>>>>>>> 76999d0 (last)
android:layout_marginLeft="5dp"
android:layout_width="0dp" />
@ -102,26 +121,36 @@
<TextView
android:id="@+id/user_sex"
<<<<<<< HEAD
<<<<<<< HEAD
android:layout_height="35dp"
=======
android:layout_height="45dp"
>>>>>>> 8d271bc (end_code)
=======
android:layout_height="45dp"
>>>>>>> 76999d0 (last)
android:layout_weight="1"
android:layout_marginLeft="5dp"
android:drawableLeft="@drawable/user_sex"
android:textColor="#000"
<<<<<<< HEAD
<<<<<<< HEAD
android:text="城市:"
android:gravity="center_vertical"
android:drawablePadding="8dp"
android:textSize="14sp"
=======
=======
>>>>>>> 76999d0 (last)
android:text="性别:"
android:gravity="center_vertical"
android:drawablePadding="8dp"
android:textSize="16sp"
<<<<<<< HEAD
>>>>>>> 8d271bc (end_code)
=======
>>>>>>> 76999d0 (last)
android:layout_width="0dp" />
<ImageView
@ -143,22 +172,30 @@
<TextView
android:id="@+id/user_city"
<<<<<<< HEAD
<<<<<<< HEAD
android:layout_height="35dp"
=======
android:layout_height="45dp"
>>>>>>> 8d271bc (end_code)
=======
android:layout_height="45dp"
>>>>>>> 76999d0 (last)
android:layout_weight="1"
android:drawableLeft="@drawable/city"
android:textColor="#000"
android:text="城市:"
android:gravity="center_vertical"
android:drawablePadding="8dp"
<<<<<<< HEAD
<<<<<<< HEAD
android:textSize="14sp"
=======
android:textSize="16sp"
>>>>>>> 8d271bc (end_code)
=======
android:textSize="16sp"
>>>>>>> 76999d0 (last)
android:layout_marginLeft="5dp"
android:layout_width="0dp" />
@ -180,22 +217,30 @@
android:orientation="horizontal">
<TextView
<<<<<<< HEAD
<<<<<<< HEAD
android:layout_height="35dp"
=======
android:layout_height="45dp"
>>>>>>> 8d271bc (end_code)
=======
android:layout_height="45dp"
>>>>>>> 76999d0 (last)
android:layout_weight="1"
android:drawableLeft="@drawable/user_general"
android:textColor="#000"
android:text="通用"
android:gravity="center_vertical"
android:drawablePadding="8dp"
<<<<<<< HEAD
<<<<<<< HEAD
android:textSize="14sp"
=======
android:textSize="16sp"
>>>>>>> 8d271bc (end_code)
=======
android:textSize="16sp"
>>>>>>> 76999d0 (last)
android:layout_marginLeft="5dp"
android:layout_width="0dp" />
@ -207,10 +252,15 @@
</LinearLayout>
<<<<<<< HEAD
<<<<<<< HEAD
=======
<!-- &lt;!&ndash;查看商品&ndash;&gt;
>>>>>>> 8d271bc (end_code)
=======
<!-- &lt;!&ndash;查看商品&ndash;&gt;
>>>>>>> 76999d0 (last)
<LinearLayout
android:id="@+id/user_searchProduct"
android:layout_width="match_parent"
@ -220,6 +270,7 @@
android:orientation="horizontal">
<TextView
<<<<<<< HEAD
<<<<<<< HEAD
android:layout_width="0dp"
android:layout_height="35dp"
@ -233,6 +284,8 @@
android:textSize="14sp"
/>
=======
=======
>>>>>>> 76999d0 (last)
android:layout_height="45dp"
android:layout_weight="1"
android:drawableLeft="@drawable/search"
@ -244,20 +297,29 @@
android:layout_marginLeft="5dp"
android:layout_width="0dp" />
<<<<<<< HEAD
>>>>>>> 8d271bc (end_code)
=======
>>>>>>> 76999d0 (last)
<ImageView
android:layout_width="25dp"
android:layout_height="25dp"
android:layout_gravity="center"
<<<<<<< HEAD
<<<<<<< HEAD
android:src="@drawable/arrow_right"/>
</LinearLayout>
=======
=======
>>>>>>> 76999d0 (last)
android:src="@drawable/arrow_right" />
</LinearLayout>-->
<<<<<<< HEAD
>>>>>>> 8d271bc (end_code)
=======
>>>>>>> 76999d0 (last)
<!--设置-->
<LinearLayout
android:id="@+id/user_setting"
@ -268,22 +330,30 @@
android:orientation="horizontal">
<TextView
<<<<<<< HEAD
<<<<<<< HEAD
android:layout_height="35dp"
=======
android:layout_height="45dp"
>>>>>>> 8d271bc (end_code)
=======
android:layout_height="45dp"
>>>>>>> 76999d0 (last)
android:layout_weight="1"
android:drawableLeft="@drawable/setting"
android:textColor="#000"
android:text="设置"
android:gravity="center_vertical"
android:drawablePadding="8dp"
<<<<<<< HEAD
<<<<<<< HEAD
android:textSize="14sp"
=======
android:textSize="16sp"
>>>>>>> 8d271bc (end_code)
=======
android:textSize="16sp"
>>>>>>> 76999d0 (last)
android:layout_marginLeft="5dp"
android:layout_width="0dp" />
@ -297,6 +367,7 @@
<Button
android:layout_width="fill_parent"
<<<<<<< HEAD
<<<<<<< HEAD
android:layout_height="48dp"
android:layout_marginLeft="10dp"
@ -304,12 +375,17 @@
android:textSize="18sp"
android:layout_marginTop="150dp"
=======
=======
>>>>>>> 76999d0 (last)
android:layout_height="40dp"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:textSize="18sp"
android:layout_marginTop="90dp"
<<<<<<< HEAD
>>>>>>> 8d271bc (end_code)
=======
>>>>>>> 76999d0 (last)
android:text="退出登录"
android:textColor="#FFFFFF"
android:layout_gravity="center"

@ -19,11 +19,15 @@
android:layout_height="50dp"
android:layout_marginLeft="5dp"
android:layout_weight="1"
<<<<<<< HEAD
<<<<<<< HEAD
android:drawableLeft="@drawable/famous_cake"
=======
android:drawableLeft="@drawable/shuiguo"
>>>>>>> 8d271bc (end_code)
=======
android:drawableLeft="@drawable/shuiguo"
>>>>>>> 76999d0 (last)
android:drawablePadding="8dp"
android:gravity="center_vertical"
android:text="热门商品"
@ -50,11 +54,15 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="#E8E8E8"
<<<<<<< HEAD
<<<<<<< HEAD
android:verticalSpacing="20dp"
=======
android:verticalSpacing="10dp"
>>>>>>> 8d271bc (end_code)
=======
android:verticalSpacing="10dp"
>>>>>>> 76999d0 (last)
android:horizontalSpacing="10dp"
android:numColumns="2" />
</LinearLayout>

@ -0,0 +1,48 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<TextView
android:id="@+id/shid"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="商品序号"
app:layout_constraintBaseline_toBaselineOf="@+id/shproductid"
app:layout_constraintStart_toStartOf="@+id/shoppingproductpicture" />
<TextView
android:id="@+id/shproductid"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="商品id"
app:layout_constraintStart_toStartOf="@+id/shid"
app:layout_constraintTop_toTopOf="@+id/shoppingproductpicture" />
<TextView
android:id="@+id/userid"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="用户id"
app:layout_constraintBaseline_toBaselineOf="@+id/shid"
app:layout_constraintStart_toStartOf="@+id/shid" />
<ImageView
android:id="@+id/shoppingproductpicture"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintBottom_toTopOf="parent"
app:layout_constraintEnd_toStartOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/shproductnum"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="商品数量"
app:layout_constraintBaseline_toBaselineOf="@+id/shid"
app:layout_constraintStart_toStartOf="@+id/shid" />
</LinearLayout>

@ -3,6 +3,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
<<<<<<< HEAD
android:background="#ffeff2">
<!--APPLogo及名字-->
@ -26,6 +27,30 @@
android:textColor="#000000"
android:textSize="22sp"
android:textStyle="italic" />
=======
android:background="#E8E8E8">
<!--APPLogo及名字-->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:layout_marginTop="40dp"
android:orientation="vertical">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:src="@drawable/orange" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="22sp"
android:textColor="#000000"
android:textStyle="italic"
android:text="Orange" />
>>>>>>> 76999d0 (last)
</LinearLayout>
<LinearLayout

@ -3,7 +3,11 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
<<<<<<< HEAD
android:background="#ffeff2">
=======
android:background="#E8E8E8">
>>>>>>> 76999d0 (last)
<!--APPLogo及名字-->
<LinearLayout
@ -15,9 +19,15 @@
<ImageView
android:layout_width="wrap_content"
<<<<<<< HEAD
android:layout_height="74dp"
android:layout_gravity="center_horizontal"
android:src="@drawable/search" />
=======
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:src="@drawable/orange" />
>>>>>>> 76999d0 (last)
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -38,7 +48,11 @@
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_gravity="center_vertical"
<<<<<<< HEAD
android:src="@drawable/user_cake" />
=======
android:src="@drawable/user" />
>>>>>>> 76999d0 (last)
<EditText
android:id="@+id/reg_username"
@ -61,7 +75,11 @@
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_gravity="center_vertical"
<<<<<<< HEAD
android:src="@drawable/user_ps" />
=======
android:src="@drawable/password" />
>>>>>>> 76999d0 (last)
<EditText
android:id="@+id/reg_password"
android:layout_width="290dp"
@ -158,11 +176,20 @@
android:id="@+id/reg_register"
android:layout_width="280dp"
android:layout_height="50dp"
<<<<<<< HEAD
android:layout_gravity="center_horizontal"
android:layout_marginTop="80dp"
android:background="@drawable/button_login"
android:text="注&#160;&#160;&#160;&#160;&#160;册"
android:textColor="#FFFFFF"
android:textSize="18sp" />
=======
android:layout_marginTop="80dp"
android:textSize="18sp"
android:layout_gravity="center_horizontal"
android:background="@drawable/button_login"
android:textColor="#FFFFFF"
android:text="注&#160;&#160;&#160;&#160;&#160;册" />
>>>>>>> 76999d0 (last)
</LinearLayout>

@ -1,6 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<<<<<<< HEAD
<color name="colorPrimary">#ffc0cb</color>
<color name="colorPrimaryDark">#ffc0cb</color>
<color name="colorAccent">#ffc0cb</color>
=======
<color name="colorPrimary">#008577</color>
<color name="colorPrimaryDark">#00574B</color>
<color name="colorAccent">#D81B60</color>
>>>>>>> 76999d0 (last)
</resources>

@ -1,4 +1,5 @@
<resources>
<<<<<<< HEAD
<string name="app_name">叶妈妈烘焙店</string>
<string name="Username">用户名:</string>
<string name="Password">&#160;&#160;&#160;&#160;码:</string>
@ -6,4 +7,9 @@
<string name="introduce">只销售当日现做面包,新鲜看得到!</string>
=======
>>>>>>> 8d271bc (end_code)
=======
<string name="app_name">橙一色</string>
<string name="Username">用户名:</string>
<string name="Password">&#160;&#160;&#160;&#160;码:</string>
>>>>>>> 76999d0 (last)
</resources>

@ -0,0 +1,20 @@
# Project-wide Gradle settings.
# IDE (e.g. Android Studio) users:
# Gradle settings configured through the IDE *will override*
# any settings specified in this file.
# For more details on how to configure your build environment visit
# http://www.gradle.org/docs/current/userguide/build_environment.html
# Specifies the JVM arguments used for the daemon process.
# The setting is particularly useful for tweaking memory settings.
org.gradle.jvmargs=-Xmx1536m
# When configured, Gradle will run in incubating parallel mode.
# This option should only be used with decoupled projects. More details, visit
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
# org.gradle.parallel=true
# AndroidX package structure to make it clearer which packages are bundled with the
# Android operating system, and which are packaged with your app's APK
# https://developer.android.com/topic/libraries/support-library/androidx-rn
android.useAndroidX=true
# Automatically convert third-party libraries to use AndroidX
android.enableJetifier=true

@ -1,4 +1,5 @@
<<<<<<< HEAD
<<<<<<< HEAD
#Tue Mar 21 10:55:58 CST 2023
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
@ -7,6 +8,11 @@ distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
>>>>>>> 8d271bc (end_code)
=======
#Wed May 17 09:41:29 CST 2023
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
>>>>>>> 76999d0 (last)
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME

Binary file not shown.

@ -1,6 +1,10 @@
include ':app'
<<<<<<< HEAD
<<<<<<< HEAD
rootProject.name='yemamacake'
=======
rootProject.name='OrangeSale_End'
>>>>>>> 8d271bc (end_code)
=======
rootProject.name='OrangeSale_End'
>>>>>>> 76999d0 (last)

Loading…
Cancel
Save