Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
G
GB28181Android
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
规范查询wiki:
http://gitlab.anweitech.com/root/AW-Project-Manage/wikis/pages
Open sidebar
Administrator
GB28181Android
Commits
c18e4ece
提交
c18e4ece
authored
9月 27, 2018
作者:
autulin
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
1.修改文件&log存储路径
2.修改native-lib名字
上级
071e7ad9
隐藏空白字符变更
内嵌
并排
正在显示
6 个修改的文件
包含
19 行增加
和
6 行删除
+19
-6
AndroidManifest.xml
app/src/main/AndroidManifest.xml
+2
-0
DemoActivity.java
...ava/com/example/autulin/gb28181_android/DemoActivity.java
+6
-1
CMakeLists.txt
gb28181library/CMakeLists.txt
+3
-3
gb_native.cpp
gb28181library/src/main/cpp/gb_native.cpp
+0
-0
JNIBridge.java
...y/src/main/java/com/autulin/gb28181library/JNIBridge.java
+1
-1
MediaRecorderBase.java
...in/java/com/autulin/gb28181library/MediaRecorderBase.java
+7
-1
没有找到文件。
app/src/main/AndroidManifest.xml
浏览文件 @
c18e4ece
...
...
@@ -2,6 +2,8 @@
<manifest
xmlns:android=
"http://schemas.android.com/apk/res/android"
package=
"com.example.autulin.gb28181_android"
>
<uses-permission
android:name=
"android.permission.READ_EXTERNAL_STORAGE"
/>
<uses-permission
android:name=
"android.permission.WRITE_EXTERNAL_STORAGE"
/>
<application
android:allowBackup=
"true"
android:icon=
"@mipmap/ic_launcher"
...
...
app/src/main/java/com/example/autulin/gb28181_android/DemoActivity.java
浏览文件 @
c18e4ece
package
com
.
example
.
autulin
.
gb28181_android
;
import
android.Manifest
;
import
android.support.v4.app.ActivityCompat
;
import
android.support.v7.app.AppCompatActivity
;
import
android.os.Bundle
;
import
android.util.Log
;
...
...
@@ -30,6 +32,8 @@ public class DemoActivity extends AppCompatActivity implements
super
.
onCreate
(
savedInstanceState
);
getWindow
().
addFlags
(
WindowManager
.
LayoutParams
.
FLAG_KEEP_SCREEN_ON
);
// 防止锁屏
setContentView
(
R
.
layout
.
activity_demo
);
ActivityCompat
.
requestPermissions
(
this
,
new
String
[]{
Manifest
.
permission
.
WRITE_EXTERNAL_STORAGE
},
1
);
initData
();
initView
();
...
...
@@ -49,7 +53,8 @@ public class DemoActivity extends AppCompatActivity implements
}
});
try
{
Runtime
.
getRuntime
().
exec
(
"logcat -f /sdcard/DCIM/pstest/log.txt"
);
Log
.
e
(
"log"
,
"path: "
+
MediaRecorderBase
.
getLogOutPutPath
());
Runtime
.
getRuntime
().
exec
(
"logcat -f "
+
MediaRecorderBase
.
getLogOutPutPath
());
}
catch
(
IOException
e
)
{
e
.
printStackTrace
();
}
...
...
gb28181library/CMakeLists.txt
浏览文件 @
c18e4ece
...
...
@@ -11,13 +11,13 @@ cmake_minimum_required(VERSION 3.4.1)
# Gradle automatically packages shared libraries with your APK.
add_library
(
# Sets the name of the library.
native-lib
gb_native
# Sets the library as a shared library.
SHARED
# Provides a relative path to your source file(s).
src/main/cpp/
native-lib
.cpp
src/main/cpp/
gb_native
.cpp
src/main/cpp/gb28181_muxer.cpp
src/main/cpp/gb28181_sender.cpp
...
...
@@ -165,7 +165,7 @@ find_library( # Sets the name of the path variable.
# build script, prebuilt third-party libraries, or system libraries.
target_link_libraries
(
# Specifies the target library.
native-lib
gb_native
avcodec
avfilter
avformat
...
...
gb28181library/src/main/cpp/
native-lib
.cpp
→
gb28181library/src/main/cpp/
gb_native
.cpp
浏览文件 @
c18e4ece
File moved
gb28181library/src/main/java/com/autulin/gb28181library/JNIBridge.java
浏览文件 @
c18e4ece
...
...
@@ -3,7 +3,7 @@ package com.autulin.gb28181library;
public
class
JNIBridge
{
// Used to load the 'native-lib' library on application startup.
static
{
System
.
loadLibrary
(
"
native-lib
"
);
System
.
loadLibrary
(
"
gb_native
"
);
}
public
final
static
int
ROTATE_0_CROP_LF
=
0
;
...
...
gb28181library/src/main/java/com/autulin/gb28181library/MediaRecorderBase.java
浏览文件 @
c18e4ece
...
...
@@ -724,7 +724,7 @@ public abstract class MediaRecorderBase implements Callback, PreviewCallback, IM
public
MediaOutput
setFileOutPut
(
String
fileName
)
{
File
dcim
=
Environment
.
getExternalStorage
PublicDirectory
(
Environment
.
DIRECTORY_DCIM
);
.
getExternalStorage
Directory
(
);
String
path
;
if
(
DeviceUtils
.
isZte
())
{
if
(
dcim
.
exists
())
{
...
...
@@ -744,4 +744,10 @@ public abstract class MediaRecorderBase implements Callback, PreviewCallback, IM
mediaOutput
=
new
MediaOutput
(
""
,
0
,
path
,
fileName
,
JNIBridge
.
FILE
,
0
);
return
mediaOutput
;
}
public
static
String
getLogOutPutPath
()
{
File
path
=
Environment
.
getExternalStorageDirectory
();
return
path
+
FILE_DIR_DEFAULT
+
"/mux.log"
;
}
}
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论