Merge branch 'dev'

app/build.gradle

@@ -27,9 +27,10 @@ android {
     defaultConfig {
         applicationId "cn.shangyu.gdxzExpert"
         minSdkVersion 21
-        targetSdkVersion 34
+        // targetSdkVersion > 32 需要处理照片权限的问题
-        versionCode 133
+        targetSdkVersion 32
-        versionName "4.1.6"
+        versionCode 418
+        versionName "4.1.8"
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
         multiDexEnabled true
         ndk {

app/src/main/AndroidManifest.xml

@@ -2,10 +2,16 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="cn.shangyu.gdxzExpert"
-    android:versionCode="133"
+    android:versionCode="418"
-    android:versionName="4.1.6">
+    android:versionName="4.1.8">
 
     <uses-sdk tools:overrideLibrary="com.huawei.android.hms.base,com.huawei.android.hms.push" />
+    <uses-feature
+        android:name="android.hardware.camera"
+        android:required="false" />
+    <uses-feature
+        android:name="android.hardware.telephony"
+        android:required="false" />
 
     <queries>
         <package android:name="com.tencent.mm" />
@@ -30,6 +36,13 @@
         android:smallScreens="true"
         android:xlargeScreens="true" />
 
+    <!-- Android 13版本适配，细化存储权限 -->
+<!--    <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />-->
+<!--    <uses-permission android:name="android.permission.READ_MEDIA_AUDIO" />-->
+<!--    <uses-permission android:name="android.permission.READ_MEDIA_VIDEO" />-->
+    <!-- Android 14版本适配，部分允许还是全部允许-->
+<!--    <uses-permission android:name="android.permission.READ_MEDIA_VISUAL_USER_SELECTED" />-->
+
     <uses-permission android:name="android.permission.KILL_BACKGROUND_PROCESSES" />
     <uses-permission android:name="android.permission.RECEIVE_USER_PRESENT" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
@@ -1854,6 +1867,11 @@
             android:name=".photo.AlbumPreviewActivity"
             android:screenOrientation="portrait"
             android:theme="@style/AppThemeNew" />
+        <activity
+            android:name=".activity.AllPhotosActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize"
+            android:screenOrientation="portrait"
+            android:theme="@style/AppThemeNew" />
         <activity
             android:name=".big.activity.BigPublicSearchActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
@@ -2081,6 +2099,16 @@
                 android:resource="@xml/provider_paths"
                 tools:replace="android:resource" />
         </provider>
+        <provider
+            android:name=".utils.UniappFileProvider"
+            android:authorities="${applicationId}.dc.fileprovider"
+            android:exported="false"
+            android:grantUriPermissions="true">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/uniapp_provider_paths"
+                tools:replace="android:resource" />
+        </provider>
         <provider
             android:name="com.netease.nimlib.ipc.NIMContentProvider"
             android:authorities="cn.shangyu.gdxzExpert.ipc.provider"
@@ -2294,11 +2322,13 @@
         <service
             android:name="com.umeng.message.XiaomiIntentService"
             android:exported="false"
-            tools:replace="android:exported" />
+            tools:replace="android:exported"
+            tools:ignore="MissingClass" />
         <service
             android:name="com.umeng.message.UmengMessageIntentReceiverService"
             android:exported="false"
-            tools:replace="android:exported" />
+            tools:replace="android:exported"
+            tools:ignore="MissingClass" />
         <service android:name=".report.ReportService" />
 
         <!-- 微信分享 配置begin -->
@@ -2318,6 +2348,7 @@
 <!--            </intent-filter>-->
 <!--        </activity>-->
         <!-- 微信分享 配置 end -->
+
     </application>
 
 </manifest>

app/src/main/assets/apps/__UNI__89F511F/www/manifest.json

@@ -1 +1 @@
-{"@platforms":["android","iPhone","iPad"],"id":"__UNI__89F511F","name":"肝胆相照专家版","version":{"name":"4.1.5","code":100},"description":"","developer":{"name":"","email":"","url":""},"permissions":{"Share":{},"Webview-x5":{},"UIWebview":{},"VideoPlayer":{},"OAuth":{},"Barcode":{},"Camera":{},"UniNView":{"description":"UniNView原生渲染"}},"plus":{"useragent":{"value":"uni-app gdxz","concatenate":true},"splashscreen":{"target":"id:1","autoclose":true,"waiting":true,"delay":0},"popGesture":"close","launchwebview":{"render":"always","id":"1","kernel":"WKWebview"},"runmode":"liberate","usingComponents":true,"nvueCompiler":"uni-app","nvueStyleCompiler":"uni-app","compatible":{"ignoreVersion":true},"nativePlugins":{"NIMUniPlugin":{"PUSH_VIVO_APPID":"100034326","PUSH_VIVO_APPKEY":"e789634c1f76c8f184b1def1101ce824","PUSH_HONOR_APPID":"900782424","__plugin_info__":{"name":"NIMUniPlugin","description":"uni消息推送插件","platforms":"Android,iOS","url":"","android_package_name":"","ios_bundle_id":"","isCloud":false,"bought":-1,"pid":"","parameters":{"PUSH_VIVO_APPID":{"des":"厂商VIVO-app_id","key":"com.vivo.push.app_id","value":""},"PUSH_VIVO_APPKEY":{"des":"厂商VIVO-app_key","key":"com.vivo.push.api_key","value":""},"PUSH_HONOR_APPID":{"des":"厂商HONOR-app_id","key":"com.hihonor.push.app_id","value":""}}}}},"statusbar":{"immersed":"supportedDevice","style":"dark","background":"#F8F8F8"},"uniStatistics":{"version":"2"},"allowsInlineMediaPlayback":true,"uni-app":{"control":"uni-v3","vueVersion":"3","compilerVersion":"4.76","nvueCompiler":"uni-app","renderer":"auto","nvue":{"flex-direction":"column"},"nvueLaunchMode":"normal","webView":{"minUserAgentVersion":"49.0"}}},"app-harmony":{"useragent":{"value":"uni-app","concatenate":true},"uniStatistics":{"version":"2"}},"locale":"zh-Hans","screenOrientation":["portrait-primary","portrait-secondary"],"launch_path":"__uniappview.html","fallbackLocale":"zh-Hans"}
+{"@platforms":["android","iPhone","iPad"],"id":"__UNI__89F511F","name":"肝胆相照专家版","version":{"name":"4.1.5","code":100},"description":"","developer":{"name":"","email":"","url":""},"permissions":{"Share":{},"Webview-x5":{},"UIWebview":{},"VideoPlayer":{},"OAuth":{},"Barcode":{},"Camera":{},"UniNView":{"description":"UniNView原生渲染"}},"plus":{"useragent":{"value":"uni-app gdxz","concatenate":true},"splashscreen":{"target":"id:1","autoclose":true,"waiting":true,"delay":0},"popGesture":"close","launchwebview":{"render":"always","id":"1","kernel":"WKWebview"},"runmode":"liberate","usingComponents":true,"nvueCompiler":"uni-app","nvueStyleCompiler":"uni-app","compatible":{"ignoreVersion":true},"nativePlugins":{"NIMUniPlugin":{"PUSH_VIVO_APPID":"100034326","PUSH_VIVO_APPKEY":"e789634c1f76c8f184b1def1101ce824","PUSH_HONOR_APPID":"900782424","__plugin_info__":{"name":"NIMUniPlugin","description":"uni消息推送插件","platforms":"Android,iOS","url":"","android_package_name":"","ios_bundle_id":"","isCloud":false,"bought":-1,"pid":"","parameters":{"PUSH_VIVO_APPID":{"des":"厂商VIVO-app_id","key":"com.vivo.push.app_id","value":""},"PUSH_VIVO_APPKEY":{"des":"厂商VIVO-app_key","key":"com.vivo.push.api_key","value":""},"PUSH_HONOR_APPID":{"des":"厂商HONOR-app_id","key":"com.hihonor.push.app_id","value":""}}}}},"statusbar":{"immersed":"supportedDevice","style":"dark","background":"#F8F8F8"},"uniStatistics":{"version":"2"},"allowsInlineMediaPlayback":true,"uni-app":{"control":"uni-v3","vueVersion":"3","compilerVersion":"4.84","nvueCompiler":"uni-app","renderer":"auto","nvue":{"flex-direction":"column"},"nvueLaunchMode":"normal","webView":{"minUserAgentVersion":"49.0"}}},"app-harmony":{"useragent":{"value":"uni-app","concatenate":true},"uniStatistics":{"version":"2"}},"locale":"zh-Hans","screenOrientation":["portrait-primary","portrait-secondary"],"launch_path":"__uniappview.html","fallbackLocale":"zh-Hans"}

app/src/main/assets/apps/__UNI__89F511F_417/www/__uniappview.html

@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <title>View</title>
+    <link rel="icon" href="data:,">
+    <link rel="stylesheet" href="app.css" />
+    <script>var __uniConfig = {"globalStyle":{},"darkmode":false}</script>
+    <script>
+      var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') ||
+        CSS.supports('top: constant(a)'))
+      document.write(
+        '<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' +
+        (coverSupport ? ', viewport-fit=cover' : '') + '" />')
+    </script>
+  </head>
+  <body>
+    <div id="app"></div>
+    <script src="uni-app-view.umd.js"></script>
+    <script src="app-wxs.js"></script>
+    
+    
+  </body>
+</html>

app/src/main/assets/apps/__UNI__89F511F_417/www/androidPrivacy.json

@@ -0,0 +1,3 @@
+{
+    "prompt" : "none"
+}

app/src/main/assets/apps/__UNI__89F511F_417/www/app-config-service.js

@@ -0,0 +1,11 @@
+
+  ;(function(){
+  let u=void 0,isReady=false,onReadyCallbacks=[],isServiceReady=false,onServiceReadyCallbacks=[];
+  const __uniConfig = {"pages":[],"globalStyle":{"pageOrientation":"portrait","backgroundColor":"#F8F8F8","background":"#efeff4","navigationBar":{"backgroundColor":"#F8F8F8","titleText":"uni-app","type":"default","titleColor":"#000000"},"isNVue":false},"nvue":{"compiler":"uni-app","styleCompiler":"uni-app","flex-direction":"column"},"renderer":"auto","appname":"肝胆相照专家版","splashscreen":{"alwaysShowBeforeRender":true,"autoclose":true},"compilerVersion":"4.76","entryPagePath":"pages/loading/loading","entryPageQuery":"","realEntryPagePath":"","networkTimeout":{"request":60000,"connectSocket":60000,"uploadFile":60000,"downloadFile":60000},"fallbackLocale":"zh-Hans","locales":{"en":{"messageText":"Message","cantactsText":"Cantact","mineText":"Me"},"zh-Hans":{"messageText":"消息","cantactsText":"通讯录","mineText":"我的"}},"darkmode":false,"themeConfig":{}};
+  const __uniRoutes = [{"path":"pages/loading/loading","meta":{"isQuit":true,"isEntry":true,"bounce":"none","navigationBar":{"titleText":"","style":"custom","type":"default"},"isNVue":false}},{"path":"pages/index/index","meta":{"bounce":"none","navigationBar":{"titleText":"","style":"custom","type":"default"},"isNVue":false}},{"path":"pages/patientClass/patientClass","meta":{"bounce":"none","navigationBar":{"titleText":"uni-app分页","style":"custom","type":"default"},"isNVue":false}},{"path":"pages/live/live","meta":{"bounce":"none","navigationBar":{"titleText":"uni-app分页","style":"custom","type":"default"},"isNVue":false}},{"path":"pages/meeting/meeting","meta":{"bounce":"none","navigationBar":{"titleText":"直播","style":"custom","type":"default"},"isNVue":false}},{"path":"pages/education/education","meta":{"bounce":"none","navigationBar":{"titleText":"uni-app分页","style":"custom","type":"default"},"isNVue":false}},{"path":"pages/my/my","meta":{"bounce":"none","navigationBar":{"titleText":"uni-app分页","style":"custom","type":"default"},"isNVue":false}},{"path":"pages/univerify/univerify","meta":{"navigationBar":{"titleText":"","type":"default"},"isNVue":false}},{"path":"pages_app/webview/webview","meta":{"softinputMode":"adjustResize","bounce":"none","softinputmode":"adjustResize","navigationBar":{"titleText":"网页","style":"custom","type":"default"},"isNVue":false}},{"path":"pages_app/scanLogin/scanLogin","meta":{"bounce":"none","navigationBar":{"titleText":"会议历史搜索","style":"custom","type":"default"},"isNVue":false}},{"path":"pages_app/meetHistroySearch/meetHistroySearch","meta":{"bounce":"none","navigationBar":{"titleText":"会议历史搜索","style":"custom","type":"default"},"isNVue":false}},{"path":"pages_app/meetHistroy/meetHistroy","meta":{"bounce":"none","navigationBar":{"titleText":"会议历史","style":"custom","type":"default"},"isNVue":false}},{"path":"pages_app/replayList/replayList","meta":{"bounce":"none","navigationBar":{"titleText":"会议回放","style":"custom","type":"default"},"isNVue":false}},{"path":"pages_app/liveReplay/liveReplay","meta":{"bounce":"none","navigationBar":{"titleText":"uni-app分页","style":"custom","type":"default"},"isNVue":false}},{"path":"pages_app/videoDetail/videoDetail","meta":{"navigationBarRightButton":{"hide":true},"bounce":"none","navigationBar":{"titleText":"uni-app分页","style":"custom","type":"default"},"isNVue":false}},{"path":"pages_app/login/login","meta":{"navigationBarRightButton":{"hide":true},"bounce":"none","navigationBar":{"titleText":"uni-app分页","style":"custom","type":"default"},"isNVue":false}},{"path":"pages_app/smsLogin/smsLogin","meta":{"bounce":"none","navigationBar":{"titleText":"uni-app分页","style":"custom","type":"default"},"isNVue":false}},{"path":"pages_app/pwdLogin/pwdLogin","meta":{"bounce":"none","navigationBar":{"titleText":"uni-app分页","style":"custom","type":"default"},"isNVue":false}},{"path":"pages_app/replayText/replayText","meta":{"bounce":"none","navigationBar":{"titleText":"会议回放","style":"custom","type":"default"},"isNVue":false}}].map(uniRoute=>(uniRoute.meta.route=uniRoute.path,__uniConfig.pages.push(uniRoute.path),uniRoute.path='/'+uniRoute.path,uniRoute));
+  __uniConfig.styles=[];//styles
+  __uniConfig.onReady=function(callback){if(__uniConfig.ready){callback()}else{onReadyCallbacks.push(callback)}};Object.defineProperty(__uniConfig,"ready",{get:function(){return isReady},set:function(val){isReady=val;if(!isReady){return}const callbacks=onReadyCallbacks.slice(0);onReadyCallbacks.length=0;callbacks.forEach(function(callback){callback()})}});
+  __uniConfig.onServiceReady=function(callback){if(__uniConfig.serviceReady){callback()}else{onServiceReadyCallbacks.push(callback)}};Object.defineProperty(__uniConfig,"serviceReady",{get:function(){return isServiceReady},set:function(val){isServiceReady=val;if(!isServiceReady){return}const callbacks=onServiceReadyCallbacks.slice(0);onServiceReadyCallbacks.length=0;callbacks.forEach(function(callback){callback()})}});
+  service.register("uni-app-config",{create(a,b,c){if(!__uniConfig.viewport){var d=b.weex.config.env.scale,e=b.weex.config.env.deviceWidth,f=Math.ceil(e/d);Object.assign(__uniConfig,{viewport:f,defaultFontSize:16})}return{instance:{__uniConfig:__uniConfig,__uniRoutes:__uniRoutes,global:u,window:u,document:u,frames:u,self:u,location:u,navigator:u,localStorage:u,history:u,Caches:u,screen:u,alert:u,confirm:u,prompt:u,fetch:u,XMLHttpRequest:u,WebSocket:u,webkit:u,print:u}}}}); 
+  })();
+  

app/src/main/assets/apps/__UNI__89F511F_417/www/app-config.js

@@ -0,0 +1 @@
+(function(){})();

app/src/main/assets/apps/__UNI__89F511F_417/www/app-wxs.js

@@ -0,0 +1,6 @@
+var __wxsModules={};
+__wxsModules["7f9de7cc"]=(()=>{var v=(r,t)=>()=>(t||r((t={exports:{}}).exports,t),t.exports);var p=v((f,c)=>{function W(r,t){var l=r.detail,a=l.scrollWidth,o=l.scrollLeft,i=r.currentTarget.dataset,e=i.scrollWidth||i.scrollwidth||0,s=i.indicatorWidth||i.indicatorwidth||0,n=i.barWidth||i.barwidth||0,h=o/(a-e)*(s-n);d(t,h)}function _(r,t){t.callMethod("scrollEvent","right");var l=r.currentTarget.dataset,a=l.indicatorWidth||l.indicatorwidth||0,o=l.barWidth||l.barwidth||0;d(t,a-o)}function u(r,t){t.callMethod("scrollEvent","left"),d(t,0)}function d(r,t){r.selectComponent(".u-scroll-list__indicator__line__bar")&&r.selectComponent(".u-scroll-list__indicator__line__bar").setStyle({transform:"translateX("+t+"px)"})}c.exports={scroll:W,scrolltolower:_,scrolltoupper:u}});return p();})();
+
+__wxsModules["229ea0d2"]=(()=>{var c=(t,r)=>()=>(r||t((r={exports:{}}).exports,r),r.exports);var M=c((A,v)=>{function b(t,r){var s=t.instance,a=s.getState();if(!a.disabled){var e=t.touches;e&&e.length>1||(a.moving=!0,a.startX=e[0].pageX,a.startY=e[0].pageY,r.callMethod("closeOther"))}}function m(t,r){var s=t.instance,a=s.getState();if(!(a.disabled||!a.moving)){var e=t.touches,i=e[0].pageX,n=e[0].pageY,o=i-a.startX,u=n-a.startY,f=a.buttonsWidth;(Math.abs(o)>Math.abs(u)||Math.abs(o)>a.threshold)&&(t.preventDefault&&t.preventDefault(),t.stopPropagation&&t.stopPropagation()),!(Math.abs(o)<Math.abs(u))&&(a.status==="open"?(o<0&&(o=0),o>f&&(o=f),g(-f+o,s,r)):(o>0&&(o=0),Math.abs(o)>f&&(o=-f),g(o,s,r)))}}function S(t,r){var s=t.instance,a=s.getState();if(!(!a.moving||a.disabled)){var e=t.changedTouches?t.changedTouches[0]:{},i=e.pageX,n=e.pageY,o=i-a.startX;if(a.status==="open"){if(o<0)return;if(o===0)return h(s,r);Math.abs(o)<a.threshold?l(s,r):h(s,r)}else{if(o>0)return;Math.abs(o)<a.threshold?h(s,r):l(s,r)}}}function p(t){return t.toString().indexOf("s")>=0?t:t>30?t+"ms":t+"s"}function g(t,r,s){var a=r.getState(),e=s.selectAllComponents(".u-swipe-action-item__right__button");r.requestAnimationFrame(function(){r.setStyle({transition:"none",transform:"translateX("+t+"px)","-webkit-transform":"translateX("+t+"px)"})})}function l(t,r){var s=t.getState(),a=r.selectAllComponents(".u-swipe-action-item__right__button"),e=p(s.duration),i=-s.buttonsWidth;t.requestAnimationFrame(function(){t.setStyle({transition:"transform "+e,transform:"translateX("+i+"px)","-webkit-transform":"translateX("+i+"px)"})}),d("open",t,r)}function d(t,r,s){var a=r.getState();a.status=t,s.callMethod("setState",t)}function h(t,r){var s=t.getState(),a=r.selectAllComponents(".u-swipe-action-item__right__button"),e=a.length,i=p(s.duration);t.requestAnimationFrame(function(){t.setStyle({transition:"transform "+i,transform:"translateX(0px)","-webkit-transform":"translateX(0px)"});for(var n=e-1;n>=0;n--)a[n].setStyle({transition:"transform "+i,transform:"translateX(0px)","-webkit-transform":"translateX(0px)"})}),d("close",t,r)}function X(t,r,s,a){var e=a.getState();e.disabled||(t==="close"&&e.status==="open"?h(a,s):t==="open"&&e.status==="close"&&l(a,s))}function _(t,r,s,a){var e=a.getState();if(!(!e||!t)){if(e.disabled=t.disabled,e.duration=t.duration,e.show=t.show,e.threshold=t.threshold,e.buttons=t.buttons,e.buttons)for(var i=e.buttons.length,n=0,o=t.buttons,u=0;u<i;u++)n+=o[u].width;e.buttonsWidth=n,e.show&&l(a,s)}}v.exports={touchstart:b,touchmove:m,touchend:S,sizeChange:_,statusChange:X}});return M();})();
+
+__wxsModules["6006ff9a"]=(()=>{var u=(r,e)=>()=>(e||r((e={exports:{}}).exports,e),e.exports);var i=u((l,t)=>{var n={abbr:!0,b:!0,big:!0,code:!0,del:!0,em:!0,i:!0,ins:!0,label:!0,q:!0,small:!0,span:!0,strong:!0,sub:!0,sup:!0};t.exports={isInline:function(r,e){return n[r]||(e||"").indexOf("display:inline")!==-1}}});return i();})();

app/src/main/assets/apps/__UNI__89F511F_417/www/manifest.json

@@ -0,0 +1 @@
+{"@platforms":["android","iPhone","iPad"],"id":"__UNI__89F511F","name":"肝胆相照专家版","version":{"name":"4.1.5","code":100},"description":"","developer":{"name":"","email":"","url":""},"permissions":{"Share":{},"Webview-x5":{},"UIWebview":{},"VideoPlayer":{},"OAuth":{},"Barcode":{},"Camera":{},"UniNView":{"description":"UniNView原生渲染"}},"plus":{"useragent":{"value":"uni-app gdxz","concatenate":true},"splashscreen":{"target":"id:1","autoclose":true,"waiting":true,"delay":0},"popGesture":"close","launchwebview":{"render":"always","id":"1","kernel":"WKWebview"},"runmode":"liberate","usingComponents":true,"nvueCompiler":"uni-app","nvueStyleCompiler":"uni-app","compatible":{"ignoreVersion":true},"nativePlugins":{"NIMUniPlugin":{"PUSH_VIVO_APPID":"100034326","PUSH_VIVO_APPKEY":"e789634c1f76c8f184b1def1101ce824","PUSH_HONOR_APPID":"900782424","__plugin_info__":{"name":"NIMUniPlugin","description":"uni消息推送插件","platforms":"Android,iOS","url":"","android_package_name":"","ios_bundle_id":"","isCloud":false,"bought":-1,"pid":"","parameters":{"PUSH_VIVO_APPID":{"des":"厂商VIVO-app_id","key":"com.vivo.push.app_id","value":""},"PUSH_VIVO_APPKEY":{"des":"厂商VIVO-app_key","key":"com.vivo.push.api_key","value":""},"PUSH_HONOR_APPID":{"des":"厂商HONOR-app_id","key":"com.hihonor.push.app_id","value":""}}}}},"statusbar":{"immersed":"supportedDevice","style":"dark","background":"#F8F8F8"},"uniStatistics":{"version":"2"},"allowsInlineMediaPlayback":true,"uni-app":{"control":"uni-v3","vueVersion":"3","compilerVersion":"4.76","nvueCompiler":"uni-app","renderer":"auto","nvue":{"flex-direction":"column"},"nvueLaunchMode":"normal","webView":{"minUserAgentVersion":"49.0"}}},"app-harmony":{"useragent":{"value":"uni-app","concatenate":true},"uniStatistics":{"version":"2"}},"locale":"zh-Hans","screenOrientation":["portrait-primary","portrait-secondary"],"launch_path":"__uniappview.html","fallbackLocale":"zh-Hans"}