diff --git a/CatApp_android_End/src/main/java/com/example/cat/controller/CatProductController.java b/CatApp_android_End/src/main/java/com/example/cat/controller/CatProductController.java index 5a19d83..8fe167b 100644 --- a/CatApp_android_End/src/main/java/com/example/cat/controller/CatProductController.java +++ b/CatApp_android_End/src/main/java/com/example/cat/controller/CatProductController.java @@ -142,7 +142,7 @@ public class CatProductController { file.transferTo(destFile); } map.put("flag", true); - map.put("data", "http://10.21.120.101:8081/uploaded/" + fileName); + map.put("data", "http://10.21.91.105:8081/uploaded/" + fileName); return map; } catch (Exception e) { map.put("flag", false); diff --git a/CatApp_android_End/src/main/java/com/example/cat/controller/CatShoppingCartController.java b/CatApp_android_End/src/main/java/com/example/cat/controller/CatShoppingCartController.java index 28d1d9d..a3463de 100644 --- a/CatApp_android_End/src/main/java/com/example/cat/controller/CatShoppingCartController.java +++ b/CatApp_android_End/src/main/java/com/example/cat/controller/CatShoppingCartController.java @@ -88,7 +88,7 @@ public class CatShoppingCartController { file.transferTo(destFile); } map.put("flag", true); - map.put("data", "http://10.21.120.101:8081/uploaded/" + fileName); + map.put("data", "http://10.21.91.105:8081/uploaded/" + fileName); return map; } catch (Exception e) { map.put("flag", false); diff --git a/CatApp_android_frontEnd/app/src/main/java/com/example/catapp/activity/IndexActivity.java b/CatApp_android_frontEnd/app/src/main/java/com/example/catapp/activity/IndexActivity.java index e9e1176..573bbb8 100644 --- a/CatApp_android_frontEnd/app/src/main/java/com/example/catapp/activity/IndexActivity.java +++ b/CatApp_android_frontEnd/app/src/main/java/com/example/catapp/activity/IndexActivity.java @@ -4,25 +4,34 @@ import android.app.Activity; import android.app.FragmentTransaction; import android.content.Intent; import android.os.Bundle; +import android.util.Log; import android.view.View; import android.widget.LinearLayout; import androidx.annotation.Nullable; import com.example.catapp.R; +import com.example.catapp.entity.CatProductPack; +import com.example.catapp.entity.ShoppingCartPack; import com.example.catapp.fragment.IndexFragment; import com.example.catapp.fragment.PearsonFragment; import com.example.catapp.fragment.ProductFragment; import com.example.catapp.fragment.ShoppingCartFragment; +import com.example.catapp.netrequest.OkHttpShoppingcart; import com.example.catapp.service.TimeService; +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; + 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; - + public static List cartList = new ArrayList<>(); + private Integer userId=1; @Override public void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -31,6 +40,8 @@ public class IndexActivity extends Activity implements View.OnClickListener { initIndexFragment(); Thread thread = new Thread(runnable); thread.start(); + check();//检查用户购物车是否为空 + Log.d("InActivity get cartList.size() ：",""+cartList.size()); } /** @@ -45,6 +56,7 @@ public class IndexActivity extends Activity implements View.OnClickListener { shoppingCartLine.setOnClickListener(this); pearsonLine = findViewById(R.id.content_pearson); pearsonLine.setOnClickListener(this); + getUserId(); } @Override @@ -65,6 +77,15 @@ public class IndexActivity extends Activity implements View.OnClickListener { } } + /** + * 获取userId来判断用户购物车是否为空 + */ + private void getUserId() { + Intent intent = IndexActivity.this.getIntent(); + Bundle bundle = intent.getExtras(); + userId=(Integer)bundle.getInt("id"); + Log.d("IndexActivity.userId",""+userId); + } /** * 初始化首页Fragment */ @@ -128,4 +149,23 @@ public class IndexActivity extends Activity implements View.OnClickListener { startService(intent); }; + /** + *发送网络检查用户购物车是否为空 + */ + public void check(){ + new Thread(new Runnable() { + @Override + public void run() { + OkHttpShoppingcart okHttpShoppingcart=new OkHttpShoppingcart(); + try { + if(okHttpShoppingcart.getShoppingCartPack(userId)==null)return; + cartList=okHttpShoppingcart.getShoppingCartPack(userId); + Log.d("check()",""+(cartList.size())); + } catch (IOException e) { + throw new RuntimeException(e); + } + } + }).start(); + } + } diff --git a/CatApp_android_frontEnd/app/src/main/java/com/example/catapp/fragment/ShoppingCartFragment.java b/CatApp_android_frontEnd/app/src/main/java/com/example/catapp/fragment/ShoppingCartFragment.java index e62a5b0..70251cb 100644 --- a/CatApp_android_frontEnd/app/src/main/java/com/example/catapp/fragment/ShoppingCartFragment.java +++ b/CatApp_android_frontEnd/app/src/main/java/com/example/catapp/fragment/ShoppingCartFragment.java @@ -5,17 +5,21 @@ import android.app.FragmentTransaction; import android.os.Bundle; import android.os.Handler; import android.os.Message; +import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.widget.AdapterView; import android.widget.Button; import android.widget.GridView; +import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import com.example.catapp.R; +import com.example.catapp.activity.IndexActivity; import com.example.catapp.adapter.ProductAdapter; import com.example.catapp.adapter.ShoppingCartAdapter; import com.example.catapp.entity.CatProductPack; @@ -34,23 +38,50 @@ public class ShoppingCartFragment extends Fragment implements View.OnClickListen private ProductFragment productFragment; private GridView productGridView; private TextView usernameText; - private Integer userId=2; + Button left1; + private Integer userId=13; private List catProductList= new ArrayList<>(); Handler h=null; + + @Override + public void onCreate(@Nullable Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + //给购物车集合赋值，用以判断界面的展示 + cartList=IndexActivity.cartList; + Log.d("ShoppingCartFragment onCrate init cartList",""+cartList); + + } + +// @Override +// public void onActivityCreated(@Nullable Bundle savedInstanceState) { +// super.onActivityCreated(savedInstanceState); +// productGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { +// @Override +// public void onItemClick(AdapterView parent, View view, int position, long id) { +// FragmentTransaction transaction = getFragmentManager().beginTransaction(); +// if (productFragment == null) { +// productFragment = new ProductFragment(); +// } +// transaction.replace(R.id.main_content0, productFragment); +// transaction.commit(); +// +// } +// }); +// } + @Nullable @Override public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { View view; -// if (cartList.size() > 0) { -// //有商品 + cartList=IndexActivity.cartList; + if (cartList.size() > 0) { + //有商品 view = LayoutInflater.from(getActivity()).inflate(R.layout.cart_have_product, container, false); -// } else { -// view = LayoutInflater.from(getActivity()).inflate(R.layout.cart_no_product, container, false); -// } + linkHttp(view); + } else { + view = LayoutInflater.from(getActivity()).inflate(R.layout.cart_no_product, container, false); + } init(view); - check(); -// if (cartList.size() > 0) - linkHttp(); return view; } @@ -59,12 +90,15 @@ public class ShoppingCartFragment extends Fragment implements View.OnClickListen */ private void init(View view) { usernameText=view.findViewById(R.id.username); - productGridView = view.findViewById(R.id.cart_productList); + //productGridView = view.findViewById(R.id.cart_productList); + if (cartList.size() > 0) { -// walkButton = view.findViewById(R.id.random_search); -// walkButton.setOnClickListener(this); + } + else { + walkButton = view.findViewById(R.id.random_search); + walkButton.setOnClickListener(this); + } - //productGridView = view.findViewById(R.id.cart_productList); setData(); } private void setData() { @@ -75,7 +109,9 @@ public class ShoppingCartFragment extends Fragment implements View.OnClickListen } @Override public void onClick(View v) { - if (cartList.size() > 0) {} + if (cartList.size() > 0) { + + } else { switch (v.getId()) { case R.id.random_search: @@ -91,29 +127,11 @@ public class ShoppingCartFragment extends Fragment implements View.OnClickListen } } + /** - * + *发送网络请求当前用户的购物车信息 */ - public void check(){ - new Thread(new Runnable() { - @Override - public void run() { - OkHttpShoppingcart okHttpShoppingcart=new OkHttpShoppingcart(); - try { - // catProductList= okHttpShoppingcart.getProductPack(userId); - System.out.println(cartList.size() ); - cartList=okHttpShoppingcart.getShoppingCartPack(userId); - System.out.println(cartList.get(0).getNum()); - System.out.println(cartList.size()); - System.out.println(cartList.size()); - System.out.println(cartList.size()); - } catch (IOException e) { - throw new RuntimeException(e); - } - } - }).start(); - } - public void linkHttp(){ + public void linkHttp(View view){ h =new Handler() { @Override public void handleMessage(@NonNull Message msg) { @@ -128,8 +146,9 @@ public class ShoppingCartFragment extends Fragment implements View.OnClickListen public void run() { OkHttpShoppingcart okHttpShoppingcart=new OkHttpShoppingcart(); try { + productGridView = view.findViewById(R.id.cart_productList); catProductList= okHttpShoppingcart.getProductPack(userId); - //cartList=okHttpShoppingcart.getShoppingCartPack(userId); + cartList=okHttpShoppingcart.getShoppingCartPack(userId); } catch (IOException e) { throw new RuntimeException(e); } diff --git a/CatApp_android_frontEnd/app/src/main/java/com/example/catapp/netrequest/OkHttpClientProduct.java b/CatApp_android_frontEnd/app/src/main/java/com/example/catapp/netrequest/OkHttpClientProduct.java index c9b8a4e..09841c5 100644 --- a/CatApp_android_frontEnd/app/src/main/java/com/example/catapp/netrequest/OkHttpClientProduct.java +++ b/CatApp_android_frontEnd/app/src/main/java/com/example/catapp/netrequest/OkHttpClientProduct.java @@ -20,6 +20,7 @@ import okhttp3.Response; public class OkHttpClientProduct { + public static String Url="http://10.21.91.105:8081"; /** * 查询商品信息 * @@ -29,7 +30,7 @@ public class OkHttpClientProduct { OkHttpClient okHttpClient = new OkHttpClient(); Request request = new Request.Builder() - .url("http://10.21.120.101:8081/orange/product/search") + .url(Url+"/orange/product/search") .build(); Response response = okHttpClient.newCall(request).execute(); diff --git a/CatApp_android_frontEnd/app/src/main/java/com/example/catapp/netrequest/OkHttpMessage.java b/CatApp_android_frontEnd/app/src/main/java/com/example/catapp/netrequest/OkHttpMessage.java index d63d255..f91ec7c 100644 --- a/CatApp_android_frontEnd/app/src/main/java/com/example/catapp/netrequest/OkHttpMessage.java +++ b/CatApp_android_frontEnd/app/src/main/java/com/example/catapp/netrequest/OkHttpMessage.java @@ -22,7 +22,7 @@ public class OkHttpMessage { OkHttpClient okHttpClient = new OkHttpClient(); Request request = new Request.Builder() //.url("http://192.168.0.102:8081/orange/message/consumeMessage") - .url("http://10.21.120.101:8081/orange/message/consumeMessage") + .url(OkHttpClientProduct.Url+"/orange/message/consumeMessage") .build(); Response response = okHttpClient.newCall(request).execute(); JSONObject jsonObject = JSON.parseObject(Objects.requireNonNull(response.body()).string()); @@ -31,7 +31,7 @@ public class OkHttpMessage { * 消费完消息以后，设置消息为已读 */ Request request1 = new Request.Builder() - .url("http://10.21.120.101:8081/orange/message/updateMessage") + .url(OkHttpClientProduct.Url+"/orange/message/updateMessage") .build(); okHttpClient.newCall(request1).execute(); return orangeMessage; diff --git a/CatApp_android_frontEnd/app/src/main/java/com/example/catapp/netrequest/OkHttpShoppingcart.java b/CatApp_android_frontEnd/app/src/main/java/com/example/catapp/netrequest/OkHttpShoppingcart.java index 9fd841c..b26d2e1 100644 --- a/CatApp_android_frontEnd/app/src/main/java/com/example/catapp/netrequest/OkHttpShoppingcart.java +++ b/CatApp_android_frontEnd/app/src/main/java/com/example/catapp/netrequest/OkHttpShoppingcart.java @@ -2,6 +2,7 @@ package com.example.catapp.netrequest; import android.graphics.Bitmap; import android.graphics.BitmapFactory; +import android.util.Log; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; @@ -23,13 +24,13 @@ import okhttp3.RequestBody; import okhttp3.Response; public class OkHttpShoppingcart { -//shoppingCart + /** - * 查询商品信息 - * + * 查询当前登录用户的商品信息 + * @param userId 用户id * @return + * @throws IOException */ - public List getProduct(Integer userId) throws IOException { OkHttpClient okHttpClient = new OkHttpClient(); //数据类型为json格式 @@ -39,7 +40,7 @@ public class OkHttpShoppingcart { RequestBody requestBody = RequestBody.create(jsonStr, mediaType); Request request = new Request.Builder() - .url("http://10.21.120.101:8081/orange/shoppingcart/search1") + .url(OkHttpClientProduct.Url+"/orange/shoppingcart/search1") .post(requestBody) .build(); Response response = okHttpClient.newCall(request).execute(); @@ -52,6 +53,12 @@ public class OkHttpShoppingcart { return list; } + /** + * 获取当前登录用户的购物车信息 + * @param userId 用户id + * @return + * @throws IOException + */ public List getShoppingCart(Integer userId) throws IOException { OkHttpClient okHttpClient = new OkHttpClient(); @@ -61,22 +68,16 @@ public class OkHttpShoppingcart { String jsonStr = JSONObject.toJSONString(userId); RequestBody requestBody = RequestBody.create(jsonStr, mediaType); Request request = new Request.Builder() - .url("http://10.21.120.101:8081/orange/shoppingcart/sharecropping") + .url(OkHttpClientProduct.Url+"/orange/shoppingcart/sharecropping") .post(requestBody) .build(); Response response = okHttpClient.newCall(request).execute(); - System.out.println(response.isSuccessful()); - System.out.println(response.isSuccessful()); + Log.d("getShoppingCart request is :",""+response.isSuccessful()); String responseStr = response.body().string(); JSONObject jsonObject = JSON.parseObject(Objects.requireNonNull(responseStr)); List list = JSON.parseObject(jsonObject.getString("data"), new TypeReference>() { }); - System.out.println(list.get(0).getNum()); - System.out.println(list.get(0).getNum()); - System.out.println(list.get(0).getNum()); - System.out.println(list.get(0).getNum()); - System.out.println(list.get(0).getNum()); - + Log.d("list",""+(list!=null)); return list; } @@ -100,17 +101,17 @@ public class OkHttpShoppingcart { } + /** - * 封装信息 - * + * 封装当前用户的商品信息 + * @param userId * @return * @throws IOException */ - public List getProductPack(Integer userId) throws IOException { List packList = new ArrayList<>(); List list = getProduct(userId); - + if(list==null)return null; for (CatProduct catProduct : list) { CatProductPack catProductPack = new CatProductPack(); catProductPack.setId(catProduct.getId()); @@ -129,9 +130,17 @@ public class OkHttpShoppingcart { return packList; } + /** + * 封装当前用户的购物车信息 + * @param userId + * @return + * @throws IOException + */ public List getShoppingCartPack(Integer userId) throws IOException { List packList = new ArrayList<>(); List list = getShoppingCart(userId); + if(list==null)return null; + else { for (ShoppingCart catProduct : list) { ShoppingCartPack catProductPack = new ShoppingCartPack(); catProductPack.setId(catProduct.getId()); @@ -139,7 +148,8 @@ public class OkHttpShoppingcart { catProductPack.setProductId(catProduct.getProductId()); catProductPack.setNum(catProduct.getNum()); packList.add(catProductPack); + System.out.println(6666666); } - return packList; + return packList;} } } diff --git a/CatApp_android_frontEnd/app/src/main/java/com/example/catapp/netrequest/OkHttpUser.java b/CatApp_android_frontEnd/app/src/main/java/com/example/catapp/netrequest/OkHttpUser.java index 4c1938e..9faf01e 100644 --- a/CatApp_android_frontEnd/app/src/main/java/com/example/catapp/netrequest/OkHttpUser.java +++ b/CatApp_android_frontEnd/app/src/main/java/com/example/catapp/netrequest/OkHttpUser.java @@ -29,7 +29,7 @@ public class OkHttpUser { RequestBody requestBody = RequestBody.create(jsonStr, mediaType); Request request = new Request.Builder() - .url("http://10.21.120.101:8081/orange/user/login") + .url(OkHttpClientProduct.Url+"/orange/user/login") .post(requestBody) .build(); @@ -58,7 +58,7 @@ public class OkHttpUser { String jsonStr = JSONObject.toJSONString(catUser); RequestBody requestBody = RequestBody.create(jsonStr, mediaType); Request request = new Request.Builder() - .url("http://10.21.120.101:8081/orange/user/register") + .url(OkHttpClientProduct.Url+"/orange/user/register") .post(requestBody) .build(); Response response = okHttpClient.newCall(request).execute(); diff --git a/CatApp_android_frontEnd/app/src/main/res/layout/shoppingcart_detail_content.xml b/CatApp_android_frontEnd/app/src/main/res/layout/shoppingcart_detail_content.xml index 8b29034..e25d6c9 100644 --- a/CatApp_android_frontEnd/app/src/main/res/layout/shoppingcart_detail_content.xml +++ b/CatApp_android_frontEnd/app/src/main/res/layout/shoppingcart_detail_content.xml @@ -3,7 +3,8 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:background="#14FFEB3B" - android:orientation="vertical"> + android:orientation="vertical" + > - - + android:background="@drawable/left" + android:text="-" + android:textColor="#070707" + android:textSize="18sp" + /> - + android:background="@drawable/right" + android:text="+" + android:textColor="#1C1C1C" + android:textSize="18sp"/> \ No newline at end of file