Compare commits

...

2 Commits

  1. 22
      app/src/main/java/com/unionmed/unionmedtv/activity/DoctorDetailActivity.java
  2. 11
      app/src/main/java/com/unionmed/unionmedtv/api/ApplyVideoApi.java
  3. 44
      app/src/main/java/com/unionmed/unionmedtv/bean/ApplyVideoQequest.java
  4. BIN
      imlib/build/.transforms/0ae089fd9b15038c563927d4c9c465d4/classes/classes.dex
  5. BIN
      imlib/build/.transforms/6c42b5ce67ee2dcb3f26438f285afb2f/classes/classes.dex
  6. 0
      imlib/build/.transforms/d6894d1350d9816434b55991bde95060.bin
  7. BIN
      imlib/build/.transforms/d6894d1350d9816434b55991bde95060/classes/classes.dex
  8. 4
      imlib/build/generated/source/buildConfig/release/io/rong/libcore/BuildConfig.java
  9. 1
      imlib/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/output.json
  10. 0
      imlib/build/intermediates/aapt_friendly_merged_manifests/release/aapt/AndroidManifest.xml
  11. 1
      imlib/build/intermediates/aapt_friendly_merged_manifests/release/aapt/output.json
  12. 0
      imlib/build/intermediates/annotation_processor_list/release/annotationProcessors.json
  13. 0
      imlib/build/intermediates/annotations_typedef_file/debug/extractDebugAnnotations/typedefs.txt
  14. BIN
      imlib/build/intermediates/compile_library_classes/debug/classes.jar
  15. BIN
      imlib/build/intermediates/compile_library_classes/release/classes.jar
  16. BIN
      imlib/build/intermediates/compile_only_not_namespaced_r_class_jar/release/R.jar
  17. 2
      imlib/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml
  18. 2
      imlib/build/intermediates/incremental/mergeDebugShaders/merger.xml
  19. 2
      imlib/build/intermediates/incremental/mergeReleaseJniLibFolders/merger.xml
  20. 2
      imlib/build/intermediates/incremental/mergeReleaseShaders/merger.xml
  21. 2
      imlib/build/intermediates/incremental/packageDebugAssets/merger.xml
  22. 1
      imlib/build/intermediates/incremental/packageDebugResources/compile-file-map.properties
  23. 2
      imlib/build/intermediates/incremental/packageDebugResources/merger.xml
  24. 2
      imlib/build/intermediates/incremental/packageReleaseAssets/merger.xml
  25. 1
      imlib/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties
  26. 0
      imlib/build/intermediates/incremental/packageReleaseResources/merged.dir/values-ar-rIL/values-ar-rIL.xml
  27. 0
      imlib/build/intermediates/incremental/packageReleaseResources/merged.dir/values-en/values-en.xml
  28. 0
      imlib/build/intermediates/incremental/packageReleaseResources/merged.dir/values-sw/values-sw.xml
  29. 0
      imlib/build/intermediates/incremental/packageReleaseResources/merged.dir/values/values.xml
  30. 2
      imlib/build/intermediates/incremental/packageReleaseResources/merger.xml
  31. BIN
      imlib/build/intermediates/incremental/release-mergeNativeLibs/merge-state
  32. 0
      imlib/build/intermediates/intermediate-jars/release/jni/arm64-v8a/libRongIMLib.so
  33. 0
      imlib/build/intermediates/intermediate-jars/release/jni/arm64-v8a/libsqlite.so
  34. 0
      imlib/build/intermediates/intermediate-jars/release/jni/armeabi-v7a/libRongIMLib.so
  35. 0
      imlib/build/intermediates/intermediate-jars/release/jni/armeabi-v7a/libsqlite.so
  36. 0
      imlib/build/intermediates/intermediate-jars/release/jni/x86/libRongIMLib.so
  37. 0
      imlib/build/intermediates/intermediate-jars/release/jni/x86/libsqlite.so
  38. 0
      imlib/build/intermediates/intermediate-jars/release/jni/x86_64/libRongIMLib.so
  39. 0
      imlib/build/intermediates/intermediate-jars/release/jni/x86_64/libsqlite.so
  40. BIN
      imlib/build/intermediates/javac/debug/classes/io/rong/libcore/BuildConfig.class
  41. BIN
      imlib/build/intermediates/javac/release/classes/io/rong/libcore/BuildConfig.class
  42. 0
      imlib/build/intermediates/library_java_res/release/res.jar
  43. 0
      imlib/build/intermediates/library_manifest/release/AndroidManifest.xml
  44. 0
      imlib/build/intermediates/local_only_symbol_list/release/parseReleaseLibraryResources/R-def.txt
  45. 118
      imlib/build/intermediates/manifest_merge_blame_file/release/manifest-merger-blame-release-report.txt
  46. 0
      imlib/build/intermediates/merged_jni_libs/release/out/arm64-v8a/libRongIMLib.so
  47. 0
      imlib/build/intermediates/merged_jni_libs/release/out/arm64-v8a/libsqlite.so
  48. 0
      imlib/build/intermediates/merged_jni_libs/release/out/armeabi-v7a/libRongIMLib.so
  49. 0
      imlib/build/intermediates/merged_jni_libs/release/out/armeabi-v7a/libsqlite.so
  50. 0
      imlib/build/intermediates/merged_jni_libs/release/out/rong_chatroom_5.2.1.55.aar
  51. 0
      imlib/build/intermediates/merged_jni_libs/release/out/rong_customservice_5.2.1.55.aar
  52. 0
      imlib/build/intermediates/merged_jni_libs/release/out/rong_discussion_5.2.1.55.aar
  53. 0
      imlib/build/intermediates/merged_jni_libs/release/out/rong_imlib_5.2.1.55.jar
  54. 0
      imlib/build/intermediates/merged_jni_libs/release/out/rong_imlibcore_5.2.1.55.jar
  55. 0
      imlib/build/intermediates/merged_jni_libs/release/out/rong_location_5.2.1.55.aar
  56. 0
      imlib/build/intermediates/merged_jni_libs/release/out/rong_publicservice_5.2.1.55.aar
  57. 0
      imlib/build/intermediates/merged_jni_libs/release/out/x86/libRongIMLib.so
  58. 0
      imlib/build/intermediates/merged_jni_libs/release/out/x86/libsqlite.so
  59. 0
      imlib/build/intermediates/merged_jni_libs/release/out/x86_64/libRongIMLib.so
  60. 0
      imlib/build/intermediates/merged_jni_libs/release/out/x86_64/libsqlite.so
  61. 1
      imlib/build/intermediates/merged_manifests/debug/output.json
  62. 1
      imlib/build/intermediates/merged_manifests/release/output.json
  63. 0
      imlib/build/intermediates/merged_native_libs/release/out/lib/arm64-v8a/libRongIMLib.so
  64. 0
      imlib/build/intermediates/merged_native_libs/release/out/lib/arm64-v8a/libsqlite.so
  65. 0
      imlib/build/intermediates/merged_native_libs/release/out/lib/armeabi-v7a/libRongIMLib.so
  66. 0
      imlib/build/intermediates/merged_native_libs/release/out/lib/armeabi-v7a/libsqlite.so
  67. 0
      imlib/build/intermediates/merged_native_libs/release/out/lib/x86/libRongIMLib.so
  68. 0
      imlib/build/intermediates/merged_native_libs/release/out/lib/x86/libsqlite.so
  69. 0
      imlib/build/intermediates/merged_native_libs/release/out/lib/x86_64/libRongIMLib.so
  70. 0
      imlib/build/intermediates/merged_native_libs/release/out/lib/x86_64/libsqlite.so
  71. 0
      imlib/build/intermediates/packaged_res/release/values-ar-rIL/values-ar-rIL.xml
  72. 0
      imlib/build/intermediates/packaged_res/release/values-en/values-en.xml
  73. 0
      imlib/build/intermediates/packaged_res/release/values-sw/values-sw.xml
  74. 0
      imlib/build/intermediates/packaged_res/release/values/values.xml
  75. 0
      imlib/build/intermediates/res/symbol-table-with-package/release/package-aware-r.txt
  76. BIN
      imlib/build/intermediates/runtime_library_classes/debug/classes.jar
  77. BIN
      imlib/build/intermediates/runtime_library_classes/release/classes.jar
  78. BIN
      imlib/build/intermediates/stripped_native_libs/debug/out/lib/arm64-v8a/libRongIMLib.so
  79. BIN
      imlib/build/intermediates/stripped_native_libs/debug/out/lib/arm64-v8a/libsqlite.so
  80. BIN
      imlib/build/intermediates/stripped_native_libs/debug/out/lib/armeabi-v7a/libRongIMLib.so
  81. BIN
      imlib/build/intermediates/stripped_native_libs/debug/out/lib/armeabi-v7a/libsqlite.so
  82. BIN
      imlib/build/intermediates/stripped_native_libs/debug/out/lib/x86/libRongIMLib.so
  83. BIN
      imlib/build/intermediates/stripped_native_libs/debug/out/lib/x86/libsqlite.so
  84. BIN
      imlib/build/intermediates/stripped_native_libs/debug/out/lib/x86_64/libRongIMLib.so
  85. BIN
      imlib/build/intermediates/stripped_native_libs/debug/out/lib/x86_64/libsqlite.so
  86. 0
      imlib/build/intermediates/stripped_native_libs/release/out/lib/arm64-v8a/libRongIMLib.so
  87. 0
      imlib/build/intermediates/stripped_native_libs/release/out/lib/arm64-v8a/libsqlite.so
  88. 0
      imlib/build/intermediates/stripped_native_libs/release/out/lib/armeabi-v7a/libRongIMLib.so
  89. 0
      imlib/build/intermediates/stripped_native_libs/release/out/lib/armeabi-v7a/libsqlite.so
  90. 0
      imlib/build/intermediates/stripped_native_libs/release/out/lib/x86/libRongIMLib.so
  91. 0
      imlib/build/intermediates/stripped_native_libs/release/out/lib/x86/libsqlite.so
  92. 0
      imlib/build/intermediates/stripped_native_libs/release/out/lib/x86_64/libRongIMLib.so
  93. 0
      imlib/build/intermediates/stripped_native_libs/release/out/lib/x86_64/libsqlite.so
  94. 0
      imlib/build/intermediates/symbols/release/R.txt
  95. 157
      imlib/build/outputs/logs/manifest-merger-debug-report.txt
  96. 157
      imlib/build/outputs/logs/manifest-merger-release-report.txt
  97. 1
      rtclib/build/.transforms/9f838db08deb599dc4e6a29ac5eaaf98.bin
  98. BIN
      rtclib/build/.transforms/9f838db08deb599dc4e6a29ac5eaaf98/classes/classes.dex
  99. 1
      rtclib/build/.transforms/ba246ea31ac3dbd69b68158593db4c98.bin
  100. BIN
      rtclib/build/.transforms/ba246ea31ac3dbd69b68158593db4c98/classes/classes.dex
  101. Some files were not shown because too many files have changed in this diff Show More

@ -18,6 +18,7 @@ import android.widget.Toast;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import com.blankj.utilcode.util.JsonUtils;
import com.blankj.utilcode.util.LogUtils;
import com.blankj.utilcode.util.ToastUtils;
import com.bumptech.glide.Glide;
@ -32,11 +33,13 @@ import com.unionmed.unionmedtv.R;
import com.unionmed.unionmedtv.api.ApplyVideoApi;
import com.unionmed.unionmedtv.api.GetDoctorInfoApi;
import com.unionmed.unionmedtv.base.BaseActivity;
import com.unionmed.unionmedtv.bean.ApplyVideoQequest;
import com.unionmed.unionmedtv.dialog.TipDialog;
import com.unionmed.unionmedtv.login.activity.LoginActivity;
import com.unionmed.unionmedtv.network.ApiResponse;
import com.unionmed.unionmedtv.network.HttpData;
import com.unionmed.unionmedtv.utils.CacheUtil;
import com.unionmed.unionmedtv.utils.FastJsonUtil;
import java.util.ArrayList;
@ -198,10 +201,23 @@ public class DoctorDetailActivity extends BaseActivity implements View.OnClickLi
ToastUtils.showLong("当前正在进行通话");
return;
}
List<String> pKeys = new ArrayList<>();
pKeys.add(targetId);
// List<String> pKeys = new ArrayList<>();
// pKeys.add(targetId);
List<ApplyVideoQequest> members = new ArrayList<>();
ApplyVideoQequest applyVideoQequest = new ApplyVideoQequest();
applyVideoQequest.setPkey(targetId);
applyVideoQequest.setIsdoctor(1);
applyVideoQequest.setRegionKey(CacheUtil.getPkey());
applyVideoQequest.setDoctorUserAccount(userAccount);
members.add(applyVideoQequest);
Map<String, Object> map = new HashMap<>();
map.put("pkeys", FastJsonUtil.toJsonObject(members));
map.put("type", "10001");
EasyHttp.post(DoctorDetailActivity.this)
.api(new ApplyVideoApi(pKeys, "10001"))
.api(new ApplyVideoApi())
.json(JsonUtils.formatJson(map.toString()))
.request(new OnHttpListener<HttpData<ApiResponse<ApplyVideoApi.ApplyVideoModel>>>() {
@Override
public void onHttpSuccess(HttpData<ApiResponse<ApplyVideoApi.ApplyVideoModel>> result) {

@ -19,12 +19,17 @@ public class ApplyVideoApi implements IRequestApi , IRequestType {
return "/message/applyVideo";
}
private List<String> pkeys;
private String pkeys;
private String type;
public ApplyVideoApi(List<String> pkeys, String type) {
public ApplyVideoApi setPkeys(String pkeys) {
this.pkeys = pkeys;
return this;
}
public ApplyVideoApi setType(String type) {
this.type = type;
return this;
}

@ -0,0 +1,44 @@
package com.unionmed.unionmedtv.bean;
public class ApplyVideoQequest {
private String doctorUserAccount;//医生账号
private Integer isdoctor;//是否医生标识 0不是,1是
private String pkey;
private String regionKey;//医生所属地区服务key
public String getDoctorUserAccount() {
return doctorUserAccount;
}
public void setDoctorUserAccount(String doctorUserAccount) {
this.doctorUserAccount = doctorUserAccount;
}
public Integer getIsdoctor() {
return isdoctor;
}
public void setIsdoctor(Integer isdoctor) {
this.isdoctor = isdoctor;
}
public String getPkey() {
return pkey;
}
public void setPkey(String pkey) {
this.pkey = pkey;
}
public String getRegionKey() {
return regionKey;
}
public void setRegionKey(String regionKey) {
this.regionKey = regionKey;
}
}

@ -4,14 +4,14 @@
package io.rong.libcore;
public final class BuildConfig {
public static final boolean DEBUG = Boolean.parseBoolean("true");
public static final boolean DEBUG = false;
public static final String LIBRARY_PACKAGE_NAME = "io.rong.libcore";
/**
* @deprecated APPLICATION_ID is misleading in libraries. For the library package name use LIBRARY_PACKAGE_NAME
*/
@Deprecated
public static final String APPLICATION_ID = "io.rong.libcore";
public static final String BUILD_TYPE = "debug";
public static final String BUILD_TYPE = "release";
public static final String FLAVOR = "";
public static final int VERSION_CODE = -1;
public static final String VERSION_NAME = "5.2.1.55";

@ -1 +0,0 @@
[{"outputType":{"type":"AAPT_FRIENDLY_MERGED_MANIFESTS"},"apkData":{"type":"MAIN","splits":[],"versionCode":-1,"versionName":"5.2.1.55","enabled":true,"outputFile":"imlib-debug.aar","fullName":"debug","baseName":"debug"},"path":"AndroidManifest.xml","properties":{"packageId":"io.rong.libcore","split":""}}]

@ -0,0 +1 @@
[{"outputType":{"type":"AAPT_FRIENDLY_MERGED_MANIFESTS"},"apkData":{"type":"MAIN","splits":[],"versionCode":-1,"versionName":"5.2.1.55","enabled":true,"outputFile":"imlib-release.aar","fullName":"release","baseName":"release"},"path":"AndroidManifest.xml","properties":{"packageId":"io.rong.libcore","split":""}}]

@ -1,2 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\StudioProjects\UnionMedTV\imlib\libs"><file name="arm64-v8a/libRongIMLib.so" path="D:\StudioProjects\UnionMedTV\imlib\libs\arm64-v8a\libRongIMLib.so"/><file name="arm64-v8a/libsqlite.so" path="D:\StudioProjects\UnionMedTV\imlib\libs\arm64-v8a\libsqlite.so"/><file name="armeabi-v7a/libRongIMLib.so" path="D:\StudioProjects\UnionMedTV\imlib\libs\armeabi-v7a\libRongIMLib.so"/><file name="armeabi-v7a/libsqlite.so" path="D:\StudioProjects\UnionMedTV\imlib\libs\armeabi-v7a\libsqlite.so"/><file name="rong_chatroom_5.2.1.55.aar" path="D:\StudioProjects\UnionMedTV\imlib\libs\rong_chatroom_5.2.1.55.aar"/><file name="rong_customservice_5.2.1.55.aar" path="D:\StudioProjects\UnionMedTV\imlib\libs\rong_customservice_5.2.1.55.aar"/><file name="rong_discussion_5.2.1.55.aar" path="D:\StudioProjects\UnionMedTV\imlib\libs\rong_discussion_5.2.1.55.aar"/><file name="rong_imlibcore_5.2.1.55.jar" path="D:\StudioProjects\UnionMedTV\imlib\libs\rong_imlibcore_5.2.1.55.jar"/><file name="rong_imlib_5.2.1.55.jar" path="D:\StudioProjects\UnionMedTV\imlib\libs\rong_imlib_5.2.1.55.jar"/><file name="rong_location_5.2.1.55.aar" path="D:\StudioProjects\UnionMedTV\imlib\libs\rong_location_5.2.1.55.aar"/><file name="rong_publicservice_5.2.1.55.aar" path="D:\StudioProjects\UnionMedTV\imlib\libs\rong_publicservice_5.2.1.55.aar"/><file name="x86/libRongIMLib.so" path="D:\StudioProjects\UnionMedTV\imlib\libs\x86\libRongIMLib.so"/><file name="x86/libsqlite.so" path="D:\StudioProjects\UnionMedTV\imlib\libs\x86\libsqlite.so"/><file name="x86_64/libRongIMLib.so" path="D:\StudioProjects\UnionMedTV\imlib\libs\x86_64\libRongIMLib.so"/><file name="x86_64/libsqlite.so" path="D:\StudioProjects\UnionMedTV\imlib\libs\x86_64\libsqlite.so"/></source></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\StudioProjects\UnionMedTV\imlib\src\debug\jniLibs"/></dataSet></merger>

@ -1,2 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\StudioProjects\UnionMedTV\imlib\src\main\shaders"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\StudioProjects\UnionMedTV\imlib\src\debug\shaders"/></dataSet></merger>

@ -0,0 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="F:\StudioProjects\UnionMedTV\imlib\libs"><file name="arm64-v8a/libRongIMLib.so" path="F:\StudioProjects\UnionMedTV\imlib\libs\arm64-v8a\libRongIMLib.so"/><file name="arm64-v8a/libsqlite.so" path="F:\StudioProjects\UnionMedTV\imlib\libs\arm64-v8a\libsqlite.so"/><file name="armeabi-v7a/libRongIMLib.so" path="F:\StudioProjects\UnionMedTV\imlib\libs\armeabi-v7a\libRongIMLib.so"/><file name="armeabi-v7a/libsqlite.so" path="F:\StudioProjects\UnionMedTV\imlib\libs\armeabi-v7a\libsqlite.so"/><file name="rong_chatroom_5.2.1.55.aar" path="F:\StudioProjects\UnionMedTV\imlib\libs\rong_chatroom_5.2.1.55.aar"/><file name="rong_customservice_5.2.1.55.aar" path="F:\StudioProjects\UnionMedTV\imlib\libs\rong_customservice_5.2.1.55.aar"/><file name="rong_discussion_5.2.1.55.aar" path="F:\StudioProjects\UnionMedTV\imlib\libs\rong_discussion_5.2.1.55.aar"/><file name="rong_imlibcore_5.2.1.55.jar" path="F:\StudioProjects\UnionMedTV\imlib\libs\rong_imlibcore_5.2.1.55.jar"/><file name="rong_imlib_5.2.1.55.jar" path="F:\StudioProjects\UnionMedTV\imlib\libs\rong_imlib_5.2.1.55.jar"/><file name="rong_location_5.2.1.55.aar" path="F:\StudioProjects\UnionMedTV\imlib\libs\rong_location_5.2.1.55.aar"/><file name="rong_publicservice_5.2.1.55.aar" path="F:\StudioProjects\UnionMedTV\imlib\libs\rong_publicservice_5.2.1.55.aar"/><file name="x86/libRongIMLib.so" path="F:\StudioProjects\UnionMedTV\imlib\libs\x86\libRongIMLib.so"/><file name="x86/libsqlite.so" path="F:\StudioProjects\UnionMedTV\imlib\libs\x86\libsqlite.so"/><file name="x86_64/libRongIMLib.so" path="F:\StudioProjects\UnionMedTV\imlib\libs\x86_64\libRongIMLib.so"/><file name="x86_64/libsqlite.so" path="F:\StudioProjects\UnionMedTV\imlib\libs\x86_64\libsqlite.so"/></source></dataSet><dataSet config="release" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="F:\StudioProjects\UnionMedTV\imlib\src\release\jniLibs"/></dataSet></merger>

@ -0,0 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="F:\StudioProjects\UnionMedTV\imlib\src\main\shaders"/></dataSet><dataSet config="release" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="F:\StudioProjects\UnionMedTV\imlib\src\release\shaders"/></dataSet></merger>

@ -1,2 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\StudioProjects\UnionMedTV\imlib\src\main\assets"/><source path="D:\StudioProjects\UnionMedTV\imlib\build\intermediates\shader_assets\debug\compileDebugShaders\out"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\StudioProjects\UnionMedTV\imlib\src\debug\assets"/></dataSet></merger>

File diff suppressed because one or more lines are too long

@ -0,0 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="F:\StudioProjects\UnionMedTV\imlib\src\main\assets"/><source path="F:\StudioProjects\UnionMedTV\imlib\build\intermediates\shader_assets\release\compileReleaseShaders\out"/></dataSet><dataSet config="release" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="F:\StudioProjects\UnionMedTV\imlib\src\release\assets"/></dataSet></merger>

File diff suppressed because one or more lines are too long

@ -6,31 +6,31 @@
6
7 <uses-sdk
8 android:minSdkVersion="19"
8-->D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml
8-->F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml
9 android:targetSdkVersion="31" />
9-->D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml
9-->F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml
10
11 <!-- 保存图片,拍照等 -->
12 <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
12-->D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:6:5-81
12-->D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:6:22-78
12-->F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:6:5-81
12-->F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:6:22-78
13 <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
13-->D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:7:5-80
13-->D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:7:22-77
13-->F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:7:5-80
13-->F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:7:22-77
14 <!-- 网络 -->
15 <uses-permission android:name="android.permission.INTERNET" />
15-->D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:9:5-67
15-->D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:9:22-64
15-->F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:9:5-67
15-->F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:9:22-64
16 <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
16-->D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:10:5-79
16-->D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:10:22-76
16-->F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:10:5-79
16-->F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:10:22-76
17 <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
17-->D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:11:5-76
17-->D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:11:22-73
17-->F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:11:5-76
17-->F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:11:22-73
18 <!-- 消息通道保活 -->
19 <uses-permission android:name="android.permission.WAKE_LOCK" />
19-->D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:13:5-68
19-->D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:13:22-65
19-->F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:13:5-68
19-->F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:13:22-65
20 <!-- 定位,如果您需要定位相关的功能,可以打开以下注释 -->
21 <!-- <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" /> -->
22
@ -42,97 +42,97 @@
28 android:protectionLevel="signature" />
29
30 <application>
30-->D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:24:5-73:19
30-->F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:24:5-73:19
31 <service
31-->D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:25:9-27:38
31-->F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:25:9-27:38
32 android:name="io.rong.imlib.ipc.RongService"
32-->D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:26:13-57
32-->F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:26:13-57
33 android:process=":ipc" />
33-->D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:27:13-35
33-->F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:27:13-35
34
35 <receiver android:name="io.rong.imlib.ConnectChangeReceiver" />
35-->D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:29:9-72
35-->D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:29:19-69
35-->F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:29:9-72
35-->F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:29:19-69
36 <receiver
36-->D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:31:9-33:38
36-->F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:31:9-33:38
37 android:name="io.rong.imlib.HeartbeatReceiver"
37-->D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:32:13-59
37-->F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:32:13-59
38 android:process=":ipc" />
38-->D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:33:13-35
38-->F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:33:13-35
39
40 <!-- 必选: SDK 核心功能 -->
41 <service
41-->D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:36:9-40:46
41-->F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:36:9-40:46
42 android:name="io.rong.push.rongpush.PushService"
42-->D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:37:13-61
42-->F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:37:13-61
43 android:exported="true"
43-->D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:38:13-36
43-->F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:38:13-36
44 android:permission="android.permission.BIND_JOB_SERVICE"
44-->D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:39:13-69
44-->F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:39:13-69
45 android:process="io.rong.push" />
45-->D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:40:13-43
45-->F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:40:13-43
46
47 <!-- push 相关事件接收器 -->
48 <receiver
48-->D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:43:9-59:20
48-->F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:43:9-59:20
49 android:name="io.rong.push.rongpush.PushReceiver"
49-->D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:44:13-62
49-->F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:44:13-62
50 android:exported="true"
50-->D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:45:13-36
50-->F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:45:13-36
51 android:process="io.rong.push" > <!-- 此处进程可以改名,名称需要和PushService所在进程统一 -->
51-->D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:46:13-43
51-->F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:46:13-43
52 <!-- 心跳事件和网络切换事件监听,必须 -->
53 <intent-filter tools:node="removeAll" >
53-->D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:48:13-51:29
53-->D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:48:29-51
53-->F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:48:13-51:29
53-->F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:48:29-51
54 <action android:name="io.rong.push.intent.action.HEART_BEAT" />
54-->D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:49:17-80
54-->D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:49:25-77
54-->F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:49:17-80
54-->F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:49:25-77
55 <action android:name="android.net.conn.CONNECTIVITY_CHANGE" />
55-->D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:50:17-79
55-->D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:50:25-76
55-->F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:50:17-79
55-->F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:50:25-76
56 </intent-filter>
57
58 <!-- 部分用户事件监听, 用来提高推送拉活率; 可移除 -->
59 <intent-filter tools:node="removeAll" >
59-->D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:54:13-58:29
59-->D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:54:28-50
59-->F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:54:13-58:29
59-->F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:54:28-50
60 <action android:name="android.intent.action.USER_PRESENT" />
60-->D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:55:17-77
60-->D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:55:25-74
60-->F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:55:17-77
60-->F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:55:25-74
61 <action android:name="android.intent.action.ACTION_POWER_CONNECTED" />
61-->D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:56:17-87
61-->D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:56:25-84
61-->F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:56:17-87
61-->F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:56:25-84
62 <action android:name="android.intent.action.ACTION_POWER_DISCONNECTED" />
62-->D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:57:17-90
62-->D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:57:25-87
62-->F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:57:17-90
62-->F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:57:25-87
63 </intent-filter>
64 </receiver>
65
66 <activity
66-->D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:61:9-72:20
66-->F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:61:9-72:20
67 android:name="io.rong.push.notification.RongBridgeActivity"
67-->D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:62:13-72
67-->F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:62:13-72
68 android:enabled="true"
68-->D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:63:13-35
68-->F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:63:13-35
69 android:exported="true"
69-->D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:64:13-36
69-->F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:64:13-36
70 android:launchMode="singleInstance"
70-->D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:65:13-48
70-->F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:65:13-48
71 android:theme="@android:style/Theme.Translucent.NoTitleBar" >
71-->D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:66:13-72
71-->F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:66:13-72
72 <intent-filter>
72-->D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:67:13-71:29
72-->F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:67:13-71:29
73 <action android:name="android.intent.action.VIEW" />
73-->D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:68:17-68
73-->D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:68:25-66
73-->F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:68:17-68
73-->F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:68:25-66
74 <action android:name="io.rong.push.notification.RongBridgeActivity" />
74-->D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:69:17-86
74-->D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:69:25-84
74-->F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:69:17-86
74-->F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:69:25-84
75
76 <category android:name="android.intent.category.DEFAULT" />
76-->D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:70:17-76
76-->D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:70:27-73
76-->F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:70:17-76
76-->F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:70:27-73
77 </intent-filter>
78 </activity>
79 </application>

@ -1 +0,0 @@
[{"outputType":{"type":"MERGED_MANIFESTS"},"apkData":{"type":"MAIN","splits":[],"versionCode":-1,"versionName":"5.2.1.55","enabled":true,"outputFile":"imlib-debug.aar","fullName":"debug","baseName":"debug"},"path":"..\\..\\library_manifest\\debug\\AndroidManifest.xml","properties":{"packageId":"io.rong.libcore","split":""}}]

@ -0,0 +1 @@
[{"outputType":{"type":"MERGED_MANIFESTS"},"apkData":{"type":"MAIN","splits":[],"versionCode":-1,"versionName":"5.2.1.55","enabled":true,"outputFile":"imlib-release.aar","fullName":"release","baseName":"release"},"path":"..\\..\\library_manifest\\release\\AndroidManifest.xml","properties":{"packageId":"io.rong.libcore","split":""}}]

@ -1,157 +0,0 @@
-- Merging decision tree log ---
manifest
ADDED from D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:1:1-75:12
INJECTED from D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:1:1-75:12
INJECTED from D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:1:1-75:12
INJECTED from D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:1:1-75:12
INJECTED from D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:1:1-75:12
package
ADDED from D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:3:5-30
INJECTED from D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml
INJECTED from D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml
android:versionName
INJECTED from D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml
ADDED from D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:1:1-75:12
INJECTED from D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml
xmlns:tools
ADDED from D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:2:5-51
xmlns:android
ADDED from D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:1:11-69
uses-permission#android.permission.WRITE_EXTERNAL_STORAGE
ADDED from D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:6:5-81
android:name
ADDED from D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:6:22-78
uses-permission#android.permission.READ_EXTERNAL_STORAGE
ADDED from D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:7:5-80
android:name
ADDED from D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:7:22-77
uses-permission#android.permission.INTERNET
ADDED from D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:9:5-67
android:name
ADDED from D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:9:22-64
uses-permission#android.permission.ACCESS_NETWORK_STATE
ADDED from D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:10:5-79
android:name
ADDED from D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:10:22-76
uses-permission#android.permission.ACCESS_WIFI_STATE
ADDED from D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:11:5-76
android:name
ADDED from D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:11:22-73
uses-permission#android.permission.WAKE_LOCK
ADDED from D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:13:5-68
android:name
ADDED from D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:13:22-65
uses-permission#${applicationId}.permission.RONG_ACCESS_RECEIVER
ADDED from D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:17:5-88
android:name
ADDED from D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:17:22-85
permission#${applicationId}.permission.RONG_ACCESS_RECEIVER
ADDED from D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:20:5-22:47
android:protectionLevel
ADDED from D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:22:9-44
android:name
ADDED from D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:21:9-72
application
ADDED from D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:24:5-73:19
service#io.rong.imlib.ipc.RongService
ADDED from D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:25:9-27:38
android:process
ADDED from D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:27:13-35
android:name
ADDED from D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:26:13-57
receiver#io.rong.imlib.ConnectChangeReceiver
ADDED from D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:29:9-72
android:name
ADDED from D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:29:19-69
receiver#io.rong.imlib.HeartbeatReceiver
ADDED from D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:31:9-33:38
android:process
ADDED from D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:33:13-35
android:name
ADDED from D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:32:13-59
service#io.rong.push.rongpush.PushService
ADDED from D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:36:9-40:46
android:process
ADDED from D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:40:13-43
android:exported
ADDED from D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:38:13-36
android:permission
ADDED from D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:39:13-69
android:name
ADDED from D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:37:13-61
receiver#io.rong.push.rongpush.PushReceiver
ADDED from D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:43:9-59:20
android:process
ADDED from D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:46:13-43
android:exported
ADDED from D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:45:13-36
android:name
ADDED from D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:44:13-62
intent-filter#action:name:android.net.conn.CONNECTIVITY_CHANGE+action:name:io.rong.push.intent.action.HEART_BEAT
ADDED from D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:48:13-51:29
tools:node
ADDED from D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:48:29-51
action#io.rong.push.intent.action.HEART_BEAT
ADDED from D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:49:17-80
android:name
ADDED from D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:49:25-77
action#android.net.conn.CONNECTIVITY_CHANGE
ADDED from D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:50:17-79
android:name
ADDED from D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:50:25-76
intent-filter#action:name:android.intent.action.ACTION_POWER_CONNECTED+action:name:android.intent.action.ACTION_POWER_DISCONNECTED+action:name:android.intent.action.USER_PRESENT
ADDED from D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:54:13-58:29
tools:node
ADDED from D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:54:28-50
action#android.intent.action.USER_PRESENT
ADDED from D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:55:17-77
android:name
ADDED from D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:55:25-74
action#android.intent.action.ACTION_POWER_CONNECTED
ADDED from D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:56:17-87
android:name
ADDED from D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:56:25-84
action#android.intent.action.ACTION_POWER_DISCONNECTED
ADDED from D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:57:17-90
android:name
ADDED from D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:57:25-87
activity#io.rong.push.notification.RongBridgeActivity
ADDED from D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:61:9-72:20
android:enabled
ADDED from D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:63:13-35
android:launchMode
ADDED from D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:65:13-48
android:exported
ADDED from D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:64:13-36
android:theme
ADDED from D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:66:13-72
android:name
ADDED from D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:62:13-72
intent-filter#action:name:android.intent.action.VIEW+action:name:io.rong.push.notification.RongBridgeActivity+category:name:android.intent.category.DEFAULT
ADDED from D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:67:13-71:29
action#android.intent.action.VIEW
ADDED from D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:68:17-68
android:name
ADDED from D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:68:25-66
action#io.rong.push.notification.RongBridgeActivity
ADDED from D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:69:17-86
android:name
ADDED from D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:69:25-84
category#android.intent.category.DEFAULT
ADDED from D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:70:17-76
android:name
ADDED from D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:70:27-73
uses-sdk
INJECTED from D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml reason: use-sdk injection requested
INJECTED from D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml
INJECTED from D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml
INJECTED from D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml
INJECTED from D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml
android:targetSdkVersion
INJECTED from D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml
ADDED from D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml
INJECTED from D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml
android:minSdkVersion
INJECTED from D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml
ADDED from D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml
INJECTED from D:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml

@ -0,0 +1,157 @@
-- Merging decision tree log ---
manifest
ADDED from F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:1:1-75:12
INJECTED from F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:1:1-75:12
INJECTED from F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:1:1-75:12
INJECTED from F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:1:1-75:12
INJECTED from F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:1:1-75:12
package
ADDED from F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:3:5-30
INJECTED from F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml
INJECTED from F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml
android:versionName
INJECTED from F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml
ADDED from F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:1:1-75:12
INJECTED from F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml
xmlns:tools
ADDED from F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:2:5-51
xmlns:android
ADDED from F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:1:11-69
uses-permission#android.permission.WRITE_EXTERNAL_STORAGE
ADDED from F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:6:5-81
android:name
ADDED from F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:6:22-78
uses-permission#android.permission.READ_EXTERNAL_STORAGE
ADDED from F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:7:5-80
android:name
ADDED from F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:7:22-77
uses-permission#android.permission.INTERNET
ADDED from F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:9:5-67
android:name
ADDED from F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:9:22-64
uses-permission#android.permission.ACCESS_NETWORK_STATE
ADDED from F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:10:5-79
android:name
ADDED from F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:10:22-76
uses-permission#android.permission.ACCESS_WIFI_STATE
ADDED from F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:11:5-76
android:name
ADDED from F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:11:22-73
uses-permission#android.permission.WAKE_LOCK
ADDED from F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:13:5-68
android:name
ADDED from F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:13:22-65
uses-permission#${applicationId}.permission.RONG_ACCESS_RECEIVER
ADDED from F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:17:5-88
android:name
ADDED from F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:17:22-85
permission#${applicationId}.permission.RONG_ACCESS_RECEIVER
ADDED from F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:20:5-22:47
android:protectionLevel
ADDED from F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:22:9-44
android:name
ADDED from F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:21:9-72
application
ADDED from F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:24:5-73:19
service#io.rong.imlib.ipc.RongService
ADDED from F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:25:9-27:38
android:process
ADDED from F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:27:13-35
android:name
ADDED from F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:26:13-57
receiver#io.rong.imlib.ConnectChangeReceiver
ADDED from F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:29:9-72
android:name
ADDED from F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:29:19-69
receiver#io.rong.imlib.HeartbeatReceiver
ADDED from F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:31:9-33:38
android:process
ADDED from F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:33:13-35
android:name
ADDED from F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:32:13-59
service#io.rong.push.rongpush.PushService
ADDED from F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:36:9-40:46
android:process
ADDED from F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:40:13-43
android:exported
ADDED from F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:38:13-36
android:permission
ADDED from F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:39:13-69
android:name
ADDED from F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:37:13-61
receiver#io.rong.push.rongpush.PushReceiver
ADDED from F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:43:9-59:20
android:process
ADDED from F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:46:13-43
android:exported
ADDED from F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:45:13-36
android:name
ADDED from F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:44:13-62
intent-filter#action:name:android.net.conn.CONNECTIVITY_CHANGE+action:name:io.rong.push.intent.action.HEART_BEAT
ADDED from F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:48:13-51:29
tools:node
ADDED from F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:48:29-51
action#io.rong.push.intent.action.HEART_BEAT
ADDED from F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:49:17-80
android:name
ADDED from F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:49:25-77
action#android.net.conn.CONNECTIVITY_CHANGE
ADDED from F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:50:17-79
android:name
ADDED from F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:50:25-76
intent-filter#action:name:android.intent.action.ACTION_POWER_CONNECTED+action:name:android.intent.action.ACTION_POWER_DISCONNECTED+action:name:android.intent.action.USER_PRESENT
ADDED from F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:54:13-58:29
tools:node
ADDED from F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:54:28-50
action#android.intent.action.USER_PRESENT
ADDED from F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:55:17-77
android:name
ADDED from F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:55:25-74
action#android.intent.action.ACTION_POWER_CONNECTED
ADDED from F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:56:17-87
android:name
ADDED from F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:56:25-84
action#android.intent.action.ACTION_POWER_DISCONNECTED
ADDED from F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:57:17-90
android:name
ADDED from F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:57:25-87
activity#io.rong.push.notification.RongBridgeActivity
ADDED from F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:61:9-72:20
android:enabled
ADDED from F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:63:13-35
android:launchMode
ADDED from F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:65:13-48
android:exported
ADDED from F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:64:13-36
android:theme
ADDED from F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:66:13-72
android:name
ADDED from F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:62:13-72
intent-filter#action:name:android.intent.action.VIEW+action:name:io.rong.push.notification.RongBridgeActivity+category:name:android.intent.category.DEFAULT
ADDED from F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:67:13-71:29
action#android.intent.action.VIEW
ADDED from F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:68:17-68
android:name
ADDED from F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:68:25-66
action#io.rong.push.notification.RongBridgeActivity
ADDED from F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:69:17-86
android:name
ADDED from F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:69:25-84
category#android.intent.category.DEFAULT
ADDED from F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:70:17-76
android:name
ADDED from F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml:70:27-73
uses-sdk
INJECTED from F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml reason: use-sdk injection requested
INJECTED from F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml
INJECTED from F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml
INJECTED from F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml
INJECTED from F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml
android:targetSdkVersion
INJECTED from F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml
ADDED from F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml
INJECTED from F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml
android:minSdkVersion
INJECTED from F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml
ADDED from F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml
INJECTED from F:\StudioProjects\UnionMedTV\imlib\AndroidManifest.xml

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save