Skip to content

Commit

Permalink
Merge pull request #10 from molihuan/dev
Browse files Browse the repository at this point in the history
fix bug
  • Loading branch information
molihuan committed Feb 2, 2023
2 parents 2418d4e + 3a9b24f commit d416f1d
Show file tree
Hide file tree
Showing 23 changed files with 740 additions and 584 deletions.
45 changes: 39 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,13 @@
<p align="center">将Bilibili缓存文件合并导出为MP4,支持安卓5.0 ~ 13,视频挂载弹幕播放</p>
<p align="center">Merge and export the Bilibili cache file to MP4, support Android 5.0~13, and mount the video to play the bullet screen</p>


<p align="center">
您是第 <img src="https://profile-counter.glitch.me/github:molihuan:BilibiliCacheVideoMerge/count.svg" />位访问者
</p>

## 说明

此软件是为了帮助网友合并音视频,你可以将它理解为一个专用的格式工厂,并不涉及破解相关内容,仅仅用于学习技术交流,严禁用于商业用途,如有侵权请联系我删档,对你带来困惑和不便我深感抱歉。
此软件是为了帮助网友合并哔哩哔哩缓存视频,Android上将bilibili缓存视频合并导出为mp4,你可以将它理解为一个专用的格式工厂,并不涉及破解相关内容,仅仅用于学习技术交流,严禁用于商业用途,如有侵权请联系我删档,对你带来困惑和不便我深感抱歉。

## 特性

Expand Down Expand Up @@ -65,11 +67,42 @@



# 软件协议
## 软件协议

### [查看](./app/src/main/assets/statement.md)

## 软件更新

- 优先级 1 (最快):交流群群文件
- 优先级 2 (次之):网盘链接:
安卓版:https://wwa.lanzouo.com/b016uhb5g
密码:MLH
电脑版:https://wwa.lanzouo.com/b016vmouf
密码:MLH
- 优先级 3 :Github(https://github.com/molihuan/BilibiliCacheVideoMerge/tree/master/app/release)
- 优先级 4 :软件内

## 问题反馈

请使用模板反馈问题,这样可以帮助开发者快速定位和解决问题,谢谢配合,爱你萌萌哒~^o^~

##### 反馈模板:

类别:(必填,0、优化建议。1、打开软件就闪退。2、无论什么视频合并都失败或闪退。3、合并个别视频失败或闪退。4、主页空白无法加载哔哩哔哩缓存视频。5、其他问题)

设备信息:(必填,软件内左测菜单栏中点击设备信息即可复制,不会泄漏设备特殊信息,无法进入软件按下列大概填写即可:
Android:9 App版本:1.6.9.2beta
机型:HUAWEI/VOG-AL10
设备id:
2f5e3c3905abc3dc5b757787725d28e43)

描述:(必填,越详细越好)

怎样触发bug:(选填)

#### [查看](./app/src/main/assets/statement.md)
视频链接:(选填,如果视频已经下架则把本地缓存文件打包压缩发我邮箱或者直接发群里,具体操作:[https://www.bilibili.com/video/BV1Mx4y1G7by](https://www.bilibili.com/video/BV1Mx4y1G7by))

# 特别鸣谢
## 特别鸣谢

- [bilibili/DanmakuFlameMaster](https://github.com/bilibili/DanmakuFlameMaster)
- [microshow/RxFFmpeg](https://github.com/microshow/RxFFmpeg)
Expand All @@ -82,7 +115,7 @@

开源项目以及其依赖项目。

### LICENSE
## LICENSE

```
Copyright [2020] molihuan
Expand Down
36 changes: 26 additions & 10 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
plugins {
id 'com.android.application'
id 'org.jetbrains.kotlin.android'
}

/**
Expand Down Expand Up @@ -39,8 +40,8 @@ android {
applicationId "com.molihua.hlbmerge"
minSdk 21
targetSdk 33
versionCode 52
versionName "1.6.9.2beta"
versionCode 53
versionName "1.6.9.3"

testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

Expand All @@ -52,6 +53,10 @@ android {
buildConfigField "int", "FFMPEG_CORE_TYPE", ffmpegCoreType

}
//开启数据绑定
buildFeatures {
dataBinding true
}

buildTypes {
release {
Expand All @@ -68,9 +73,8 @@ android {

}
}

//基于不同的abi架构配置打包不同的apk
splits {
// 基于不同的abi架构配置不同的apk
abi {
// 必须为true,打包才会为不同的abi生成不同的apk
enable true
Expand All @@ -97,11 +101,7 @@ android {
}


compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}

//资源配置
sourceSets {
main {
java {
Expand Down Expand Up @@ -130,6 +130,16 @@ android {
}
}

//环境配置
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}

kotlinOptions {
jvmTarget = '1.8'
}

}


Expand Down Expand Up @@ -161,7 +171,13 @@ dependencies {
implementation 'com.umeng.umsdk:apm:1.8.0'// U-APM产品包依赖(必选)
//bugly依赖
implementation 'com.tencent.bugly:crashreport:latest.release'

//kotlin
implementation 'androidx.core:core-ktx:1.9.0'
//协程
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4'
//黄油刀
implementation 'com.jakewharton:butterknife:10.2.3'
annotationProcessor 'com.jakewharton:butterknife-compiler:10.2.3'

implementation 'androidx.appcompat:appcompat:1.4.1'
implementation 'com.google.android.material:material:1.5.0'
Expand Down
Binary file modified app/release/app-all.apk
Binary file not shown.
Binary file modified app/release/app-arm64-v8a.apk
Binary file not shown.
Binary file modified app/release/app-armeabi-v7a.apk
Binary file not shown.
Binary file modified app/release/app-x86.apk
Binary file not shown.
Binary file modified app/release/app-x86_64.apk
Binary file not shown.
32 changes: 16 additions & 16 deletions app/release/output-metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,35 +11,35 @@
"type": "UNIVERSAL",
"filters": [],
"attributes": [],
"versionCode": 52,
"versionName": "1.6.9.2beta",
"versionCode": 53,
"versionName": "1.6.9.3",
"outputFile": "app-all.apk"
},
{
"type": "ONE_OF_MANY",
"filters": [
{
"filterType": "ABI",
"value": "x86_64"
"value": "armeabi-v7a"
}
],
"attributes": [],
"versionCode": 52,
"versionName": "1.6.9.2beta",
"outputFile": "app-x86_64.apk"
"versionCode": 53,
"versionName": "1.6.9.3",
"outputFile": "app-armeabi-v7a.apk"
},
{
"type": "ONE_OF_MANY",
"filters": [
{
"filterType": "ABI",
"value": "armeabi-v7a"
"value": "arm64-v8a"
}
],
"attributes": [],
"versionCode": 52,
"versionName": "1.6.9.2beta",
"outputFile": "app-armeabi-v7a.apk"
"versionCode": 53,
"versionName": "1.6.9.3",
"outputFile": "app-arm64-v8a.apk"
},
{
"type": "ONE_OF_MANY",
Expand All @@ -50,22 +50,22 @@
}
],
"attributes": [],
"versionCode": 52,
"versionName": "1.6.9.2beta",
"versionCode": 53,
"versionName": "1.6.9.3",
"outputFile": "app-x86.apk"
},
{
"type": "ONE_OF_MANY",
"filters": [
{
"filterType": "ABI",
"value": "arm64-v8a"
"value": "x86_64"
}
],
"attributes": [],
"versionCode": 52,
"versionName": "1.6.9.2beta",
"outputFile": "app-arm64-v8a.apk"
"versionCode": 53,
"versionName": "1.6.9.3",
"outputFile": "app-x86_64.apk"
}
],
"elementType": "File"
Expand Down
6 changes: 6 additions & 0 deletions app/src/main/assets/updataLog.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,12 @@ <h2>
<h3><span>因为权限问题,输出路径不能设置为SD卡,缓存文件路径可以设置为SD卡,即SD卡只能读取不能写入</span></h3>


<h3><span>1.6.9.3版本(新)</span></h3>
<h4><span>更新日期:2023年2月2日</span></h4>
<p><span>----修复大视频合并卡死问题</span></p>
<p><span>----修复因temp目录被删除导致合并失败的问题</span></p>
<p><span>----修复压缩问题</span></p>

<h3><span>1.6.9.2beta版本(新)</span></h3>
<h4><span>更新日期:2023年1月28日</span></h4>
<p><span>----修改合并命名问题</span></p>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
import com.umeng.analytics.MobclickAgent;
import com.xuexiang.xui.XUI;

import butterknife.ButterKnife;


/**
* @ClassName: AbstractActivity
Expand All @@ -24,6 +26,8 @@ protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
//设置布局资源
setContentView(setContentViewID());
//绑定黄油
ButterKnife.bind(this);
//获取组件
getComponents();
//初始化数据
Expand Down
88 changes: 88 additions & 0 deletions app/src/main/java/com/molihua/hlbmerge/activity/BaseActivityKT.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
package com.molihua.hlbmerge.activity

import android.os.Bundle
import androidx.appcompat.app.AppCompatActivity
import androidx.databinding.DataBindingUtil
import androidx.databinding.ViewDataBinding
import androidx.lifecycle.ViewModel
import androidx.lifecycle.ViewModelProvider
import com.umeng.analytics.MobclickAgent
import com.xuexiang.xui.XUI

abstract class BaseActivityKT<T : ViewDataBinding> : AppCompatActivity() {
protected lateinit var mBinding: T


override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
//初始化主题
XUI.initTheme(this);
//获取ViewDataBinding,有了ViewDataBinding就可以操作视图了
mBinding = DataBindingUtil.setContentView(this, setContentViewId())
initViewModel()
initData()
setListeners()
//设置数据观察
mBinding.lifecycleOwner = this
}

//获取视图id
abstract fun setContentViewId(): Int

//初始化ViewModel,推荐使用本类getViewModel快速获取
open fun initViewModel() {

}

//初始化数据
open fun initData() {

}

//设置监听
open fun setListeners() {

}

/**
* 将ViewModel与当前Activity绑定
* 子类快速获取ViewModel
*/
fun <T : ViewModel> getViewModelByProvider(viewModelClass: Class<T>): T {
return ViewModelProvider(this)[viewModelClass]
}

override fun onStart() {
super.onStart()
//Mtools.log(javaClass.simpleName + "---------onStart");
}

override fun onResume() {
super.onResume()
//Mtools.log(javaClass.simpleName + "---------onResume");
}

override fun onPause() {
super.onPause()
//Mtools.log(javaClass.simpleName + "---------onPause");
}

override fun onStop() {
super.onStop()
//Mtools.log(javaClass.simpleName + "---------onStop");
}

override fun onRestart() {
super.onRestart()
//Mtools.log(javaClass.simpleName + "---------onRestart");
}

override fun onDestroy() {
//友盟保存数据
MobclickAgent.onKillProcess(this)
//Mtools.log(javaClass.simpleName + "---------onDestroy");
super.onDestroy()
}


}
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import android.content.Intent;
import android.view.MenuItem;
import android.view.View;
import android.view.WindowManager;
import android.widget.TextView;

Expand All @@ -12,6 +13,7 @@
import androidx.fragment.app.Fragment;
import androidx.viewpager.widget.ViewPager;

import com.blankj.molihuan.utilcode.util.ClipboardUtils;
import com.blankj.molihuan.utilcode.util.DeviceUtils;
import com.google.android.material.bottomnavigation.BottomNavigationView;
import com.google.android.material.navigation.NavigationView;
Expand Down Expand Up @@ -91,18 +93,25 @@ public void initData() {
mainCompleteFragment = new MainCompleteFragment();
mainHandleFragment = new MainHandleFragment();


}

@Override
public void initView() {
//侧边栏手机信息
TextView phoneInfoTv = navigationView.getHeaderView(0).findViewById(R.id.phone_info);
phoneInfoTv.setText(
"Android:" + DeviceUtils.getSDKVersionName() +
" App版本:" + BuildConfig.VERSION_NAME +
"\n机型:" + DeviceUtils.getManufacturer() + "/" + DeviceUtils.getModel() +
"\n设备id:\n" + CrashReport.getUserId()
);
String infos = "Android:" + DeviceUtils.getSDKVersionName() +
" App版本:" + BuildConfig.VERSION_NAME +
"\n机型:" + DeviceUtils.getManufacturer() + "/" + DeviceUtils.getModel() +
"\n设备id:\n" + CrashReport.getUserId();
phoneInfoTv.setText(infos);
phoneInfoTv.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
ClipboardUtils.copyText(infos);
Mtools.toast("已复制到剪贴板");
}
});


//加载主显示区
Expand Down
Loading

0 comments on commit d416f1d

Please sign in to comment.