Merge branch 'master' of http://10.108.64.190:3000/gfg/client

AndroidLibrary/app/build.gradle

@@ -6,7 +6,7 @@ android {
 
     defaultConfig {
         applicationId "com.example.myapplication"
-        minSdkVersion 19
+        minSdkVersion 23
         targetSdkVersion 26
         versionCode 1
         versionName "1.0"

AndroidLibrary/gfglibrary/build.gradle

@@ -5,7 +5,7 @@ android {
     buildToolsVersion "30.0.3"
 
     defaultConfig {
-        minSdkVersion 21
+        minSdkVersion 23
         targetSdkVersion 26
         versionCode 1
         versionName "1.0"

GameClient/Assets/Game/HotUpdate/Data/PhotographUtil.cs

@@ -328,8 +328,8 @@ namespace GFGGame
         private void UpdateSystemPhoto(string filePath)
         {
 #if UNITY_ANDROID
-            AndroidJavaObject androidJavaObject = new AndroidJavaObject("com.gfg.gfglibrary.SaveImage"); //设置成我们aar库中的签名+类名
-            androidJavaObject.Call("scanFile", filePath, "已保存至本地"); //这里我们可以设置保存成功弹窗内容
+            var SaveImageJavaClass = new AndroidJavaClass("com.gfg.gfglibrary.SaveImage"); //设置成我们aar库中的签名+类名
+            SaveImageJavaClass.CallStatic("scanFile", filePath, "已保存至本地"); //这里我们可以设置保存成功弹窗内容
 #endif
         }
 

GameClient/Assets/Plugins/Android/AndroidManifest.xml

@@ -5,25 +5,6 @@
     package="com.unity3d.player"
     xmlns:tools="http://schemas.android.com/tools"
 	android:installLocation="preferExternal">
-	<!-- 权限组：STORAGE == 读取存储相关的权限申请 -->
-	<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <supports-screens
-        android:smallScreens="true"
-        android:normalScreens="true"
-        android:largeScreens="true"
-        android:xlargeScreens="true"
-        android:anyDensity="true"/>
-    <application
-		android:icon="@drawable/ic_launcher"
-		android:label="万世镜内网">
-        <activity
-			android:name="com.taptap.sdk.TapTapActivity"
-			android:configChanges="keyboard|keyboardHidden|screenLayout|screenSize|orientation"
-			android:exported="false"
-			android:theme="@android:style/Theme.Translucent.NoTitleBar.Fullscreen" />
-    </application>
-
     <!--bugly配置权限start-->
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
     <uses-permission android:name="android.permission.INTERNET" />
@@ -31,4 +12,23 @@
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.READ_LOGS" />
     <!--bugly配置权限end-->
+	<!-- 权限组：STORAGE == 读取存储相关的权限申请 -->
+	<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <application
+        android:allowBackup="true"
+		android:icon="@mipmap/ic_launcher"
+		android:label="万世镜内网">
+		<activity android:name="com.unity3d.player.UnityPlayerActivity"
+            android:configChanges="mnc|keyboardHidden|screenSize|orientation|keyboard"
+            android:screenOrientation="portrait"
+            android:theme="@android:style/Theme.Black.NoTitleBar.Fullscreen"
+            android:label="@string/app_name">
+			<intent-filter>
+				<action android:name="android.intent.action.MAIN" />
+				<category android:name="android.intent.category.LAUNCHER" />
+			</intent-filter>
+		</activity>
+    </application>
+
 </manifest>

GameClient/ProjectSettings/ProjectSettings.asset

@@ -173,7 +173,7 @@ PlayerSettings:
   overrideDefaultApplicationIdentifier: 1
   AndroidBundleVersionCode: 1
   AndroidMinSdkVersion: 23
-  AndroidTargetSdkVersion: 0
+  AndroidTargetSdkVersion: 26
   AndroidPreferredInstallLocation: 1
   aotOptions: 
   stripEngineCode: 1