Skip to content

Commit

Permalink
Fix bug, update sdk.
Browse files Browse the repository at this point in the history
  • Loading branch information
@garyxgwang
garyxgwang committed Aug 6, 2021
1 parent e4b796b commit fc77a00
Show file tree
Hide file tree
Showing 117 changed files with 2,075 additions and 805 deletions.
18 changes: 13 additions & 5 deletions Demo/app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,17 @@ android {
applicationId "com.tencent.liteav.demo"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 19
versionName "8.9.1015"
versionCode 20
versionName "9.0.857"

multiDexEnabled true
ndk {
abiFilters "armeabi-v7a"
}
}

signingConfigs{
release{
signingConfigs {
release {
}
}

Expand All @@ -38,11 +38,17 @@ android {
doNotStrip "*/arm64-v8a/libYTCommon.so"
}

dexOptions {
jumboMode true
javaMaxHeapSize "4g"
}

}

dependencies {

compile fileTree(dir: 'libs', include: ['*.jar'])
compile project(':common')
compile project(':superplayerdemo')

compile 'com.android.support:appcompat-v7:25.+'
Expand All @@ -53,7 +59,9 @@ dependencies {
compile 'com.android.support.constraint:constraint-layout:1.1.3'
compile "com.android.support:design:$rootProject.ext.supportSdkVersion"
compile 'com.squareup.picasso:picasso:2.71828'
compile 'com.blankj:utilcode:1.25.9'
compile('com.blankj:utilcode:1.25.9', {
exclude group: 'com.google.code.gson', module: 'gson'
})

compile 'com.tencent.bugly:crashreport_upgrade:1.5.1'
compile 'com.tencent.bugly:nativecrashreport:3.8.0'
Expand Down
26 changes: 8 additions & 18 deletions Demo/app/src/main/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="com.tencent.liteav.demo"
android:versionCode="1"
android:versionName="1.0">
xmlns:tools="http://schemas.android.com/tools" package="com.tencent.liteav.demo"
android:versionCode="1" android:versionName="1.0">

<application
android:name=".DemoApplication"
android:allowBackup="false"
android:icon="@drawable/ic_launcher"
android:label="@string/app_name"
android:largeHeap="true"
android:theme="@style/AppTheme"
<application android:name=".DemoApplication" android:allowBackup="false"
android:icon="@drawable/ic_launcher" android:label="@string/app_name"
android:largeHeap="true" android:theme="@style/AppTheme"
tools:replace="android:allowBackup">

<activity android:name=".SplashActivity" android:launchMode="singleTop"
Expand All @@ -35,17 +29,13 @@
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />

<data
android:host="com.tencent.liteav.demo"
android:scheme="liteav"/>
<data android:host="com.tencent.liteav.demo" android:scheme="liteav" />
</intent-filter>
</activity>

<activity
android:name=".MainActivity"
<activity android:name=".MainActivity"
android:configChanges="keyboardHidden|orientation|screenSize"
android:label="@string/app_name"
android:launchMode="singleTop"
android:label="@string/app_name" android:launchMode="singleTop"
android:screenOrientation="portrait">
<intent-filter>
<action android:name="com.tencent.liteav.action.liteavapp" />
Expand Down
57 changes: 29 additions & 28 deletions Demo/app/src/main/assets/UserProtocol.html
View file
Original file line number Diff line number Diff line change
@@ -1,30 +1,31 @@
<html>

<head>
<meta http-equiv="Content-Type" content="text/xml; charset=utf-8"/>
<title>用户协议</title>
</head>

<body>
<h2><p>用户协议</p></h2>
<p>尊敬的用户，请您仔细阅读以下条款，如果您对本协议的条款存在异议，您可以选择不使用本应用。使用则表示您同意本协议下的全部条款。</p>
<h2><p>遵守法律及法律效力</p></h2>
<p>会员同意遵守《中华人民共和国保密法》、《计算机信息系统国际联网保密管理规定》、《中华人民共和国计算机信息系统安全保护条例》、《计算机信息网络国际联网安全保护管理办法》、《中华人民共和国计算机信息网络国际联网管理暂行规定》及其实施办法等相关法律法规的任何及所有的规定，并对会员以任何方式使用服务的任何行为及其结果承担全部责任。</p>
<h2><p>用户说明</p></h2>
<p>用户不得利用本服务制作、上载、复制、发布、传播如下法律、法规和政策禁止的内容：</p>
<p>1. 反对宪法所确定的基本原则的；</p>
<p>2. 危害国家安全，泄露国家秘密，颠覆国家政权，破坏国家统一的；</p>
<p>3. 损害国家荣誉和利益的；</p>
<p> 4. 煽动民族仇恨、民族歧视，破坏民族团结的；</p>
<p>5. 破坏国家宗教政策，宣扬邪教和封建迷信的；</p>
<p>6. 散布谣言，扰乱社会秩序，破坏社会稳定的；</p>
<p>7. 散布淫秽、色情、赌博、暴力、凶杀、恐怖或者教唆犯罪的；</p>
<p>8. 侮辱或者诽谤他人，侵害他人合法权益的；</p>
<p>9.不遵守法律法规底线、社会主义制度底线、国家利益底线、公民合法权益底线、社会公共秩序底线、道德风尚底线和信息真实性底线的“七条底线”要求的；</p>
<p>10.含有法律、行政法规禁止的其他内容的信息。
</p>
<p>如果用户出现以上情况一种几种，将承担关闭全部权限，禁止使用的后果。</p>

</body>


<head>
<meta http-equiv="Content-Type" content="text/xml; charset=utf-8"/>
<title>用户协议</title>
</head>

<body>
<h2><p>用户协议</p></h2>
<p>尊敬的用户，请您仔细阅读以下条款，如果您对本协议的条款存在异议，您可以选择不使用本应用。使用则表示您同意本协议下的全部条款。</p>
<h2><p>遵守法律及法律效力</p></h2>
<p>
会员同意遵守《中华人民共和国保密法》、《计算机信息系统国际联网保密管理规定》、《中华人民共和国计算机信息系统安全保护条例》、《计算机信息网络国际联网安全保护管理办法》、《中华人民共和国计算机信息网络国际联网管理暂行规定》及其实施办法等相关法律法规的任何及所有的规定，并对会员以任何方式使用服务的任何行为及其结果承担全部责任。</p>
<h2><p>用户说明</p></h2>
<p>用户不得利用本服务制作、上载、复制、发布、传播如下法律、法规和政策禁止的内容：</p>
<p>1. 反对宪法所确定的基本原则的；</p>
<p>2. 危害国家安全，泄露国家秘密，颠覆国家政权，破坏国家统一的；</p>
<p>3. 损害国家荣誉和利益的；</p>
<p> 4. 煽动民族仇恨、民族歧视，破坏民族团结的；</p>
<p>5. 破坏国家宗教政策，宣扬邪教和封建迷信的；</p>
<p>6. 散布谣言，扰乱社会秩序，破坏社会稳定的；</p>
<p>7. 散布淫秽、色情、赌博、暴力、凶杀、恐怖或者教唆犯罪的；</p>
<p>8. 侮辱或者诽谤他人，侵害他人合法权益的；</p>
<p>9.不遵守法律法规底线、社会主义制度底线、国家利益底线、公民合法权益底线、社会公共秩序底线、道德风尚底线和信息真实性底线的“七条底线”要求的；</p>
<p>10.含有法律、行政法规禁止的其他内容的信息。
</p>
<p>如果用户出现以上情况一种几种，将承担关闭全部权限，禁止使用的后果。</p>

</body>

</html>
69 changes: 42 additions & 27 deletions Demo/app/src/main/assets/UserProtocol_EN.html
View file
Original file line number Diff line number Diff line change
@@ -1,30 +1,45 @@
<html>

<head>
<meta http-equiv="Content-Type" content="text/xml; charset=utf-8"/>
<title>Terms and Conditions</title>
</head>

<body>
<h2><p> Terms and Conditions</p></h2>
<p> Please read carefully the content below. If you have any objections, you can choose not to use this app. By using this app, you agree to all terms in this agreement.</p>
<h2><p> Law Compliance</p></h2>
<p> You agree to abide by the Law of the People's Republic of China on Guarding State Secrets, Regulations on Confidentiality Protection for the International Networking of Computer Information Networks, Regulations of the People's Republic of China on Protecting the Safety of Computer Information Systems, Measures for Security Protection Administration of the International Networking of Computer Information Networks, Provisional Regulations of the People's Republic of China on the Management of the International Networking of Computer Information Networks, as well as their implementation rules. You assume all responsibility with respect to your use of the app and the consequences.</p>
<h2><p> Terms of Use</p></h2>
<p> You must not use this app to create, upload, copy, publish or spread any content that is forbidden by laws, regulations or government policies, including:</p>
<p>1. Content that violates the Constitution of the People's Republic of China;</p>
<p>2. Content that endangers national security, leaks state secrets, subverts state power, or undermines national unity;</p>
<p>3. Content that harms national reputation or interests;</p>
<p>4. Content that incites ethnic enmity, propagates racial discrimination, or undermines ethnic unity;</p>
<p>5. Content that violates China’s policies on religion, or promotes cults or superstitions; </p>
<p>6. Content that spreads rumors, disturbs social order, or undermines social stability; </p>
<p>7. Obscene, pornographic, violent, gambling/murder/terrorism-related, or crime-abetting content;</p>
<p>8. Insulting or defaming content or content that infringes others’ legal rights; </p>
<p>9. Content that crosses any of the “Seven Baselines” of laws and regulations, the socialist system, national interests, citizens’ legal rights and interests, public order, morality, and information accuracy.</p>
<p>10. Other content forbidden by laws and regulations.
</p>
<p> You take responsibility for the consequences of having your permissions and access to the app revoked as a result of violating any of the above terms.</p>

</body>

<head>
<meta http-equiv="Content-Type" content="text/xml; charset=utf-8"/>
<title>Terms and Conditions</title>
</head>

<body>
<h2><p> Terms and Conditions</p></h2>
<p> Please read carefully the content below. If you have any objections, you can choose not to use
this app. By using this app, you agree to all terms in this agreement.</p>
<h2><p> Law Compliance</p></h2>
<p> You agree to abide by the Law of the People's Republic of China on Guarding State Secrets,
Regulations on Confidentiality Protection for the International Networking of Computer
Information Networks, Regulations of the People's Republic of China on Protecting the Safety of
Computer Information Systems, Measures for Security Protection Administration of the
International Networking of Computer Information Networks, Provisional Regulations of the
People's Republic of China on the Management of the International Networking of Computer
Information Networks, as well as their implementation rules. You assume all responsibility with
respect to your use of the app and the consequences.</p>
<h2><p> Terms of Use</p></h2>
<p> You must not use this app to create, upload, copy, publish or spread any content that is
forbidden by laws, regulations or government policies, including:</p>
<p>1. Content that violates the Constitution of the People's Republic of China;</p>
<p>2. Content that endangers national security, leaks state secrets, subverts state power, or
undermines national unity;</p>
<p>3. Content that harms national reputation or interests;</p>
<p>4. Content that incites ethnic enmity, propagates racial discrimination, or undermines ethnic
unity;</p>
<p>5. Content that violates China’s policies on religion, or promotes cults or superstitions; </p>
<p>6. Content that spreads rumors, disturbs social order, or undermines social stability; </p>
<p>7. Obscene, pornographic, violent, gambling/murder/terrorism-related, or crime-abetting
content;</p>
<p>8. Insulting or defaming content or content that infringes others’ legal rights; </p>
<p>9. Content that crosses any of the “Seven Baselines” of laws and regulations, the socialist
system, national interests, citizens’ legal rights and interests, public order, morality, and
information accuracy.</p>
<p>10. Other content forbidden by laws and regulations.
</p>
<p> You take responsibility for the consequences of having your permissions and access to the app
revoked as a result of violating any of the above terms.</p>

</body>

</html>
36 changes: 16 additions & 20 deletions Demo/app/src/main/java/com/tencent/liteav/demo/DemoApplication.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,10 @@


public class DemoApplication extends MultiDexApplication {
private static String TAG = "DemoApplication";

//配置bugly组件的appId
private static final String BUGLY_APPID = "";
// 配置bugly组件的APP渠道号
private static final String BUGLY_APP_CHANNEL = "";
//配置bugly组件的调试模式（true或者false）
private static final boolean BUGLY_ENABLE_DEBUG = true;
private static String TAG = "DemoApplication";
private static final String BUGLY_APPID = ""; //配置bugly组件的appId
private static final String BUGLY_APP_CHANNEL = ""; // 配置bugly组件的APP渠道号
private static final boolean BUGLY_ENABLE_DEBUG = true; //配置bugly组件的调试模式（true或者false）

// private RefWatcher mRefWatcher;
private static DemoApplication instance;
Expand Down Expand Up @@ -69,18 +65,18 @@ public static DemoApplication getApplication() {

private void closeAndroidPDialog() {
try {
Class aClass = Class.forName("android.content.pm.PackageParser$Package");
Class aClass = Class.forName("android.content.pm.PackageParser$Package");
Constructor declaredConstructor = aClass.getDeclaredConstructor(String.class);
declaredConstructor.setAccessible(true);
} catch (Exception e) {
e.printStackTrace();
}
try {
Class cls = Class.forName("android.app.ActivityThread");
Class cls = Class.forName("android.app.ActivityThread");
Method declaredMethod = cls.getDeclaredMethod("currentActivityThread");
declaredMethod.setAccessible(true);
Object activityThread = declaredMethod.invoke(null);
Field mHiddenApiWarningShown = cls.getDeclaredField("mHiddenApiWarningShown");
Object activityThread = declaredMethod.invoke(null);
Field mHiddenApiWarningShown = cls.getDeclaredField("mHiddenApiWarningShown");
mHiddenApiWarningShown.setAccessible(true);
mHiddenApiWarningShown.setBoolean(activityThread, true);
} catch (Exception e) {
Expand All @@ -101,40 +97,40 @@ public void onReceive(DownloadTask downloadTask) {

@Override
public void onCompleted(DownloadTask downloadTask) {
Log.d(TAG,"downloadListener download apk file success");
Log.d(TAG, "downloadListener download apk file success");
}

@Override
public void onFailed(DownloadTask downloadTask, int i, String s) {
Log.d(TAG,"downloadListener download apk file fail");
Log.d(TAG, "downloadListener download apk file fail");
}
};

//监听APP升级状态
Beta.upgradeStateListener = new UpgradeStateListener(){
Beta.upgradeStateListener = new UpgradeStateListener() {
@Override
public void onUpgradeFailed(boolean b) {
Log.d(TAG,"upgradeStateListener upgrade failed");
Log.d(TAG, "upgradeStateListener upgrade failed");
}

@Override
public void onUpgradeSuccess(boolean b) {
Log.d(TAG,"upgradeStateListener upgrade success");
Log.d(TAG, "upgradeStateListener upgrade success");
}

@Override
public void onUpgradeNoVersion(boolean b) {
Log.d(TAG,"upgradeStateListener upgrade has no new version");
Log.d(TAG, "upgradeStateListener upgrade has no new version");
}

@Override
public void onUpgrading(boolean b) {
Log.d(TAG,"upgradeStateListener upgrading");
Log.d(TAG, "upgradeStateListener upgrading");
}

@Override
public void onDownloadCompleted(boolean b) {
Log.d(TAG,"upgradeStateListener download apk file success");
Log.d(TAG, "upgradeStateListener download apk file success");
}
};
Bugly.init(getApplicationContext(), BUGLY_APPID, BUGLY_ENABLE_DEBUG, strategy);
Expand Down
14 changes: 7 additions & 7 deletions Demo/app/src/main/java/com/tencent/liteav/demo/MainActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ protected void onCreate(Bundle savedInstanceState) {
setContentView(R.layout.activity_main);

mTvVersion = (TextView) findViewById(R.id.main_tv_version);
mTvVersion.setText(getString(R.string.app_tv_super_player_version, TXLiveBase.getSDKVersionStr()+"(8.9.1015)"));
mTvVersion.setText(getString(R.string.app_tv_super_player_version, TXLiveBase.getSDKVersionStr()+"(9.0.857)"));

mMainTitle = (TextView) findViewById(R.id.main_title);
mMainTitle.setOnLongClickListener(new View.OnLongClickListener() {
Expand Down Expand Up @@ -322,12 +322,12 @@ private File getLogFile() {
return null;
}

String path = sdcardDir.getAbsolutePath() + "/log/liteav";
List<String> logs = new ArrayList<>();
File directory = new File(path);
String path = sdcardDir.getAbsolutePath() + "/log/liteav";
List<String> logs = new ArrayList<>();
File directory = new File(path);
if (directory != null && directory.exists() && directory.isDirectory()) {
long lastModify = 0;
File files[] = directory.listFiles();
File files[] = directory.listFiles();
if (files != null && files.length > 0) {
for (File file : files) {
if (file.getName().endsWith("xlog")) {
Expand All @@ -345,7 +345,7 @@ private File getLogFile() {
private File zip(List<String> files, String zipFileName) {
File zipFile = new File(zipFileName);
zipFile.deleteOnExit();
InputStream is = null;
InputStream is = null;
ZipOutputStream zos = null;

try {
Expand All @@ -359,7 +359,7 @@ private File zip(List<String> files, String zipFileName) {
is = new FileInputStream(file);
zos.putNextEntry(new ZipEntry(file.getName()));
byte[] buffer = new byte[8 * 1024];
int length = 0;
int length = 0;
while ((length = is.read(buffer)) != -1) {
zos.write(buffer, 0, length);
}
Expand Down
2 changes: 1 addition & 1 deletion Demo/app/src/main/java/com/tencent/liteav/demo/common/widget/AvatarConstant.java
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.tencent.liteav.demo.common.widget;

public interface AvatarConstant {
String USER_AVATAR_ARRAY [] = {
String USER_AVATAR_ARRAY[] = {
"https://liteav.sdk.qcloud.com/app/res/picture/voiceroom/avatar/user_avatar1.png",
"https://liteav.sdk.qcloud.com/app/res/picture/voiceroom/avatar/user_avatar2.png",
"https://liteav.sdk.qcloud.com/app/res/picture/voiceroom/avatar/user_avatar3.png",
Expand Down
Loading

0 comments on commit fc77a00

Please sign in to comment.