fix malimali source

670848654 · Aug 3, 2022 · c0624c6 · c0624c6
1 parent e826420
commit c0624c6
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 4 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -7,8 +7,8 @@ android {
         applicationId "my.project.sakuraproject"
         minSdkVersion 21
         targetSdkVersion 30
-        versionCode 44
-        versionName "2.3.5"
+        versionCode 45
+        versionName "2.3.6"
         ndk{abiFilters "arm64-v8a", "x86_64"}
         resConfigs"zh"
     }

diff --git a/app/src/main/java/my/project/sakuraproject/database/DatabaseUtil.java b/app/src/main/java/my/project/sakuraproject/database/DatabaseUtil.java
@@ -1073,4 +1073,23 @@ public static void deleteAllDownloads() {
         db.execSQL("delete from T_DOWNLOAD");
         db.execSQL("delete from T_DOWNLOAD_DATA");
     }
+
+    /**
+     * 2022年8月3日09:28:04新增
+     * 由于MALIMALI源地址变更需更新错误的播放记录
+     */
+    public static void updatePlayUrl() {
+        Cursor cursor = db.rawQuery("select F_ID, F_PLAY_URL from T_HISTORY_DATA WHERE F_PLAY_URL like '%/play/%'", null);
+        if (cursor.getCount() > 0) {
+            while (cursor.moveToNext()) {
+                String id = cursor.getString(0);
+                String url = cursor.getString(1).replaceAll("/play/", "/vodplay/");
+                db.execSQL("UPDATE T_HISTORY_DATA SET F_PLAY_URL = ? WHERE F_ID = ?", new String[] {
+                        url,
+                        id
+                });
+            }
+            cursor.close();
+        }
+    }
 }
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
@@ -144,6 +144,7 @@ public void showUpdateLogs() {
 
     public List createUpdateLogList() {
         List logsList = new ArrayList();
+        logsList.add(new LogBean("版本：2.3.6", "修复malimali源播放时闪退的问题\n**由于malimali源播放地址变更，从历史记录中进行播放出现闪退时需手动删除该历史记录"));
         logsList.add(new LogBean("版本：2.3.5", "修复malimali源部分图片显示失败的问题\n修复malimali源分类解析方法\n修复删除下载的视频后下载其他视频时出现TaskId重复导致下载异常闪退的问题，如已出现需删除所有下载记录（设置->清除所有下载记录）\n**malimali源站点搜索功能异常，需等待站点修复"));
         logsList.add(new LogBean("版本：2.3.4", "修复malimali源站点UI改版（又变回原来的UI了。。。）导致所有相关解析出错的问题\n修复在下载列表界面中出现下载成功但显示下载失败的问题"));
         logsList.add(new LogBean("版本：2.3.3", "malimali域名变更为https://www.malimali6.com\n修复malimali源站点UI改版导致所有相关解析出错的问题\nmalimali源新增当视频地址是链接到腾讯视频等视频网站资源时，在播放失败时选择网页嗅探时加入了几个免费的VIP视频解析接口（不保证长期有效），下载该类型的视频时同理，但不保证一定能嗅探成功\n**由于malimali源站点改版导致部分番剧的地址发生变化可能导致在我的收藏、历史记录等界面操作时出现崩溃的情况，如出现请手动删除相关信息"));

diff --git a/app/src/main/java/my/project/sakuraproject/main/base/BaseActivity.java b/app/src/main/java/my/project/sakuraproject/main/base/BaseActivity.java
@@ -226,6 +226,7 @@ private void build() {
         if (getRunningActivityName().equals("StartActivity")) {
             DatabaseUtil.dataTransfer();
             DatabaseUtil.deleteImomoeData();
+            DatabaseUtil.updatePlayUrl();
         }
         setStatusBarColor();
         initCustomViews();

diff --git a/app/src/main/java/my/project/sakuraproject/main/video/VideoModel.java b/app/src/main/java/my/project/sakuraproject/main/video/VideoModel.java
@@ -22,7 +22,7 @@ public class VideoModel extends BaseModel implements VideoContract.Model {
     private boolean isImomoe;
     @Override
     public void getData(String title, String url, int source, String playNumber, VideoContract.LoadDataCallback callback) {
-        isImomoe = url.contains("/play/");
+        isImomoe = url.contains("/vodplay/");
         if (isImomoe)
             parserImomoe(title, BaseModel.getDomain(true) + url, source, playNumber, false, callback);
         else

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