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 7708172..17af0ec 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,7 @@ public class OkHttpClientProduct { public List getProduct() throws IOException { OkHttpClient okHttpClient = new OkHttpClient(); Request request = new Request.Builder() - .url("http://10.21.221.183:8081/orange/product/search") + .url("http://10.21.192.15:8081/orange/product/search") .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 92e772e..8865582 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,7 @@ public class OkHttpMessage { public OrangeMessage consumeMessage() throws IOException { OkHttpClient okHttpClient = new OkHttpClient(); Request request = new Request.Builder() - .url("http://10.21.221.183:8081/orange/message/consumeMessage") + .url("http://10.21.192.15:8081/orange/message/consumeMessage") .build(); Response response = okHttpClient.newCall(request).execute(); JSONObject jsonObject = JSON.parseObject(Objects.requireNonNull(response.body()).string()); @@ -30,7 +30,7 @@ public class OkHttpMessage { * 消费完消息以后,设置消息为已读 */ Request request1 = new Request.Builder() - .url("http://10.21.221.183:8081/orange/message/updateMessage") + .url("http://10.21.192.15:8081/orange/message/updateMessage") .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 d190cc6..dc06ec5 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,7 @@ public class OkHttpUser { RequestBody requestBody = RequestBody.create(jsonStr, mediaType); Request request = new Request.Builder() - .url("http://10.21.221.183:8081/orange/user/login") + .url("http://10.21.192.15:8081/orange/user/login") .post(requestBody) .build(); @@ -58,7 +58,7 @@ public class OkHttpUser { String jsonStr = JSONObject.toJSONString(orangeUser); RequestBody requestBody = RequestBody.create(jsonStr, mediaType); Request request = new Request.Builder() - .url("http://10.21.221.183:8081/orange/user/register") + .url("http://10.21.192.15:8081/orange/user/register") .post(requestBody) .build(); Response response = okHttpClient.newCall(request).execute(); diff --git a/app/src/main/res/drawable/mao.png b/app/src/main/res/drawable/mao.png new file mode 100644 index 0000000..6eedd6e Binary files /dev/null and b/app/src/main/res/drawable/mao.png differ diff --git a/app/src/main/res/drawable/renwu.png b/app/src/main/res/drawable/renwu.png new file mode 100644 index 0000000..e3c9920 Binary files /dev/null and b/app/src/main/res/drawable/renwu.png differ diff --git a/app/src/main/res/layout/cart_no_product.xml b/app/src/main/res/layout/cart_no_product.xml index 9f4a2f1..3247914 100644 --- a/app/src/main/res/layout/cart_no_product.xml +++ b/app/src/main/res/layout/cart_no_product.xml @@ -11,35 +11,124 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_gravity="center" - android:layout_marginTop="160dp" + android:layout_marginTop="10dp" android:orientation="vertical"> + + + + android:text="草莓蛋糕" + android:textColor="#B5B5B5" + android:textSize="20sp" /> + +