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 8fe167b..50cbc2c 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.91.105:8081/uploaded/" + fileName); + map.put("data", "http://192.168.1.9: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 a3463de..eae81ec 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.91.105:8081/uploaded/" + fileName); + map.put("data", "http://192.168.1.9:8081/uploaded/" + fileName); return map; } catch (Exception e) { map.put("flag", false); diff --git a/CatApp_android_End/src/main/resources/application.properties b/CatApp_android_End/src/main/resources/application.properties index 359c3e5..df68f45 100644 --- a/CatApp_android_End/src/main/resources/application.properties +++ b/CatApp_android_End/src/main/resources/application.properties @@ -3,7 +3,7 @@ spring.datasource.url=jdbc:mysql://localhost:3306/orange?useUnicode=true&charact spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver spring.datasource.username=root -spring.datasource.password=root +spring.datasource.password=tx511520 #շԶת mybatis.configuration.map-underscore-to-camel-case=true mybatis.mapper-locations=classpath:mapper/*Mapper.xml diff --git a/CatApp_android_frontEnd/app/src/main/java/com/example/catapp/adapter/CartAdapter.java b/CatApp_android_frontEnd/app/src/main/java/com/example/catapp/adapter/CartAdapter.java new file mode 100644 index 0000000..f2c0121 --- /dev/null +++ b/CatApp_android_frontEnd/app/src/main/java/com/example/catapp/adapter/CartAdapter.java @@ -0,0 +1,70 @@ +package com.example.catapp.adapter; + +import android.content.Context; +import android.util.Log; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.BaseAdapter; +import android.widget.ImageView; +import android.widget.TextView; + +import com.example.catapp.R; +import com.example.catapp.entity.Product; + +import java.util.List; + +public class CartAdapter extends BaseAdapter { + private List cartList; + private LayoutInflater layoutInflater; + + public CartAdapter(Context context, List productList) { + this.cartList = productList; + this.layoutInflater = LayoutInflater.from(context); + } + + @Override + public int getCount() { + return cartList.size(); + } + + @Override + public Object getItem(int position) { + return cartList.get(position); + } + + @Override + public long getItemId(int position) { + return position; + } + + @Override + public View getView(int position, View convertView, ViewGroup parent) { + ViewHolder viewHolder; + if (convertView == null) { + Log.i("aa", "getView: "+"aa"); + convertView = layoutInflater.inflate(R.layout.cart_good, null); + viewHolder = new ViewHolder(); + viewHolder.productImage = convertView.findViewById(R.id.category_product_image); + viewHolder.productName = convertView.findViewById(R.id.category_product_name); + viewHolder.productPrice = convertView.findViewById(R.id.category_product_price); + convertView.setTag(viewHolder); + } else { + viewHolder = (ViewHolder) convertView.getTag(); + } + Product product = cartList.get(position); + Log.i("product", "getView: "+product.toString()); + if (product != null) { + viewHolder.productImage.setBackgroundResource(product.getImageUrlId()); + viewHolder.productName.setText(product.getProductName()); + viewHolder.productPrice.setText(String.valueOf(product.getProductPrice())); + } + return convertView; + } + + class ViewHolder { + ImageView productImage; + TextView productName, productPrice; + } +} + 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 09841c5..8148cc5 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,7 +20,7 @@ import okhttp3.Response; public class OkHttpClientProduct { - public static String Url="http://10.21.91.105:8081"; + public static String Url="http://10.21.93.212:8081"; /** * 查询商品信息 * diff --git a/CatApp_android_frontEnd/app/src/main/res/layout/cart_good.xml b/CatApp_android_frontEnd/app/src/main/res/layout/cart_good.xml new file mode 100644 index 0000000..eb7b387 --- /dev/null +++ b/CatApp_android_frontEnd/app/src/main/res/layout/cart_good.xml @@ -0,0 +1,53 @@ + + + + + + + + + + + + + + + + + diff --git a/CatApp_web_frontEnd/.idea/vcs.xml b/CatApp_web_frontEnd/.idea/vcs.xml new file mode 100644 index 0000000..6c0b863 --- /dev/null +++ b/CatApp_web_frontEnd/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file