update

670848654 · Oct 18, 2020 · e491b19 · e491b19
1 parent eeb8799
commit e491b19
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -6,8 +6,8 @@ android {
         applicationId "my.project.sakuraproject"
         minSdkVersion 21
         targetSdkVersion 29
-        versionCode 25
-        versionName "1.9.4_redirection_fix1"
+        versionCode 26
+        versionName "1.9.5"
         ndk{abiFilters "armeabi"}
         resConfigs"zh"
     }

diff --git a/app/src/main/java/my/project/sakuraproject/main/about/AboutActivity.java b/app/src/main/java/my/project/sakuraproject/main/about/AboutActivity.java
@@ -168,6 +168,7 @@ public void showUpdateLogs() {
 
     public List createUpdateLogList() {
         List logsList = new ArrayList();
+        logsList.add(new LogBean("版本：1.9.5", "修复部分设备（平板）无法正常播放的问题"));
         logsList.add(new LogBean("版本：1.9.4_redirection_fix1", "再次尝试修复由于网站重定向导致某些获数据取异常的Bug ┐(´д｀)┌"));
         logsList.add(new LogBean("版本：1.9.4", "尝试修复由于网站重定向导致获数据取异常的Bug"));
         logsList.add(new LogBean("版本：1.9.3", "修复番剧详情加载失败闪退Bug"));

diff --git a/app/src/main/java/my/project/sakuraproject/main/player/JZPlayer.java b/app/src/main/java/my/project/sakuraproject/main/player/JZPlayer.java
@@ -56,12 +56,12 @@ public void onClick(View v) {
                 if (locked) {
                     // 已经上锁，再次点击解锁
                     changeUiToPlayingShow();
-                    ibLock.setImageResource(R.drawable.player_btn_locking_pre);
+                    ibLock.setImageResource(R.drawable.player_btn_locking);
                     Toast.makeText(context, "屏幕锁定关闭", Toast.LENGTH_SHORT).show();
                 } else {
                     // 上锁
                     changeUiToPlayingClear();
-                    ibLock.setImageResource(R.drawable.player_btn_locking);
+                    ibLock.setImageResource(R.drawable.player_btn_locking_pre);
                     Toast.makeText(context, "屏幕锁定开启", Toast.LENGTH_SHORT).show();
 //                    Drawable up = ContextCompat.getDrawable(context,R.drawable.player_btn_locking_pre);
 //                    Drawable drawableUp= DrawableCompat.wrap(up);

diff --git a/app/src/main/java/my/project/sakuraproject/util/VideoUtils.java b/app/src/main/java/my/project/sakuraproject/util/VideoUtils.java
@@ -76,8 +76,7 @@ public static void showMultipleVideoSources(Context context,
 
     public static String getVideoUrl(String url) {
         String playStr = "";
-        url = url.substring(12);
-        url = url.substring(0, url.length() - 3);
+        url = url.replaceAll("\\$(.*)", "").replaceAll("changeplay\\('", "").replaceAll("'\\);", "");
         //如果网址
         if (Patterns.WEB_URL.matcher(url.replace(" ", "")).matches()) {
             Matcher m = PLAY_URL_PATTERN.matcher(url);

diff --git a/app/src/main/res/layout/jz_layout_std.xml b/app/src/main/res/layout/jz_layout_std.xml
@@ -191,7 +191,7 @@
             android:layout_alignParentLeft="true"
             android:layout_marginLeft="12dp"
             android:layout_centerVertical="true"
-            android:src="@drawable/player_btn_locking_pre"
+            android:src="@drawable/player_btn_locking"
             android:visibility="invisible"
             android:layout_width="@dimen/jz_start_button_w_h_normal"
             android:layout_height="@dimen/jz_start_button_w_h_normal"/>

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -122,7 +122,7 @@
     <string name="test_model_desc">OnePlus 7 Pro\nAndroid 10</string>
     <string name="now_version">当前版本</string>
     <string name="final_compile">最后编译日期</string>
-    <string name="final_compile_time">2020年9月4日</string>
+    <string name="final_compile_time">2020年10月18日</string>
     <string name="cache">缓存目录</string>
     <string name="cache_text">/SakuraAnime/\n卸载后自行删除此目录</string>
     <string name="github">Github</string>