调整文件结构

README.md

@@ -15,6 +15,15 @@
     三、 消息  notice
     四、 个人中心  mine
 
+******代码的结构模块划分***********
+app/   项目的根文件，每个页面都会在这个基础上面展开的
+assets/  静态资源文件    主要是图片
+directive/  命令文件
+pipe/  过滤器文件
+provier/  服务组件
+service/  网络请求模块
+pages/  app的页面
+
 
 ******启动命令******
       1.npm install      //安装项目依赖

config.xml

@@ -91,6 +91,7 @@
     <plugin name="cordova-plugin-file-transfer" spec="^1.7.1" />
     <plugin name="cordova-plugin-file" spec="^6.0.1" />
     <plugin name="cordova.plugins.diagnostic" spec="^2.0.0" />
+    <plugin name="cordova-plugin-tts" spec="^0.2.3" />
     <engine name="ios" spec="4.5.5" />
     <engine name="browser" spec="5.0.4" />
     <engine name="android" spec="7.0.0" />

package.json

@@ -24,7 +24,6 @@
     "@ionic-native/badge": "^4.11.0",
     "@ionic-native/calendar": "^4.11.0",
     "@ionic-native/core": "4.4.0",
-    "@ionic-native/diagnostic": "^5.4.0",
     "@ionic-native/file": "^4.20.0",
     "@ionic-native/file-opener": "^4.11.0",
     "@ionic-native/file-transfer": "^4.20.0",
@@ -32,8 +31,9 @@
     "@ionic-native/keyboard": "^4.6.0",
     "@ionic-native/splash-screen": "4.4.0",
     "@ionic-native/status-bar": "4.4.0",
+    "@ionic-native/text-to-speech": "^4.20.0",
     "@ionic/storage": "2.1.3",
-    "cordova": "^8.0.0",
+    "cordova": "^6.5.0",
     "cordova-android": "7.0.0",
     "cordova-browser": "5.0.4",
     "cordova-ios": "4.5.5",
@@ -47,6 +47,7 @@
     "cordova-plugin-ionic-webview": "^1.1.16",
     "cordova-plugin-splashscreen": "^5.0.2",
     "cordova-plugin-statusbar": "^2.4.2",
+    "cordova-plugin-tts": "^0.2.3",
     "cordova-plugin-whitelist": "^1.3.3",
     "cordova.plugins.diagnostic": "^2.0.0",
     "ion2-calendar": "^2.2.0",
@@ -81,7 +82,8 @@
       "cordova-plugin-file-opener2": {},
       "cordova-plugin-ionic-keyboard": {},
       "cordova-plugin-statusbar": {},
-      "cordova.plugins.diagnostic": {}
+      "cordova.plugins.diagnostic": {},
+      "cordova-plugin-tts": {}
     },
     "platforms": [
       "ios",
@@ -89,4 +91,4 @@
       "android"
     ]
   }
-}
\ No newline at end of file
+}

plugins/android.json

@@ -48,6 +48,9 @@
     },
     "cordova.plugins.diagnostic": {
       "PACKAGE_NAME": "io.ionic.smart19.starter.test"
+    },
+    "cordova-plugin-tts": {
+      "PACKAGE_NAME": "io.ionic.smart19.starter"
     }
   },
   "dependent_plugins": {}

plugins/fetch.json

@@ -120,5 +120,13 @@
     },
     "is_top_level": true,
     "variables": {}
+  },
+  "cordova-plugin-tts": {
+    "source": {
+      "type": "registry",
+      "id": "cordova-plugin-tts"
+    },
+    "is_top_level": true,
+    "variables": {}
   }
 }
\ No newline at end of file

src/app/app.module.ts

@@ -13,7 +13,6 @@ import {LoginModule} from '../pages/login/login.module';
 import {HttpModule, JsonpModule} from '@angular/http';
 import {AppService} from '../service/appHttpService';
 import {AppUpdateService} from '../service/appUpdateService';
-import {ActivityStatisticService} from '../service/activityStatisticService';
 import {AppVersion} from '@ionic-native/app-version';
 import {FileOpener} from '@ionic-native/file-opener';
 import {FileTransfer, FileTransferObject} from '@ionic-native/file-transfer';
@@ -31,11 +30,11 @@ import {DirectivesModule} from "../directives/directives.module";
 import {LearnService} from "../pages/home/learning/learn.service";
 import {LoginService} from "../pages/login/login.service";
 import {LearnManageService} from "../pages/home/learn-manage/learnManage.service";
-import {CommonService} from "../service/common.service";
+import {CommonService} from "../provide/common.service";
 import {TabsService} from "../pages/tabs/tabs.service";
-import {BackButtonService} from "../service/backButton.service";
-import {EmitService} from "../service/emit.service";
-import {Diagnostic} from "@ionic-native/diagnostic/ngx";
+import {BackButtonService} from "../provide/backButton.service";
+import {EmitService} from "../provide/emit.service";
+import {TextToSpeech} from "@ionic-native/text-to-speech";
 
 @NgModule({
     declarations: [
@@ -87,9 +86,8 @@ import {Diagnostic} from "@ionic-native/diagnostic/ngx";
         Keyboard,
         Calendar,
         Badge,
-        Diagnostic,
+        TextToSpeech,
         Geolocation,
-        ActivityStatisticService,
         DatePipe,
         LearnService,
         LearnManageService,

src/pages/home/activity-track/joinDetail/joinDetail.ts

@@ -6,7 +6,6 @@ import {AppService,AppGlobal} from "../../../../service/appHttpService";
 import {ReplaceApplyPage} from "../replace-apply/replace-apply";
 import {ActivitySearchPage} from "../activity-search/activity-search";
 import {message} from "../../../../app/main";
-import {ActivityStatisticService} from "../../../../service/activityStatisticService";
 
 @IonicPage()
 @Component({
@@ -50,7 +49,7 @@ export class JoinDetailPage {
                 public http: Http,public loadingCtrl:LoadingController,
                 public appService: AppService,
                 public toast: ToastController,
-                public activityStatisticService: ActivityStatisticService) {
+    ) {
 
     }
 

src/pages/home/activity/activityDetail/activityDetail.ts

@@ -7,10 +7,9 @@ import {AppService, AppGlobal} from "../../../../service/appHttpService";
 import {JoinDetailPage} from '../../activity-track/joinDetail/joinDetail';
 import {BatchDetailPage} from "../batch-detail/batch-detail";
 import {TabsService} from "../../../tabs/tabs.service";
-import {CommonService} from "../../../../service/common.service";
+import {CommonService} from "../../../../provide/common.service";
 import {FileTransfer, FileTransferObject} from "@ionic-native/file-transfer";
 import {File} from "@ionic-native/file";
-import {Diagnostic} from '@ionic-native/diagnostic/ngx';
 
 @IonicPage()
 @Component({
@@ -35,7 +34,6 @@ export class ActivityDetailPage {
 
 
     constructor(public navCtrl: NavController,
-                public diagnostic: Diagnostic,
                 public navParams: NavParams,
                 private fileTransfer: FileTransfer,
                 private fileTransferObject: FileTransferObject,

src/pages/home/activity/activityList/activityList.ts

@@ -7,7 +7,7 @@ import { ActivityConfirmPage } from '../activityConfirm/activityConfirm';
 import {ActivityDetailPage} from "../activityDetail/activityDetail";
 import {AppService} from "../../../../service/appHttpService";
 import {TabsService} from "../../../tabs/tabs.service";
-import {CommonService} from "../../../../service/common.service";
+import {CommonService} from "../../../../provide/common.service";
 
 @IonicPage()
 @Component({

src/pages/home/learning/learn.service.ts

@@ -2,7 +2,7 @@ import {HttpClient} from "@angular/common/http";
 import {Injectable} from "@angular/core";
 import {Observable} from "rxjs/Observable";
 import {AppGlobal} from "../../../service/appHttpService";
-import {CommonService} from "../../../service/common.service";
+import {CommonService} from "../../../provide/common.service";
 
 @Injectable()
 export class LearnService{

src/pages/home/learning/learning-do/learning-do.ts

@@ -5,9 +5,9 @@ import {AppGlobal, AppService} from "../../../../service/appHttpService";
 import {LearningResultPage} from "../learning-result/learning-result";
 import {LearnService} from "../learn.service";
 import {DatePipe} from "@angular/common";
-import {CommonService} from "../../../../service/common.service";
+import {CommonService} from "../../../../provide/common.service";
 import {ReviewResultPage} from "../review-result/review-result";
-import {EmitService} from "../../../../service/emit.service";
+import {EmitService} from "../../../../provide/emit.service";
 
 @IonicPage()
 @Component({

src/pages/home/learning/learning-explain/learning-explain.ts

@@ -3,7 +3,7 @@ import {IonicPage, NavController, NavParams} from 'ionic-angular';
 import {LearningDoPage} from "../learning-do/learning-do";
 import {LearnService} from "../learn.service";
 import {AppGlobal, AppService} from "../../../../service/appHttpService";
-import {CommonService} from "../../../../service/common.service";
+import {CommonService} from "../../../../provide/common.service";
 
 @IonicPage()
 @Component({

src/pages/home/learning/learning-list/learning-list.ts

@@ -5,9 +5,9 @@ import {LearnService} from "../learn.service";
 import {DatePipe} from "@angular/common";
 import {LearningResultPage} from "../learning-result/learning-result";
 import {TabsService} from "../../../tabs/tabs.service";
-import {CommonService} from "../../../../service/common.service";
+import {CommonService} from "../../../../provide/common.service";
 import {RankPage} from "../rank/rank";
-import {EmitService} from "../../../../service/emit.service";
+import {EmitService} from "../../../../provide/emit.service";
 
 
 @IonicPage()

src/pages/home/learning/learning-result/learning-result.ts

@@ -2,7 +2,7 @@ import {Component, EventEmitter, ViewChild} from '@angular/core';
 import {IonicPage, Nav, Navbar, NavController, NavParams} from 'ionic-angular';
 import {ReviewLearnPage} from "../review-learn/review-learn";
 import {LearnService} from "../learn.service";
-import {EmitService} from "../../../../service/emit.service";
+import {EmitService} from "../../../../provide/emit.service";
 
 @IonicPage()
 @Component({

src/pages/home/learning/review-learn/review-learn.ts

@@ -3,7 +3,7 @@ import {IonicPage, NavController, NavParams, Slides, ToastController} from 'ioni
 import {AppService} from "../../../../service/appHttpService";
 import {message} from "../../../../app/main";
 import {LearnService} from "../learn.service";
-import {CommonService} from "../../../../service/common.service";
+import {CommonService} from "../../../../provide/common.service";
 
 
 @IonicPage()

src/pages/home/learning/review-result/review-result.ts

@@ -3,7 +3,7 @@ import {IonicPage, Navbar, NavController, NavParams, Slides, ToastController} fr
 import {message} from "../../../../app/main";
 import {LearnService} from "../learn.service";
 import {AppService} from "../../../../service/appHttpService";
-import {EmitService} from "../../../../service/emit.service";
+import {EmitService} from "../../../../provide/emit.service";
 
 @IonicPage()
 @Component({

src/pages/mine/myActivityList/myActivityList.ts

@@ -5,7 +5,6 @@ import {  Response } from '@angular/http';
 
 import { AppService } from '../../../service/appHttpService';
 import { ActivityConfirmPage } from "../../home/activity/activityConfirm/activityConfirm";
-import { ActivityStatisticService } from '../../../service/activityStatisticService';
 import { OrderDetailPage } from "../../home/activity/order-detail/order-detail";
 import { OrderEditPage } from "../../home/activity/order-edit/order-edit";
 import {ActivityDetailPage} from "../../home/activity/activityDetail/activityDetail";
@@ -40,23 +39,15 @@ export class MyActivityListPage {
 
   //活动类型
   activityType: Array<String> = ['未知', '体检', '疗休养', '培训', '工会活动'];
-  //参加人员类型（活动发布对象）
-  activityFbObject: Array<String> = ['未知', '全体人员', '用户组', '处事部门'];
 
   //ViewChild传入一个字符串contentSlides，变量contentSlides接收。其它不变  
   @ViewChild('contentSlides') contentSlides: Slides;
-  menus: Array<string> = ['活动订单', '待进行', '待确认'];
-
-  waitgoOrderCount = 0;
-  waitsureOrderCount = 0;
 
     swiperIndex = 0;
 
   constructor(
     public navCtrl: NavController,
     public appService: AppService,
-    //public flushRef: ChangeDetectorRef
-    public activityStatisticService:ActivityStatisticService
   ) {
 
   }
@@ -78,10 +69,7 @@ export class MyActivityListPage {
   }
 
   ionViewWillEnter(){
-    this.activityStatisticService.myActivityOrderCount((data)=>{
-     this.waitgoOrderCount = data.waitgoOrder;
-     this.waitsureOrderCount = data.waitSureOrder;      
-   });
+
  }
 
   initAllMyActivityOrder() {
@@ -131,10 +119,6 @@ export class MyActivityListPage {
               this.waitGoOrder.splice(this.waitGoOrder[index]["orderid"].indexOf(orderid),1); 
             }
           }
-          this.waitgoOrderCount =  this.waitGoOrder.length;
-          //this.allOrder.splice(this.allOrder.indexOf(orderid),1)   
-          //this.waitGoOrder.splice(this.waitGoOrder.indexOf(orderid),1) 
-          //this.waitgoOrderCount =  this.waitGoOrder.length;
 
         }, error => {        
         }
@@ -205,7 +189,6 @@ export class MyActivityListPage {
                 this.waitSureOrder.splice(this.waitSureOrder[index]["orderid"].indexOf(orderid),1); 
               }
             }
-            this.waitsureOrderCount = this.waitSureOrder.length;
         }else{
           //失败
         }             
@@ -255,7 +238,6 @@ export class MyActivityListPage {
                 this.waitSureOrder.splice(this.waitSureOrder[index]["orderid"].indexOf(orderid),1); 
               }
             }
-            this.waitsureOrderCount = this.waitSureOrder.length;
             if(true){
               this.fourth =false;
               this.isSuccess=true;

src/pages/mine/myReport/myReport.ts

@@ -5,7 +5,6 @@ import {Response} from '@angular/http';
 
 import {AppService} from '../../../service/appHttpService';
 import {OutGoingReportEditPage} from "../../home/report/outGoingReportEdit/outGoingReportEdit";
-import {ActivityStatisticService} from '../../../service/activityStatisticService';
 import {OutGoingReportViewPage} from "../../home/report/outGoingReportView/outGoingReportView";
 
 import {Storage} from '@ionic/storage';
@@ -34,7 +33,6 @@ export class MyReportPage {
 
     constructor(public navCtrl: NavController,
                 public appService: AppService,
-                public activityStatisticService: ActivityStatisticService,
                 public storage: Storage) {
     }
 

src/pages/tabs/home/home.html

@@ -61,6 +61,10 @@
                 <img src="./assets/imgs/home/icon-more.png" alt="">
                 <label class="label2-2 more2-2">更多应用</label>
             </div>
+            <div class="card" (click)="readBook()">
+                <img src="./assets/imgs/home/icon-more.png" alt="">
+                <label class="label2-2 more2-2">阅读</label>
+            </div>
         </div>
     </div>
     <div class="item3" style="padding-top: 0px;">

src/pages/tabs/home/home.ts

@@ -2,7 +2,6 @@ import {Component, ViewChild} from '@angular/core';
 import {NavController, IonicPage, Slides} from 'ionic-angular';
 import {ActivityListPage} from "../../home/activity/activityList/activityList";
 import {Http, Response} from '@angular/http';
-import {ActivityStatisticService} from '../../../service/activityStatisticService';
 import {AppService, AppGlobal} from '../../../service/appHttpService';
 import {Calendar} from '@ionic-native/calendar';
 import {ActivityApplyPage} from "../../home/activity/activityApply/activityApply";
@@ -12,14 +11,13 @@ import {AnnouncementPage} from '../../home/announcement/announcementList/announc
 import {Storage} from '@ionic/storage';
 import {OutGoingReportEditPage} from "../../home/report/outGoingReportEdit/outGoingReportEdit";
 import {AnnouncementViewPage} from '../../home/announcement/announcementView/announcementView';
-import {MoreAppPage} from "../../home/more-app/more-app";
-import {ReportTrackPage} from "../../home/report/reportTrack/reportTrack";
 import {CalendarComponentOptions, DayConfig} from "ion2-calendar";
 import {NoticePage} from "../notice/notice";
 import {monthCh, weekDay} from "../../../app/main";
 import {Badge} from '@ionic-native/badge';
-import {LearningListPage} from "../../home/learning/learning-list/learning-list";
 import {TabsService} from "../tabs.service";
+import {TextToSpeech} from "@ionic-native/text-to-speech";
+import {CommonService} from "../../../provide/common.service";
 
 declare var Swiper;
 
@@ -47,10 +45,6 @@ export class HomePage {
     optionsMulti: CalendarComponentOptions;
     newArr: DayConfig[] = [];
 
-    //待出行
-    waitgoCount = '0';
-    //待确认
-    waitsureCount = '0';
     //未读通知
     NoticeNotreadCount = '0';
     //尚未报备
@@ -75,7 +69,8 @@ export class HomePage {
     noticeTips;
     role;
 
-    constructor(public navCtrl: NavController, public activityStatisticService: ActivityStatisticService,
+    constructor(public navCtrl: NavController,public tts:TextToSpeech,
+                public commonSer:CommonService,
                 public appService: AppService, public http: Http, private calendar: Calendar, public storage: Storage,
                 public badge: Badge, public tabsSer: TabsService) {
 
@@ -102,25 +97,11 @@ export class HomePage {
         this.slidersItems = [];
         this.getHasNew();
         //初始化日期
-        //统计待进行和待确认活动数目
-        this.activityStatisticService.myActivityOrderCount((data) => {
-            this.waitgoCount = data.waitgoOrder;
-            this.waitsureCount = data.waitSureOrder;
-        });
-
         this.appService.ObserverHttpGet("/wisdomgroup/modules/common/file/getBanner", {}).subscribe((res: Response) => {
             this.slidersItems = res.json();
         }, error => {
         })
 
-        //初始化统计未读通知
-        this.activityStatisticService.myNoticeNotreadCount((data) => {
-            this.NoticeNotreadCount = data;
-        });
-        //初始化统计尚未报备
-        this.activityStatisticService.myNotdoPremanagerCount((data) => {
-            this.PremanagerNotdoCount = data;
-        });
     }
 
     ionViewDidLeave() {
@@ -209,6 +190,15 @@ export class HomePage {
         this.navCtrl.push(page);
     }
 
+    readBook(){
+        this.tts.speak({text: "你好，欢迎，向前走10米，路口右转，执行10米，在左转", locale: 'zh-CN'})
+            .then(() => {
+                console.log('Success');
+            }).catch((reason: any) => {
+            console.error('Error', reason);
+        });
+    }
+
     /**
      * 获取是否有新的信息
      */
@@ -255,6 +245,7 @@ export class HomePage {
             .subscribe((res) => {
                 let data = Number(res.json());
                 this.noticeTips = data;
+                console.log(this.noticeTips)
                 if (data > 0) {
                     this.badge.set(data);
                 } else {

src/pages/tabs/tabs.service.ts

@@ -3,7 +3,7 @@ import {HttpClient} from "@angular/common/http";
 import {Http} from "@angular/http";
 import {Observable} from "rxjs/Observable";
 import {AppGlobal} from "../../service/appHttpService";
-import {CommonService} from "../../service/common.service";
+import {CommonService} from "../../provide/common.service";
 
 @Injectable()
 export class TabsService{

src/pages/tabs/tabs.ts

@@ -8,7 +8,7 @@ import { MinePage } from './mine/mine';
 import { Storage } from '@ionic/storage';
 import { AppService, AppGlobal } from '../../service/appHttpService';
 import {NoticePage} from "./notice/notice";
-import {BackButtonService} from "../../service/backButton.service";
+import {BackButtonService} from "../../provide/backButton.service";
 
 @Component({
   templateUrl: 'tabs.html'

src/pipes/format-time/format-time.ts

@@ -15,6 +15,6 @@ export class FormatTimePipe implements PipeTransform {
         let seconds = Math.floor(value % 60).toString();
         seconds = (seconds.length > 1 ? seconds : '0' + seconds);
         const timeText = hourse + ":" + minutes + ":" + seconds;
-        return timeText
+        return timeText;
     }
 }

src/service/common.service.ts → src/provide/common.service.ts

 import {Injectable} from "@angular/core";
 import {AlertController, ToastController} from "ionic-angular";
-import {AppGlobal} from "./appHttpService";
+import {AppGlobal} from "../service/appHttpService";
 import {File} from "@ionic-native/file";
 import {FileOpener} from "@ionic-native/file-opener";
 

src/service/activityStatisticService.ts

@@ -9,22 +9,9 @@ export class ActivityStatisticService {
 
     constructor(
         public http: Http, 
-        public loadingCtrl: LoadingController, 
-        private alertCtrl: AlertController, 
-        private toastCtrl: ToastController,
+        public loadingCtrl: LoadingController,
         public appService: AppService,) { } 
 
-    //待出行活动,待确认活动,所有活动
-    myActivityOrderCount(callback?){
-        this.appService.ObserverHttpPost("/wisdomgroup/modules/order/findMyActivityOrderCount",null)
-        .subscribe((res: Response) => {
-          let data = res.json();
-          callback(data == null ? "[]" : data);
-          }, error => {        
-            this.appService.alert('网络异常！');  
-          }   
-        );
-    }
     //未读通知统计
     myNoticeNotreadCount(callback?){
         this.appService.ObserverHttpPost("/wisdomgroup/modules/notice/getNotReadNotice",null)
@@ -47,32 +34,5 @@ export class ActivityStatisticService {
           }   
         );
     }
-    //统计活动的报名订单数目
-    activityOrderCount(id,callback?){
-      this.appService.ObserverHttpPost("/wisdomgroup/modules/order/findActivityOrderCount",{id:id})
-      .subscribe((res: Response) => {
-        let data = res.json();
-        console.log("myactivityCount------->",data);    
-        callback(data == null ? "[]" : data);
-        }, error => {        
-          this.appService.alert('网络异常！');  
-        }   
-      );
-  }
-    //统计已发布，已结束活动数目
-  statisticActivityNum(callback?){
-      this.appService.ObserverHttpGet("/wisdomgroup/modules/activity/statisticActivityNum",null)
-      .subscribe((res: Response) => {
-        let data = res.json(); 
-        callback(data == null ? "[]" : data);
-        }, error => {        
-          this.appService.alert('网络异常！');  
-        }   
-      );
-  }
-
-  
-
-
 
 }
\ No newline at end of file

src/service/appHttpService.ts

@@ -13,18 +13,18 @@ export class AppGlobal {
     };
 
     //接口基地址
-     static domain = "http://101.89.112.92:80";       //正式环境
-    // static domain = "http://180.168.156.212:2931";   //测试环境
+    //  static domain = "http://101.89.112.92:80";       //正式环境
+    static domain = "http://180.168.156.212:2931";   //测试环境
     // static domain = "";   //本地环境
 
 
     //图片地址
-     static picture = "http://101.89.112.92:80/wisdomgroup/manager/getIcon/";     //正式地址
-    // static picture = "http://180.168.156.212:2931/wisdomgroup/manager/getIcon/";   //测试
+    //  static picture = "http://101.89.112.92:80/wisdomgroup/manager/getIcon/";     //正式地址
+    static picture = "http://180.168.156.212:2931/wisdomgroup/manager/getIcon/";   //测试
 
     //通知公告图片参数
-     static pictureNotice = "http://101.89.112.92:80";    //正式地址
-     // static pictureNotice = "http://180.168.156.212:2931";  //测试
+    //  static pictureNotice = "http://101.89.112.92:80";    //正式地址
+     static pictureNotice = "http://180.168.156.212:2931";  //测试
 
     //接口地址
     static API: any = {