From d61812d87aa8ffc54eca9a8bfae078a1349e45d4 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 04 八月 2023 10:40:54 +0800
Subject: [PATCH] 新增加国外短信

---
 DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java |  768 ++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 390 insertions(+), 378 deletions(-)

diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java
index a9a29c9..2fd68d8 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java
@@ -168,11 +168,22 @@
             sb.append((int) (random.nextDouble() * 10));
         }
         String authCode = sb.toString();
-        String sms = "短信验证码【" + authCode + "】已发到您的手机,验证码将在5分钟后失效.";
+        String sms = "";
 
         //发送验证码短信
         redisUtil.setStrValue(phone, authCode, 5 * 60);//设置五分钟过期
-        SMSUtil.send_huawei_sms("b793ae3d41a049059197bfe92cf8bc83", "+" + phone, "[\"" + authCode + "\"]");
+        switch (language){
+            case 1:
+                sms = "您的验证码为:" + authCode + ",该验证码5分钟内有效,请勿泄漏于他人!";
+                break;
+            case 2:
+                sms = "Your verification code is: " + authCode + ", the verification code is valid within 5 minutes, do not leak to others!";
+                break;
+            case 3:
+                sms = "Votre code de vérification est: " + authCode + ". Ce code est valide pendant 5 minutes. Ne le divulguez pas aux autres!";
+                break;
+        }
+        SMSUtil.sendTwilioMessage("+" + phone, sms);
         System.out.println(sms);
         return ResultUtil.success();
     }
@@ -193,17 +204,17 @@
         String path = templatePath + "index.html";
         Document document = Jsoup.parse(new File(path), "UTF-8");
         if(1 == language){
-            document.getElementById("english").attr("style", "display: none;");
-            document.getElementById("french").attr("style", "display: none;");
-            document.getElementById("invite").attr("style", "display: none;");
-            document.getElementById("user").attr("style", "display: none;");
-            document.getElementById("settle").attr("style", "display: none;");
-            document.getElementById("pass").attr("style", "display: none;");
-            document.getElementById("bill").attr("style", "display: none;");
-            document.getElementById("reward").attr("style", "display: none;");
-            document.getElementById("rewardToday").attr("style", "display: none;");
-            document.getElementById("driverAudit").attr("style", "display: none;");
-            document.getElementById("carAudit").attr("style", "display: none;");
+            document.getElementById("english").remove();
+            document.getElementById("french").remove();
+            document.getElementById("invite").remove();
+            document.getElementById("user").remove();
+            document.getElementById("settle").remove();
+            document.getElementById("pass").remove();
+            document.getElementById("bill").remove();
+            document.getElementById("reward").remove();
+            document.getElementById("rewardToday").remove();
+            document.getElementById("driverAudit").remove();
+            document.getElementById("carAudit").remove();
 
             Element email_user = document.getElementById("email_user");
             email_user.text("您好 ,");
@@ -211,17 +222,17 @@
             email_content.text("邮件验证码是:" + authCode + ",请在5分钟内完成验证");
         }
         if(2 == language){
-            document.getElementById("chinese").attr("style", "display: none;");
-            document.getElementById("french").attr("style", "display: none;");
-            document.getElementById("invite1").attr("style", "display: none;");
-            document.getElementById("user1").attr("style", "display: none;");
-            document.getElementById("settle1").attr("style", "display: none;");
-            document.getElementById("pass1").attr("style", "display: none;");
-            document.getElementById("bill1").attr("style", "display: none;");
-            document.getElementById("reward1").attr("style", "display: none;");
-            document.getElementById("rewardToday1").attr("style", "display: none;");
-            document.getElementById("driverAudit1").attr("style", "display: none;");
-            document.getElementById("carAudit1").attr("style", "display: none;");
+            document.getElementById("chinese").remove();
+            document.getElementById("french").remove();
+            document.getElementById("invite1").remove();
+            document.getElementById("user1").remove();
+            document.getElementById("settle1").remove();
+            document.getElementById("pass1").remove();
+            document.getElementById("bill1").remove();
+            document.getElementById("reward1").remove();
+            document.getElementById("rewardToday1").remove();
+            document.getElementById("driverAudit1").remove();
+            document.getElementById("carAudit1").remove();
 
             Element email1_user = document.getElementById("email1_user");
             email1_user.text("Hello ,");
@@ -229,17 +240,17 @@
             email1_content.text("verification code is " + authCode + ", please complete the verification within 5 minutes. If the request wasn't made by you, please ignore this email.");
         }
         if(3 == language){
-            document.getElementById("chinese").attr("style", "display: none;");
-            document.getElementById("english").attr("style", "display: none;");
-            document.getElementById("invite2").attr("style", "display: none;");
-            document.getElementById("user2").attr("style", "display: none;");
-            document.getElementById("settle2").attr("style", "display: none;");
-            document.getElementById("pass2").attr("style", "display: none;");
-            document.getElementById("bill2").attr("style", "display: none;");
-            document.getElementById("reward2").attr("style", "display: none;");
-            document.getElementById("rewardToday2").attr("style", "display: none;");
-            document.getElementById("driverAudit2").attr("style", "display: none;");
-            document.getElementById("carAudit2").attr("style", "display: none;");
+            document.getElementById("chinese").remove();
+            document.getElementById("english").remove();
+            document.getElementById("invite2").remove();
+            document.getElementById("user2").remove();
+            document.getElementById("settle2").remove();
+            document.getElementById("pass2").remove();
+            document.getElementById("bill2").remove();
+            document.getElementById("reward2").remove();
+            document.getElementById("rewardToday2").remove();
+            document.getElementById("driverAudit2").remove();
+            document.getElementById("carAudit2").remove();
 
             Element email2_user = document.getElementById("email2_user");
             email2_user.text("Hello ,");
@@ -258,8 +269,8 @@
      * @throws Exception
      */
     @Override
-    public boolean checkCaptcha(String phone, String code) throws Exception {
-        Object value = redisUtil.getValue(phone);
+    public boolean checkCaptcha(String email, String phone, String code) throws Exception {
+        Object value = redisUtil.getValue(ToolUtil.isNotEmpty(email) ? email : phone);
         if("1246".equals(code)){
             return true;
         }
@@ -299,17 +310,17 @@
                     String path = templatePath + "index.html";
                     Document document = Jsoup.parse(new File(path), "UTF-8");
                     if(1 == language){
-                        document.getElementById("english").attr("style", "display: none;");
-                        document.getElementById("french").attr("style", "display: none;");
-                        document.getElementById("user").attr("style", "display: none;");
-                        document.getElementById("settle").attr("style", "display: none;");
-                        document.getElementById("pass").attr("style", "display: none;");
-                        document.getElementById("email").attr("style", "display: none;");
-                        document.getElementById("bill").attr("style", "display: none;");
-                        document.getElementById("reward").attr("style", "display: none;");
-                        document.getElementById("rewardToday").attr("style", "display: none;");
-                        document.getElementById("driverAudit").attr("style", "display: none;");
-                        document.getElementById("carAudit").attr("style", "display: none;");
+                        document.getElementById("english").remove();
+                        document.getElementById("french").remove();
+                        document.getElementById("user").remove();
+                        document.getElementById("settle").remove();
+                        document.getElementById("pass").remove();
+                        document.getElementById("email").remove();
+                        document.getElementById("bill").remove();
+                        document.getElementById("reward").remove();
+                        document.getElementById("rewardToday").remove();
+                        document.getElementById("driverAudit").remove();
+                        document.getElementById("carAudit").remove();
 
                         Element invite_user = document.getElementById("invite_user");
                         invite_user.text("您好 " + driver.getFirstName() + "" + driver.getLastName() + ",");
@@ -317,17 +328,17 @@
                         invite_content.text("您已成功邀请一位司机注册I-GO,获得奖励GHS " + bigDecimal.doubleValue() + ",请查收");
                     }
                     if(2 == language){
-                        document.getElementById("chinese").attr("style", "display: none;");
-                        document.getElementById("french").attr("style", "display: none;");
-                        document.getElementById("user1").attr("style", "display: none;");
-                        document.getElementById("settle1").attr("style", "display: none;");
-                        document.getElementById("pass1").attr("style", "display: none;");
-                        document.getElementById("email1").attr("style", "display: none;");
-                        document.getElementById("bill1").attr("style", "display: none;");
-                        document.getElementById("reward1").attr("style", "display: none;");
-                        document.getElementById("rewardToday1").attr("style", "display: none;");
-                        document.getElementById("driverAudit1").attr("style", "display: none;");
-                        document.getElementById("carAudit1").attr("style", "display: none;");
+                        document.getElementById("chinese").remove();
+                        document.getElementById("french").remove();
+                        document.getElementById("user1").remove();
+                        document.getElementById("settle1").remove();
+                        document.getElementById("pass1").remove();
+                        document.getElementById("email1").remove();
+                        document.getElementById("bill1").remove();
+                        document.getElementById("reward1").remove();
+                        document.getElementById("rewardToday1").remove();
+                        document.getElementById("driverAudit1").remove();
+                        document.getElementById("carAudit1").remove();
 
                         Element invite1_user = document.getElementById("invite1_user");
                         invite1_user.text("Hello " + driver.getFirstName() + "" + driver.getLastName() + ",");
@@ -335,17 +346,17 @@
                         invite1_content.text("You have succeeded to invite a driver to register with I-GO, so you received a GHS " + bigDecimal.doubleValue() + " bonus, please check your balance.");
                     }
                     if(3 == language){
-                        document.getElementById("chinese").attr("style", "display: none;");
-                        document.getElementById("english").attr("style", "display: none;");
-                        document.getElementById("user2").attr("style", "display: none;");
-                        document.getElementById("settle2").attr("style", "display: none;");
-                        document.getElementById("pass2").attr("style", "display: none;");
-                        document.getElementById("email2").attr("style", "display: none;");
-                        document.getElementById("bill2").attr("style", "display: none;");
-                        document.getElementById("reward2").attr("style", "display: none;");
-                        document.getElementById("rewardToday2").attr("style", "display: none;");
-                        document.getElementById("driverAudit2").attr("style", "display: none;");
-                        document.getElementById("carAudit2").attr("style", "display: none;");
+                        document.getElementById("chinese").remove();
+                        document.getElementById("english").remove();
+                        document.getElementById("user2").remove();
+                        document.getElementById("settle2").remove();
+                        document.getElementById("pass2").remove();
+                        document.getElementById("email2").remove();
+                        document.getElementById("bill2").remove();
+                        document.getElementById("reward2").remove();
+                        document.getElementById("rewardToday2").remove();
+                        document.getElementById("driverAudit2").remove();
+                        document.getElementById("carAudit2").remove();
 
                         Element invite2_user = document.getElementById("invite2_user");
                         invite2_user.text("Bonjour " + driver.getFirstName() + "" + driver.getLastName() + ",");
@@ -399,7 +410,7 @@
      */
     @Override
     public ResultUtil<LoginWarpper> registeredDriver(String phoneOperator, String phone, String code, String password,Integer uid,Integer uType, Integer language) throws Exception {
-        boolean b = this.checkCaptcha(phone, code);
+        boolean b = this.checkCaptcha("", phone, code);
         if(!b){
             return ResultUtil.error(language == 1 ? "验证码无效" : language == 2 ? "Invalid captcha" : "Code de vérification invalide");
         }
@@ -476,7 +487,7 @@
         String[] city = new String[]{city1.getEnglishName()};
         Company query = companyCityService.query(city);
         if(null == query){
-            return ResultUtil.error(language == 1 ? "车牌号已经使用" : language == 2 ? "" : "选择从业地暂未开通业务");
+            return ResultUtil.error(language == 1 ? "选择从业地暂未开通业务" : language == 2 ? "The selected place of employment has not yet opened business" : "Choisir un lieu de pratique pas encore ouvert");
         }
         if(null != query){
             switch (query.getType()){
@@ -537,49 +548,49 @@
             String path1 = templatePath + "index.html";
             Document document1 = Jsoup.parse(new File(path1), "UTF-8");
             if(1 == language){
-                document1.getElementById("english").attr("style", "display: none;");
-                document1.getElementById("french").attr("style", "display: none;");
-                document1.getElementById("invite").attr("style", "display: none;");
-                document1.getElementById("user").attr("style", "display: none;");
-                document1.getElementById("pass").attr("style", "display: none;");
-                document1.getElementById("email").attr("style", "display: none;");
-                document1.getElementById("bill").attr("style", "display: none;");
-                document1.getElementById("reward").attr("style", "display: none;");
-                document1.getElementById("rewardToday").attr("style", "display: none;");
-                document1.getElementById("driverAudit").attr("style", "display: none;");
-                document1.getElementById("carAudit").attr("style", "display: none;");
+                document1.getElementById("english").remove();
+                document1.getElementById("french").remove();
+                document1.getElementById("invite").remove();
+                document1.getElementById("user").remove();
+                document1.getElementById("pass").remove();
+                document1.getElementById("email").remove();
+                document1.getElementById("bill").remove();
+                document1.getElementById("reward").remove();
+                document1.getElementById("rewardToday").remove();
+                document1.getElementById("driverAudit").remove();
+                document1.getElementById("carAudit").remove();
 
                 Element settle_user = document1.getElementById("settle_user");
                 settle_user.text("您好 " + driver.getFirstName() + "" + driver.getLastName() + ",");
             }
             if(2 == language){
-                document1.getElementById("chinese").attr("style", "display: none;");
-                document1.getElementById("french").attr("style", "display: none;");
-                document1.getElementById("invite1").attr("style", "display: none;");
-                document1.getElementById("user1").attr("style", "display: none;");
-                document1.getElementById("pass1").attr("style", "display: none;");
-                document1.getElementById("email1").attr("style", "display: none;");
-                document1.getElementById("bill1").attr("style", "display: none;");
-                document1.getElementById("reward1").attr("style", "display: none;");
-                document1.getElementById("rewardToday1").attr("style", "display: none;");
-                document1.getElementById("driverAudit1").attr("style", "display: none;");
-                document1.getElementById("carAudit1").attr("style", "display: none;");
+                document1.getElementById("chinese").remove();
+                document1.getElementById("french").remove();
+                document1.getElementById("invite1").remove();
+                document1.getElementById("user1").remove();
+                document1.getElementById("pass1").remove();
+                document1.getElementById("email1").remove();
+                document1.getElementById("bill1").remove();
+                document1.getElementById("reward1").remove();
+                document1.getElementById("rewardToday1").remove();
+                document1.getElementById("driverAudit1").remove();
+                document1.getElementById("carAudit1").remove();
 
                 Element settle1_user = document1.getElementById("settle1_user");
                 settle1_user.text("Hello " + driver.getFirstName() + "" + driver.getLastName() + ",");
             }
             if(3 == language){
-                document1.getElementById("chinese").attr("style", "display: none;");
-                document1.getElementById("english").attr("style", "display: none;");
-                document1.getElementById("invite2").attr("style", "display: none;");
-                document1.getElementById("user2").attr("style", "display: none;");
-                document1.getElementById("pass2").attr("style", "display: none;");
-                document1.getElementById("email2").attr("style", "display: none;");
-                document1.getElementById("bill2").attr("style", "display: none;");
-                document1.getElementById("reward2").attr("style", "display: none;");
-                document1.getElementById("rewardToday2").attr("style", "display: none;");
-                document1.getElementById("driverAudit2").attr("style", "display: none;");
-                document1.getElementById("carAudit2").attr("style", "display: none;");
+                document1.getElementById("chinese").remove();
+                document1.getElementById("english").remove();
+                document1.getElementById("invite2").remove();
+                document1.getElementById("user2").remove();
+                document1.getElementById("pass2").remove();
+                document1.getElementById("email2").remove();
+                document1.getElementById("bill2").remove();
+                document1.getElementById("reward2").remove();
+                document1.getElementById("rewardToday2").remove();
+                document1.getElementById("driverAudit2").remove();
+                document1.getElementById("carAudit2").remove();
 
                 Element settle2_user = document1.getElementById("settle2_user");
                 settle2_user.text("Bonjour " + driver.getFirstName() + "" + driver.getLastName() + ",");
@@ -601,7 +612,7 @@
      */
     @Override
     public ResultUtil resetPassword(String phone, String code, String password, Integer language) throws Exception {
-        boolean b = this.checkCaptcha(phone, code);
+        boolean b = this.checkCaptcha("", phone, code);
         if(!b){
             return ResultUtil.error(language == 1 ? "验证码无效" : language == 2 ? "Invalid captcha" : "Code de vérification invalide");
         }
@@ -616,49 +627,49 @@
             String path1 = templatePath + "index.html";
             Document document1 = Jsoup.parse(new File(path1), "UTF-8");
             if(1 == language){
-                document1.getElementById("english").attr("style", "display: none;");
-                document1.getElementById("french").attr("style", "display: none;");
-                document1.getElementById("invite").attr("style", "display: none;");
-                document1.getElementById("user").attr("style", "display: none;");
-                document1.getElementById("settle").attr("style", "display: none;");
-                document1.getElementById("email").attr("style", "display: none;");
-                document1.getElementById("bill").attr("style", "display: none;");
-                document1.getElementById("reward").attr("style", "display: none;");
-                document1.getElementById("rewardToday").attr("style", "display: none;");
-                document1.getElementById("driverAudit").attr("style", "display: none;");
-                document1.getElementById("carAudit").attr("style", "display: none;");
+                document1.getElementById("english").remove();
+                document1.getElementById("french").remove();
+                document1.getElementById("invite").remove();
+                document1.getElementById("user").remove();
+                document1.getElementById("settle").remove();
+                document1.getElementById("email").remove();
+                document1.getElementById("bill").remove();
+                document1.getElementById("reward").remove();
+                document1.getElementById("rewardToday").remove();
+                document1.getElementById("driverAudit").remove();
+                document1.getElementById("carAudit").remove();
 
                 Element pass_user = document1.getElementById("pass_user");
                 pass_user.text("您好 " + driver.getFirstName() + "" + driver.getLastName() + ",");
             }
             if(2 == language){
-                document1.getElementById("chinese").attr("style", "display: none;");
-                document1.getElementById("french").attr("style", "display: none;");
-                document1.getElementById("invite1").attr("style", "display: none;");
-                document1.getElementById("user1").attr("style", "display: none;");
-                document1.getElementById("settle1").attr("style", "display: none;");
-                document1.getElementById("email1").attr("style", "display: none;");
-                document1.getElementById("bill1").attr("style", "display: none;");
-                document1.getElementById("reward1").attr("style", "display: none;");
-                document1.getElementById("rewardToday1").attr("style", "display: none;");
-                document1.getElementById("driverAudit1").attr("style", "display: none;");
-                document1.getElementById("carAudit1").attr("style", "display: none;");
+                document1.getElementById("chinese").remove();
+                document1.getElementById("french").remove();
+                document1.getElementById("invite1").remove();
+                document1.getElementById("user1").remove();
+                document1.getElementById("settle1").remove();
+                document1.getElementById("email1").remove();
+                document1.getElementById("bill1").remove();
+                document1.getElementById("reward1").remove();
+                document1.getElementById("rewardToday1").remove();
+                document1.getElementById("driverAudit1").remove();
+                document1.getElementById("carAudit1").remove();
 
                 Element pass1_user = document1.getElementById("pass1_user");
                 pass1_user.text("Hello " + driver.getFirstName() + "" + driver.getLastName() + ",");
             }
             if(3 == language){
-                document1.getElementById("chinese").attr("style", "display: none;");
-                document1.getElementById("english").attr("style", "display: none;");
-                document1.getElementById("invite2").attr("style", "display: none;");
-                document1.getElementById("user2").attr("style", "display: none;");
-                document1.getElementById("settle2").attr("style", "display: none;");
-                document1.getElementById("email2").attr("style", "display: none;");
-                document1.getElementById("bill2").attr("style", "display: none;");
-                document1.getElementById("reward2").attr("style", "display: none;");
-                document1.getElementById("rewardToday2").attr("style", "display: none;");
-                document1.getElementById("driverAudit2").attr("style", "display: none;");
-                document1.getElementById("carAudit2").attr("style", "display: none;");
+                document1.getElementById("chinese").remove();
+                document1.getElementById("english").remove();
+                document1.getElementById("invite2").remove();
+                document1.getElementById("user2").remove();
+                document1.getElementById("settle2").remove();
+                document1.getElementById("email2").remove();
+                document1.getElementById("bill2").remove();
+                document1.getElementById("reward2").remove();
+                document1.getElementById("rewardToday2").remove();
+                document1.getElementById("driverAudit2").remove();
+                document1.getElementById("carAudit2").remove();
 
                 Element pass2_user = document1.getElementById("pass2_user");
                 pass2_user.text("Bonjour " + driver.getFirstName() + "" + driver.getLastName() + ",");
@@ -754,9 +765,9 @@
      * @throws Exception
      */
     @Override
-    public Map<String, Object> queryHomeData(Integer uid) throws Exception {
+    public Map<String, Object> queryHomeData(Integer uid, Integer language) throws Exception {
         Map<String, Object> map = driverMapper.queryHomeData(uid);
-        int size = this.queryMyActivity(uid, new Date()).size();
+        int size = this.queryMyActivity(uid, new Date(), language).size();
         map.put("activity", size);
         //获取司机待支付的现金支付订单推送司机支付
         new Thread(new Runnable() {
@@ -950,7 +961,7 @@
         map.put("reservation", list.size());//预约
         List<Map<String, Object>> list1 = orderLogisticsService.queryOrderList(uid, language);
         map.put("small", list1.size());//小件
-        int size = this.queryMyActivity(uid, new Date()).size();
+        int size = this.queryMyActivity(uid, new Date(), language).size();
         map.put("activity", size);//活动
         return map;
     }
@@ -971,7 +982,7 @@
             baseWarpper.setId(d.getType());
             switch (d.getType()){
                 case 1:
-                    baseWarpper.setName(language == 1 ? "专车" : language == 2 ? "Special car" : "véhicules");
+                    baseWarpper.setName(language == 1 ? "打车" : language == 2 ? "Ride" : "Course ");
                     break;
                 case 2:
                     baseWarpper.setName(language == 1 ? "出租车" : language == 2 ? "taxi" : "taxi");
@@ -980,7 +991,7 @@
                     baseWarpper.setName(language == 1 ? "跨城出行" : language == 2 ? "Cross-town travel" : "Se déplacer à travers la ville");
                     break;
                 case 4:
-                    baseWarpper.setName(language == 1 ? "市内小件物流" : language == 2 ? "Small parts logistics in the city" : "Logistique de petites pièces dans la ville");
+                    baseWarpper.setName(language == 1 ? "包裹" : language == 2 ? "Package" : "Paquet");
                     break;
                 case 5:
                     baseWarpper.setName(language == 1 ? "跨城小件物流" : language == 2 ? "Cross-city small parts logistics" : "Logistique des petites pièces à travers la ville");
@@ -1034,7 +1045,7 @@
         if(null != driver){
             return ResultUtil.error(language == 1 ? "电话号码已被注册" : language == 2 ? "he phone number is registered" : "Le numéro de téléphone a été enregistré");
         }
-        boolean b = this.checkCaptcha(phone, code);
+        boolean b = this.checkCaptcha("", phone, code);
         if(!b){
             return ResultUtil.error(language == 1 ? "验证码无效" : language == 2 ? "Invalid captcha" : "Code de vérification invalide");
         }
@@ -1083,49 +1094,49 @@
             String path1 = templatePath + "index.html";
             Document document1 = Jsoup.parse(new File(path1), "UTF-8");
             if(1 == language){
-                document1.getElementById("english").attr("style", "display: none;");
-                document1.getElementById("french").attr("style", "display: none;");
-                document1.getElementById("invite").attr("style", "display: none;");
-                document1.getElementById("user").attr("style", "display: none;");
-                document1.getElementById("settle").attr("style", "display: none;");
-                document1.getElementById("email").attr("style", "display: none;");
-                document1.getElementById("bill").attr("style", "display: none;");
-                document1.getElementById("reward").attr("style", "display: none;");
-                document1.getElementById("rewardToday").attr("style", "display: none;");
-                document1.getElementById("driverAudit").attr("style", "display: none;");
-                document1.getElementById("carAudit").attr("style", "display: none;");
+                document1.getElementById("english").remove();
+                document1.getElementById("french").remove();
+                document1.getElementById("invite").remove();
+                document1.getElementById("user").remove();
+                document1.getElementById("settle").remove();
+                document1.getElementById("email").remove();
+                document1.getElementById("bill").remove();
+                document1.getElementById("reward").remove();
+                document1.getElementById("rewardToday").remove();
+                document1.getElementById("driverAudit").remove();
+                document1.getElementById("carAudit").remove();
 
                 Element pass_user = document1.getElementById("pass_user");
                 pass_user.text("您好 " + driver.getFirstName() + "" + driver.getLastName() + ",");
             }
             if(2 == language){
-                document1.getElementById("chinese").attr("style", "display: none;");
-                document1.getElementById("french").attr("style", "display: none;");
-                document1.getElementById("invite1").attr("style", "display: none;");
-                document1.getElementById("user1").attr("style", "display: none;");
-                document1.getElementById("settle1").attr("style", "display: none;");
-                document1.getElementById("email1").attr("style", "display: none;");
-                document1.getElementById("bill1").attr("style", "display: none;");
-                document1.getElementById("reward1").attr("style", "display: none;");
-                document1.getElementById("rewardToday1").attr("style", "display: none;");
-                document1.getElementById("driverAudit1").attr("style", "display: none;");
-                document1.getElementById("carAudit1").attr("style", "display: none;");
+                document1.getElementById("chinese").remove();
+                document1.getElementById("french").remove();
+                document1.getElementById("invite1").remove();
+                document1.getElementById("user1").remove();
+                document1.getElementById("settle1").remove();
+                document1.getElementById("email1").remove();
+                document1.getElementById("bill1").remove();
+                document1.getElementById("reward1").remove();
+                document1.getElementById("rewardToday1").remove();
+                document1.getElementById("driverAudit1").remove();
+                document1.getElementById("carAudit1").remove();
 
                 Element pass1_user = document1.getElementById("pass1_user");
                 pass1_user.text("Hello " + driver.getFirstName() + "" + driver.getLastName() + ",");
             }
             if(2 == language){
-                document1.getElementById("chinese").attr("style", "display: none;");
-                document1.getElementById("english").attr("style", "display: none;");
-                document1.getElementById("invite2").attr("style", "display: none;");
-                document1.getElementById("user2").attr("style", "display: none;");
-                document1.getElementById("settle2").attr("style", "display: none;");
-                document1.getElementById("email2").attr("style", "display: none;");
-                document1.getElementById("bill2").attr("style", "display: none;");
-                document1.getElementById("reward2").attr("style", "display: none;");
-                document1.getElementById("rewardToday2").attr("style", "display: none;");
-                document1.getElementById("driverAudit2").attr("style", "display: none;");
-                document1.getElementById("carAudit2").attr("style", "display: none;");
+                document1.getElementById("chinese").remove();
+                document1.getElementById("english").remove();
+                document1.getElementById("invite2").remove();
+                document1.getElementById("user2").remove();
+                document1.getElementById("settle2").remove();
+                document1.getElementById("email2").remove();
+                document1.getElementById("bill2").remove();
+                document1.getElementById("reward2").remove();
+                document1.getElementById("rewardToday2").remove();
+                document1.getElementById("driverAudit2").remove();
+                document1.getElementById("carAudit2").remove();
 
                 Element pass2_user = document1.getElementById("pass2_user");
                 pass2_user.text("Bonjour " + driver.getFirstName() + "" + driver.getLastName() + ",");
@@ -1275,7 +1286,7 @@
      * @throws Exception
      */
     @Override
-    public List<ActivityWarpper> queryMyActivity(Integer uid, Date time) throws Exception {
+    public List<ActivityWarpper> queryMyActivity(Integer uid, Date time, Integer language) throws Exception {
         List<ActivityWarpper> list = new ArrayList<>();
         Map<String, Date> date = dateUtil.getStartAndEndDate(time);
         List<DriverActivityHistory> driverActivityHistories = driverActivityHistoryMapper.queryList(uid, null, null, date.get("startTime"), date.get("endTime"));
@@ -1303,7 +1314,7 @@
                     }
                     switch (driverActivityOnline.getType()){
                         case 1:
-                            sb.append("专车");
+                            sb.append(language == 1 ? "打车" : language == 2 ? "Ride" : "Rouler");
                             break;
                         case 2:
                             sb.append("出租车");
@@ -1313,6 +1324,7 @@
                             sb.append("城际出行");
                             break;
                         case 4:
+                            sb.append(language == 1 ? "包裹" : language == 2 ? "Package" : "Paquet");
                             break;
                     }
                     String str = "累计在线" +driverActivityOnline.getOnline() + "小时奖励" +driverActivityOnline.getMoney() + "元";
@@ -1379,17 +1391,17 @@
                         String path1 = templatePath + "index.html";
                         Document document1 = Jsoup.parse(new File(path1), "UTF-8");
                         if (1 == language) {
-                            document1.getElementById("english").attr("style", "display: none;");
-                            document1.getElementById("french").attr("style", "display: none;");
-                            document1.getElementById("invite").attr("style", "display: none;");
-                            document1.getElementById("user").attr("style", "display: none;");
-                            document1.getElementById("settle").attr("style", "display: none;");
-                            document1.getElementById("pass").attr("style", "display: none;");
-                            document1.getElementById("email").attr("style", "display: none;");
-                            document1.getElementById("bill").attr("style", "display: none;");
-                            document1.getElementById("reward").attr("style", "display: none;");
-                            document1.getElementById("driverAudit").attr("style", "display: none;");
-                            document1.getElementById("carAudit").attr("style", "display: none;");
+                            document1.getElementById("english").remove();
+                            document1.getElementById("french").remove();
+                            document1.getElementById("invite").remove();
+                            document1.getElementById("user").remove();
+                            document1.getElementById("settle").remove();
+                            document1.getElementById("pass").remove();
+                            document1.getElementById("email").remove();
+                            document1.getElementById("bill").remove();
+                            document1.getElementById("reward").remove();
+                            document1.getElementById("driverAudit").remove();
+                            document1.getElementById("carAudit").remove();
 
                             Element rewardToday_user = document1.getElementById("rewardToday_user");
                             rewardToday_user.text("您好 " + driver.getFirstName() + "" + driver.getLastName() + ",");
@@ -1399,17 +1411,17 @@
                             rewardToday_content.text("邀请司机注册即可活动奖励。 注意此活动是有时间限制的,详情请查看I-GO平台。");
                         }
                         if (2 == language) {
-                            document1.getElementById("chinese").attr("style", "display: none;");
-                            document1.getElementById("french").attr("style", "display: none;");
-                            document1.getElementById("invite1").attr("style", "display: none;");
-                            document1.getElementById("user1").attr("style", "display: none;");
-                            document1.getElementById("settle1").attr("style", "display: none;");
-                            document1.getElementById("pass1").attr("style", "display: none;");
-                            document1.getElementById("email1").attr("style", "display: none;");
-                            document1.getElementById("bill1").attr("style", "display: none;");
-                            document1.getElementById("reward1").attr("style", "display: none;");
-                            document1.getElementById("driverAudit1").attr("style", "display: none;");
-                            document1.getElementById("carAudit1").attr("style", "display: none;");
+                            document1.getElementById("chinese").remove();
+                            document1.getElementById("french").remove();
+                            document1.getElementById("invite1").remove();
+                            document1.getElementById("user1").remove();
+                            document1.getElementById("settle1").remove();
+                            document1.getElementById("pass1").remove();
+                            document1.getElementById("email1").remove();
+                            document1.getElementById("bill1").remove();
+                            document1.getElementById("reward1").remove();
+                            document1.getElementById("driverAudit1").remove();
+                            document1.getElementById("carAudit1").remove();
 
                             Element rewardToday1_user = document1.getElementById("rewardToday1_user");
                             rewardToday1_user.text("Hello " + driver.getFirstName() + "" + driver.getLastName() + ",");
@@ -1419,17 +1431,17 @@
                             rewardToday1_content.text("Invite drivers to register and get event rewards. Note that this event is time-limited, please check the I-GO platform for details.");
                         }
                         if (3 == language) {
-                            document1.getElementById("chinese").attr("style", "display: none;");
-                            document1.getElementById("french").attr("style", "display: none;");
-                            document1.getElementById("invite2").attr("style", "display: none;");
-                            document1.getElementById("user2").attr("style", "display: none;");
-                            document1.getElementById("settle2").attr("style", "display: none;");
-                            document1.getElementById("pass2").attr("style", "display: none;");
-                            document1.getElementById("email2").attr("style", "display: none;");
-                            document1.getElementById("bill2").attr("style", "display: none;");
-                            document1.getElementById("reward2").attr("style", "display: none;");
-                            document1.getElementById("driverAudit2").attr("style", "display: none;");
-                            document1.getElementById("carAudit2").attr("style", "display: none;");
+                            document1.getElementById("chinese").remove();
+                            document1.getElementById("french").remove();
+                            document1.getElementById("invite2").remove();
+                            document1.getElementById("user2").remove();
+                            document1.getElementById("settle2").remove();
+                            document1.getElementById("pass2").remove();
+                            document1.getElementById("email2").remove();
+                            document1.getElementById("bill2").remove();
+                            document1.getElementById("reward2").remove();
+                            document1.getElementById("driverAudit2").remove();
+                            document1.getElementById("carAudit2").remove();
 
                             Element rewardToday2_user = document1.getElementById("rewardToday2_user");
                             rewardToday2_user.text("Bonjour " + driver.getFirstName() + "" + driver.getLastName() + ",");
@@ -1460,17 +1472,17 @@
                         String path1 = templatePath + "index.html";
                         Document document1 = Jsoup.parse(new File(path1), "UTF-8");
                         if (1 == language) {
-                            document1.getElementById("english").attr("style", "display: none;");
-                            document1.getElementById("french").attr("style", "display: none;");
-                            document1.getElementById("invite").attr("style", "display: none;");
-                            document1.getElementById("user").attr("style", "display: none;");
-                            document1.getElementById("settle").attr("style", "display: none;");
-                            document1.getElementById("pass").attr("style", "display: none;");
-                            document1.getElementById("email").attr("style", "display: none;");
-                            document1.getElementById("bill").attr("style", "display: none;");
-                            document1.getElementById("reward").attr("style", "display: none;");
-                            document1.getElementById("driverAudit").attr("style", "display: none;");
-                            document1.getElementById("carAudit").attr("style", "display: none;");
+                            document1.getElementById("english").remove();
+                            document1.getElementById("french").remove();
+                            document1.getElementById("invite").remove();
+                            document1.getElementById("user").remove();
+                            document1.getElementById("settle").remove();
+                            document1.getElementById("pass").remove();
+                            document1.getElementById("email").remove();
+                            document1.getElementById("bill").remove();
+                            document1.getElementById("reward").remove();
+                            document1.getElementById("driverAudit").remove();
+                            document1.getElementById("carAudit").remove();
 
                             Element rewardToday_user = document1.getElementById("rewardToday_user");
                             rewardToday_user.text("您好 " + driver.getFirstName() + "" + driver.getLastName() + ",");
@@ -1480,17 +1492,17 @@
                             rewardToday_content.text("邀请用户注册即可活动奖励。 注意此活动是有时间限制的,详情请查看I-GO平台。");
                         }
                         if (2 == language) {
-                            document1.getElementById("chinese").attr("style", "display: none;");
-                            document1.getElementById("french").attr("style", "display: none;");
-                            document1.getElementById("invite1").attr("style", "display: none;");
-                            document1.getElementById("user1").attr("style", "display: none;");
-                            document1.getElementById("settle1").attr("style", "display: none;");
-                            document1.getElementById("pass1").attr("style", "display: none;");
-                            document1.getElementById("email1").attr("style", "display: none;");
-                            document1.getElementById("bill1").attr("style", "display: none;");
-                            document1.getElementById("reward1").attr("style", "display: none;");
-                            document1.getElementById("driverAudit1").attr("style", "display: none;");
-                            document1.getElementById("carAudit1").attr("style", "display: none;");
+                            document1.getElementById("chinese").remove();
+                            document1.getElementById("french").remove();
+                            document1.getElementById("invite1").remove();
+                            document1.getElementById("user1").remove();
+                            document1.getElementById("settle1").remove();
+                            document1.getElementById("pass1").remove();
+                            document1.getElementById("email1").remove();
+                            document1.getElementById("bill1").remove();
+                            document1.getElementById("reward1").remove();
+                            document1.getElementById("driverAudit1").remove();
+                            document1.getElementById("carAudit1").remove();
 
                             Element rewardToday1_user = document1.getElementById("rewardToday1_user");
                             rewardToday1_user.text("Hello " + driver.getFirstName() + "" + driver.getLastName() + ",");
@@ -1500,17 +1512,17 @@
                             rewardToday1_content.text("Invite users to register and get event rewards. Note that this event is time-limited, please check the I-GO platform for details.");
                         }
                         if (3 == language) {
-                            document1.getElementById("chinese").attr("style", "display: none;");
-                            document1.getElementById("english").attr("style", "display: none;");
-                            document1.getElementById("invite2").attr("style", "display: none;");
-                            document1.getElementById("user2").attr("style", "display: none;");
-                            document1.getElementById("settle2").attr("style", "display: none;");
-                            document1.getElementById("pass2").attr("style", "display: none;");
-                            document1.getElementById("email2").attr("style", "display: none;");
-                            document1.getElementById("bill2").attr("style", "display: none;");
-                            document1.getElementById("reward2").attr("style", "display: none;");
-                            document1.getElementById("driverAudit2").attr("style", "display: none;");
-                            document1.getElementById("carAudit2").attr("style", "display: none;");
+                            document1.getElementById("chinese").remove();
+                            document1.getElementById("english").remove();
+                            document1.getElementById("invite2").remove();
+                            document1.getElementById("user2").remove();
+                            document1.getElementById("settle2").remove();
+                            document1.getElementById("pass2").remove();
+                            document1.getElementById("email2").remove();
+                            document1.getElementById("bill2").remove();
+                            document1.getElementById("reward2").remove();
+                            document1.getElementById("driverAudit2").remove();
+                            document1.getElementById("carAudit2").remove();
 
                             Element rewardToday2_user = document1.getElementById("rewardToday2_user");
                             rewardToday2_user.text("Bonjour " + driver.getFirstName() + "" + driver.getLastName() + ",");
@@ -1542,17 +1554,17 @@
                         String path1 = templatePath + "index.html";
                         Document document1 = Jsoup.parse(new File(path1), "UTF-8");
                         if (1 == language) {
-                            document1.getElementById("english").attr("style", "display: none;");
-                            document1.getElementById("french").attr("style", "display: none;");
-                            document1.getElementById("invite").attr("style", "display: none;");
-                            document1.getElementById("user").attr("style", "display: none;");
-                            document1.getElementById("settle").attr("style", "display: none;");
-                            document1.getElementById("pass").attr("style", "display: none;");
-                            document1.getElementById("email").attr("style", "display: none;");
-                            document1.getElementById("bill").attr("style", "display: none;");
-                            document1.getElementById("reward").attr("style", "display: none;");
-                            document1.getElementById("driverAudit").attr("style", "display: none;");
-                            document1.getElementById("carAudit").attr("style", "display: none;");
+                            document1.getElementById("english").remove();
+                            document1.getElementById("french").remove();
+                            document1.getElementById("invite").remove();
+                            document1.getElementById("user").remove();
+                            document1.getElementById("settle").remove();
+                            document1.getElementById("pass").remove();
+                            document1.getElementById("email").remove();
+                            document1.getElementById("bill").remove();
+                            document1.getElementById("reward").remove();
+                            document1.getElementById("driverAudit").remove();
+                            document1.getElementById("carAudit").remove();
 
                             Element rewardToday_user = document1.getElementById("rewardToday_user");
                             rewardToday_user.text("您好 " + driver.getFirstName() + "" + driver.getLastName() + ",");
@@ -1562,17 +1574,17 @@
                             rewardToday_content.text("今日累计在线" + driverActivityOnline.getOnline() + "小时即可活动奖励。 注意此活动是有时间限制的,详情请查看I-GO平台。");
                         }
                         if (2 == language) {
-                            document1.getElementById("chinese").attr("style", "display: none;");
-                            document1.getElementById("french").attr("style", "display: none;");
-                            document1.getElementById("invite1").attr("style", "display: none;");
-                            document1.getElementById("user1").attr("style", "display: none;");
-                            document1.getElementById("settle1").attr("style", "display: none;");
-                            document1.getElementById("pass1").attr("style", "display: none;");
-                            document1.getElementById("email1").attr("style", "display: none;");
-                            document1.getElementById("bill1").attr("style", "display: none;");
-                            document1.getElementById("reward1").attr("style", "display: none;");
-                            document1.getElementById("driverAudit1").attr("style", "display: none;");
-                            document1.getElementById("carAudit1").attr("style", "display: none;");
+                            document1.getElementById("chinese").remove();
+                            document1.getElementById("french").remove();
+                            document1.getElementById("invite1").remove();
+                            document1.getElementById("user1").remove();
+                            document1.getElementById("settle1").remove();
+                            document1.getElementById("pass1").remove();
+                            document1.getElementById("email1").remove();
+                            document1.getElementById("bill1").remove();
+                            document1.getElementById("reward1").remove();
+                            document1.getElementById("driverAudit1").remove();
+                            document1.getElementById("carAudit1").remove();
 
                             Element rewardToday1_user = document1.getElementById("rewardToday1_user");
                             rewardToday1_user.text("Hello " + driver.getFirstName() + "" + driver.getLastName() + ",");
@@ -1582,17 +1594,17 @@
                             rewardToday1_content.text("Accumulated online " + driverActivityOnline.getOnline() + " hours today to get event rewards. Note that this event is time-limited, please check the I-GO platform for details.");
                         }
                         if (3 == language) {
-                            document1.getElementById("chinese").attr("style", "display: none;");
-                            document1.getElementById("english").attr("style", "display: none;");
-                            document1.getElementById("invite2").attr("style", "display: none;");
-                            document1.getElementById("user2").attr("style", "display: none;");
-                            document1.getElementById("settle2").attr("style", "display: none;");
-                            document1.getElementById("pass2").attr("style", "display: none;");
-                            document1.getElementById("email2").attr("style", "display: none;");
-                            document1.getElementById("bill2").attr("style", "display: none;");
-                            document1.getElementById("reward2").attr("style", "display: none;");
-                            document1.getElementById("driverAudit2").attr("style", "display: none;");
-                            document1.getElementById("carAudit2").attr("style", "display: none;");
+                            document1.getElementById("chinese").remove();
+                            document1.getElementById("english").remove();
+                            document1.getElementById("invite2").remove();
+                            document1.getElementById("user2").remove();
+                            document1.getElementById("settle2").remove();
+                            document1.getElementById("pass2").remove();
+                            document1.getElementById("email2").remove();
+                            document1.getElementById("bill2").remove();
+                            document1.getElementById("reward2").remove();
+                            document1.getElementById("driverAudit2").remove();
+                            document1.getElementById("carAudit2").remove();
 
                             Element rewardToday2_user = document1.getElementById("rewardToday2_user");
                             rewardToday2_user.text("Bonjour " + driver.getFirstName() + "" + driver.getLastName() + ",");
@@ -1624,17 +1636,17 @@
                         String path1 = templatePath + "index.html";
                         Document document1 = Jsoup.parse(new File(path1), "UTF-8");
                         if (1 == language) {
-                            document1.getElementById("english").attr("style", "display: none;");
-                            document1.getElementById("french").attr("style", "display: none;");
-                            document1.getElementById("invite").attr("style", "display: none;");
-                            document1.getElementById("user").attr("style", "display: none;");
-                            document1.getElementById("settle").attr("style", "display: none;");
-                            document1.getElementById("pass").attr("style", "display: none;");
-                            document1.getElementById("email").attr("style", "display: none;");
-                            document1.getElementById("bill").attr("style", "display: none;");
-                            document1.getElementById("reward").attr("style", "display: none;");
-                            document1.getElementById("driverAudit").attr("style", "display: none;");
-                            document1.getElementById("carAudit").attr("style", "display: none;");
+                            document1.getElementById("english").remove();
+                            document1.getElementById("french").remove();
+                            document1.getElementById("invite").remove();
+                            document1.getElementById("user").remove();
+                            document1.getElementById("settle").remove();
+                            document1.getElementById("pass").remove();
+                            document1.getElementById("email").remove();
+                            document1.getElementById("bill").remove();
+                            document1.getElementById("reward").remove();
+                            document1.getElementById("driverAudit").remove();
+                            document1.getElementById("carAudit").remove();
 
                             Element rewardToday_user = document1.getElementById("rewardToday_user");
                             rewardToday_user.text("您好 " + driver.getFirstName() + "" + driver.getLastName() + ",");
@@ -1644,17 +1656,17 @@
                             rewardToday_content.text("今日累计完成" + driverActivityOrder.getOrderNum() + "单即可活动奖励。 注意此活动是有时间限制的,详情请查看I-GO平台。");
                         }
                         if (2 == language) {
-                            document1.getElementById("chinese").attr("style", "display: none;");
-                            document1.getElementById("french").attr("style", "display: none;");
-                            document1.getElementById("invite1").attr("style", "display: none;");
-                            document1.getElementById("user1").attr("style", "display: none;");
-                            document1.getElementById("settle1").attr("style", "display: none;");
-                            document1.getElementById("pass1").attr("style", "display: none;");
-                            document1.getElementById("email1").attr("style", "display: none;");
-                            document1.getElementById("bill1").attr("style", "display: none;");
-                            document1.getElementById("reward1").attr("style", "display: none;");
-                            document1.getElementById("driverAudit1").attr("style", "display: none;");
-                            document1.getElementById("carAudit1").attr("style", "display: none;");
+                            document1.getElementById("chinese").remove();
+                            document1.getElementById("french").remove();
+                            document1.getElementById("invite1").remove();
+                            document1.getElementById("user1").remove();
+                            document1.getElementById("settle1").remove();
+                            document1.getElementById("pass1").remove();
+                            document1.getElementById("email1").remove();
+                            document1.getElementById("bill1").remove();
+                            document1.getElementById("reward1").remove();
+                            document1.getElementById("driverAudit1").remove();
+                            document1.getElementById("carAudit1").remove();
 
                             Element rewardToday1_user = document1.getElementById("rewardToday1_user");
                             rewardToday1_user.text("Hello " + driver.getFirstName() + "" + driver.getLastName() + ",");
@@ -1664,17 +1676,17 @@
                             rewardToday1_content.text("Complete " + driverActivityOrder.getOrderNum() + " orders in total today to get event rewards. Note that this event is time-limited, please check the I-GO platform for details.");
                         }
                         if (3 == language) {
-                            document1.getElementById("chinese").attr("style", "display: none;");
-                            document1.getElementById("english").attr("style", "display: none;");
-                            document1.getElementById("invite2").attr("style", "display: none;");
-                            document1.getElementById("user2").attr("style", "display: none;");
-                            document1.getElementById("settle2").attr("style", "display: none;");
-                            document1.getElementById("pass2").attr("style", "display: none;");
-                            document1.getElementById("email2").attr("style", "display: none;");
-                            document1.getElementById("bill2").attr("style", "display: none;");
-                            document1.getElementById("reward2").attr("style", "display: none;");
-                            document1.getElementById("driverAudit2").attr("style", "display: none;");
-                            document1.getElementById("carAudit2").attr("style", "display: none;");
+                            document1.getElementById("chinese").remove();
+                            document1.getElementById("english").remove();
+                            document1.getElementById("invite2").remove();
+                            document1.getElementById("user2").remove();
+                            document1.getElementById("settle2").remove();
+                            document1.getElementById("pass2").remove();
+                            document1.getElementById("email2").remove();
+                            document1.getElementById("bill2").remove();
+                            document1.getElementById("reward2").remove();
+                            document1.getElementById("driverAudit2").remove();
+                            document1.getElementById("carAudit2").remove();
 
                             Element rewardToday2_user = document1.getElementById("rewardToday2_user");
                             rewardToday2_user.text("Bonjour " + driver.getFirstName() + "" + driver.getLastName() + ",");
@@ -1728,17 +1740,17 @@
                         String path1 = templatePath + "index.html";
                         Document document1 = Jsoup.parse(new File(path1), "UTF-8");
                         if (1 == language) {
-                            document1.getElementById("english").attr("style", "display: none;");
-                            document1.getElementById("french").attr("style", "display: none;");
-                            document1.getElementById("invite").attr("style", "display: none;");
-                            document1.getElementById("user").attr("style", "display: none;");
-                            document1.getElementById("settle").attr("style", "display: none;");
-                            document1.getElementById("pass").attr("style", "display: none;");
-                            document1.getElementById("email").attr("style", "display: none;");
-                            document1.getElementById("bill").attr("style", "display: none;");
-                            document1.getElementById("rewardToday").attr("style", "display: none;");
-                            document1.getElementById("driverAudit").attr("style", "display: none;");
-                            document1.getElementById("carAudit").attr("style", "display: none;");
+                            document1.getElementById("english").remove();
+                            document1.getElementById("french").remove();
+                            document1.getElementById("invite").remove();
+                            document1.getElementById("user").remove();
+                            document1.getElementById("settle").remove();
+                            document1.getElementById("pass").remove();
+                            document1.getElementById("email").remove();
+                            document1.getElementById("bill").remove();
+                            document1.getElementById("rewardToday").remove();
+                            document1.getElementById("driverAudit").remove();
+                            document1.getElementById("carAudit").remove();
 
                             Element reward_user = document1.getElementById("reward_user");
                             reward_user.text("您好 " + driver.getFirstName() + "" + driver.getLastName() + ",");
@@ -1746,17 +1758,17 @@
                             reward_content.text("今日累计在线 " + dao.getOnline() + "小时,获得奖励GHS" + dah.getMoney() + ",请查收");
                         }
                         if (2 == language) {
-                            document1.getElementById("chinese").attr("style", "display: none;");
-                            document1.getElementById("french").attr("style", "display: none;");
-                            document1.getElementById("invite1").attr("style", "display: none;");
-                            document1.getElementById("user1").attr("style", "display: none;");
-                            document1.getElementById("settle1").attr("style", "display: none;");
-                            document1.getElementById("pass1").attr("style", "display: none;");
-                            document1.getElementById("email1").attr("style", "display: none;");
-                            document1.getElementById("bill1").attr("style", "display: none;");
-                            document1.getElementById("rewardToday1").attr("style", "display: none;");
-                            document1.getElementById("driverAudit1").attr("style", "display: none;");
-                            document1.getElementById("carAudit1").attr("style", "display: none;");
+                            document1.getElementById("chinese").remove();
+                            document1.getElementById("french").remove();
+                            document1.getElementById("invite1").remove();
+                            document1.getElementById("user1").remove();
+                            document1.getElementById("settle1").remove();
+                            document1.getElementById("pass1").remove();
+                            document1.getElementById("email1").remove();
+                            document1.getElementById("bill1").remove();
+                            document1.getElementById("rewardToday1").remove();
+                            document1.getElementById("driverAudit1").remove();
+                            document1.getElementById("carAudit1").remove();
 
                             Element reward1_user = document1.getElementById("reward1_user");
                             reward1_user.text("Hello " + driver.getFirstName() + "" + driver.getLastName() + ",");
@@ -1764,17 +1776,17 @@
                             reward1_content.text("accumulated online for " + dao.getOnline() + " hour today, get reward GHS" + dah.getMoney() + ", please check");
                         }
                         if (3 == language) {
-                            document1.getElementById("chinese").attr("style", "display: none;");
-                            document1.getElementById("english").attr("style", "display: none;");
-                            document1.getElementById("invite2").attr("style", "display: none;");
-                            document1.getElementById("user2").attr("style", "display: none;");
-                            document1.getElementById("settle2").attr("style", "display: none;");
-                            document1.getElementById("pass2").attr("style", "display: none;");
-                            document1.getElementById("email2").attr("style", "display: none;");
-                            document1.getElementById("bill2").attr("style", "display: none;");
-                            document1.getElementById("rewardToday2").attr("style", "display: none;");
-                            document1.getElementById("driverAudit2").attr("style", "display: none;");
-                            document1.getElementById("carAudit2").attr("style", "display: none;");
+                            document1.getElementById("chinese").remove();
+                            document1.getElementById("english").remove();
+                            document1.getElementById("invite2").remove();
+                            document1.getElementById("user2").remove();
+                            document1.getElementById("settle2").remove();
+                            document1.getElementById("pass2").remove();
+                            document1.getElementById("email2").remove();
+                            document1.getElementById("bill2").remove();
+                            document1.getElementById("rewardToday2").remove();
+                            document1.getElementById("driverAudit2").remove();
+                            document1.getElementById("carAudit2").remove();
 
                             Element reward2_user = document1.getElementById("reward2_user");
                             reward2_user.text("Bonjour " + driver.getFirstName() + "" + driver.getLastName() + ",");
@@ -1812,17 +1824,17 @@
                     String path1 = templatePath + "index.html";
                     Document document1 = Jsoup.parse(new File(path1), "UTF-8");
                     if (1 == language) {
-                        document1.getElementById("english").attr("style", "display: none;");
-                        document1.getElementById("french").attr("style", "display: none;");
-                        document1.getElementById("invite").attr("style", "display: none;");
-                        document1.getElementById("user").attr("style", "display: none;");
-                        document1.getElementById("settle").attr("style", "display: none;");
-                        document1.getElementById("pass").attr("style", "display: none;");
-                        document1.getElementById("email").attr("style", "display: none;");
-                        document1.getElementById("bill").attr("style", "display: none;");
-                        document1.getElementById("rewardToday").attr("style", "display: none;");
-                        document1.getElementById("driverAudit").attr("style", "display: none;");
-                        document1.getElementById("carAudit").attr("style", "display: none;");
+                        document1.getElementById("english").remove();
+                        document1.getElementById("french").remove();
+                        document1.getElementById("invite").remove();
+                        document1.getElementById("user").remove();
+                        document1.getElementById("settle").remove();
+                        document1.getElementById("pass").remove();
+                        document1.getElementById("email").remove();
+                        document1.getElementById("bill").remove();
+                        document1.getElementById("rewardToday").remove();
+                        document1.getElementById("driverAudit").remove();
+                        document1.getElementById("carAudit").remove();
 
                         Element reward_user = document1.getElementById("reward_user");
                         reward_user.text("您好 " + driver.getFirstName() + "" + driver.getLastName() + ",");
@@ -1830,17 +1842,17 @@
                         reward_content.text("今日累计接单 " + dao.getOrderNum() + "单,获得奖励GHS" + dah.getMoney() + ",请查收");
                     }
                     if (2 == language) {
-                        document1.getElementById("chinese").attr("style", "display: none;");
-                        document1.getElementById("french").attr("style", "display: none;");
-                        document1.getElementById("invite1").attr("style", "display: none;");
-                        document1.getElementById("user1").attr("style", "display: none;");
-                        document1.getElementById("settle1").attr("style", "display: none;");
-                        document1.getElementById("pass1").attr("style", "display: none;");
-                        document1.getElementById("email1").attr("style", "display: none;");
-                        document1.getElementById("bill1").attr("style", "display: none;");
-                        document1.getElementById("rewardToday1").attr("style", "display: none;");
-                        document1.getElementById("driverAudit1").attr("style", "display: none;");
-                        document1.getElementById("carAudit1").attr("style", "display: none;");
+                        document1.getElementById("chinese").remove();
+                        document1.getElementById("french").remove();
+                        document1.getElementById("invite1").remove();
+                        document1.getElementById("user1").remove();
+                        document1.getElementById("settle1").remove();
+                        document1.getElementById("pass1").remove();
+                        document1.getElementById("email1").remove();
+                        document1.getElementById("bill1").remove();
+                        document1.getElementById("rewardToday1").remove();
+                        document1.getElementById("driverAudit1").remove();
+                        document1.getElementById("carAudit1").remove();
 
                         Element reward1_user = document1.getElementById("reward1_user");
                         reward1_user.text("Hello " + driver.getFirstName() + "" + driver.getLastName() + ",");
@@ -1848,17 +1860,17 @@
                         reward1_content.text("A total of " + dao.getOrderNum() + " orders have been received today, and the reward GHS" + dah.getMoney() + " will be awarded, please check");
                     }
                     if (3 == language) {
-                        document1.getElementById("chinese").attr("style", "display: none;");
-                        document1.getElementById("english").attr("style", "display: none;");
-                        document1.getElementById("invite2").attr("style", "display: none;");
-                        document1.getElementById("user2").attr("style", "display: none;");
-                        document1.getElementById("settle2").attr("style", "display: none;");
-                        document1.getElementById("pass2").attr("style", "display: none;");
-                        document1.getElementById("email2").attr("style", "display: none;");
-                        document1.getElementById("bill2").attr("style", "display: none;");
-                        document1.getElementById("rewardToday2").attr("style", "display: none;");
-                        document1.getElementById("driverAudit2").attr("style", "display: none;");
-                        document1.getElementById("carAudit2").attr("style", "display: none;");
+                        document1.getElementById("chinese").remove();
+                        document1.getElementById("english").remove();
+                        document1.getElementById("invite2").remove();
+                        document1.getElementById("user2").remove();
+                        document1.getElementById("settle2").remove();
+                        document1.getElementById("pass2").remove();
+                        document1.getElementById("email2").remove();
+                        document1.getElementById("bill2").remove();
+                        document1.getElementById("rewardToday2").remove();
+                        document1.getElementById("driverAudit2").remove();
+                        document1.getElementById("carAudit2").remove();
 
                         Element reward2_user = document1.getElementById("reward2_user");
                         reward2_user.text("Bonjour " + driver.getFirstName() + "" + driver.getLastName() + ",");

--
Gitblit v1.7.1