修复卡组上传非ydk识别的问题

修复mc登录成功后头像刷新的问题

mobile/src/main/java/cn/garymb/ygomobile/bean/events/DeckFile.java

 package cn.garymb.ygomobile.bean.events;
 
-import androidx.annotation.Nullable;
-
 import java.io.File;
 
 import cn.garymb.ygomobile.bean.TextSelect;
@@ -13,16 +11,18 @@ public class DeckFile extends TextSelect {
 
     public DeckFile(String path) {
         this.path = path;
-        name=new File(path).getName();
-        name=name.substring(0,name.lastIndexOf("."));
+        name = new File(path).getName();
+        int end = name.lastIndexOf(".");
+        if (end != -1)
+            name = name.substring(0, end);
         super.setName(name);
         setObject(this);
     }
 
     public DeckFile(File file) {
-        path=file.getAbsolutePath();
-        name=file.getName();
-        name=name.substring(0,name.lastIndexOf("."));
+        path = file.getAbsolutePath();
+        name = file.getName();
+        name = name.substring(0, name.lastIndexOf("."));
         super.setName(name);
         setObject(this);
     }

mobile/src/main/java/cn/garymb/ygomobile/ui/mycard/MyCardActivity.java

 package cn.garymb.ygomobile.ui.mycard;
 
+import android.annotation.SuppressLint;
 import android.annotation.TargetApi;
 import android.app.Activity;
 import android.content.ClipData;
@@ -7,6 +8,8 @@ import android.content.Intent;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
+import android.os.Handler;
+import android.os.Message;
 import android.text.TextUtils;
 import android.view.Gravity;
 import android.view.MenuItem;
@@ -40,12 +43,30 @@ import cn.garymb.ygomobile.ui.mycard.mcchat.SplashActivity;
 public class MyCardActivity extends BaseActivity implements MyCard.MyCardListener, NavigationView.OnNavigationItemSelectedListener {
 
     private static final int FILECHOOSER_RESULTCODE = 10;
+    private static final int TYPE_MC_LOGIN = 0;
+
     protected DrawerLayout mDrawerlayout;
     private MyCardWebView mWebViewPlus;
     private MyCard mMyCard;
     private ImageView mHeadView;
     private TextView mNameView, mStatusView;
-
+    @SuppressLint("HandlerLeak")
+    Handler handler = new Handler() {
+        @Override
+        public void handleMessage(Message msg) {
+            super.handleMessage(msg);
+            switch (msg.what) {
+                case TYPE_MC_LOGIN:
+                    String[] ss = (String[]) msg.obj;
+                    if (!TextUtils.isEmpty(ss[0])) {
+                        Glide.with(MyCardActivity.this).load(Uri.parse(ss[0])).into(mHeadView);
+                    }
+                    mNameView.setText(ss[1]);
+                    mStatusView.setText(ss[2]);
+                    break;
+            }
+        }
+    };
     private ProgressBar mProgressBar;
     private ValueCallback<Uri> uploadMessage;
     private ValueCallback<Uri[]> mUploadCallbackAboveL;
@@ -71,9 +92,9 @@ public class MyCardActivity extends BaseActivity implements MyCard.MyCardListene
         NavigationView navigationView = $(R.id.nav_main);
         navigationView.setNavigationItemSelectedListener(this);
         View navHead = navigationView.getHeaderView(0);
-        mHeadView = (ImageView) navHead.findViewById(R.id.img_head);
-        mNameView = (TextView) navHead.findViewById(R.id.tv_name);
-        mStatusView = (TextView) navHead.findViewById(R.id.tv_dp);
+        mHeadView = navHead.findViewById(R.id.img_head);
+        mNameView = navHead.findViewById(R.id.tv_name);
+        mStatusView = navHead.findViewById(R.id.tv_dp);
         //mWebViewPlus.enableHtml5();
 
         WebSettings settings = mWebViewPlus.getSettings();
@@ -197,6 +218,22 @@ public class MyCardActivity extends BaseActivity implements MyCard.MyCardListene
         }
     }
 
+
+    /*@Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        if (mWebViewPlus != null) {
+            mWebViewPlus.onActivityResult(requestCode, resultCode, data);
+        }
+    }
+
+    @Override
+    protected void onNewIntent(Intent intent) {
+        super.onNewIntent(intent);
+        if (mWebViewPlus != null) {
+            mWebViewPlus.onNewIntent(intent);
+        }
+    }*/
+
     @TargetApi(Build.VERSION_CODES.LOLLIPOP)
     private void onActivityResultAboveL(int requestCode, int resultCode, Intent data) {
         if (requestCode != FILECHOOSER_RESULTCODE
@@ -205,8 +242,7 @@ public class MyCardActivity extends BaseActivity implements MyCard.MyCardListene
         }
         Uri[] results = null;
         if (resultCode == Activity.RESULT_OK) {
-            if (data == null) {
-            } else {
+            if (data != null) {
                 String dataString = data.getDataString();
                 ClipData clipData = data.getClipData();
                 if (clipData != null) {
@@ -222,25 +258,8 @@ public class MyCardActivity extends BaseActivity implements MyCard.MyCardListene
         }
         mUploadCallbackAboveL.onReceiveValue(results);
         mUploadCallbackAboveL = null;
-        return;
     }
 
-
-    /*@Override
-    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-        if (mWebViewPlus != null) {
-            mWebViewPlus.onActivityResult(requestCode, resultCode, data);
-        }
-    }
-
-    @Override
-    protected void onNewIntent(Intent intent) {
-        super.onNewIntent(intent);
-        if (mWebViewPlus != null) {
-            mWebViewPlus.onNewIntent(intent);
-        }
-    }*/
-
     @Override
     public void onBackPressed() {
         onBackHome();
@@ -302,11 +321,10 @@ public class MyCardActivity extends BaseActivity implements MyCard.MyCardListene
     @Override
     public void onLogin(String name, String icon, String statu) {
 
-        if (!TextUtils.isEmpty(icon)) {
-            Glide.with(this).load(Uri.parse(icon)).into(mHeadView);
-        }
-        mNameView.setText(name);
-        mStatusView.setText(statu);
+        Message message = new Message();
+        message.obj = new String[]{name, icon, statu};
+        message.what = TYPE_MC_LOGIN;
+        handler.sendMessage(message);
     }
 
     @Override
@@ -356,13 +374,6 @@ public class MyCardActivity extends BaseActivity implements MyCard.MyCardListene
 
     @Override
     public boolean onNavigationItemSelected(@NonNull MenuItem item) {
-        if (doMenu(item.getItemId())) {
-            return true;
-        }
-        return false;
-    }
-
-    public void ProgressBar() {
-
+        return doMenu(item.getItemId());
     }
 }