经由file provider分享

Classes/gframe/menu_handler.cpp

@@ -278,16 +278,16 @@ bool MenuHandler::OnEvent(const irr::SEvent& event) {
 					if(sel == -1)
 						break;
 					mainGame->gMutex.lock();
-                    wchar_t textBuffer[256];
                     char name[1024];
-                    char* fname= name;
-					myswprintf(textBuffer, L"%ls", mainGame->lstReplayList->getListItem(sel));
-                    BufferIO::EncodeUTF8(textBuffer,fname);
-                    __android_log_print(ANDROID_LOG_DEBUG, "ygo", "share replay file=%s", fname);
-					android::OnShareFile(mainGame->appMain, fname, "yrp");
+					BufferIO::EncodeUTF8(mainGame->lstReplayList->getListItem(sel), name);
 					mainGame->gMutex.unlock();
 					prev_operation = id;
 					prev_sel = sel;
+#ifdef _IRR_ANDROID_PLATFORM_
+					__android_log_print(ANDROID_LOG_DEBUG, "ygo", "1share replay file=%s", name);
+					android::OnShareFile(mainGame->appMain, "yrp", name);
+					__android_log_print(ANDROID_LOG_DEBUG, "ygo", "2after share replay file:index=%d", sel);
+#endif
 					break;
 				}
 			case BUTTON_RENAME_REPLAY: {

libcore/android/android_tools.cpp

@@ -23,17 +23,17 @@ InitOptions::InitOptions(void*data) :
 		char* rawdata = (char*)data;
 		int tmplength = 0;
 		m_opengles_version = BufferIO::ReadInt32(rawdata);
-		
+
 		m_card_quality = BufferIO::ReadInt32(rawdata);
 		m_font_aa_enabled = BufferIO::ReadInt32(rawdata) > 0;
 		m_ps_enabled = BufferIO::ReadInt32(rawdata) > 0;
-		
+
 		//cache dir
 		ReadString(m_work_dir, rawdata);
 		//cdbs
 		cdb_count = BufferIO::ReadInt32(rawdata);
 		m_db_files = new io::path[cdb_count];
-		
+
 		for(int i = 0;i < cdb_count; i++){
 			io::path tmp_path;
 			ReadString(tmp_path, rawdata);
@@ -64,7 +64,7 @@ irr::io::path getExternalStorageDir(ANDROID_APP app) {
 		return ret;
 
 	JNIEnv* jni = nullptr;
-	app->activity->vm->AttachCurrentThread(&jni, NULL);
+	app->activity->vm->AttachCurrentThread(&jni, nullptr);
 	if (!jni)
 		return ret;
 	jclass classEnvironment = jni->FindClass("android/os/Environment");
@@ -807,22 +807,28 @@ int getLocalAddr(ANDROID_APP app) {
 	return addr;
 }
 
-void OnShareFile(ANDROID_APP app, char* title, char* ext){
-	if (!app || !app->activity || !app->activity->vm)
-		return;
-	JNIEnv* jni = nullptr;
-	app->activity->vm->AttachCurrentThread(&jni, nullptr);
-	jobject lNativeActivity = app->activity->clazz;
-	jclass ClassNativeActivity = jni->GetObjectClass(lNativeActivity);
-	jmethodID MethodGetAddr = jni->GetMethodID(ClassNativeActivity,
-			"shareFile", "(Ljava/lang/String;Ljava/lang/String;)V");
-	jstring s_title = jni->NewStringUTF(title);
-	jstring s_ext = jni->NewStringUTF(ext);
-	jni->CallVoidMethod(lNativeActivity, MethodGetAddr, s_title, s_ext);
-	jni->ReleaseStringUTFChars(s_title, title);
-	jni->ReleaseStringUTFChars(s_ext, ext);
-	jni->DeleteLocalRef(ClassNativeActivity);
-	app->activity->vm->DetachCurrentThread();
+void OnShareFile(ANDROID_APP app, const char* title, const char* ext){
+    if (!app || !app->activity || !app->activity->vm)
+        return;
+    JNIEnv* jni = nullptr;
+   	app->activity->vm->AttachCurrentThread(&jni, nullptr);
+  	if (!jni)
+  	    return;
+   	jobject lNativeActivity = app->activity->clazz;
+   	jclass ClassNativeActivity = jni->GetObjectClass(lNativeActivity);
+   	jmethodID methodId = jni->GetMethodID(ClassNativeActivity, "shareFile", "(Ljava/lang/String;Ljava/lang/String;)V");
+   	jstring s_title = jni->NewStringUTF(title);
+   	jstring s_ext = jni->NewStringUTF(ext);
+   	jni->CallVoidMethod(lNativeActivity, methodId, s_title, s_ext);
+   	if (s_title) {
+   	    //不需要用ReleaseStringUTFChars，因为是c变量，函数外面自己释放
+   	    jni->DeleteLocalRef(s_title);
+   	}
+   	if (s_ext) {
+   	    jni->DeleteLocalRef(s_ext);
+   	}
+   	jni->DeleteLocalRef(ClassNativeActivity);
+   	app->activity->vm->DetachCurrentThread();
 }
 
 void showAndroidComboBoxCompat(ANDROID_APP app, bool pShow, char** pContents,

libcore/android/android_tools.h

@@ -98,7 +98,7 @@ extern float getScreenWidth(ANDROID_APP app);
 
 extern float getScreenHeight(ANDROID_APP app);
 
-extern void OnShareFile(ANDROID_APP app, char* title, char* ext);
+extern void OnShareFile(ANDROID_APP app, const char* title, const char* ext);
 
 // Get SDCard path.
 extern irr::io::path getExternalStorageDir(ANDROID_APP app);

mobile/src/main/AndroidManifest.xml

@@ -13,8 +13,8 @@
         android:supportsRtl="false"
         android:theme="@style/AppTheme"
         android:usesCleartextTraffic="true"
+        android:extractNativeLibs="true"
         android:requestLegacyExternalStorage="true"
-
         tools:replace="android:allowBackup,android:supportsRtl"
         tools:targetApi="m">
         <activity
@@ -97,15 +97,6 @@
                 <data android:pathPattern=".*\..*\..*\..*\..*\..*\..*\.yrp" />
                 <data android:pathPattern=".*\..*\..*\..*\..*\..*\..*\..*\.yrp" />
                 <data android:pathPattern=".*\..*\..*\..*\..*\..*\..*\..*\..*\.yrp" />
-                <data android:pathPattern=".*\.lua" />
-                <data android:pathPattern=".*\..*\.lua" />
-                <data android:pathPattern=".*\..*\..*\.lua" />
-                <data android:pathPattern=".*\..*\..*\..*\.lua" />
-                <data android:pathPattern=".*\..*\..*\..*\..*\.lua" />
-                <data android:pathPattern=".*\..*\..*\..*\..*\..*\.lua" />
-                <data android:pathPattern=".*\..*\..*\..*\..*\..*\..*\.lua" />
-                <data android:pathPattern=".*\..*\..*\..*\..*\..*\..*\..*\.lua" />
-                <data android:pathPattern=".*\..*\..*\..*\..*\..*\..*\..*\..*\.lua" />
             </intent-filter>
 
             <intent-filter>
@@ -116,7 +107,7 @@
             android:name="cn.garymb.ygomobile.ui.activities.ShareFileActivity"
             android:configChanges="orientation|keyboardHidden|navigation|screenSize"
             android:launchMode="singleTop"
-            android:theme="@style/AppTheme"
+            android:theme="@style/TranslucentTheme"
             android:windowSoftInputMode="stateAlwaysHidden|adjustResize">
             <intent-filter>
                 <action android:name="cn.garymb.ygomobile.game.shared.file" />
@@ -192,7 +183,7 @@
             android:windowSoftInputMode="stateHidden|adjustResize" />
         <activity android:name="cn.garymb.ygomobile.ui.mycard.mcchat.SplashActivity" />
         <activity android:name="cn.garymb.ygomobile.ui.activities.FileLogActivity" />
-        <activity 
+        <activity
             android:name="cn.garymb.ygomobile.ui.activities.PermissionsActivity"
             android:theme="@style/TranslucentTheme"/>
         <activity
@@ -222,7 +213,15 @@
                 android:name="android.support.FILE_PROVIDER_PATHS"
                 android:resource="@xml/provider_paths" />
         </provider>
-
+        <provider
+            android:name="androidx.core.content.FileProvider"
+            android:authorities="${applicationId}.fileprovider"
+            android:exported="false"
+            android:grantUriPermissions="true">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/file_paths" />
+        </provider>
     </application>
 
     <uses-permission android:name="android.permission.INTERNET" />

mobile/src/main/java/cn/garymb/ygomobile/ui/activities/ShareFileActivity.java

 package cn.garymb.ygomobile.ui.activities;
 
+import android.app.Activity;
 import android.content.Intent;
-import android.graphics.Color;
-import android.net.Uri;
+import android.os.Build;
 import android.os.Bundle;
+import android.util.Log;
+import android.view.View;
 import android.widget.Toast;
 
 import androidx.annotation.Nullable;
@@ -16,14 +18,15 @@ import cn.garymb.ygomobile.Constants;
 import cn.garymb.ygomobile.core.IrrlichtBridge;
 import cn.garymb.ygomobile.lite.BuildConfig;
 import cn.garymb.ygomobile.lite.R;
+import cn.garymb.ygomobile.utils.FileUtils;
 
-public class ShareFileActivity extends BaseActivity{
+public class ShareFileActivity extends Activity {
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         //TODO setContentView
-        setContentView(R.layout.combobox_compat_layout);
         doIntent(getIntent());
+        hideBottomUIMenu();
     }
 
     @Override
@@ -31,21 +34,39 @@ public class ShareFileActivity extends BaseActivity{
         super.onNewIntent(intent);
     }
 
-    private void doIntent(Intent intent){
-        String title = intent.getStringExtra(IrrlichtBridge.EXTRA_SHARE_TYPE);
-        String ext = intent.getStringExtra(IrrlichtBridge.EXTRA_SHARE_FILE);
+    private void doIntent(Intent intent) {
+        String title = intent.getStringExtra(IrrlichtBridge.EXTRA_SHARE_FILE);
+        String ext = intent.getStringExtra(IrrlichtBridge.EXTRA_SHARE_TYPE);
         //TODO
-        Toast.makeText(this, title+"."+ext, Toast.LENGTH_LONG).show();
-        String shareFile = null;
+        Toast.makeText(this, "title=" + title + ",ext=" + ext, Toast.LENGTH_SHORT).show();
+        String sharePath = "";
         if (ext.equals("yrp")) {
-            shareFile = AppsSettings.get().getResourcePath() + "/" + Constants.CORE_REPLAY_PATH + "/" + title;
+            sharePath = AppsSettings.get().getResourcePath() + "/" + Constants.CORE_REPLAY_PATH + "/" + title;
         } else if (ext.equals("lua")) {
-            shareFile = AppsSettings.get().getResourcePath()+ "/" + Constants.CORE_SINGLE_PATH + "/" + title;
+            sharePath = AppsSettings.get().getResourcePath()+ "/" + Constants.CORE_SINGLE_PATH + "/" + title;
         }
+        File shareFile = new File(sharePath);
         Intent shareIntent = new Intent(Intent.ACTION_SEND);
-        shareIntent.putExtra(Intent.EXTRA_STREAM, FileProvider.getUriForFile(this, BuildConfig.APPLICATION_ID + ".fileprovider", new File(shareFile)));
+        shareIntent.putExtra(Intent.EXTRA_STREAM, FileUtils.toUri(this, shareFile));
         shareIntent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
+        shareIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         shareIntent.setType("*/*");//此处可发送多种文件
-        startActivity(Intent.createChooser(shareIntent, "分享到"));
+        startActivity(Intent.createChooser(shareIntent, getString(R.string.send)));
+        finish();
+    }
+
+    protected void hideBottomUIMenu() {
+        //隐藏虚拟按键，并且全屏
+        if (Build.VERSION.SDK_INT > 11 && Build.VERSION.SDK_INT < 19) { // lower api
+            View v = this.getWindow().getDecorView();
+            v.setSystemUiVisibility(View.GONE);
+        } else if (Build.VERSION.SDK_INT >= 19) {
+            //for new api versions.
+            View decorView = getWindow().getDecorView();
+            int uiOptions = View.SYSTEM_UI_FLAG_FULLSCREEN;
+//            View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
+//                    | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY | View.SYSTEM_UI_FLAG_FULLSCREEN;
+            decorView.setSystemUiVisibility(uiOptions);
+        }
     }
 }
\ No newline at end of file

mobile/src/main/java/cn/garymb/ygomobile/utils/FileUtils.java

 package cn.garymb.ygomobile.utils;
 
+import android.content.Context;
+import android.net.Uri;
 import android.util.Log;
 
+import androidx.core.content.FileProvider;
+
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileInputStream;
@@ -17,6 +21,10 @@ import java.util.List;
 
 public class FileUtils {
 
+    public static Uri toUri(Context context, File file) {
+        return FileProvider.getUriForFile(context, context.getPackageName() + ".fileprovider", file);
+    }
+
     public static boolean deleteFile(File file) {
         if (file.isFile()) {
             try {

mobile/src/main/res/xml/file_paths.xml

+<?xml version="1.0" encoding="utf-8"?>
+<paths xmlns:android="http://schemas.android.com/apk/res/android">
+    <root-path name="root" path="." />
+    <files-path name="files" path="." />
+    <cache-path name="cache" path="." />
+    <external-path name="external" path="." />
+    <!--/storage/emulated/0/Android/data/${applicationId}/files/ygocore-->
+    <external-files-path name="game_path" path="ygocore"/>
+</paths>
\ No newline at end of file