diff --git a/resources/views/ads/game_onead_1_pc.blade.php b/resources/views/ads/game_onead_1_pc.blade.php index 1b22b267..736aca68 100644 --- a/resources/views/ads/game_onead_1_pc.blade.php +++ b/resources/views/ads/game_onead_1_pc.blade.php @@ -1,27 +1,33 @@ @if(!is_skip_ad())
+@push('scripts') + ONEAD_TEXT = {}; + ONEAD_TEXT.pub = {}; + ONEAD_TEXT.pub.uid = 2000374; //媒體 uid + ONEAD_TEXT.pub.player_mode_div = "div-onead-ad"; + ONEAD_TEXT.pub.slotobj = document.getElementById("div-onead-nd-01"); + ONEAD_TEXT.pub.player_mode = "native-drive"; + ONEAD_TEXT.pub.max_threads = 3; + ONEAD_TEXT.pub.position_id = /Mobi|Android|iPhone|iPad|iPod/i.test(navigator.userAgent)? "5" : "0"; + ONEAD_TEXT.pub.mediaOption = { landingNewPage : true } + ONEAD_TEXT.pub.queryAdCallback = custom_call + window.ONEAD_text_pubs = window.ONEAD_text_pubs || []; + ONEAD_text_pubs.push(ONEAD_TEXT); - + var script = document.createElement('script'); + script.src = 'https://ad-specs.guoshipartners.com/static/js/ad-serv.min.js'; + document.body.appendChild(script); + }); + +@endpush @endif diff --git a/resources/views/ads/home_onead_1_pc.blade.php b/resources/views/ads/home_onead_1_pc.blade.php index e7767385..e8ef9602 100644 --- a/resources/views/ads/home_onead_1_pc.blade.php +++ b/resources/views/ads/home_onead_1_pc.blade.php @@ -1,26 +1,33 @@ @if(!is_skip_ad())
+@push('scripts') - +@endpush @endif diff --git a/resources/views/ads/home_onead_2_pc.blade.php b/resources/views/ads/home_onead_2_pc.blade.php index 1b0b8c1f..f967b400 100644 --- a/resources/views/ads/home_onead_2_pc.blade.php +++ b/resources/views/ads/home_onead_2_pc.blade.php @@ -1,24 +1,31 @@ @if(!is_skip_ad())
+@push('scripts') - +@endpush @endif diff --git a/resources/views/ads/onead_text.blade.php b/resources/views/ads/onead_text.blade.php index e0f926df..1154ce04 100644 --- a/resources/views/ads/onead_text.blade.php +++ b/resources/views/ads/onead_text.blade.php @@ -1,21 +1,28 @@ @if(!is_skip_ad())
+@push('scripts') - +@endpush @endif diff --git a/resources/views/ads/rank_onead_1.blade.php b/resources/views/ads/rank_onead_1.blade.php index 1b22b267..1dbf2064 100644 --- a/resources/views/ads/rank_onead_1.blade.php +++ b/resources/views/ads/rank_onead_1.blade.php @@ -1,6 +1,8 @@ @if(!is_skip_ad()) -
- - + var script = document.createElement('script'); + script.src = 'https://ad-specs.guoshipartners.com/static/js/ad-serv.min.js'; + document.body.appendChild(script); + }); + +@endpush @endif diff --git a/resources/views/ads/rank_onead_2.blade.php b/resources/views/ads/rank_onead_2.blade.php index e7767385..1cbe8f3c 100644 --- a/resources/views/ads/rank_onead_2.blade.php +++ b/resources/views/ads/rank_onead_2.blade.php @@ -1,26 +1,33 @@ @if(!is_skip_ad()) -
+
+@push('scripts') - +@endpush @endif diff --git a/resources/views/ads/script_load_ad.blade.php b/resources/views/ads/script_load_ad.blade.php index 36d6b67a..737a7e44 100644 --- a/resources/views/ads/script_load_ad.blade.php +++ b/resources/views/ads/script_load_ad.blade.php @@ -1,5 +1,7 @@ @if (!is_skip_ad()) - +@endpush @endif diff --git a/resources/views/game/rank.blade.php b/resources/views/game/rank.blade.php index fd2b3118..39cfcc64 100644 --- a/resources/views/game/rank.blade.php +++ b/resources/views/game/rank.blade.php @@ -9,6 +9,19 @@ @section('header') + @if (config('services.google_ad.enabled') && config('services.google_ad.rank_page') && !is_skip_ad()) + + + @endif @endsection @section('content') diff --git a/resources/views/game/show.blade.php b/resources/views/game/show.blade.php index e9bec381..5ca02d69 100644 --- a/resources/views/game/show.blade.php +++ b/resources/views/game/show.blade.php @@ -886,7 +886,7 @@ class="btn btn-outline-dark ml-1 white-space-no-wrap black-box-toggle"
Element 1 + :src="post.element1.url" :alt="post.element1.title">
@@ -905,7 +905,7 @@ class="btn btn-outline-dark ml-1 white-space-no-wrap black-box-toggle"
Element 2 + :src="post.element2.url" :alt="post.element2.title">
diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php index 04a405f3..1cb716c6 100644 --- a/resources/views/home.blade.php +++ b/resources/views/home.blade.php @@ -6,6 +6,7 @@ @section('header') @if (config('services.google_ad.enabled') && config('services.google_ad.home_page') && !is_skip_ad()) {{-- Ads --}} + @push('scripts') + @endpush @endif @endsection @@ -428,11 +430,13 @@ {{-- google ads --}}
+ @push('scripts') + @endpush
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index 5116f5df..52e1da23 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -176,6 +176,7 @@ class="rounded-circle" width="24" height="24" style="object-fit: cover" @yield('footer') + @stack('scripts') diff --git a/tests/Unit/ElementControllerTest.php b/tests/Unit/ElementControllerTest.php index 111b8ffd..e09d7378 100644 --- a/tests/Unit/ElementControllerTest.php +++ b/tests/Unit/ElementControllerTest.php @@ -219,7 +219,7 @@ public function testUpdateElementVideo() $element = $this->createElements($post, 1)[0]; $this->be($post->user); // update video url - $url = 'http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/BigBuckBunny.mp4'; + $url = 'https://avtshare01.rz.tu-ilmenau.de/avt-vqdb-uhd-1/test_1/segments/bigbuck_bunny_8bit_15000kbps_1080p_60.0fps_h264.mp4'; $res = $this->put(route('api.element.update', $element->id), [ 'post_serial' => $post->serial, 'url' => $url, diff --git a/tests/Unit/ElementSourceGuessTest.php b/tests/Unit/ElementSourceGuessTest.php index 986d6637..37b249f6 100644 --- a/tests/Unit/ElementSourceGuessTest.php +++ b/tests/Unit/ElementSourceGuessTest.php @@ -65,7 +65,7 @@ public function testGuessImgurUrl() public function testGuessVideoUrl() { - $source = 'http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/BigBuckBunny.mp4'; + $source = 'https://avtshare01.rz.tu-ilmenau.de/avt-vqdb-uhd-1/test_1/segments/bigbuck_bunny_8bit_15000kbps_1080p_60.0fps_h264.mp4'; $guess = new ElementSourceGuess(); $guess->guess($source); $this->assertFalse($guess->isImage);