From 1fddc76c0e8a84060f14a90bf92184b17984febf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E5=87=AF?= <1509501143@qq.com>
Date: Mon, 6 May 2024 20:31:09 +0800
Subject: [PATCH 1/3] =?UTF-8?q?feat:=E6=8F=90=E4=BA=A4506=E4=BD=9C?=
 =?UTF-8?q?=E4=B8=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AirPlane.java"                            | 13 +++++
 .../Car.java"                                 | 17 ++++++
 .../Vehicles.java"                            | 54 +++++++++++++++++++
 .../VehiclesMain.java"                        | 13 +++++
 4 files changed, 97 insertions(+)
 create mode 100644 "work/com/java/minxi/java_20240506/java_23012_\345\256\213\345\207\257_2344310137/AirPlane.java"
 create mode 100644 "work/com/java/minxi/java_20240506/java_23012_\345\256\213\345\207\257_2344310137/Car.java"
 create mode 100644 "work/com/java/minxi/java_20240506/java_23012_\345\256\213\345\207\257_2344310137/Vehicles.java"
 create mode 100644 "work/com/java/minxi/java_20240506/java_23012_\345\256\213\345\207\257_2344310137/VehiclesMain.java"

diff --git "a/work/com/java/minxi/java_20240506/java_23012_\345\256\213\345\207\257_2344310137/AirPlane.java" "b/work/com/java/minxi/java_20240506/java_23012_\345\256\213\345\207\257_2344310137/AirPlane.java"
new file mode 100644
index 00000000..b47e3920
--- /dev/null
+++ "b/work/com/java/minxi/java_20240506/java_23012_\345\256\213\345\207\257_2344310137/AirPlane.java"
@@ -0,0 +1,13 @@
+package com.java.minxi.java_20240506.java_23012_宋凯_2344310137;
+
+public class AirPlane extends Vehicles {
+    public AirPlane(String type, String brand, String color,String place) {
+    super(type, brand, color, place);
+}
+    public void travel(){
+        System.out.println("坐着"+getColor()+getBrand()+"前往"+getPlace()+"旅游");
+
+    }
+    public void combination(String color,String brand){}
+    public void combination(String brand){}
+}
diff --git "a/work/com/java/minxi/java_20240506/java_23012_\345\256\213\345\207\257_2344310137/Car.java" "b/work/com/java/minxi/java_20240506/java_23012_\345\256\213\345\207\257_2344310137/Car.java"
new file mode 100644
index 00000000..86c70166
--- /dev/null
+++ "b/work/com/java/minxi/java_20240506/java_23012_\345\256\213\345\207\257_2344310137/Car.java"
@@ -0,0 +1,17 @@
+package com.java.minxi.java_20240506.java_23012_宋凯_2344310137;
+
+public class Car extends Vehicles{  public Car(String type, String brand, String color,String place) {
+    super(type, brand, color,place);
+}
+
+    public void travel(){
+        System.out.println("开着"+getColor()+getBrand()+"前往"+getPlace()+"旅游");
+    }
+    public void combination(String color,String brand){
+        System.out.println(color+brand);
+    }
+    public void combination(String brand){
+        System.out.println(brand);
+        return;
+    }
+}
diff --git "a/work/com/java/minxi/java_20240506/java_23012_\345\256\213\345\207\257_2344310137/Vehicles.java" "b/work/com/java/minxi/java_20240506/java_23012_\345\256\213\345\207\257_2344310137/Vehicles.java"
new file mode 100644
index 00000000..90ee36b6
--- /dev/null
+++ "b/work/com/java/minxi/java_20240506/java_23012_\345\256\213\345\207\257_2344310137/Vehicles.java"
@@ -0,0 +1,54 @@
+package com.java.minxi.java_20240506.java_23012_宋凯_2344310137;
+
+public class Vehicles { private String type;
+    private String brand;
+    private String color;
+    private String place;
+
+
+    public Vehicles(String type, String brand, String color,String place) {
+        this.type = type;
+        this.brand = brand;
+        this.color = color;
+        this.place = place;
+    }
+
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public String getBrand() {
+        return brand;
+    }
+
+    public void setBrand(String brand) {
+        this.brand = brand;
+    }
+
+    public String getColor() {
+        return color;
+    }
+
+    public void setColor(String color) {
+        this.color = color;
+    }
+
+    public String getPlace() {
+        return place;
+    }
+
+    public void setPlace(String place) {
+        this.place = place;
+    }
+
+
+    public void travel(){
+        System.out.println();
+        System.out.println();
+    }
+}
diff --git "a/work/com/java/minxi/java_20240506/java_23012_\345\256\213\345\207\257_2344310137/VehiclesMain.java" "b/work/com/java/minxi/java_20240506/java_23012_\345\256\213\345\207\257_2344310137/VehiclesMain.java"
new file mode 100644
index 00000000..b44ddb6a
--- /dev/null
+++ "b/work/com/java/minxi/java_20240506/java_23012_\345\256\213\345\207\257_2344310137/VehiclesMain.java"
@@ -0,0 +1,13 @@
+package com.java.minxi.java_20240506.java_23012_宋凯_2344310137;
+
+public class VehiclesMain {public static void main(String[] args) {
+    Car v1 = new Car("1","大众汽车","白色","北京");
+    v1.travel();
+    Car v2 = new Car("2","奔驰汽车","白色","东山岛");
+    v2.travel();
+    AirPlane v3 = new AirPlane("3","波音客机","蓝色","大理");
+    v3.travel();
+    AirPlane v4 = new AirPlane("4","空客客机","白色","哈尔滨岛");
+    v4.travel();
+}
+}
-- 
Gitee


From 1a0c9f2606fbb27ea5701b1031a1a32aa8fa3ee3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E5=87=AF?= <1509501143@qq.com>
Date: Sun, 12 May 2024 11:33:02 +0800
Subject: [PATCH 2/3] =?UTF-8?q?feat:=E6=8F=90=E4=BA=A4506,507=E4=BD=9C?=
 =?UTF-8?q?=E4=B8=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Bus.java"                                 | 18 +++++++
 .../ControlTemperature.java"                  |  5 ++
 .../Main.java"                                | 12 +++++
 .../MoneyFare.java"                           |  4 ++
 .../MotorVehicles.java"                       |  5 ++
 .../Taxi.java"                                |  7 +++
 .../AirPlane.java"                            | 12 +++++
 .../Car.java"                                 | 17 ++++++
 .../Vehicles.java"                            | 54 +++++++++++++++++++
 .../VehiclesMain.java"                        | 15 ++++++
 10 files changed, 149 insertions(+)
 create mode 100644 "work/com/java/minxi/java20240507/java_2301_\345\256\213\345\207\257_2344310137/Bus.java"
 create mode 100644 "work/com/java/minxi/java20240507/java_2301_\345\256\213\345\207\257_2344310137/ControlTemperature.java"
 create mode 100644 "work/com/java/minxi/java20240507/java_2301_\345\256\213\345\207\257_2344310137/Main.java"
 create mode 100644 "work/com/java/minxi/java20240507/java_2301_\345\256\213\345\207\257_2344310137/MoneyFare.java"
 create mode 100644 "work/com/java/minxi/java20240507/java_2301_\345\256\213\345\207\257_2344310137/MotorVehicles.java"
 create mode 100644 "work/com/java/minxi/java20240507/java_2301_\345\256\213\345\207\257_2344310137/Taxi.java"
 create mode 100644 "work/com/java/minxi/java_20240506/java_2301_\345\256\213\345\207\257_2344310137/AirPlane.java"
 create mode 100644 "work/com/java/minxi/java_20240506/java_2301_\345\256\213\345\207\257_2344310137/Car.java"
 create mode 100644 "work/com/java/minxi/java_20240506/java_2301_\345\256\213\345\207\257_2344310137/Vehicles.java"
 create mode 100644 "work/com/java/minxi/java_20240506/java_2301_\345\256\213\345\207\257_2344310137/VehiclesMain.java"

diff --git "a/work/com/java/minxi/java20240507/java_2301_\345\256\213\345\207\257_2344310137/Bus.java" "b/work/com/java/minxi/java20240507/java_2301_\345\256\213\345\207\257_2344310137/Bus.java"
new file mode 100644
index 00000000..ad75984f
--- /dev/null
+++ "b/work/com/java/minxi/java20240507/java_2301_\345\256\213\345\207\257_2344310137/Bus.java"
@@ -0,0 +1,18 @@
+package work.com.java.minxi.java20240507.java_2301_宋凯_2344310137;
+import java.util.Scanner;
+public class Bus extends MotorVehicles implements MoneyFare{ void brake(String s){
+    System.out.println("请输入公交车采用的刹车技术和车票价(元):");
+    String b=new  Scanner(System.in).next();
+    String a=new  Scanner(System.in).next();
+};
+    public void charge(String c){
+        System.out.println("请输入出租车采用的刹车技术、车票价(元)、安装的空调样式:");
+        String q=new  Scanner(System.in).next();
+        String d=new  Scanner(System.in).next();
+        System.out.println("公交车采用的刹车技术:气式");
+        System.out.println("公共汽车:2元/张,不计公里数");
+        System.out.println("出租车采用的刹车技术:油式");
+        System.out.println("出租车:1元/公里,起步价3公里");
+        System.out.println("出租车安装国嵌入式空调");
+    };
+}
diff --git "a/work/com/java/minxi/java20240507/java_2301_\345\256\213\345\207\257_2344310137/ControlTemperature.java" "b/work/com/java/minxi/java20240507/java_2301_\345\256\213\345\207\257_2344310137/ControlTemperature.java"
new file mode 100644
index 00000000..5fb9f9b9
--- /dev/null
+++ "b/work/com/java/minxi/java20240507/java_2301_\345\256\213\345\207\257_2344310137/ControlTemperature.java"
@@ -0,0 +1,5 @@
+package work.com.java.minxi.java20240507.java_2301_宋凯_2344310137;
+
+public interface ControlTemperature {
+    void controlAirTemperature(String t);
+}
diff --git "a/work/com/java/minxi/java20240507/java_2301_\345\256\213\345\207\257_2344310137/Main.java" "b/work/com/java/minxi/java20240507/java_2301_\345\256\213\345\207\257_2344310137/Main.java"
new file mode 100644
index 00000000..e51cd193
--- /dev/null
+++ "b/work/com/java/minxi/java20240507/java_2301_\345\256\213\345\207\257_2344310137/Main.java"
@@ -0,0 +1,12 @@
+package work.com.java.minxi.java20240507.java_2301_宋凯_2344310137;
+
+public class Main {
+    public static void main(String[] args) {
+        Bus bus=new Bus();
+        Taxi taxi = new Taxi();
+        System.out.println("");
+        bus.brake("");
+        bus.charge("");
+
+    }
+}
diff --git "a/work/com/java/minxi/java20240507/java_2301_\345\256\213\345\207\257_2344310137/MoneyFare.java" "b/work/com/java/minxi/java20240507/java_2301_\345\256\213\345\207\257_2344310137/MoneyFare.java"
new file mode 100644
index 00000000..8e3a42ed
--- /dev/null
+++ "b/work/com/java/minxi/java20240507/java_2301_\345\256\213\345\207\257_2344310137/MoneyFare.java"
@@ -0,0 +1,4 @@
+package work.com.java.minxi.java20240507.java_2301_宋凯_2344310137;
+
+public interface MoneyFare {void charge(String c);
+}
diff --git "a/work/com/java/minxi/java20240507/java_2301_\345\256\213\345\207\257_2344310137/MotorVehicles.java" "b/work/com/java/minxi/java20240507/java_2301_\345\256\213\345\207\257_2344310137/MotorVehicles.java"
new file mode 100644
index 00000000..1c1f3242
--- /dev/null
+++ "b/work/com/java/minxi/java20240507/java_2301_\345\256\213\345\207\257_2344310137/MotorVehicles.java"
@@ -0,0 +1,5 @@
+package work.com.java.minxi.java20240507.java_2301_宋凯_2344310137;
+
+public abstract class MotorVehicles {
+    abstract void brake(String s);
+}
diff --git "a/work/com/java/minxi/java20240507/java_2301_\345\256\213\345\207\257_2344310137/Taxi.java" "b/work/com/java/minxi/java20240507/java_2301_\345\256\213\345\207\257_2344310137/Taxi.java"
new file mode 100644
index 00000000..e4693fad
--- /dev/null
+++ "b/work/com/java/minxi/java20240507/java_2301_\345\256\213\345\207\257_2344310137/Taxi.java"
@@ -0,0 +1,7 @@
+package work.com.java.minxi.java20240507.java_2301_宋凯_2344310137;
+
+public class Taxi extends MotorVehicles implements MoneyFare,ControlTemperature{
+    public void controlAirTemperature(String t){}
+    public void charge(String c){}
+    public void brake(String s){}
+}
diff --git "a/work/com/java/minxi/java_20240506/java_2301_\345\256\213\345\207\257_2344310137/AirPlane.java" "b/work/com/java/minxi/java_20240506/java_2301_\345\256\213\345\207\257_2344310137/AirPlane.java"
new file mode 100644
index 00000000..ceffae02
--- /dev/null
+++ "b/work/com/java/minxi/java_20240506/java_2301_\345\256\213\345\207\257_2344310137/AirPlane.java"
@@ -0,0 +1,12 @@
+package work.com.java.minxi.java_20240506.java_2301_宋凯_2344310137;
+
+public class AirPlane extends Vehicles{ public AirPlane(String type, String brand, String color,String place) {
+    super(type, brand, color, place);
+}
+    public void travel(){
+        System.out.println("坐着"+getColor()+getBrand()+"前往"+getPlace()+"旅游");
+
+    }
+    public void combination(String color,String brand){}
+    public void combination(String brand){}
+}
diff --git "a/work/com/java/minxi/java_20240506/java_2301_\345\256\213\345\207\257_2344310137/Car.java" "b/work/com/java/minxi/java_20240506/java_2301_\345\256\213\345\207\257_2344310137/Car.java"
new file mode 100644
index 00000000..6507ddf9
--- /dev/null
+++ "b/work/com/java/minxi/java_20240506/java_2301_\345\256\213\345\207\257_2344310137/Car.java"
@@ -0,0 +1,17 @@
+package work.com.java.minxi.java_20240506.java_2301_宋凯_2344310137;
+
+public class Car extends Vehicles{public Car(String type, String brand, String color,String place) {
+    super(type, brand, color,place);
+}
+
+    public void travel(){
+        System.out.println("开着"+getColor()+getBrand()+"前往"+getPlace()+"旅游");
+    }
+    public void combination(String color,String brand){
+        System.out.println(color+brand);
+    }
+    public void combination(String brand){
+        System.out.println(brand);
+        return;
+    }
+}
diff --git "a/work/com/java/minxi/java_20240506/java_2301_\345\256\213\345\207\257_2344310137/Vehicles.java" "b/work/com/java/minxi/java_20240506/java_2301_\345\256\213\345\207\257_2344310137/Vehicles.java"
new file mode 100644
index 00000000..e108e63f
--- /dev/null
+++ "b/work/com/java/minxi/java_20240506/java_2301_\345\256\213\345\207\257_2344310137/Vehicles.java"
@@ -0,0 +1,54 @@
+package work.com.java.minxi.java_20240506.java_2301_宋凯_2344310137;
+
+public class Vehicles {private String type;
+    private String brand;
+    private String color;
+    private String place;
+    //
+
+    public Vehicles(String type, String brand, String color,String place) {
+        this.type = type;
+        this.brand = brand;
+        this.color = color;
+        this.place = place;
+    }
+    //
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public String getBrand() {
+        return brand;
+    }
+
+    public void setBrand(String brand) {
+        this.brand = brand;
+    }
+
+    public String getColor() {
+        return color;
+    }
+
+    public void setColor(String color) {
+        this.color = color;
+    }
+
+    public String getPlace() {
+        return place;
+    }
+
+    public void setPlace(String place) {
+        this.place = place;
+    }
+
+    //
+    public void travel(){
+        System.out.println();
+        System.out.println();
+    }
+}
diff --git "a/work/com/java/minxi/java_20240506/java_2301_\345\256\213\345\207\257_2344310137/VehiclesMain.java" "b/work/com/java/minxi/java_20240506/java_2301_\345\256\213\345\207\257_2344310137/VehiclesMain.java"
new file mode 100644
index 00000000..ee98eb31
--- /dev/null
+++ "b/work/com/java/minxi/java_20240506/java_2301_\345\256\213\345\207\257_2344310137/VehiclesMain.java"
@@ -0,0 +1,15 @@
+package work.com.java.minxi.java_20240506.java_2301_宋凯_2344310137;
+
+public class VehiclesMain {
+    public static void main(String[] args) {
+        Car v1 = new Car("1","大众汽车","白色","北京");
+        v1.travel();
+        Car v2 = new Car("2","奔驰汽车","白色","东山岛");
+        v2.travel();
+        AirPlane v3 = new AirPlane("3","波音客机","蓝色","大理");
+        v3.travel();
+        AirPlane v4 = new AirPlane("4","空客客机","白色","哈尔滨岛");
+        v4.travel();
+    }
+    }
+
-- 
Gitee


From a1e39486abc95dee8b91d9ffa046b364ecfebb31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E5=87=AF?= <1509501143@qq.com>
Date: Sun, 12 May 2024 11:37:12 +0800
Subject: [PATCH 3/3] =?UTF-8?q?feat:=E4=BF=AE=E6=94=B9506=E4=BD=9C?=
 =?UTF-8?q?=E4=B8=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AirPlane.java"                            | 13 -----
 .../Car.java"                                 | 17 ------
 .../Vehicles.java"                            | 54 -------------------
 .../VehiclesMain.java"                        | 13 -----
 4 files changed, 97 deletions(-)
 delete mode 100644 "work/com/java/minxi/java_20240506/java_23012_\345\256\213\345\207\257_2344310137/AirPlane.java"
 delete mode 100644 "work/com/java/minxi/java_20240506/java_23012_\345\256\213\345\207\257_2344310137/Car.java"
 delete mode 100644 "work/com/java/minxi/java_20240506/java_23012_\345\256\213\345\207\257_2344310137/Vehicles.java"
 delete mode 100644 "work/com/java/minxi/java_20240506/java_23012_\345\256\213\345\207\257_2344310137/VehiclesMain.java"

diff --git "a/work/com/java/minxi/java_20240506/java_23012_\345\256\213\345\207\257_2344310137/AirPlane.java" "b/work/com/java/minxi/java_20240506/java_23012_\345\256\213\345\207\257_2344310137/AirPlane.java"
deleted file mode 100644
index b47e3920..00000000
--- "a/work/com/java/minxi/java_20240506/java_23012_\345\256\213\345\207\257_2344310137/AirPlane.java"
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.java.minxi.java_20240506.java_23012_宋凯_2344310137;
-
-public class AirPlane extends Vehicles {
-    public AirPlane(String type, String brand, String color,String place) {
-    super(type, brand, color, place);
-}
-    public void travel(){
-        System.out.println("坐着"+getColor()+getBrand()+"前往"+getPlace()+"旅游");
-
-    }
-    public void combination(String color,String brand){}
-    public void combination(String brand){}
-}
diff --git "a/work/com/java/minxi/java_20240506/java_23012_\345\256\213\345\207\257_2344310137/Car.java" "b/work/com/java/minxi/java_20240506/java_23012_\345\256\213\345\207\257_2344310137/Car.java"
deleted file mode 100644
index 86c70166..00000000
--- "a/work/com/java/minxi/java_20240506/java_23012_\345\256\213\345\207\257_2344310137/Car.java"
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.java.minxi.java_20240506.java_23012_宋凯_2344310137;
-
-public class Car extends Vehicles{  public Car(String type, String brand, String color,String place) {
-    super(type, brand, color,place);
-}
-
-    public void travel(){
-        System.out.println("开着"+getColor()+getBrand()+"前往"+getPlace()+"旅游");
-    }
-    public void combination(String color,String brand){
-        System.out.println(color+brand);
-    }
-    public void combination(String brand){
-        System.out.println(brand);
-        return;
-    }
-}
diff --git "a/work/com/java/minxi/java_20240506/java_23012_\345\256\213\345\207\257_2344310137/Vehicles.java" "b/work/com/java/minxi/java_20240506/java_23012_\345\256\213\345\207\257_2344310137/Vehicles.java"
deleted file mode 100644
index 90ee36b6..00000000
--- "a/work/com/java/minxi/java_20240506/java_23012_\345\256\213\345\207\257_2344310137/Vehicles.java"
+++ /dev/null
@@ -1,54 +0,0 @@
-package com.java.minxi.java_20240506.java_23012_宋凯_2344310137;
-
-public class Vehicles { private String type;
-    private String brand;
-    private String color;
-    private String place;
-
-
-    public Vehicles(String type, String brand, String color,String place) {
-        this.type = type;
-        this.brand = brand;
-        this.color = color;
-        this.place = place;
-    }
-
-
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
-
-    public String getBrand() {
-        return brand;
-    }
-
-    public void setBrand(String brand) {
-        this.brand = brand;
-    }
-
-    public String getColor() {
-        return color;
-    }
-
-    public void setColor(String color) {
-        this.color = color;
-    }
-
-    public String getPlace() {
-        return place;
-    }
-
-    public void setPlace(String place) {
-        this.place = place;
-    }
-
-
-    public void travel(){
-        System.out.println();
-        System.out.println();
-    }
-}
diff --git "a/work/com/java/minxi/java_20240506/java_23012_\345\256\213\345\207\257_2344310137/VehiclesMain.java" "b/work/com/java/minxi/java_20240506/java_23012_\345\256\213\345\207\257_2344310137/VehiclesMain.java"
deleted file mode 100644
index b44ddb6a..00000000
--- "a/work/com/java/minxi/java_20240506/java_23012_\345\256\213\345\207\257_2344310137/VehiclesMain.java"
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.java.minxi.java_20240506.java_23012_宋凯_2344310137;
-
-public class VehiclesMain {public static void main(String[] args) {
-    Car v1 = new Car("1","大众汽车","白色","北京");
-    v1.travel();
-    Car v2 = new Car("2","奔驰汽车","白色","东山岛");
-    v2.travel();
-    AirPlane v3 = new AirPlane("3","波音客机","蓝色","大理");
-    v3.travel();
-    AirPlane v4 = new AirPlane("4","空客客机","白色","哈尔滨岛");
-    v4.travel();
-}
-}
-- 
Gitee