From 05d5949fec98706556b9472434de7dfa4bfe6df8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=98=BF=E9=9B=AA=E5=93=A5=E4=B8=8D=E5=8F=AF=E8=A8=80?=
 =?UTF-8?q?=E8=AF=B4=E7=9A=8423=E4=BA=8B?= <402475095@qq.com>
Date: Sun, 12 May 2024 15:52:46 +0800
Subject: [PATCH 1/5] 1

---
 .../AirPlane.java"                            | 37 -----------------
 .../Car.java"                                 | 40 -------------------
 .../Main.java"                                | 34 ----------------
 .../AirPlane.java"                            | 16 ++++++++
 .../Car.java"                                 | 15 +++++++
 .../Mainaaa.java"                             | 27 +++++++++++++
 .../Vehicles.java"                            |  7 +++-
 .../Bus.java"                                 | 31 --------------
 .../ContrlTemerature.java"                    |  5 ---
 .../Main.java"                                | 30 --------------
 .../MoneyFare.java"                           |  6 ---
 .../MotorVehicles.java"                       |  7 ----
 .../Taxi.java"                                | 30 --------------
 .../Bus.java"                                 | 13 ++++++
 .../ControlTemperature.java"                  |  5 +++
 .../MainText.java"                            | 28 +++++++++++++
 .../MoneyFare.java"                           |  5 +++
 .../MotorVehicles.java"                       |  6 +++
 .../Taxi.java"                                | 18 +++++++++
 19 files changed, 138 insertions(+), 222 deletions(-)
 delete mode 100644 "work/com/java/minxi/java_20240508/java_2302_\345\210\230\345\244\251\347\235\277_2344310234/AirPlane.java"
 delete mode 100644 "work/com/java/minxi/java_20240508/java_2302_\345\210\230\345\244\251\347\235\277_2344310234/Car.java"
 delete mode 100644 "work/com/java/minxi/java_20240508/java_2302_\345\210\230\345\244\251\347\235\277_2344310234/Main.java"
 create mode 100644 "work/com/java/minxi/java_20240508/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/AirPlane.java"
 create mode 100644 "work/com/java/minxi/java_20240508/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/Car.java"
 create mode 100644 "work/com/java/minxi/java_20240508/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/Mainaaa.java"
 rename "work/com/java/minxi/java_20240508/java_2302_\345\210\230\345\244\251\347\235\277_2344310234/Vehicles.java" => "work/com/java/minxi/java_20240508/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/Vehicles.java" (82%)
 delete mode 100644 "work/com/java/minxi/java_20240509/java_2302_\345\210\230\345\244\251\347\235\277_2344310234/Bus.java"
 delete mode 100644 "work/com/java/minxi/java_20240509/java_2302_\345\210\230\345\244\251\347\235\277_2344310234/ContrlTemerature.java"
 delete mode 100644 "work/com/java/minxi/java_20240509/java_2302_\345\210\230\345\244\251\347\235\277_2344310234/Main.java"
 delete mode 100644 "work/com/java/minxi/java_20240509/java_2302_\345\210\230\345\244\251\347\235\277_2344310234/MoneyFare.java"
 delete mode 100644 "work/com/java/minxi/java_20240509/java_2302_\345\210\230\345\244\251\347\235\277_2344310234/MotorVehicles.java"
 delete mode 100644 "work/com/java/minxi/java_20240509/java_2302_\345\210\230\345\244\251\347\235\277_2344310234/Taxi.java"
 create mode 100644 "work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/Bus.java"
 create mode 100644 "work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/ControlTemperature.java"
 create mode 100644 "work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/MainText.java"
 create mode 100644 "work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/MoneyFare.java"
 create mode 100644 "work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/MotorVehicles.java"
 create mode 100644 "work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/Taxi.java"

diff --git "a/work/com/java/minxi/java_20240508/java_2302_\345\210\230\345\244\251\347\235\277_2344310234/AirPlane.java" "b/work/com/java/minxi/java_20240508/java_2302_\345\210\230\345\244\251\347\235\277_2344310234/AirPlane.java"
deleted file mode 100644
index 173c1df..0000000
--- "a/work/com/java/minxi/java_20240508/java_2302_\345\210\230\345\244\251\347\235\277_2344310234/AirPlane.java"
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.java.minxi.java_20240508.java_2302_刘天睿_2344310234;
-public class AirPlane extends org.example.Vehicles {
-    String a;
-    String b;
-    String c;
-    String d;
-
-    public void travel(String type, String brand, String color, String place) {
-
-        this.a=type;
-        this.b=brand;
-        this.c=color;
-        this.d=place;
-        System.out.println( "坐着"+ combination(b,c)+getType()+"前往"+getPlace()+"旅游");
-
-    }
-    public void travel(String type, String brand,  String place) {
-        this.a=type;
-        this.b=brand;
-        this.d=place;
-
-        System.out.println( "坐着"+ combination(b)+getType()+"前往"+getPlace()+"旅游");
-    }
-
-    public String combination(String brand, String color) {
-        String a = null;
-        a=brand+color;
-        return a;
-
-
-    }
-
-    public String combination(String brand) {
-        return brand;
-    }
-
-}
diff --git "a/work/com/java/minxi/java_20240508/java_2302_\345\210\230\345\244\251\347\235\277_2344310234/Car.java" "b/work/com/java/minxi/java_20240508/java_2302_\345\210\230\345\244\251\347\235\277_2344310234/Car.java"
deleted file mode 100644
index 4af97ba..0000000
--- "a/work/com/java/minxi/java_20240508/java_2302_\345\210\230\345\244\251\347\235\277_2344310234/Car.java"
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.java.minxi.java_20240508.java_2302_刘天睿_2344310234;
-
-public class Car extends org.example.Vehicles {
-
-
-    String a;
-    String b;
-    String c;
-    String d;
-
-    public void travel(String type, String brand, String color, String place) {
-
-        this.a=type;
-        this.b=brand;
-        this.c=color;
-        this.d=place;
-        System.out.println( "开着"+ combination(b,c)+getType()+"前往"+getPlace()+"旅游");
-
-    }
-    public void travel(String type, String brand,  String place) {
-        this.a=type;
-        this.b=brand;
-        this.d=place;
-
-        System.out.println( "开着"+ combination(b)+getType()+"前往"+getPlace()+"旅游");
-    }
-
-    public String combination(String brand, String color) {
-        String a = null;
-        a=brand+color;
-        return a;
-
-
-    }
-
-    public String combination(String brand) {
-        return brand;
-    }
-
-}
diff --git "a/work/com/java/minxi/java_20240508/java_2302_\345\210\230\345\244\251\347\235\277_2344310234/Main.java" "b/work/com/java/minxi/java_20240508/java_2302_\345\210\230\345\244\251\347\235\277_2344310234/Main.java"
deleted file mode 100644
index 9409243..0000000
--- "a/work/com/java/minxi/java_20240508/java_2302_\345\210\230\345\244\251\347\235\277_2344310234/Main.java"
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.java.minxi.java_20240508.java_2302_刘天睿_2344310234;
-
-public class Main {
-
-
-    public static void main(String[] args) {
-
-        Car u1 = new Car();
-        u1.setBrand("大众");
-        u1.setColor("白色");
-        u1.setPlace("北京");
-        u1.setType("汽车");
-        u1.travel(u1.getType(), u1.getBrand(), u1.getColor(), u1.getPlace());
-        Car u2 = new Car();
-        u2.setBrand("奔驰");
-        u2.setPlace("东山岛");
-        u2.setType("汽车");
-        u2.travel(u2.getType(), u2.getBrand(), u2.getPlace());
-        AirPlane u3 = new AirPlane();
-        u3.setBrand("波音");
-        u3.setColor("蓝色");
-        u3.setPlace("大理");
-        u3.setType("客机");
-        u3.travel(u3.getType(), u3.getBrand(), u3.getColor(), u3.getPlace());
-        AirPlane u4 = new AirPlane();
-        u4.setBrand("空客");
-
-        u4.setPlace("哈尔滨岛");
-        u4.setType("客机");
-        u4.travel(u4.getType(), u4.getBrand(), u4.getPlace());
-
-
-    }
-}
\ No newline at end of file
diff --git "a/work/com/java/minxi/java_20240508/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/AirPlane.java" "b/work/com/java/minxi/java_20240508/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/AirPlane.java"
new file mode 100644
index 0000000..9576537
--- /dev/null
+++ "b/work/com/java/minxi/java_20240508/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/AirPlane.java"
@@ -0,0 +1,16 @@
+package com.java.minxi.java_20240508.java_2302_郭子懿_2344310236;
+
+public class AirPlane extends Vehicles {
+    @Override
+    public void travel() {
+        System.out.println("坐着"+super.getColor()+super.getBrand()+"客机前往"+super.getPlace()+"旅游");
+
+    }
+    public void combination(String color, String brand) {
+        brand = getBrand();
+        color = getColor();
+    }
+    public void combination(String brand) {
+        brand = getBrand();
+    }
+}
diff --git "a/work/com/java/minxi/java_20240508/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/Car.java" "b/work/com/java/minxi/java_20240508/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/Car.java"
new file mode 100644
index 0000000..9b9dd04
--- /dev/null
+++ "b/work/com/java/minxi/java_20240508/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/Car.java"
@@ -0,0 +1,15 @@
+package com.java.minxi.java_20240508.java_2302_郭子懿_2344310236;
+
+public class Car extends Vehicles {
+    @Override
+    public void travel() {
+        System.out.println("开着"+super.getColor()+super.getBrand()+"汽车前往"+super.getPlace()+"旅游");
+    }
+    public void combination(String color, String brand) {
+        brand = getBrand();
+        color = getColor();
+    }
+    public void combination(String brand) {
+        brand = getBrand();
+    }
+}
diff --git "a/work/com/java/minxi/java_20240508/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/Mainaaa.java" "b/work/com/java/minxi/java_20240508/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/Mainaaa.java"
new file mode 100644
index 0000000..fa0a474
--- /dev/null
+++ "b/work/com/java/minxi/java_20240508/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/Mainaaa.java"
@@ -0,0 +1,27 @@
+package com.java.minxi.java_20240508.java_2302_郭子懿_2344310236;
+
+public class Mainaaa {
+    public static void main(String[] args) {
+        Car car =new Car();
+        car.setColor("白色");
+        car.setBrand("大众");
+        car.setPlace("大理");
+        car.travel();
+
+        car.setColor("");
+        car.setBrand("奔驰");
+        car.setPlace("东山岛");
+        car.travel();
+
+        AirPlane airPlane =new AirPlane();
+        airPlane.setColor("蓝色");
+        airPlane.setBrand("波音");
+        airPlane.setPlace("大理");
+        airPlane.travel();
+
+        airPlane.setColor("");
+        airPlane.setBrand("空客");
+        airPlane.setPlace("哈尔滨岛");
+        airPlane.travel();
+    }
+}
diff --git "a/work/com/java/minxi/java_20240508/java_2302_\345\210\230\345\244\251\347\235\277_2344310234/Vehicles.java" "b/work/com/java/minxi/java_20240508/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/Vehicles.java"
similarity index 82%
rename from "work/com/java/minxi/java_20240508/java_2302_\345\210\230\345\244\251\347\235\277_2344310234/Vehicles.java"
rename to "work/com/java/minxi/java_20240508/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/Vehicles.java"
index 2d785c5..5aadec4 100644
--- "a/work/com/java/minxi/java_20240508/java_2302_\345\210\230\345\244\251\347\235\277_2344310234/Vehicles.java"
+++ "b/work/com/java/minxi/java_20240508/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/Vehicles.java"
@@ -1,4 +1,4 @@
-package org.example;
+package com.java.minxi.java_20240508.java_2302_郭子懿_2344310236;
 
 public class Vehicles {
     private String type;
@@ -10,7 +10,10 @@ public class Vehicles {
     }
 
     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() {
diff --git "a/work/com/java/minxi/java_20240509/java_2302_\345\210\230\345\244\251\347\235\277_2344310234/Bus.java" "b/work/com/java/minxi/java_20240509/java_2302_\345\210\230\345\244\251\347\235\277_2344310234/Bus.java"
deleted file mode 100644
index 4463c9c..0000000
--- "a/work/com/java/minxi/java_20240509/java_2302_\345\210\230\345\244\251\347\235\277_2344310234/Bus.java"
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.java.minxi.java_20240509.java_2302_刘天睿_2344310234;
-
-public class Bus extends MotorVehicles {
-
-
-    @Override
-    public void brake(String t,String c) {
-        String name="巴士";
-        controlAirTemperature(t,name);
-        charge(c,name);
-
-
-
-
-
-    }
-
-    @Override
-    public void controlAirTemperature(String c, String name) {
-
-            System.out.println(name+"使用的刹车技术："+c+"\n");
-
-    }
-
-    @Override
-    public void charge(String t, String name) {
-        if (t.equals("2")){
-            System.out.println(name+":"+t+"/张,不计算公里数");
-        }else {System.out.println(name+":"+t+"/元,起步价3公里");}
-    }
-}
diff --git "a/work/com/java/minxi/java_20240509/java_2302_\345\210\230\345\244\251\347\235\277_2344310234/ContrlTemerature.java" "b/work/com/java/minxi/java_20240509/java_2302_\345\210\230\345\244\251\347\235\277_2344310234/ContrlTemerature.java"
deleted file mode 100644
index ff467ef..0000000
--- "a/work/com/java/minxi/java_20240509/java_2302_\345\210\230\345\244\251\347\235\277_2344310234/ContrlTemerature.java"
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.java.minxi.java_20240509.java_2302_刘天睿_2344310234;
-
-public interface ContrlTemerature {
-    public  void controlAirTemperature(String t, String name);
-}
diff --git "a/work/com/java/minxi/java_20240509/java_2302_\345\210\230\345\244\251\347\235\277_2344310234/Main.java" "b/work/com/java/minxi/java_20240509/java_2302_\345\210\230\345\244\251\347\235\277_2344310234/Main.java"
deleted file mode 100644
index 584f618..0000000
--- "a/work/com/java/minxi/java_20240509/java_2302_\345\210\230\345\244\251\347\235\277_2344310234/Main.java"
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.java.minxi.java_20240509.java_2302_刘天睿_2344310234;
-
-
-import java.util.Scanner;
-
-public class Main {
-    public static void main(String[] args) {
-        String s;
-        String f;
-        String p;
-        String v;
-        Scanner uu = new Scanner(System.in);
-        System.out.println("g刹车：");
-        s = uu.next();
-        System.out.println("g票价：");
-        f = uu.next();
-        System.out.println("g刹车：");
-        p = uu.next();
-        System.out.println("g票价：");
-        v = uu.next();
-
-        MotorVehicles oo = new Bus();
-        oo.brake(s, f);
-
-        MotorVehicles ii = new Taxi();
-        ii.brake(p, v);
-
-
-    }
-}
\ No newline at end of file
diff --git "a/work/com/java/minxi/java_20240509/java_2302_\345\210\230\345\244\251\347\235\277_2344310234/MoneyFare.java" "b/work/com/java/minxi/java_20240509/java_2302_\345\210\230\345\244\251\347\235\277_2344310234/MoneyFare.java"
deleted file mode 100644
index caa5e18..0000000
--- "a/work/com/java/minxi/java_20240509/java_2302_\345\210\230\345\244\251\347\235\277_2344310234/MoneyFare.java"
+++ /dev/null
@@ -1,6 +0,0 @@
-package com.java.minxi.java_20240509.java_2302_刘天睿_2344310234;
-
-
-public interface MoneyFare {
-    public void charge(String c,String name);
-}
diff --git "a/work/com/java/minxi/java_20240509/java_2302_\345\210\230\345\244\251\347\235\277_2344310234/MotorVehicles.java" "b/work/com/java/minxi/java_20240509/java_2302_\345\210\230\345\244\251\347\235\277_2344310234/MotorVehicles.java"
deleted file mode 100644
index 578cd20..0000000
--- "a/work/com/java/minxi/java_20240509/java_2302_\345\210\230\345\244\251\347\235\277_2344310234/MotorVehicles.java"
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.java.minxi.java_20240509.java_2302_刘天睿_2344310234;
-
-public abstract class MotorVehicles implements ContrlTemerature,MoneyFare {
-    public  void brake(String t,String c){
-        String name;
-    }
-}
diff --git "a/work/com/java/minxi/java_20240509/java_2302_\345\210\230\345\244\251\347\235\277_2344310234/Taxi.java" "b/work/com/java/minxi/java_20240509/java_2302_\345\210\230\345\244\251\347\235\277_2344310234/Taxi.java"
deleted file mode 100644
index 5c40b44..0000000
--- "a/work/com/java/minxi/java_20240509/java_2302_\345\210\230\345\244\251\347\235\277_2344310234/Taxi.java"
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.java.minxi.java_20240509.java_2302_刘天睿_2344310234;
-
-
-public class Taxi extends MotorVehicles {
-
-    public void brake(String t,String c) {
-        String name="出租车";
-        controlAirTemperature(t,name);
-        charge(c,name);
-
-
-
-
-
-    }
-
-
-    public void controlAirTemperature(String t, String name) {
-
-        System.out.println(name+"使用的刹车技术："+t+"\n");
-
-    }
-
-
-    public void charge(String c, String name) {
-        if (c.equals("2")){
-            System.out.println(name+":"+c+"/张,不计算公里数");
-        }else {System.out.println(name+":"+c+"/元,起步价3公里");}
-    }
-}
diff --git "a/work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/Bus.java" "b/work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/Bus.java"
new file mode 100644
index 0000000..b38369b
--- /dev/null
+++ "b/work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/Bus.java"
@@ -0,0 +1,13 @@
+package com.java.minxi.java_20240509.java_2302_郭子懿_2344310236;
+
+public class Bus extends MotorVehicles implements MoneyFare {
+    @Override
+    public void charge(String c) {
+        System.out.println("公共汽车使用的刹车技术:"+c);
+    }
+
+    @Override
+    public void brake(String s) {
+        System.out.println("公共汽车:"+s+"元/张,不计算公里数");
+    }
+}
diff --git "a/work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/ControlTemperature.java" "b/work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/ControlTemperature.java"
new file mode 100644
index 0000000..b3b5a7d
--- /dev/null
+++ "b/work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/ControlTemperature.java"
@@ -0,0 +1,5 @@
+package com.java.minxi.java_20240509.java_2302_郭子懿_2344310236;
+
+public interface ControlTemperature {
+    public void controlAirTemperature(String t);
+}
diff --git "a/work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/MainText.java" "b/work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/MainText.java"
new file mode 100644
index 0000000..6453c59
--- /dev/null
+++ "b/work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/MainText.java"
@@ -0,0 +1,28 @@
+package com.java.minxi.java_20240509.java_2302_郭子懿_2344310236;
+
+import java.util.Scanner;
+
+public class MainText {
+    public static void main(String[] args) {
+        Scanner a = new Scanner(System.in);
+        //公交车
+        System.out.println("请输人公交车采用的刹车技术和车票价(元):");
+        String busA = a.next();
+        String busB = a.next();
+
+        //出租车
+        System.out.println("请输入出租车采用的刹车技术、车票价(元)、安装的空调样式:");
+        String taxiA = a.next();
+        String taxiB = a.next();
+        String taxiC = a.next();
+
+        Bus bus = new Bus();
+        bus.charge(busA);
+        bus.brake(busB);
+
+        Taxi taxi = new Taxi();
+        taxi.controlAirTemperature(taxiA);
+        taxi.charge(taxiB);
+        taxi.brake(taxiC);
+    }
+}
diff --git "a/work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/MoneyFare.java" "b/work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/MoneyFare.java"
new file mode 100644
index 0000000..98d1775
--- /dev/null
+++ "b/work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/MoneyFare.java"
@@ -0,0 +1,5 @@
+package com.java.minxi.java_20240509.java_2302_郭子懿_2344310236;
+
+public interface MoneyFare {
+    public void charge(String c);
+}
diff --git "a/work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/MotorVehicles.java" "b/work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/MotorVehicles.java"
new file mode 100644
index 0000000..9769d65
--- /dev/null
+++ "b/work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/MotorVehicles.java"
@@ -0,0 +1,6 @@
+package com.java.minxi.java_20240509.java_2302_郭子懿_2344310236;
+
+public abstract class MotorVehicles {
+    public abstract void brake(String s);
+
+}
diff --git "a/work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/Taxi.java" "b/work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/Taxi.java"
new file mode 100644
index 0000000..9a2b978
--- /dev/null
+++ "b/work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/Taxi.java"
@@ -0,0 +1,18 @@
+package com.java.minxi.java_20240509.java_2302_郭子懿_2344310236;
+
+public class Taxi extends MotorVehicles implements MoneyFare,ControlTemperature{
+    @Override
+    public void controlAirTemperature(String t) {
+        System.out.println("出租车使用的刹车技术:"+t);
+    }
+
+    @Override
+    public void charge(String c) {
+        System.out.println("出租车:"+c+"元/公里,起步价3公里");
+    }
+
+    @Override
+    public void brake(String s) {
+        System.out.println("出租车安装了"+s+"空调");
+    }
+}
-- 
Gitee


From 9c3eb0ba4eaacd4983769ef3cd5a3ff5e8968b66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=98=BF=E9=9B=AA=E5=93=A5=E4=B8=8D=E5=8F=AF=E8=A8=80?=
 =?UTF-8?q?=E8=AF=B4=E7=9A=8423=E4=BA=8B?= <402475095@qq.com>
Date: Sun, 12 May 2024 15:53:48 +0800
Subject: [PATCH 2/5] 1

---
 .../Bus.java"                                 | 13 ---------
 .../ControlTemperature.java"                  |  5 ----
 .../MainText.java"                            | 28 -------------------
 .../MoneyFare.java"                           |  5 ----
 .../MotorVehicles.java"                       |  6 ----
 .../Taxi.java"                                | 18 ------------
 6 files changed, 75 deletions(-)
 delete mode 100644 "work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/Bus.java"
 delete mode 100644 "work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/ControlTemperature.java"
 delete mode 100644 "work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/MainText.java"
 delete mode 100644 "work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/MoneyFare.java"
 delete mode 100644 "work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/MotorVehicles.java"
 delete mode 100644 "work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/Taxi.java"

diff --git "a/work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/Bus.java" "b/work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/Bus.java"
deleted file mode 100644
index b38369b..0000000
--- "a/work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/Bus.java"
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.java.minxi.java_20240509.java_2302_郭子懿_2344310236;
-
-public class Bus extends MotorVehicles implements MoneyFare {
-    @Override
-    public void charge(String c) {
-        System.out.println("公共汽车使用的刹车技术:"+c);
-    }
-
-    @Override
-    public void brake(String s) {
-        System.out.println("公共汽车:"+s+"元/张,不计算公里数");
-    }
-}
diff --git "a/work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/ControlTemperature.java" "b/work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/ControlTemperature.java"
deleted file mode 100644
index b3b5a7d..0000000
--- "a/work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/ControlTemperature.java"
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.java.minxi.java_20240509.java_2302_郭子懿_2344310236;
-
-public interface ControlTemperature {
-    public void controlAirTemperature(String t);
-}
diff --git "a/work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/MainText.java" "b/work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/MainText.java"
deleted file mode 100644
index 6453c59..0000000
--- "a/work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/MainText.java"
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.java.minxi.java_20240509.java_2302_郭子懿_2344310236;
-
-import java.util.Scanner;
-
-public class MainText {
-    public static void main(String[] args) {
-        Scanner a = new Scanner(System.in);
-        //公交车
-        System.out.println("请输人公交车采用的刹车技术和车票价(元):");
-        String busA = a.next();
-        String busB = a.next();
-
-        //出租车
-        System.out.println("请输入出租车采用的刹车技术、车票价(元)、安装的空调样式:");
-        String taxiA = a.next();
-        String taxiB = a.next();
-        String taxiC = a.next();
-
-        Bus bus = new Bus();
-        bus.charge(busA);
-        bus.brake(busB);
-
-        Taxi taxi = new Taxi();
-        taxi.controlAirTemperature(taxiA);
-        taxi.charge(taxiB);
-        taxi.brake(taxiC);
-    }
-}
diff --git "a/work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/MoneyFare.java" "b/work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/MoneyFare.java"
deleted file mode 100644
index 98d1775..0000000
--- "a/work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/MoneyFare.java"
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.java.minxi.java_20240509.java_2302_郭子懿_2344310236;
-
-public interface MoneyFare {
-    public void charge(String c);
-}
diff --git "a/work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/MotorVehicles.java" "b/work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/MotorVehicles.java"
deleted file mode 100644
index 9769d65..0000000
--- "a/work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/MotorVehicles.java"
+++ /dev/null
@@ -1,6 +0,0 @@
-package com.java.minxi.java_20240509.java_2302_郭子懿_2344310236;
-
-public abstract class MotorVehicles {
-    public abstract void brake(String s);
-
-}
diff --git "a/work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/Taxi.java" "b/work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/Taxi.java"
deleted file mode 100644
index 9a2b978..0000000
--- "a/work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/Taxi.java"
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.java.minxi.java_20240509.java_2302_郭子懿_2344310236;
-
-public class Taxi extends MotorVehicles implements MoneyFare,ControlTemperature{
-    @Override
-    public void controlAirTemperature(String t) {
-        System.out.println("出租车使用的刹车技术:"+t);
-    }
-
-    @Override
-    public void charge(String c) {
-        System.out.println("出租车:"+c+"元/公里,起步价3公里");
-    }
-
-    @Override
-    public void brake(String s) {
-        System.out.println("出租车安装了"+s+"空调");
-    }
-}
-- 
Gitee


From cc147a1b6f977cdac4dc43c95547db9f8fc53274 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=98=BF=E9=9B=AA=E5=93=A5=E4=B8=8D=E5=8F=AF=E8=A8=80?=
 =?UTF-8?q?=E8=AF=B4=E7=9A=8423=E4=BA=8B?= <402475095@qq.com>
Date: Sun, 12 May 2024 15:54:49 +0800
Subject: [PATCH 3/5] 1

---
 .../Bus.java"                                 | 13 +++++++++
 .../ControlTemperature.java"                  |  5 ++++
 .../MainText.java"                            | 28 +++++++++++++++++++
 .../MoneyFare.java"                           |  5 ++++
 .../MotorVehicles.java"                       |  6 ++++
 .../Taxi.java"                                | 18 ++++++++++++
 6 files changed, 75 insertions(+)
 create mode 100644 "work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/Bus.java"
 create mode 100644 "work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/ControlTemperature.java"
 create mode 100644 "work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/MainText.java"
 create mode 100644 "work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/MoneyFare.java"
 create mode 100644 "work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/MotorVehicles.java"
 create mode 100644 "work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/Taxi.java"

diff --git "a/work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/Bus.java" "b/work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/Bus.java"
new file mode 100644
index 0000000..7345574
--- /dev/null
+++ "b/work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/Bus.java"
@@ -0,0 +1,13 @@
+package com.java.minxi.java_20240509.java_2302_郭子懿_2344310236;
+
+public class Bus extends MotorVehicles implements MoneyFare{
+    @Override
+    public void charge(String c) {
+        System.out.println("公共汽车使用的刹车技术:"+c);
+    }
+
+    @Override
+    public void brake(String s) {
+        System.out.println("公共汽车:"+s+"元/张,不计算公里数");
+    }
+}
diff --git "a/work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/ControlTemperature.java" "b/work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/ControlTemperature.java"
new file mode 100644
index 0000000..b3b5a7d
--- /dev/null
+++ "b/work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/ControlTemperature.java"
@@ -0,0 +1,5 @@
+package com.java.minxi.java_20240509.java_2302_郭子懿_2344310236;
+
+public interface ControlTemperature {
+    public void controlAirTemperature(String t);
+}
diff --git "a/work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/MainText.java" "b/work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/MainText.java"
new file mode 100644
index 0000000..6453c59
--- /dev/null
+++ "b/work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/MainText.java"
@@ -0,0 +1,28 @@
+package com.java.minxi.java_20240509.java_2302_郭子懿_2344310236;
+
+import java.util.Scanner;
+
+public class MainText {
+    public static void main(String[] args) {
+        Scanner a = new Scanner(System.in);
+        //公交车
+        System.out.println("请输人公交车采用的刹车技术和车票价(元):");
+        String busA = a.next();
+        String busB = a.next();
+
+        //出租车
+        System.out.println("请输入出租车采用的刹车技术、车票价(元)、安装的空调样式:");
+        String taxiA = a.next();
+        String taxiB = a.next();
+        String taxiC = a.next();
+
+        Bus bus = new Bus();
+        bus.charge(busA);
+        bus.brake(busB);
+
+        Taxi taxi = new Taxi();
+        taxi.controlAirTemperature(taxiA);
+        taxi.charge(taxiB);
+        taxi.brake(taxiC);
+    }
+}
diff --git "a/work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/MoneyFare.java" "b/work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/MoneyFare.java"
new file mode 100644
index 0000000..98d1775
--- /dev/null
+++ "b/work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/MoneyFare.java"
@@ -0,0 +1,5 @@
+package com.java.minxi.java_20240509.java_2302_郭子懿_2344310236;
+
+public interface MoneyFare {
+    public void charge(String c);
+}
diff --git "a/work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/MotorVehicles.java" "b/work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/MotorVehicles.java"
new file mode 100644
index 0000000..9769d65
--- /dev/null
+++ "b/work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/MotorVehicles.java"
@@ -0,0 +1,6 @@
+package com.java.minxi.java_20240509.java_2302_郭子懿_2344310236;
+
+public abstract class MotorVehicles {
+    public abstract void brake(String s);
+
+}
diff --git "a/work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/Taxi.java" "b/work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/Taxi.java"
new file mode 100644
index 0000000..826c8d2
--- /dev/null
+++ "b/work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/Taxi.java"
@@ -0,0 +1,18 @@
+package com.java.minxi.java_20240509.java_2302_郭子懿_2344310236;
+
+public class Taxi extends MotorVehicles implements MoneyFare, ControlTemperature {
+    @Override
+    public void controlAirTemperature(String t) {
+        System.out.println("出租车使用的刹车技术:"+t);
+    }
+
+    @Override
+    public void charge(String c) {
+        System.out.println("出租车:"+c+"元/公里,起步价3公里");
+    }
+
+    @Override
+    public void brake(String s) {
+        System.out.println("出租车安装了"+s+"空调");
+    }
+}
-- 
Gitee


From a161a01981bad5339b02a90280be4091e7f395b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=98=BF=E9=9B=AA=E5=93=A5=E4=B8=8D=E5=8F=AF=E8=A8=80?=
 =?UTF-8?q?=E8=AF=B4=E7=9A=8423=E4=BA=8B?= <402475095@qq.com>
Date: Sun, 12 May 2024 15:56:27 +0800
Subject: [PATCH 4/5] 1

---
 .../Bus.java"                                 | 13 ---------
 .../ControlTemperature.java"                  |  5 ----
 .../MainText.java"                            | 28 -------------------
 .../MoneyFare.java"                           |  5 ----
 .../MotorVehicles.java"                       |  6 ----
 .../Taxi.java"                                | 18 ------------
 6 files changed, 75 deletions(-)
 delete mode 100644 "work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/Bus.java"
 delete mode 100644 "work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/ControlTemperature.java"
 delete mode 100644 "work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/MainText.java"
 delete mode 100644 "work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/MoneyFare.java"
 delete mode 100644 "work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/MotorVehicles.java"
 delete mode 100644 "work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/Taxi.java"

diff --git "a/work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/Bus.java" "b/work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/Bus.java"
deleted file mode 100644
index 7345574..0000000
--- "a/work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/Bus.java"
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.java.minxi.java_20240509.java_2302_郭子懿_2344310236;
-
-public class Bus extends MotorVehicles implements MoneyFare{
-    @Override
-    public void charge(String c) {
-        System.out.println("公共汽车使用的刹车技术:"+c);
-    }
-
-    @Override
-    public void brake(String s) {
-        System.out.println("公共汽车:"+s+"元/张,不计算公里数");
-    }
-}
diff --git "a/work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/ControlTemperature.java" "b/work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/ControlTemperature.java"
deleted file mode 100644
index b3b5a7d..0000000
--- "a/work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/ControlTemperature.java"
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.java.minxi.java_20240509.java_2302_郭子懿_2344310236;
-
-public interface ControlTemperature {
-    public void controlAirTemperature(String t);
-}
diff --git "a/work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/MainText.java" "b/work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/MainText.java"
deleted file mode 100644
index 6453c59..0000000
--- "a/work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/MainText.java"
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.java.minxi.java_20240509.java_2302_郭子懿_2344310236;
-
-import java.util.Scanner;
-
-public class MainText {
-    public static void main(String[] args) {
-        Scanner a = new Scanner(System.in);
-        //公交车
-        System.out.println("请输人公交车采用的刹车技术和车票价(元):");
-        String busA = a.next();
-        String busB = a.next();
-
-        //出租车
-        System.out.println("请输入出租车采用的刹车技术、车票价(元)、安装的空调样式:");
-        String taxiA = a.next();
-        String taxiB = a.next();
-        String taxiC = a.next();
-
-        Bus bus = new Bus();
-        bus.charge(busA);
-        bus.brake(busB);
-
-        Taxi taxi = new Taxi();
-        taxi.controlAirTemperature(taxiA);
-        taxi.charge(taxiB);
-        taxi.brake(taxiC);
-    }
-}
diff --git "a/work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/MoneyFare.java" "b/work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/MoneyFare.java"
deleted file mode 100644
index 98d1775..0000000
--- "a/work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/MoneyFare.java"
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.java.minxi.java_20240509.java_2302_郭子懿_2344310236;
-
-public interface MoneyFare {
-    public void charge(String c);
-}
diff --git "a/work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/MotorVehicles.java" "b/work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/MotorVehicles.java"
deleted file mode 100644
index 9769d65..0000000
--- "a/work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/MotorVehicles.java"
+++ /dev/null
@@ -1,6 +0,0 @@
-package com.java.minxi.java_20240509.java_2302_郭子懿_2344310236;
-
-public abstract class MotorVehicles {
-    public abstract void brake(String s);
-
-}
diff --git "a/work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/Taxi.java" "b/work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/Taxi.java"
deleted file mode 100644
index 826c8d2..0000000
--- "a/work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/Taxi.java"
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.java.minxi.java_20240509.java_2302_郭子懿_2344310236;
-
-public class Taxi extends MotorVehicles implements MoneyFare, ControlTemperature {
-    @Override
-    public void controlAirTemperature(String t) {
-        System.out.println("出租车使用的刹车技术:"+t);
-    }
-
-    @Override
-    public void charge(String c) {
-        System.out.println("出租车:"+c+"元/公里,起步价3公里");
-    }
-
-    @Override
-    public void brake(String s) {
-        System.out.println("出租车安装了"+s+"空调");
-    }
-}
-- 
Gitee


From a6d8cb4e575c992b34ddbb748e624d78827285a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=98=BF=E9=9B=AA=E5=93=A5=E4=B8=8D=E5=8F=AF=E8=A8=80?=
 =?UTF-8?q?=E8=AF=B4=E7=9A=8423=E4=BA=8B?= <402475095@qq.com>
Date: Sun, 12 May 2024 15:58:03 +0800
Subject: [PATCH 5/5] 1

---
 .../AirPlane.java"                            | 16 ------
 .../Car.java"                                 | 15 ------
 .../Mainaaa.java"                             | 27 ----------
 .../Vehicles.java"                            | 53 -------------------
 .../Bus.java"                                 | 13 +++++
 .../ControlTemperature.java"                  |  5 ++
 .../MainText.java"                            | 28 ++++++++++
 .../MoneyFare.java"                           |  5 ++
 .../MotorVehicles.java"                       |  6 +++
 .../Taxi.java"                                | 18 +++++++
 10 files changed, 75 insertions(+), 111 deletions(-)
 delete mode 100644 "work/com/java/minxi/java_20240508/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/AirPlane.java"
 delete mode 100644 "work/com/java/minxi/java_20240508/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/Car.java"
 delete mode 100644 "work/com/java/minxi/java_20240508/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/Mainaaa.java"
 delete mode 100644 "work/com/java/minxi/java_20240508/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/Vehicles.java"
 create mode 100644 "work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/Bus.java"
 create mode 100644 "work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/ControlTemperature.java"
 create mode 100644 "work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/MainText.java"
 create mode 100644 "work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/MoneyFare.java"
 create mode 100644 "work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/MotorVehicles.java"
 create mode 100644 "work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/Taxi.java"

diff --git "a/work/com/java/minxi/java_20240508/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/AirPlane.java" "b/work/com/java/minxi/java_20240508/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/AirPlane.java"
deleted file mode 100644
index 9576537..0000000
--- "a/work/com/java/minxi/java_20240508/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/AirPlane.java"
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.java.minxi.java_20240508.java_2302_郭子懿_2344310236;
-
-public class AirPlane extends Vehicles {
-    @Override
-    public void travel() {
-        System.out.println("坐着"+super.getColor()+super.getBrand()+"客机前往"+super.getPlace()+"旅游");
-
-    }
-    public void combination(String color, String brand) {
-        brand = getBrand();
-        color = getColor();
-    }
-    public void combination(String brand) {
-        brand = getBrand();
-    }
-}
diff --git "a/work/com/java/minxi/java_20240508/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/Car.java" "b/work/com/java/minxi/java_20240508/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/Car.java"
deleted file mode 100644
index 9b9dd04..0000000
--- "a/work/com/java/minxi/java_20240508/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/Car.java"
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.java.minxi.java_20240508.java_2302_郭子懿_2344310236;
-
-public class Car extends Vehicles {
-    @Override
-    public void travel() {
-        System.out.println("开着"+super.getColor()+super.getBrand()+"汽车前往"+super.getPlace()+"旅游");
-    }
-    public void combination(String color, String brand) {
-        brand = getBrand();
-        color = getColor();
-    }
-    public void combination(String brand) {
-        brand = getBrand();
-    }
-}
diff --git "a/work/com/java/minxi/java_20240508/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/Mainaaa.java" "b/work/com/java/minxi/java_20240508/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/Mainaaa.java"
deleted file mode 100644
index fa0a474..0000000
--- "a/work/com/java/minxi/java_20240508/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/Mainaaa.java"
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.java.minxi.java_20240508.java_2302_郭子懿_2344310236;
-
-public class Mainaaa {
-    public static void main(String[] args) {
-        Car car =new Car();
-        car.setColor("白色");
-        car.setBrand("大众");
-        car.setPlace("大理");
-        car.travel();
-
-        car.setColor("");
-        car.setBrand("奔驰");
-        car.setPlace("东山岛");
-        car.travel();
-
-        AirPlane airPlane =new AirPlane();
-        airPlane.setColor("蓝色");
-        airPlane.setBrand("波音");
-        airPlane.setPlace("大理");
-        airPlane.travel();
-
-        airPlane.setColor("");
-        airPlane.setBrand("空客");
-        airPlane.setPlace("哈尔滨岛");
-        airPlane.travel();
-    }
-}
diff --git "a/work/com/java/minxi/java_20240508/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/Vehicles.java" "b/work/com/java/minxi/java_20240508/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/Vehicles.java"
deleted file mode 100644
index 5aadec4..0000000
--- "a/work/com/java/minxi/java_20240508/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/Vehicles.java"
+++ /dev/null
@@ -1,53 +0,0 @@
-package com.java.minxi.java_20240508.java_2302_郭子懿_2344310236;
-
-public class Vehicles {
-    private String type;
-    private String brand;
-    private String color;
-    private String place;
-
-    public Vehicles() {
-    }
-
-    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(){
-
-    }
-}
diff --git "a/work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/Bus.java" "b/work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/Bus.java"
new file mode 100644
index 0000000..b38369b
--- /dev/null
+++ "b/work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/Bus.java"
@@ -0,0 +1,13 @@
+package com.java.minxi.java_20240509.java_2302_郭子懿_2344310236;
+
+public class Bus extends MotorVehicles implements MoneyFare {
+    @Override
+    public void charge(String c) {
+        System.out.println("公共汽车使用的刹车技术:"+c);
+    }
+
+    @Override
+    public void brake(String s) {
+        System.out.println("公共汽车:"+s+"元/张,不计算公里数");
+    }
+}
diff --git "a/work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/ControlTemperature.java" "b/work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/ControlTemperature.java"
new file mode 100644
index 0000000..b3b5a7d
--- /dev/null
+++ "b/work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/ControlTemperature.java"
@@ -0,0 +1,5 @@
+package com.java.minxi.java_20240509.java_2302_郭子懿_2344310236;
+
+public interface ControlTemperature {
+    public void controlAirTemperature(String t);
+}
diff --git "a/work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/MainText.java" "b/work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/MainText.java"
new file mode 100644
index 0000000..6453c59
--- /dev/null
+++ "b/work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/MainText.java"
@@ -0,0 +1,28 @@
+package com.java.minxi.java_20240509.java_2302_郭子懿_2344310236;
+
+import java.util.Scanner;
+
+public class MainText {
+    public static void main(String[] args) {
+        Scanner a = new Scanner(System.in);
+        //公交车
+        System.out.println("请输人公交车采用的刹车技术和车票价(元):");
+        String busA = a.next();
+        String busB = a.next();
+
+        //出租车
+        System.out.println("请输入出租车采用的刹车技术、车票价(元)、安装的空调样式:");
+        String taxiA = a.next();
+        String taxiB = a.next();
+        String taxiC = a.next();
+
+        Bus bus = new Bus();
+        bus.charge(busA);
+        bus.brake(busB);
+
+        Taxi taxi = new Taxi();
+        taxi.controlAirTemperature(taxiA);
+        taxi.charge(taxiB);
+        taxi.brake(taxiC);
+    }
+}
diff --git "a/work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/MoneyFare.java" "b/work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/MoneyFare.java"
new file mode 100644
index 0000000..98d1775
--- /dev/null
+++ "b/work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/MoneyFare.java"
@@ -0,0 +1,5 @@
+package com.java.minxi.java_20240509.java_2302_郭子懿_2344310236;
+
+public interface MoneyFare {
+    public void charge(String c);
+}
diff --git "a/work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/MotorVehicles.java" "b/work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/MotorVehicles.java"
new file mode 100644
index 0000000..9769d65
--- /dev/null
+++ "b/work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/MotorVehicles.java"
@@ -0,0 +1,6 @@
+package com.java.minxi.java_20240509.java_2302_郭子懿_2344310236;
+
+public abstract class MotorVehicles {
+    public abstract void brake(String s);
+
+}
diff --git "a/work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/Taxi.java" "b/work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/Taxi.java"
new file mode 100644
index 0000000..826c8d2
--- /dev/null
+++ "b/work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/Taxi.java"
@@ -0,0 +1,18 @@
+package com.java.minxi.java_20240509.java_2302_郭子懿_2344310236;
+
+public class Taxi extends MotorVehicles implements MoneyFare, ControlTemperature {
+    @Override
+    public void controlAirTemperature(String t) {
+        System.out.println("出租车使用的刹车技术:"+t);
+    }
+
+    @Override
+    public void charge(String c) {
+        System.out.println("出租车:"+c+"元/公里,起步价3公里");
+    }
+
+    @Override
+    public void brake(String s) {
+        System.out.println("出租车安装了"+s+"空调");
+    }
+}
-- 
Gitee