From 4ba746680c38ded0dcbbe2914dd4ed78afddd596 Mon Sep 17 00:00:00 2001 From: minishev Date: 2023年5月13日 10:26:46 +0300 Subject: [PATCH 1/5] =?UTF-8?q?=D0=98=20=D0=BF=D1=83=D1=81=D1=82=D1=8C=20?= =?UTF-8?q?=D1=82=D0=B5=D0=BF=D0=B5=D1=80=D1=8C=20=D0=B2=D1=81=D0=B5=20?= =?UTF-8?q?=D0=BF=D0=BE=D0=BB=D1=83=D1=87=D0=B8=D1=82=D1=8C=D1=81=D1=8F!?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 63be1bfe0..d738744e4 100644 --- a/README.md +++ b/README.md @@ -1 +1,2 @@ # Пустой репозиторий для работы с Java кодом в Android Studio +И пусть все получиться! \ No newline at end of file From a82a0f776dc5bbf69df81e33fc4cc219912f725f Mon Sep 17 00:00:00 2001 From: minishev Date: 2023年5月13日 10:50:54 +0300 Subject: [PATCH 2/5] =?UTF-8?q?=D0=98=20=D0=BF=D1=83=D1=81=D1=82=D1=8C=20?= =?UTF-8?q?=D1=82=D0=B5=D0=BF=D0=B5=D1=80=D1=8C=20=D0=B2=D1=81=D0=B5=20?= =?UTF-8?q?=D0=BF=D0=BE=D0=BB=D1=83=D1=87=D0=B8=D1=82=D1=8C=D1=81=D1=8F!?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/Main.java | 62 ++++++++++++++++++++++++++++-- src/main/java/ProductFeatures.java | 29 ++++++++++++++ 2 files changed, 88 insertions(+), 3 deletions(-) create mode 100644 src/main/java/ProductFeatures.java diff --git a/src/main/java/Main.java b/src/main/java/Main.java index db9356a08..22ab67583 100644 --- a/src/main/java/Main.java +++ b/src/main/java/Main.java @@ -1,6 +1,62 @@ - +import java.util.Scanner; public class Main { public static void main(String[] args) { - System.out.println("Hello world!"); + Scanner scanner = new Scanner(System.in); + ProductFeatures productFeatures = new ProductFeatures (); //объект класса ProductFeatures + System.out.println("Сколько счетов у Вас будет?"); + int howPeople = 0; + while (true){ + howPeople = scanner.nextInt(); + if (howPeople <=1) { + System.out.println("Введено некорректное значение для подсчёта, введите число больше 1"); + } + if(howPeople> 1) { + System.out.println("Счет будет разделен на:" + howPeople); + break; + } + } + productFeatures.product(scanner); + // - Фарматерр: + double finalScorePeople = productFeatures.finalProductPrice/howPeople; + String RUB; + String RUB2; + int endingRubles = (int) productFeatures.finalProductPrice;// % 100 / 10; + int endingRubles2 = (int) finalScorePeople;// % 100 / 10; + if (endingRubles % 100>= 11 && endingRubles % 100 <= 14) { + RUB = "рублей"; + } else + + switch (endingRubles %10){ + case 1: + RUB = "рубль"; + break; + case 2: + case 3: + case 4: + RUB = "рубля"; + break; + default: + RUB = "рублей"; + break; + } + if (endingRubles2 % 100>= 11 && endingRubles2 % 100 <= 14) { + RUB2 = "рублей"; + } else + switch (endingRubles2 % 10){ + case 1: + RUB2 = "рублю"; + break; + case 2: + case 3: + case 4: + RUB2 = "рубля"; + break; + default: + RUB2 = "рублей"; + break; + } + System.out.println("Список продуктов:\n"+productFeatures.listProducts+"\n"); + String format = "Общая стоимость составила: %.2f "+RUB+ "\nна каждого по: %.2f " +RUB2+"."; + System.out.println(String.format(format, productFeatures.finalProductPrice, finalScorePeople)); } -} \ No newline at end of file +} diff --git a/src/main/java/ProductFeatures.java b/src/main/java/ProductFeatures.java new file mode 100644 index 000000000..ef90dabed --- /dev/null +++ b/src/main/java/ProductFeatures.java @@ -0,0 +1,29 @@ +import java.util.Scanner; +public class ProductFeatures { + double finalProductPrice = 00.00; + double productPrice = 00.00; + String listProducts = ""; + + public void product(Scanner scanner) { + while (true) { + System.out.println("Введите название товара"); + String product = scanner.next(); + listProducts += product + "\n"; + System.out.println("Введите цену товара в формате ХХ,ХХ"); + double productPrice = scanner.nextDouble(); + if (productPrice <= 0) { + System.out.println("Введена неверная цена, цена должна быть больше 0.00"); + } + if (productPrice> 0) { + } + System.out.println("Хотите продолжить ввод товаров или введите завершить"); + finalProductPrice = finalProductPrice + productPrice; + String complete = scanner.next(); + if (complete.equalsIgnoreCase("Завершить")) { + System.out.println("Добавление товаров завершено, произведен расчет:"); + break; + } + } + } +} + From 6696530ed13358df94b12f99c3478cc29bb5ae23 Mon Sep 17 00:00:00 2001 From: minishev Date: 2023年5月17日 23:32:50 +0300 Subject: [PATCH 3/5] =?UTF-8?q?=D0=98=20=D0=BF=D1=83=D1=81=D1=82=D1=8C=20?= =?UTF-8?q?=D1=82=D0=B5=D0=BF=D0=B5=D1=80=D1=8C=20=D0=B2=D1=81=D0=B5=20?= =?UTF-8?q?=D0=BF=D0=BE=D0=BB=D1=83=D1=87=D0=B8=D1=82=D1=8C=D1=81=D1=8F!?= =?UTF-8?q?=5Fv1.1=20=D0=BF=D1=80=D0=BE=D0=BC=D0=B5=D0=B6=D1=83=D1=82?= =?UTF-8?q?=D0=BE=D1=87=D0=BD=D0=B0=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/Farmaterr.java | 42 ++++++++++++++++++++ src/main/java/Main.java | 62 +++++++----------------------- src/main/java/ProductFeatures.java | 1 - 3 files changed, 55 insertions(+), 50 deletions(-) create mode 100644 src/main/java/Farmaterr.java diff --git a/src/main/java/Farmaterr.java b/src/main/java/Farmaterr.java new file mode 100644 index 000000000..9afddbc46 --- /dev/null +++ b/src/main/java/Farmaterr.java @@ -0,0 +1,42 @@ +import java.util.Scanner; +public class Farmaterr { + public void formatRub (int howPeople, double finalProductPrice) { + double finalScorePeople = finalProductPrice/howPeople; + String RUB; + String RUB2; + int endingRubles = (int) finalProductPrice;// % 100 / 10; + int endingRubles2 = (int) finalScorePeople;// % 100 / 10; + if (endingRubles % 100>= 11 && endingRubles % 100 <= 14) { + RUB = "рублей"; + } else + switch (endingRubles %10){ + case 1: + RUB = "рубль"; + break; + case 2: + case 3: + case 4: + RUB = "рубля"; + break; + default: + RUB = "рублей"; + break; + } + if (endingRubles2 % 100>= 11 && endingRubles2 % 100 <= 14) { + RUB2 = "рублей"; + } else + switch (endingRubles2 % 10){ + case 1: + RUB2 = "рублю"; + break; + case 2: + case 3: + case 4: + RUB2 = "рубля"; + break; + default: + RUB2 = "рублей"; + break; + } + } +} diff --git a/src/main/java/Main.java b/src/main/java/Main.java index 22ab67583..9eb318052 100644 --- a/src/main/java/Main.java +++ b/src/main/java/Main.java @@ -3,60 +3,24 @@ public class Main { public static void main(String[] args) { Scanner scanner = new Scanner(System.in); ProductFeatures productFeatures = new ProductFeatures (); //объект класса ProductFeatures - System.out.println("Сколько счетов у Вас будет?"); + Farmaterr farmaterr = new Farmaterr ();//объект класса Farmaterr int howPeople = 0; - while (true){ - howPeople = scanner.nextInt(); - if (howPeople <=1) { - System.out.println("Введено некорректное значение для подсчёта, введите число больше 1"); - } - if(howPeople> 1) { - System.out.println("Счет будет разделен на:" + howPeople); - break; + String chek4num; + while (howPeople <=1){ + System.out.println("Сколько счетов у Вас будет?"); + try { + chek4num = scanner.nextLine(); + howPeople = Integer.parseInt(chek4num); + } + catch (Exception error){ + System.out.println("Введите чиловое значение больше 1"); } } + System.out.println("Счет будет разделен на:" + howPeople); productFeatures.product(scanner); - // - Фарматерр: - double finalScorePeople = productFeatures.finalProductPrice/howPeople; - String RUB; - String RUB2; - int endingRubles = (int) productFeatures.finalProductPrice;// % 100 / 10; - int endingRubles2 = (int) finalScorePeople;// % 100 / 10; - if (endingRubles % 100>= 11 && endingRubles % 100 <= 14) { - RUB = "рублей"; - } else - - switch (endingRubles %10){ - case 1: - RUB = "рубль"; - break; - case 2: - case 3: - case 4: - RUB = "рубля"; - break; - default: - RUB = "рублей"; - break; - } - if (endingRubles2 % 100>= 11 && endingRubles2 % 100 <= 14) { - RUB2 = "рублей"; - } else - switch (endingRubles2 % 10){ - case 1: - RUB2 = "рублю"; - break; - case 2: - case 3: - case 4: - RUB2 = "рубля"; - break; - default: - RUB2 = "рублей"; - break; - } + farmaterr.formatRub(String RUB,double finalScorePeople); System.out.println("Список продуктов:\n"+productFeatures.listProducts+"\n"); - String format = "Общая стоимость составила: %.2f "+RUB+ "\nна каждого по: %.2f " +RUB2+"."; + String format = "Общая стоимость составила: %.2f "+RUB+ "\nс каждого по: %.2f " +RUB2+"."; System.out.println(String.format(format, productFeatures.finalProductPrice, finalScorePeople)); } } diff --git a/src/main/java/ProductFeatures.java b/src/main/java/ProductFeatures.java index ef90dabed..3693eb733 100644 --- a/src/main/java/ProductFeatures.java +++ b/src/main/java/ProductFeatures.java @@ -3,7 +3,6 @@ public class ProductFeatures { double finalProductPrice = 00.00; double productPrice = 00.00; String listProducts = ""; - public void product(Scanner scanner) { while (true) { System.out.println("Введите название товара"); From 5acdece3569c010f650d384ee71e1bd1bf91177b Mon Sep 17 00:00:00 2001 From: minishev Date: 2023年5月20日 17:45:04 +0300 Subject: [PATCH 4/5] =?UTF-8?q?=D0=98=20=D0=BF=D1=83=D1=81=D1=82=D1=8C=20?= =?UTF-8?q?=D1=82=D0=B5=D0=BF=D0=B5=D1=80=D1=8C=20=D0=B2=D1=81=D0=B5=20?= =?UTF-8?q?=D0=BF=D0=BE=D0=BB=D1=83=D1=87=D0=B8=D1=82=D1=8C=D1=81=D1=8F!?= =?UTF-8?q?=5Fv1.2=20=D0=BF=D1=80=D0=BE=D0=BC=D0=B5=D0=B6=D1=83=D1=82?= =?UTF-8?q?=D0=BE=D1=87=D0=BD=D0=B0=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/Farmaterr.java | 45 ++++++++++++++++-------------- src/main/java/Main.java | 9 ++++-- src/main/java/ProductFeatures.java | 17 +++++++---- 3 files changed, 41 insertions(+), 30 deletions(-) diff --git a/src/main/java/Farmaterr.java b/src/main/java/Farmaterr.java index 9afddbc46..95206e7e0 100644 --- a/src/main/java/Farmaterr.java +++ b/src/main/java/Farmaterr.java @@ -1,15 +1,15 @@ import java.util.Scanner; public class Farmaterr { - public void formatRub (int howPeople, double finalProductPrice) { - double finalScorePeople = finalProductPrice/howPeople; + public String formatRub(int howPeople, double finalProductPrice) { + //double finalScorePeople = finalProductPrice / howPeople; String RUB; - String RUB2; + //String RUB2; int endingRubles = (int) finalProductPrice;// % 100 / 10; - int endingRubles2 = (int) finalScorePeople;// % 100 / 10; + //int endingRubles = (int) finalScorePeople;// % 100 / 10; if (endingRubles % 100>= 11 && endingRubles % 100 <= 14) { RUB = "рублей"; } else - switch (endingRubles %10){ + switch (endingRubles % 10) { case 1: RUB = "рубль"; break; @@ -22,21 +22,24 @@ public void formatRub (int howPeople, double finalProductPrice) { RUB = "рублей"; break; } - if (endingRubles2 % 100>= 11 && endingRubles2 % 100 <= 14) { - RUB2 = "рублей"; - } else - switch (endingRubles2 % 10){ - case 1: - RUB2 = "рублю"; - break; - case 2: - case 3: - case 4: - RUB2 = "рубля"; - break; - default: - RUB2 = "рублей"; - break; - } + return RUB; } } + // if (endingRubles2 % 100>= 11 && endingRubles2 % 100 <= 14) { + // RUB2 = "рублей"; + // } else + // switch (endingRubles2 % 10){ + // case 1: + // RUB2 = "рублю"; + // break; + //case 2: + //case 3: + //case 4: + // RUB2 = "рубля"; + // break; + //default: + // RUB2 = "рублей"; + // break; + //} + //} + diff --git a/src/main/java/Main.java b/src/main/java/Main.java index 9eb318052..a60703108 100644 --- a/src/main/java/Main.java +++ b/src/main/java/Main.java @@ -18,9 +18,12 @@ public static void main(String[] args) { } System.out.println("Счет будет разделен на:" + howPeople); productFeatures.product(scanner); - farmaterr.formatRub(String RUB,double finalScorePeople); + //farmaterr.formatRub(); + double finalScorePeople = productFeatures.finalProductPrice / howPeople; + String RUB = farmaterr.formatRub(howPeople, productFeatures.finalProductPrice); System.out.println("Список продуктов:\n"+productFeatures.listProducts+"\n"); - String format = "Общая стоимость составила: %.2f "+RUB+ "\nс каждого по: %.2f " +RUB2+"."; - System.out.println(String.format(format, productFeatures.finalProductPrice, finalScorePeople)); + String format = "Общая стоимость составила: %.2f "+RUB+ "\nс каждого по:"; + //String format = "Общая стоимость составила: %.2f "+RUB+ "\nс каждого по: %.2f " +RUB+"."; + System.out.println(String.format(format, productFeatures.finalProductPrice)); } } diff --git a/src/main/java/ProductFeatures.java b/src/main/java/ProductFeatures.java index 3693eb733..c29ba3a54 100644 --- a/src/main/java/ProductFeatures.java +++ b/src/main/java/ProductFeatures.java @@ -4,17 +4,22 @@ public class ProductFeatures { double productPrice = 00.00; String listProducts = ""; public void product(Scanner scanner) { - while (true) { + while (productPrice <= 0 ) { System.out.println("Введите название товара"); String product = scanner.next(); listProducts += product + "\n"; System.out.println("Введите цену товара в формате ХХ,ХХ"); - double productPrice = scanner.nextDouble(); - if (productPrice <= 0) { - System.out.println("Введена неверная цена, цена должна быть больше 0.00"); - } - if (productPrice> 0) { + String chekProductPrice = null; + double productPrice = 0; + try { + chekProductPrice = scanner.nextLine(); + productPrice = Integer.parseInt(chekProductPrice); + } + catch (Exception error) { + System.out.println("Введена неверная цена, цена должна быть больше 0.00"); + }finally { } + System.out.println("Хотите продолжить ввод товаров или введите завершить"); finalProductPrice = finalProductPrice + productPrice; String complete = scanner.next(); From 8a45e10079c9aa4a3b5f27340d1e81daf83f190d Mon Sep 17 00:00:00 2001 From: minishev Date: 2023年5月20日 17:46:44 +0300 Subject: [PATCH 5/5] =?UTF-8?q?=D0=98=20=D0=BF=D1=83=D1=81=D1=82=D1=8C=20?= =?UTF-8?q?=D1=82=D0=B5=D0=BF=D0=B5=D1=80=D1=8C=20=D0=B2=D1=81=D0=B5=20?= =?UTF-8?q?=D0=BF=D0=BE=D0=BB=D1=83=D1=87=D0=B8=D1=82=D1=8C=D1=81=D1=8F!?= =?UTF-8?q?=5Fv1.2=20=D0=BF=D1=80=D0=BE=D0=BC=D0=B5=D0=B6=D1=83=D1=82?= =?UTF-8?q?=D0=BE=D1=87=D0=BD=D0=B0=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/ProductFeatures.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/ProductFeatures.java b/src/main/java/ProductFeatures.java index c29ba3a54..124ba4701 100644 --- a/src/main/java/ProductFeatures.java +++ b/src/main/java/ProductFeatures.java @@ -17,8 +17,7 @@ public void product(Scanner scanner) { } catch (Exception error) { System.out.println("Введена неверная цена, цена должна быть больше 0.00"); - }finally { - } + } System.out.println("Хотите продолжить ввод товаров или введите завершить"); finalProductPrice = finalProductPrice + productPrice;

AltStyle によって変換されたページ (->オリジナル) /