Compare commits

...

5 Commits

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

@ -1,6 +1,21 @@
apply plugin: 'com.android.application'
android {
signingConfigs {
debug {
storeFile file('/ruijapkkey')
storePassword 'ruijie888888'
keyAlias 'ruijie'
keyPassword 'ruijie888888'
}
release {
storeFile file('/ruijapkkey')
storePassword 'ruijie888888'
keyAlias 'ruijie'
keyPassword 'ruijie888888'
}
}
compileSdkVersion 29
buildToolsVersion "29.0.3"
defaultConfig {
@ -8,7 +23,7 @@ android {
minSdkVersion 21
targetSdkVersion 29
versionCode 1
versionName "1.0"
versionName "1.0.0"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
ndk {
// SO库架构
@ -25,8 +40,21 @@ android {
}
buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
zipAlignEnabled true
debuggable false
// minifyEnabled true //
// shrinkResources true //
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
signingConfig signingConfigs.release
}
debug {
debuggable true
zipAlignEnabled true
debuggable true
// minifyEnabled false //release出现的bug有可能是因为混淆造成的
// shrinkResources false //
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
signingConfig signingConfigs.debug
}
}
lintOptions {
@ -47,6 +75,20 @@ android {
pickFirst 'lib/x86_64/libc++_shared.so'
}
}
android.applicationVariants.all {
variant ->
variant.outputs.all { output ->
if (variant.buildType.name == 'debug') {
output.outputFileName = "unionhealthTV_${android.defaultConfig.versionName}_${getNowTime()}_debug.apk"
} else if (variant.buildType.name == 'release') {
output.outputFileName = "unionhealthTV_${android.defaultConfig.versionName}_${getNowTime()}_release.apk"
}
}
}
static def getNowTime() {
return new Date().format("MM-dd_HH.mm")
}
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
@ -86,7 +128,7 @@ dependencies {
// https://github.com/getActivity/XXPermissions
implementation 'com.github.getActivity:XXPermissions:16.5'
implementation 'com.github.getActivity:XXPermissions:18.6'
//BaseRecyclerViewAdapterHelper
implementation 'com.github.CymChad:BaseRecyclerViewAdapterHelper:3.0.11'
@ -110,4 +152,7 @@ dependencies {
compile 'com.github.lmiot:LoadDialog:V2.1'
// api project(path: ':meeting1v1')
implementation 'com.alibaba:fastjson:2.0.19.android'
//
implementation 'com.teprinciple:updateapputilsx:2.3.0'
}

Binary file not shown.

@ -108,7 +108,6 @@
android:screenOrientation="landscape" />
<activity
android:name=".activity.MsgDetailActivity"
android:theme="@style/TranslucentTheme"
android:screenOrientation="landscape" />
<meta-data

@ -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) {

@ -21,29 +21,40 @@ import androidx.fragment.app.Fragment;
import androidx.lifecycle.Observer;
import androidx.viewpager2.adapter.FragmentStateAdapter;
import androidx.viewpager2.widget.ViewPager2;
import com.blankj.utilcode.util.ToastUtils;
import com.bumptech.glide.Glide;
import com.bumptech.glide.request.RequestOptions;
import com.hjq.http.EasyHttp;
import com.hjq.http.listener.OnHttpListener;
import com.hjq.permissions.OnPermissionCallback;
import com.hjq.permissions.Permission;
import com.hjq.permissions.XXPermissions;
import com.lxj.xpopup.XPopup;
import com.unionmed.unionmedtv.R;
import com.unionmed.unionmedtv.api.VersionUpLoadApi;
import com.unionmed.unionmedtv.base.BaseActivity;
import com.unionmed.unionmedtv.dialog.TipDialog;
import com.unionmed.unionmedtv.fragment.MyDoctorFragment;
import com.unionmed.unionmedtv.livedatas.LiveDataBus;
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.Constants;
import com.unionmed.unionmedtv.widgets.ScaleConstraintLayout;
import org.jetbrains.annotations.NotNull;
import java.util.ArrayList;
import java.util.List;
import constant.UiType;
import io.rong.imlib.RongCoreClient;
import io.rong.imlib.RongIMClient;
import listener.OnInitUiListener;
import model.UiConfig;
import model.UpdateConfig;
import update.UpdateAppUtils;
/**
* 首页
@ -75,7 +86,59 @@ public class HomeActivity extends BaseActivity implements View.OnFocusChangeList
initBroadCast();
initPermissions();
}
public void uploadVersion() {
EasyHttp.post(HomeActivity.this)
.api(new VersionUpLoadApi())
.request(new OnHttpListener<HttpData<ApiResponse<VersionUpLoadApi>>>() {
@Override
public void onHttpSuccess(HttpData<ApiResponse<VersionUpLoadApi>> versionInfo) {
if (versionInfo.isRequestSucceed()) {
if (versionInfo.getData().isInnerRequestSucceed()) {
VersionUpLoadApi.VersionInfoBean versionInfoBean = versionInfo.getData().getData().getVersionInfo();
if (versionInfoBean.getIfNeedUpdate().equals("1")) {
// 更新配置
UpdateConfig updateConfig = new UpdateConfig();
updateConfig.setForce(versionInfoBean.getIs_force().equals("1"));
updateConfig.setCheckWifi(false);
updateConfig.setNeedCheckMd5(false);
updateConfig.setShowNotification(false);
updateConfig.setAlwaysShowDownLoadDialog(true);
//ui配置
UiConfig uiConfig = new UiConfig();
uiConfig.setUiType(UiType.CUSTOM);
uiConfig.setCustomLayoutId(R.layout.view_custom_version);
UpdateAppUtils
.getInstance()
.apkUrl(versionInfoBean.getUpdate_url())
.updateTitle("发现新版本")
.updateContent(versionInfoBean.getUpdate_info())
.updateConfig(updateConfig)
.uiConfig(uiConfig)
.setOnInitUiListener(new OnInitUiListener() {
@Override
public void onInitUpdateUi(@org.jetbrains.annotations.Nullable View view, @NotNull UpdateConfig updateConfig, @NotNull UiConfig uiConfig) {
TextView textView = view.findViewById(R.id.tv_version_name);
textView.setText("V" + versionInfoBean.getVersion_number());
}
}).update();
}
} else {
}
} else {
}
}
@Override
public void onHttpFail(Exception e) {
}
});
}
public void initPermissions() {
XXPermissions.with(HomeActivity.this)
// 申请单个权限
@ -91,6 +154,8 @@ public class HomeActivity extends BaseActivity implements View.OnFocusChangeList
if (!all) {
// toast("获取部分权限成功,但部分权限未正常授予");
return;
}else {
uploadVersion();
}
}

@ -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,312 @@
package com.unionmed.unionmedtv.api;
import androidx.annotation.NonNull;
import com.hjq.http.config.IRequestApi;
import com.hjq.http.config.IRequestType;
import com.hjq.http.model.BodyType;
import java.util.List;
/**
* desc : 账号登录
*/
public final class VersionUpLoadApi implements IRequestApi, IRequestType{
/**
* protocol : [{"name":"法律声明及隐私政策","value":"https://mobile.union-med.net/LegalStatement.html"},{"name":"个人用户服务协议","value":"https://mobile.union-med.net/PersonalDelegate.html"},{"name":"平台医生服务协议","value":"https://mobile.union-med.net/DoctorDelegate.html"},{"name":"康联健康服务平台用户支付服务协议","value":"https://mobile.union-med.net/PaymentAgreement.html"},{"name":"医疗机构服务协议","value":"https://mobile.union-med.net/HospitalService.html"}]
* route : [{"pkey":"17","ip":"23.86.174.181","port":"8085","fmsvr":"rtmp://10.120.224.5/livepkgr/","msgsvr":"http://120.195.56.245:3190/msg_server","ipsvr":"https://mini.union-med.net:8085/appintegrate/v1.8","type":"01","msgip":"120.195.56.245","oder_num":0,"memo":"越西","svalue":"rtmp://10.120.224.5/livepkgr/","filesvr":"https://mini.union-med.net:8085/eleand/"}]
* customerServicePhone : 400-998-169-8
* ifNeedUpdate : 1
* versionInfo : {"version_number":"1.0.1","client":"iptv","update_info":null,"release_time":"2023-09-11 00:00:00.0","is_force":"0","update_url":"http://47.118.51.167:9000/apk/unionhealthTV_1.0.1_09-11_10.37_release.apk","ifNeedUpdate":"1"}
*/
private String customerServicePhone;
private String ifNeedUpdate;
private VersionInfoBean versionInfo;
private List<ProtocolBean> protocol;
private List<RouteBean> route;
@NonNull
@Override
public BodyType getBodyType() {
return BodyType.JSON;
}
@NonNull
@Override
public String getApi() {
return "/login/getConfig";
}
public String getCustomerServicePhone() {
return customerServicePhone;
}
public void setCustomerServicePhone(String customerServicePhone) {
this.customerServicePhone = customerServicePhone;
}
public String getIfNeedUpdate() {
return ifNeedUpdate;
}
public void setIfNeedUpdate(String ifNeedUpdate) {
this.ifNeedUpdate = ifNeedUpdate;
}
public VersionInfoBean getVersionInfo() {
return versionInfo;
}
public void setVersionInfo(VersionInfoBean versionInfo) {
this.versionInfo = versionInfo;
}
public List<ProtocolBean> getProtocol() {
return protocol;
}
public void setProtocol(List<ProtocolBean> protocol) {
this.protocol = protocol;
}
public List<RouteBean> getRoute() {
return route;
}
public void setRoute(List<RouteBean> route) {
this.route = route;
}
public static class VersionInfoBean {
/**
* version_number : 1.0.1
* client : iptv
* update_info : null
* release_time : 2023-09-11 00:00:00.0
* is_force : 0
* update_url : http://47.118.51.167:9000/apk/unionhealthTV_1.0.1_09-11_10.37_release.apk
* ifNeedUpdate : 1
*/
private String version_number;
private String client;
private String update_info="";
private String release_time;
private String is_force;
private String update_url;
private String ifNeedUpdate;
public String getVersion_number() {
return version_number;
}
public void setVersion_number(String version_number) {
this.version_number = version_number;
}
public String getClient() {
return client;
}
public void setClient(String client) {
this.client = client;
}
public String getUpdate_info() {
return update_info;
}
public void setUpdate_info(String update_info) {
this.update_info = update_info;
}
public String getRelease_time() {
return release_time;
}
public void setRelease_time(String release_time) {
this.release_time = release_time;
}
public String getIs_force() {
return is_force;
}
public void setIs_force(String is_force) {
this.is_force = is_force;
}
public String getUpdate_url() {
return update_url;
}
public void setUpdate_url(String update_url) {
this.update_url = update_url;
}
public String getIfNeedUpdate() {
return ifNeedUpdate;
}
public void setIfNeedUpdate(String ifNeedUpdate) {
this.ifNeedUpdate = ifNeedUpdate;
}
}
public static class ProtocolBean {
/**
* name : 法律声明及隐私政策
* value : https://mobile.union-med.net/LegalStatement.html
*/
private String name;
private String value;
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getValue() {
return value;
}
public void setValue(String value) {
this.value = value;
}
}
public static class RouteBean {
/**
* pkey : 17
* ip : 23.86.174.181
* port : 8085
* fmsvr : rtmp://10.120.224.5/livepkgr/
* msgsvr : http://120.195.56.245:3190/msg_server
* ipsvr : https://mini.union-med.net:8085/appintegrate/v1.8
* type : 01
* msgip : 120.195.56.245
* oder_num : 0
* memo : 越西
* svalue : rtmp://10.120.224.5/livepkgr/
* filesvr : https://mini.union-med.net:8085/eleand/
*/
private String pkey;
private String ip;
private String port;
private String fmsvr;
private String msgsvr;
private String ipsvr;
private String type;
private String msgip;
private int oder_num;
private String memo;
private String svalue;
private String filesvr;
public String getPkey() {
return pkey;
}
public void setPkey(String pkey) {
this.pkey = pkey;
}
public String getIp() {
return ip;
}
public void setIp(String ip) {
this.ip = ip;
}
public String getPort() {
return port;
}
public void setPort(String port) {
this.port = port;
}
public String getFmsvr() {
return fmsvr;
}
public void setFmsvr(String fmsvr) {
this.fmsvr = fmsvr;
}
public String getMsgsvr() {
return msgsvr;
}
public void setMsgsvr(String msgsvr) {
this.msgsvr = msgsvr;
}
public String getIpsvr() {
return ipsvr;
}
public void setIpsvr(String ipsvr) {
this.ipsvr = ipsvr;
}
public String getType() {
return type;
}
public void setType(String type) {
this.type = type;
}
public String getMsgip() {
return msgip;
}
public void setMsgip(String msgip) {
this.msgip = msgip;
}
public int getOder_num() {
return oder_num;
}
public void setOder_num(int oder_num) {
this.oder_num = oder_num;
}
public String getMemo() {
return memo;
}
public void setMemo(String memo) {
this.memo = memo;
}
public String getSvalue() {
return svalue;
}
public void setSvalue(String svalue) {
this.svalue = svalue;
}
public String getFilesvr() {
return filesvr;
}
public void setFilesvr(String filesvr) {
this.filesvr = filesvr;
}
}
}

@ -12,6 +12,7 @@ import android.widget.Toast;
import androidx.annotation.NonNull;
import com.blankj.utilcode.util.AppUtils;
import com.blankj.utilcode.util.ToastUtils;
import com.hjq.permissions.OnPermissionCallback;
import com.hjq.permissions.Permission;
@ -93,10 +94,11 @@ public class MyApplication extends Application {
.setServer(new RequestServer())
// 设置请求处理策略
.setHandler(new RequestHandler(this))
.addHeader("client", "IPTV")
.addHeader("client", "iptv")
.addHeader("cur_version", AppUtils.getAppVersionName())
// 添加全局请求参数
//.addParam("token", "6666666")
// 添加全局请求头
// 添加全局请求头ho
.addHeader("Content-Type", "application/json;charset=UTF-8")
.into();
//zxing初始化

@ -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;
}
}

@ -7,6 +7,7 @@ import android.view.View;
import android.view.ViewGroup;
import android.widget.FrameLayout;
import android.widget.ImageView;
import android.widget.RelativeLayout;
import android.widget.TextView;
import androidx.annotation.NonNull;
@ -98,15 +99,22 @@ public class MeetMemberAdapter extends RecyclerView.Adapter<MeetMemberAdapter.Vi
holder.iv_userPhoto.setVisibility(View.GONE);
}
holder.view_item.setOnClickListener(new View.OnClickListener() {
holder.relative.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
public void onClick(View view) {
if (null != mListener) {
mListener.onItemClick(meetingModel, position);
}
}
});
// holder.view_item.setOnClickListener(new View.OnClickListener() {
// @Override
// public void onClick(View v) {
// if (null != mListener) {
// mListener.onItemClick(meetingModel, position);
// }
// }
// });
if (meetingModel.isVoiceDisable()) {
@ -132,6 +140,7 @@ public class MeetMemberAdapter extends RecyclerView.Adapter<MeetMemberAdapter.Vi
TextView tv_userName;
ImageView iv_userPhoto;
ImageView iv_voice;
RelativeLayout relative;
public ViewHolder(View itemView) {
super(itemView);
@ -140,6 +149,7 @@ public class MeetMemberAdapter extends RecyclerView.Adapter<MeetMemberAdapter.Vi
iv_userPhoto = itemView.findViewById(R.id.iv_userPhoto);
iv_voice = itemView.findViewById(R.id.iv_voice);
view_item = itemView.findViewById(R.id.view_item);
relative = itemView.findViewById(R.id.relative);
}
}

@ -175,7 +175,7 @@ public class MeetingActivity extends BaseActivity implements MeetingPresenter.Me
@SuppressLint("UseCompatLoadingForDrawables")
public void click(View view) {
if (view.getId() == R.id.btn_leave) {
if (view.getId() == R.id.btn_leave||view.getId()==R.id.lin_hang_up) {
RCRTCEngine.getInstance().leaveRoom(new IRCRTCResultCallback() {
@Override
public void onSuccess() {
@ -188,7 +188,7 @@ public class MeetingActivity extends BaseActivity implements MeetingPresenter.Me
}
});
finish();
} else if (view.getId() == R.id.btn_mic) {
} else if (view.getId() == R.id.btn_mic||view.getId()==R.id.lin_mute) {
// 设置禁用麦克风采集
if (RCRTCEngine.getInstance().getDefaultAudioStream().isMicrophoneDisable()) {
RCRTCEngine.getInstance().getDefaultAudioStream().setMicrophoneDisable(false);
@ -218,7 +218,7 @@ public class MeetingActivity extends BaseActivity implements MeetingPresenter.Me
}
}
}
} else if (view.getId() == R.id.btn_camera) {
} else if (view.getId() == R.id.btn_camera||view.getId()==R.id.lin_camera) {
if (cameraOpen) {
RCRTCEngine.getInstance().getDefaultVideoStream().stopCamera();
btn_camera.setImageResource(R.mipmap.icon_camera_off);

Binary file not shown.

After

Width:  |  Height:  |  Size: 141 KiB

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<shape android:shape="rectangle">
<solid android:color="#0BBAC6"/>
<corners android:radius="16dp" />
</shape>
</item>
</layer-list>

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/bg_focus_6" android:state_focused="true"/>
<item android:drawable="@drawable/btn_update_bg" />
</selector>

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="16dp"/>
<solid android:color="#F5F6F8"/>
</shape>

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.4 KiB

@ -9,6 +9,7 @@
android:layout_height="match_parent"
android:orientation="vertical"
android:layout_weight="3"
android:background="@mipmap/translucent_bg"
>
</LinearLayout>

@ -44,11 +44,7 @@
android:layout_centerInParent="true" />
</RelativeLayout>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recycleview"
android:layout_width="match_parent"
android:layout_height="200dp"
android:layout_above="@+id/rel_btn" />
<FrameLayout
@ -81,67 +77,115 @@
android:layout_alignParentBottom="true"
android:layout_marginBottom="45dp">
<Button
android:id="@+id/btn_leave"
android:layout_width="60dp"
android:layout_height="60dp"
android:layout_centerHorizontal="true"
android:background="@mipmap/icon_hang_up"
android:onClick="click" />
<TextView
android:layout_width="60dp"
<LinearLayout
android:id="@+id/lin_hang_up"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/btn_leave"
android:layout_alignLeft="@+id/btn_leave"
android:layout_marginTop="10dp"
android:gravity="center_horizontal"
android:text="挂断"
android:textColor="#ffffff"
android:textSize="10sp" />
<ImageView
android:id="@+id/btn_camera"
android:layout_width="60dp"
android:layout_height="60dp"
android:layout_marginLeft="15dp"
android:layout_toRightOf="@+id/btn_leave"
android:background="@null"
android:layout_marginRight="84dp"
android:background="@drawable/bg_focus_selector_10"
android:clickable="true"
android:focusable="true"
android:focusableInTouchMode="true"
android:nextFocusLeft="@+id/lin_hang_up"
android:onClick="click"
android:src="@mipmap/icon_camera_on" />
<TextView
android:id="@+id/tv_camera"
android:layout_width="60dp"
android:orientation="vertical"
android:padding="@dimen/dp_10">
<Button
android:id="@+id/btn_leave"
android:layout_width="60dp"
android:layout_height="60dp"
android:layout_centerHorizontal="true"
android:background="@mipmap/icon_hang_up"
android:onClick="click" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/btn_leave"
android:layout_alignLeft="@+id/btn_leave"
android:layout_marginTop="10dp"
android:gravity="center_horizontal"
android:text="挂断"
android:textColor="#ffffff"
android:textSize="10sp" />
</LinearLayout>
<LinearLayout
android:id="@+id/lin_camera"
android:padding="@dimen/dp_10"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/btn_camera"
android:layout_alignLeft="@+id/btn_camera"
android:layout_marginTop="10dp"
android:gravity="center_horizontal"
android:text="摄像头已开"
android:textColor="#ffffff"
android:textSize="10sp" />
android:layout_marginRight="84dp"
android:layout_toRightOf="@+id/lin_hang_up"
android:background="@drawable/bg_focus_selector_10"
android:clickable="true"
android:focusable="true"
android:focusableInTouchMode="true"
android:onClick="click"
android:orientation="vertical">
<ImageView
android:id="@+id/btn_camera"
android:layout_width="60dp"
android:layout_height="60dp"
android:background="@null"
android:onClick="click"
android:src="@mipmap/icon_camera_on" />
<TextView
android:id="@+id/tv_camera"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/btn_camera"
android:layout_alignLeft="@+id/btn_camera"
android:layout_marginTop="10dp"
android:gravity="center_horizontal"
android:text="摄像头已开"
android:textColor="#ffffff"
android:textSize="10sp" />
</LinearLayout>
<LinearLayout
android:id="@+id/lin_mute"
android:padding="@dimen/dp_10"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_toRightOf="@+id/lin_camera"
android:layout_marginRight="84dp"
android:background="@drawable/bg_focus_selector_10"
android:clickable="true"
android:focusable="true"
android:focusableInTouchMode="true"
android:nextFocusRight="@+id/lin_mute"
android:onClick="click"
android:orientation="vertical">
<Button
android:id="@+id/btn_mic"
android:layout_width="60dp"
android:layout_height="60dp"
android:layout_marginLeft="15dp"
android:layout_toRightOf="@+id/btn_camera"
android:background="@mipmap/icon_mute_on"
android:onClick="click" />
android:onClick="click"
android:background="@mipmap/icon_mute_on" />
<TextView
android:id="@+id/tv_mic"
android:layout_width="60dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/btn_mic"
android:layout_alignLeft="@+id/btn_mic"
android:layout_marginTop="10dp"
android:gravity="center_horizontal"
android:gravity="center"
android:text="语音已开"
android:textColor="#ffffff"
android:textSize="10sp" />
</LinearLayout>
</RelativeLayout>
<androidx.recyclerview.widget.RecyclerView
android:focusable="false"
android:focusableInTouchMode="false"
android:id="@+id/recycleview"
android:layout_width="match_parent"
android:layout_height="200dp"
android:layout_marginBottom="20dp"
android:layout_above="@+id/rel_btn"
/>
</RelativeLayout>

@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/relative"
android:layout_width="200dp"
android:layout_height="200dp"
android:padding="10dp"
android:layout_marginLeft="10dp"
android:background="@drawable/edit_phone_select"
android:descendantFocusability="afterDescendants"
style="@style/FocusStyle"
android:orientation="vertical">

@ -0,0 +1,97 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="480dp"
android:layout_height="wrap_content"
tools:ignore="MissingPrefix"
android:orientation="vertical">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/bg_custom_update"
android:paddingBottom="15dp">
<TextView
android:id="@+id/tv_update_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="180dp"
android:textColor="@color/text_title"
android:textSize="18sp"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.502"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:text="版本更新啦!" />
<ScrollView
android:id="@+id/scrollView2"
android:layout_width="match_parent"
android:layout_height="150dp"
android:layout_marginTop="30dp"
android:overScrollMode="never"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tv_update_title">
<TextView
android:id="@+id/tv_update_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="top"
android:gravity="start"
android:lineSpacingExtra="5dp"
android:paddingLeft="20dp"
android:paddingRight="20dp"
android:textColor="@color/text_content"
android:textSize="14sp"
tools:text="1、快来升级最新版本\" />
</ScrollView>
<TextView
style="@style/FocusStyle"
android:focusable="true"
android:id="@+id/btn_update_sure"
android:layout_width="192dp"
android:layout_height="32dp"
android:layout_marginStart="20dp"
android:layout_marginTop="10dp"
android:layout_marginEnd="20dp"
android:background="@drawable/bg_focus_selector_6"
android:gravity="center"
android:text="@string/update_now"
android:textColor="@color/colorBlack"
android:textSize="14sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/scrollView2" />
<TextView
android:id="@+id/tv_version_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="100dp"
android:layout_marginEnd="15dp"
android:textColor="@color/white"
android:textSize="16sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:text="V1.0.0" />
</androidx.constraintlayout.widget.ConstraintLayout>
<ImageView
android:layout_marginTop="20dp"
android:id="@+id/btn_update_cancel"
android:layout_width="30dp"
android:layout_gravity="center_horizontal"
android:layout_height="30dp"
style="@style/FocusStyle"
app:bl_focused_drawable="@drawable/ic_version_close_choose"
app:bl_unFocused_drawable="@drawable/ic_version_close"
/>
</LinearLayout>

Binary file not shown.

After

Width:  |  Height:  |  Size: 257 KiB

@ -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":""}}]

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

Loading…
Cancel
Save