[Android]fix arcore problem, jira: MS-198734

Author: xgfd3

Android/APIExample/app/src/main/java/io/agora/api/example/ExampleActivity.java

@@ -10,6 +10,9 @@
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.fragment.app.Fragment;
 
+import com.yanzhenjie.permission.AndPermission;
+import com.yanzhenjie.permission.runtime.Permission;
+
 import io.agora.api.component.Constant;
 import io.agora.api.example.common.model.ExampleBean;
 import io.agora.api.example.examples.advanced.ARCore;
@@ -70,7 +73,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
             actionBar.setDisplayHomeAsUpEnabled(true);
         }
 
-        Fragment fragment;
+        Fragment fragment = null;
         switch (exampleBean.getActionId()) {
             case R.id.action_mainFragment_to_joinChannelAudio:
                 fragment = new JoinChannelAudio();
@@ -145,7 +148,15 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
                 fragment = new LiveStreaming();
                 break;
             case R.id.action_mainFragment_arcore:
-                fragment = new ARCore();
+                AndPermission.with(this).runtime().permission(
+                        Permission.Group.STORAGE,
+                        Permission.Group.CAMERA,
+                        Permission.Group.MICROPHONE
+                ).onGranted(data -> {
+                    getSupportFragmentManager().beginTransaction()
+                            .replace(R.id.fragment_Layout, new ARCore())
+                            .commit();
+                }).onDenied(data -> finish()).start();
                 break;
             case R.id.action_mainFragment_senddatastream:
                 fragment = new SendDataStream();
@@ -166,9 +177,11 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
                 fragment = new JoinChannelAudio();
                 break;
         }
-        getSupportFragmentManager().beginTransaction()
-                .replace(R.id.fragment_Layout, fragment)
-                .commit();
+        if(fragment != null){
+            getSupportFragmentManager().beginTransaction()
+                    .replace(R.id.fragment_Layout, fragment)
+                    .commit();
+        }
     }
 
     @Override

Android/APIExample/app/src/main/java/io/agora/api/example/examples/advanced/ARCore.java

@@ -1,5 +1,8 @@
 package io.agora.api.example.examples.advanced;
 
+import static io.agora.api.example.common.model.Examples.ADVANCED;
+import static io.agora.rtc.video.VideoEncoderConfiguration.STANDARD_BITRATE;
+
 import android.annotation.TargetApi;
 import android.content.Context;
 import android.graphics.Bitmap;
@@ -15,12 +18,10 @@
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.PixelCopy;
-import android.view.SurfaceView;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.EditText;
-import android.widget.FrameLayout;
 import android.widget.Toast;
 
 import androidx.annotation.NonNull;
@@ -35,7 +36,6 @@
 import com.google.ar.core.HitResult;
 import com.google.ar.core.Plane;
 import com.google.ar.core.Point;
-import com.google.ar.core.PointCloud;
 import com.google.ar.core.Session;
 import com.google.ar.core.Trackable;
 import com.google.ar.core.TrackingState;
@@ -44,8 +44,6 @@
 import com.google.ar.core.exceptions.UnavailableArcoreNotInstalledException;
 import com.google.ar.core.exceptions.UnavailableSdkTooOldException;
 import com.google.ar.core.exceptions.UnavailableUserDeclinedInstallationException;
-import com.yanzhenjie.permission.AndPermission;
-import com.yanzhenjie.permission.runtime.Permission;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
@@ -74,13 +72,8 @@
 import io.agora.rtc.RtcEngine;
 import io.agora.rtc.mediaio.MediaIO;
 import io.agora.rtc.models.ChannelMediaOptions;
-import io.agora.rtc.video.VideoCanvas;
 import io.agora.rtc.video.VideoEncoderConfiguration;
 
-import static io.agora.api.example.common.model.Examples.ADVANCED;
-import static io.agora.rtc.video.VideoCanvas.RENDER_MODE_HIDDEN;
-import static io.agora.rtc.video.VideoEncoderConfiguration.STANDARD_BITRATE;
-
 /**This demo demonstrates how to make a one-to-one video call*/
 @Example(
         index = 24,
@@ -166,7 +159,6 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
         join = view.findViewById(R.id.btn_join);
         et_channel = view.findViewById(R.id.et_channel);
         et_channel.setText("arcoreDemo");
-        joinChannel("arcoreDemo");
         view.findViewById(R.id.btn_join).setOnClickListener(this);
         mSurfaceView = view.findViewById(R.id.fl_local);
         mDisplayRotationHelper = new DisplayRotationHelper(getContext());
@@ -216,6 +208,10 @@ public void onDestroy()
     {
         super.onDestroy();
         /**leaveChannel and Destroy the RtcEngine instance*/
+        if(mSession != null){
+            mSession.close();
+            mSession = null;
+        }
         if(engine != null)
         {
             engine.leaveChannel();
@@ -228,7 +224,10 @@ public void onDestroy()
             //mRtcEngine.setRemoteVideoRenderer(render.getPeer().uid, null);
         }
         mRemoteRenders.clear();
-        mSenderHandler.getLooper().quit();
+        if(mSenderHandler != null){
+            mSenderHandler.getLooper().quit();
+            mSenderHandler = null;
+        }
     }
 
     @Override
@@ -242,21 +241,7 @@ public void onClick(View v)
                 // call when join button hit
                 String channelId = et_channel.getText().toString();
                 // Check permission
-                if (AndPermission.hasPermissions(this, Permission.Group.STORAGE, Permission.Group.MICROPHONE, Permission.Group.CAMERA))
-                {
-                    joinChannel(channelId);
-                    return;
-                }
-                // Request permission
-                AndPermission.with(this).runtime().permission(
-                        Permission.Group.STORAGE,
-                        Permission.Group.MICROPHONE,
-                        Permission.Group.CAMERA
-                ).onGranted(permissions ->
-                {
-                    // Permissions Granted
-                    joinChannel(channelId);
-                }).start();
+                joinChannel(channelId);
             }
             else
             {
@@ -280,6 +265,10 @@ public void onClick(View v)
                  *          triggers the removeInjectStreamUrl method.*/
                 engine.leaveChannel();
                 join.setText(getString(R.string.join));
+                if (mSenderHandler != null) {
+                    mSenderHandler.getLooper().quit();
+                    mSenderHandler = null;
+                }
             }
         }
     }
@@ -584,14 +573,17 @@ public void onResume() {
 
     @RequiresApi(api = Build.VERSION_CODES.N)
     private void sendARViewMessage() {
+        if (mSenderHandler == null) {
+            return;
+        }
         final Bitmap outBitmap = Bitmap.createBitmap(mSurfaceView.getWidth(), mSurfaceView.getHeight(), Bitmap.Config.ARGB_8888);
         PixelCopy.request(mSurfaceView, outBitmap, new PixelCopy.OnPixelCopyFinishedListener() {
             @Override
             public void onPixelCopyFinished(int copyResult) {
                 if (copyResult == PixelCopy.SUCCESS) {
                     sendARView(outBitmap);
                 } else {
-                    Toast.makeText(getContext(), "Pixel Copy Failed", Toast.LENGTH_SHORT);
+                    handler.post(() -> Toast.makeText(getContext(), "Pixel Copy Failed", Toast.LENGTH_SHORT).show());
                 }
             }
         }, mSenderHandler);