Browse Source

更新资源路径问题&初始化ionicModule

warrior 2 months ago
parent
commit
c3178bf2f9

+ 7 - 7
projects/live-app/src/app/components/gift-modal/gift-modal.component.ts

@@ -1,20 +1,20 @@
 import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { FormsModule } from '@angular/forms';
-import {
-  AlertController,
-  IonicModule,
-  LoadingController,
-} from '@ionic/angular';
 import { AiChatService } from '../../../services/aichart.service';
 import { LiveService } from '../../../services/live.service';
 import * as Parse from 'parse';
+import {
+  ionicStandaloneModules,
+  AlertController,
+  LoadingController,
+} from '../../../modules/ionic-standalone.modules';
 @Component({
   selector: 'app-gift-modal',
   templateUrl: './gift-modal.component.html',
   styleUrls: ['./gift-modal.component.scss'],
   standalone: true,
-  imports: [IonicModule, CommonModule, FormsModule],
+  imports: [...ionicStandaloneModules, CommonModule, FormsModule],
 })
 export class GiftModalComponent implements OnInit {
   @Input('toUid') toUid!: string; // 接收礼物的uid
@@ -70,7 +70,7 @@ export class GiftModalComponent implements OnInit {
   }
 
   async sendGift() {
-    let _this = this
+    let _this = this;
     if (!this.currentGift?.id || this.giftCount < 1) return;
     const alert = await this.alertController.create({
       cssClass: 'my-custom-class',

+ 11 - 11
projects/live-app/src/app/components/live/live.component.ts

@@ -1,22 +1,22 @@
 import { Component, EventEmitter, OnInit, Output, output } from '@angular/core';
 import { FormsModule } from '@angular/forms';
 import * as Parse from 'parse';
-import {
-  AlertController,
-  IonicModule,
-  LoadingController,
-  ToastController,
-} from '@ionic/angular';
 import { ActivatedRoute } from '@angular/router';
 import { AiChatService } from '../../../services/aichart.service';
 import { HttpService } from '../../../services/http.service';
 import { LiveService } from '../../../services/live.service';
+import {
+  ionicStandaloneModules,
+  AlertController,
+  LoadingController,
+  ToastController,
+} from '../../../modules/ionic-standalone.modules';
 @Component({
   selector: 'app-live',
   templateUrl: './live.component.html',
   styleUrls: ['./live.component.scss'],
   standalone: true,
-  imports: [IonicModule, FormsModule],
+  imports: [...ionicStandaloneModules, FormsModule],
 })
 export class LiveComponent implements OnInit {
   @Output() touch = new EventEmitter();
@@ -24,7 +24,7 @@ export class LiveComponent implements OnInit {
   rid?: string;
   room?: Parse.Object;
   changeScreen: boolean = false; //大小屏切换
-  timer: any;//轮询获取频道token的定时
+  timer: any; //轮询获取频道token的定时
   constructor(
     public toastController: ToastController,
     private loadingCtrl: LoadingController,
@@ -33,7 +33,7 @@ export class LiveComponent implements OnInit {
     private http: HttpService,
     private liveService: LiveService
   ) {
-    this.liveService.initAgora()
+    this.liveService.initAgora();
   }
 
   ngOnInit() {
@@ -64,14 +64,14 @@ export class LiveComponent implements OnInit {
       const alert = await this.alertController.create({
         header: '提示',
         message: '房间号不存在',
-        buttons:[
+        buttons: [
           {
             text: '确定',
             handler: () => {
               history.back();
             },
           },
-        ]
+        ],
       });
       await alert.present();
     }

+ 2 - 2
projects/live-app/src/app/components/nav/nav.component.ts

@@ -1,12 +1,12 @@
 import { Component, Input, OnInit } from '@angular/core';
-import { IonicModule } from '@ionic/angular';
+import { ionicStandaloneModules } from '../../../modules/ionic-standalone.modules';
 
 @Component({
   selector: 'nav',
   templateUrl: './nav.component.html',
   styleUrls: ['./nav.component.scss'],
   standalone: true,
-  imports: [IonicModule],
+  imports: [...ionicStandaloneModules],
 })
 export class NavComponent implements OnInit {
   @Input('type') type: string = 'back';

+ 2 - 2
projects/live-app/src/app/components/pay-comp/pay-comp.component.ts

@@ -1,10 +1,10 @@
 import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
 import { CommonModule } from '@angular/common';
-import { AlertController, IonicModule, ToastController } from '@ionic/angular';
 import { ActivatedRoute } from '@angular/router';
 import { AccountService } from '../../../services/account.service';
 import { HttpClient } from '@angular/common/http';
 import * as Parse from 'parse';
+import { ionicStandaloneModules,AlertController, ToastController } from '../../../modules/ionic-standalone.modules';
 declare var wx: any;
 
 @Component({
@@ -12,7 +12,7 @@ declare var wx: any;
   templateUrl: './pay-comp.component.html',
   styleUrls: ['./pay-comp.component.scss'],
   standalone: true,
-  imports: [IonicModule, CommonModule],
+  imports: [...ionicStandaloneModules, CommonModule],
 })
 export class PayCompComponent implements OnInit {
   @Input('price') price!: number;

+ 6 - 6
projects/live-app/src/app/components/upload/upload.component.ts

@@ -1,17 +1,17 @@
 import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
-import {
-  ToastController,
-  IonicModule,
-  LoadingController,
-} from '@ionic/angular';
 import * as Parse from 'parse';
 import * as qiniu from 'qiniu-js';
+import {
+  ionicStandaloneModules,
+  LoadingController,
+  ToastController,
+} from '../../../modules/ionic-standalone.modules';
 @Component({
   selector: 'app-upload',
   templateUrl: './upload.component.html',
   styleUrls: ['./upload.component.scss'],
   standalone: true,
-  imports: [IonicModule],
+  imports: [...ionicStandaloneModules],
 })
 export class UploadComponent implements OnInit {
   @Input('files') files: Array<any> = [];

+ 4 - 2
projects/live-app/src/modules/ionic-standalone.modules.ts

@@ -31,7 +31,8 @@ import {
 
   AlertController,
   ToastController,
-  LoadingController
+  LoadingController,
+  ScrollDetail
 } from '@ionic/angular/standalone';
 
 export const ionicStandaloneModules = [
@@ -69,5 +70,6 @@ export const ionicStandaloneModules = [
 export {
   AlertController,
   ToastController,
-  LoadingController
+  LoadingController,
+  ScrollDetail
 }

+ 14 - 14
projects/live-app/src/modules/live/chat/chat.component.ts

@@ -5,18 +5,18 @@ import { FormsModule } from '@angular/forms';
 import { ActivatedRoute, Router } from '@angular/router';
 import { SharedModule } from '../../shared.module';
 
-import {
-  LoadingController,
-  ScrollDetail,
-  ToastController,
-} from '@ionic/angular';
 // import * as JIMServ from '../../services/common/jim';
 // var JIM = JIMServ.JIM;
 // var Events = JIMServ.Events;
 import * as Parse from 'parse';
 import { GiftModalComponent } from '../../../app/components/gift-modal/gift-modal.component';
 import { MessageService } from '../../../services/message.service';
-import { ionicStandaloneModules } from '../../ionic-standalone.modules';
+import {
+  ionicStandaloneModules,
+  LoadingController,
+  ScrollDetail,
+  ToastController,
+} from '../../ionic-standalone.modules';
 @Component({
   selector: 'app-chat',
   templateUrl: './chat.component.html',
@@ -28,12 +28,12 @@ import { ionicStandaloneModules } from '../../ionic-standalone.modules';
     // DatePipe,
     GiftModalComponent,
     CommonModule,
-    SharedModule
+    SharedModule,
   ],
   // providers: [DatePipe],
 })
 export class ChatComponent implements OnInit {
-  channle:string = ''
+  channle: string = '';
   uid: string = '';
   profile?: Parse.Object; // 对方身份
   targetUser?: Parse.Object; // 对方用户
@@ -62,11 +62,11 @@ export class ChatComponent implements OnInit {
   ngOnInit() {
     this.activateRoute.paramMap.subscribe(async (params) => {
       let id: any = params.get('id');
-      this.channle = id
-      if(id !== 'global_room'){
-        const us = id.split('-')
-        const current = Parse.User.current()?.id!
-        this.uid = us.find((item:string)=> item !== current)
+      this.channle = id;
+      if (id !== 'global_room') {
+        const us = id.split('-');
+        const current = Parse.User.current()?.id!;
+        this.uid = us.find((item: string) => item !== current);
       }
       if (!this.channle) {
         history.back();
@@ -122,7 +122,7 @@ export class ChatComponent implements OnInit {
   }
   ngOnDestroy(): void {
     this.msgServe.pageFun = () => {};
-    if(!this.uid){
+    if (!this.uid) {
       this.msgServe.unsubscribeMessage(this.channle);
     }
   }

+ 8 - 7
projects/live-app/src/modules/live/link-page/link-page.component.ts

@@ -2,18 +2,19 @@ import { Component, OnInit, ViewChild } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { FormsModule } from '@angular/forms';
 import * as Parse from 'parse';
-import {
-  AlertController,
-  LoadingController,
-  ToastController,
-} from '@ionic/angular';
+
 import { ActivatedRoute } from '@angular/router';
 import { LiveComponent } from '../../../app/components/live/live.component';
 import { LiveService } from '../../../services/live.service';
 import { SharedModule } from '../../shared.module';
 import { AiChatService } from '../../../services/aichart.service';
 import { GiftModalComponent } from '../../../app/components/gift-modal/gift-modal.component';
-import { ionicStandaloneModules } from '../../ionic-standalone.modules';
+import {
+  ionicStandaloneModules,
+  AlertController,
+  LoadingController,
+  ToastController,
+} from '../../ionic-standalone.modules';
 @Component({
   selector: 'app-link-page',
   templateUrl: './link-page.component.html',
@@ -132,7 +133,7 @@ export class LinkPageComponent implements OnInit {
   }
   onSendGift() {
     console.log('点击送出礼物');
-    this.liveService.get_duration()
+    this.liveService.get_duration();
   }
   /* 结束直播 */
   async endCall(e: any) {

+ 5 - 0
projects/live-app/src/modules/tabs/home/home.component.ts

@@ -109,11 +109,16 @@ export class HomeComponent implements OnInit {
     // });
   }
   async refresh() {
+    const loading = await this.loadingCtrl.create({
+      message: '正在加载',
+    });
+    loading.present();
     await this.connectTask.init();
     await this.getBanner();
     await this.getRoom();
     setTimeout(() => {
       this.initSwiperTimeEvent();
+      loading.dismiss();
     }, 100);
   }
   async getBanner() {

+ 3 - 0
projects/live-app/src/modules/tabs/tabs/tabs.component.scss

@@ -40,4 +40,7 @@
       box-shadow: 0 1.3333vw 4vw -1.3333vw rgb(251 251 251 / 50%);
     }
   }
+}
+ion-tab-button{
+  height: 0px;
 }

+ 2 - 2
projects/live-app/src/modules/user/certification/certification.component.html

@@ -5,7 +5,7 @@
       {{ title }}
     </div>
     <img
-      src="http://cloud.file.futurestack.cn/real-idcard.png"
+      src="http://file-cloud.fmode.cn/real-idcard.png"
       class="hred-img"
     />
   </div>
@@ -13,7 +13,7 @@
   <div class="tips">
     <img
       class="tips-img"
-      src="http://cloud.file.futurestack.cn/game-auth.png"
+      src="https://file-cloud.fmode.cn/game-auth.png"
       alt=""
     />
     <div class="text">您已完成认证</div>

+ 12 - 9
projects/live-app/src/modules/user/profile/profile.component.ts

@@ -3,11 +3,6 @@ import { CommonModule, DatePipe } from '@angular/common';
 import { FormsModule } from '@angular/forms';
 import { NavComponent } from '../../../app/components/nav/nav.component';
 import { ActivatedRoute, Router } from '@angular/router';
-import {
-  AlertController,
-  LoadingController,
-  ToastController,
-} from '@ionic/angular';
 import * as Parse from 'parse';
 import { ImagePreviewComponent } from '../../../app/components/image-preview/image-preview.component';
 import { AiChatService } from '../../../services/aichart.service';
@@ -15,7 +10,12 @@ import { UploadComponent } from '../../../app/components/upload/upload.component
 import { GiftModalComponent } from '../../../app/components/gift-modal/gift-modal.component';
 import { MessageService } from '../../../services/message.service';
 import { ConnectTaskService } from '../../../services/connectTask.service';
-import { ionicStandaloneModules } from '../../ionic-standalone.modules';
+import {
+  ionicStandaloneModules,
+  AlertController,
+  LoadingController,
+  ToastController,
+} from '../../ionic-standalone.modules';
 
 @Component({
   selector: 'app-profile',
@@ -133,9 +133,9 @@ export class ProfileComponent implements OnInit {
     let query2 = new Parse.Query('Friends');
     query2.equalTo('user', this.uid);
     query2.equalTo('friend', this.currentUser?.id);
-    let query = Parse.Query.or(query1,query2);
+    let query = Parse.Query.or(query1, query2);
     query.notEqualTo('isDeleted', true);
-    query.select('objectId','isPass');
+    query.select('objectId', 'isPass','channel');
     this.friends = await query.first();
   }
   async getProfile() {
@@ -328,7 +328,10 @@ export class ProfileComponent implements OnInit {
   async sendVideoCallInvite() {
     this.iscall = true;
     // this.router.navigate(['live/link-room/' + this.room?.id]);
-    await this.msgSer.subscribeMessage(this.uid, { message: true,presence:true }); //进入对方主播频道发送聊天邀请
+    await this.msgSer.subscribeMessage(this.uid, {
+      message: true,
+      presence: true,
+    }); //进入对方主播频道发送聊天邀请
     this.msgSer.publishMessage('USERCALLINVITATION', this.uid);
   }
   async onCloseCall() {