From a0d8f353717d1af6935c5da32c4be419d01a26a9 Mon Sep 17 00:00:00 2001 From: yizhiyun <2094853677@qq.com> Date: Tue, 23 Apr 2024 22:16:12 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=E4=BA=A4=E4=BD=9C=E4=B8=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ACd.java" | 98 +++++++++++++++++++ .../ZY.java" | 55 +++++++++++ 2 files changed, 153 insertions(+) create mode 100644 "work/com/java/minxi/java_20240423/java_2302_\346\230\223\345\277\227\346\230\200_2344310235/ACd.java" create mode 100644 "work/com/java/minxi/java_20240423/java_2302_\346\230\223\345\277\227\346\230\200_2344310235/ZY.java" diff --git "a/work/com/java/minxi/java_20240423/java_2302_\346\230\223\345\277\227\346\230\200_2344310235/ACd.java" "b/work/com/java/minxi/java_20240423/java_2302_\346\230\223\345\277\227\346\230\200_2344310235/ACd.java" new file mode 100644 index 0000000..37e7710 --- /dev/null +++ "b/work/com/java/minxi/java_20240423/java_2302_\346\230\223\345\277\227\346\230\200_2344310235/ACd.java" @@ -0,0 +1,98 @@ +package com.java.minxi.java2302.work.com.java.minxi.java_20240423.java_2302_易志昀_2344310235; + +public class ACd { + public String logo; + public int weight; + public String kind; + + public boolean wash(){ + if(this.kind.equals("洗衣机")){ + System.out.println(this.logo+this.kind+"正在洗衣服"); + return true; + }else { + System.out.println("不是洗衣机怎么洗衣服"); + return false; + } + } + + public boolean cook(){ + if(this.kind.equals("电饭锅")){ + System.out.println(this.logo+this.kind+"正在炖鸡汤"); + return true; + }else { + System.out.println("不是电饭锅怎么做饭"); + return false; + } + } + + public void weigh(){ + System.out.println(this.logo+this.kind+"有"+weight+"kg重"); + } + + public ACd(){} + public ACd(String logo, int weight, String kind) { + this.logo = logo; + this.weight = weight; + this.kind = kind; + } + + public String getLogo() { + return logo; + } + + public void setLogo(String logo) { + this.logo = logo; + } + + public int getWeight() { + return weight; + } + + public void setWeight(int weight) { + this.weight = weight; + } + + public String getKind() { + return kind; + } + + public void setKind(String kind) { + this.kind = kind; + } + + public static class Air_conditioner{ + public String logo; + public String kind; + + public void cold(){ + System.out.println(this.logo+this.kind+"正在制冷"); + } + public void hot(){ + System.out.println(this.logo+this.kind+"正在制热"); + } + public Air_conditioner() { + } + + public Air_conditioner(String logo, String kind) { + this.logo = logo; + this.kind = kind; + } + + public String getLogo() { + return logo; + } + + public void setLogo(String logo) { + this.logo = logo; + } + + public String getKind() { + return kind; + } + + public void setKind(String kind) { + this.kind = kind; + } + } + } + diff --git "a/work/com/java/minxi/java_20240423/java_2302_\346\230\223\345\277\227\346\230\200_2344310235/ZY.java" "b/work/com/java/minxi/java_20240423/java_2302_\346\230\223\345\277\227\346\230\200_2344310235/ZY.java" new file mode 100644 index 0000000..4740a91 --- /dev/null +++ "b/work/com/java/minxi/java_20240423/java_2302_\346\230\223\345\277\227\346\230\200_2344310235/ZY.java" @@ -0,0 +1,55 @@ +package com.java.minxi.java2302.work.com.java.minxi.java_20240423.java_2302_易志昀_2344310235; +public class ZY { + public static void main(String[] args) { + ACd xyj=new ACd(); + xyj.logo="海尔"; + xyj.weight=1; + xyj.kind="洗衣机"; + ACd dfg=new ACd(); + dfg.logo="美的"; + dfg.weight=2; + dfg.kind="电饭锅"; + ACd bx=new ACd(); + bx.logo="海尔"; + bx.weight=50; + bx.kind="冰箱"; + ACd.Air_conditioner kt= new ACd.Air_conditioner(); + kt.logo="大金"; + kt.kind="空调"; + xyj.wash(); + dfg.cook(); + bx.weigh(); + kt.cold(); + + ACd xyj1=new ACd(); + xyj1.setLogo("海尔"); + xyj1.setWeight(1); + xyj1.setKind("洗衣机"); + ACd dfg1=new ACd(); + dfg1.setLogo("美的"); + dfg1.setWeight(2); + dfg1.setKind("电饭锅"); + ACd bx1=new ACd(); + bx1.setLogo("海尔"); + bx1.setWeight(50); + bx1.setKind("冰箱"); + ACd.Air_conditioner kt1=new ACd.Air_conditioner(); + kt1.setLogo("大金"); + kt1.setKind("空调"); + xyj1.wash(); + dfg1.cook(); + bx1.weigh(); + kt1.cold(); + + ACd xyj2=new ACd("海尔",1,"洗衣机"); + ACd dfg2=new ACd("美的",2,"电饭锅"); + ACd bx2=new ACd("海尔",50,"冰箱"); + ACd.Air_conditioner kt2=new ACd.Air_conditioner("大金","空调"); + xyj2.wash(); + dfg2.cook(); + bx2.weigh(); + kt2.cold(); + } + +} + -- Gitee From 92329da4bdbb1f28c0f06c51eaf811bedef36edf Mon Sep 17 00:00:00 2001 From: yizhiyun <2094853677@qq.com> Date: Wed, 24 Apr 2024 10:03:54 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat:=E4=BA=A4=E4=BD=9C=E4=B8=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ACd.java" | 2 +- .../ZY.java" | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename "work/com/java/minxi/java_20240423/java_2302_\346\230\223\345\277\227\346\230\200_2344310235/ACd.java" => "work/com/java/minxi/java_20240420/java_2302_\346\230\223\345\277\227\346\230\200_2344310235/ACd.java" (98%) rename "work/com/java/minxi/java_20240423/java_2302_\346\230\223\345\277\227\346\230\200_2344310235/ZY.java" => "work/com/java/minxi/java_20240420/java_2302_\346\230\223\345\277\227\346\230\200_2344310235/ZY.java" (97%) diff --git "a/work/com/java/minxi/java_20240423/java_2302_\346\230\223\345\277\227\346\230\200_2344310235/ACd.java" "b/work/com/java/minxi/java_20240420/java_2302_\346\230\223\345\277\227\346\230\200_2344310235/ACd.java" similarity index 98% rename from "work/com/java/minxi/java_20240423/java_2302_\346\230\223\345\277\227\346\230\200_2344310235/ACd.java" rename to "work/com/java/minxi/java_20240420/java_2302_\346\230\223\345\277\227\346\230\200_2344310235/ACd.java" index 37e7710..73cfb03 100644 --- "a/work/com/java/minxi/java_20240423/java_2302_\346\230\223\345\277\227\346\230\200_2344310235/ACd.java" +++ "b/work/com/java/minxi/java_20240420/java_2302_\346\230\223\345\277\227\346\230\200_2344310235/ACd.java" @@ -1,4 +1,4 @@ -package com.java.minxi.java2302.work.com.java.minxi.java_20240423.java_2302_易志昀_2344310235; +package com.java.minxi.java2302.work.com.java.minxi.java_20240420.java_2302_易志昀_2344310235; public class ACd { public String logo; diff --git "a/work/com/java/minxi/java_20240423/java_2302_\346\230\223\345\277\227\346\230\200_2344310235/ZY.java" "b/work/com/java/minxi/java_20240420/java_2302_\346\230\223\345\277\227\346\230\200_2344310235/ZY.java" similarity index 97% rename from "work/com/java/minxi/java_20240423/java_2302_\346\230\223\345\277\227\346\230\200_2344310235/ZY.java" rename to "work/com/java/minxi/java_20240420/java_2302_\346\230\223\345\277\227\346\230\200_2344310235/ZY.java" index 4740a91..4bf5abe 100644 --- "a/work/com/java/minxi/java_20240423/java_2302_\346\230\223\345\277\227\346\230\200_2344310235/ZY.java" +++ "b/work/com/java/minxi/java_20240420/java_2302_\346\230\223\345\277\227\346\230\200_2344310235/ZY.java" @@ -1,4 +1,4 @@ -package com.java.minxi.java2302.work.com.java.minxi.java_20240423.java_2302_易志昀_2344310235; +package com.java.minxi.java2302.work.com.java.minxi.java_20240420.java_2302_易志昀_2344310235; public class ZY { public static void main(String[] args) { ACd xyj=new ACd(); -- Gitee