整理

mobile/build.gradle

@@ -8,8 +8,8 @@ android {
         applicationId "cn.garymb.ygomobile"
         minSdkVersion 16
         targetSdkVersion 22
-        versionCode 33030723
-        versionName "3.3.3"
+        versionCode 33030810
+        versionName "3.3.4"
         flavorDimensions "versionCode"
         vectorDrawables.useSupportLibrary = true
         ndk {
@@ -23,12 +23,12 @@ android {
     productFlavors {
         en {
             applicationId "cn.garymb.ygomobile.EN"
-            versionName "EN3.3.3"
+            versionName "EN3.3.4"
             //assets.srcDirs = ['assets_en']
         }
         ko {
             applicationId "cn.garymb.ygomobile.KO"
-            versionName "KO3.3.3"
+            versionName "KO3.3.4"
             //assets.srcDirs = ['assets_ko']
         }
         cn {

mobile/src/core/AndroidManifest.xml

-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="cn.garymb.ygomobile.lite">
-
-    <application>
-        <activity
-            android:name="cn.garymb.ygomobile.ui.online.MyCardActivity"
-            android:configChanges="orientation|keyboardHidden|navigation|screenSize"
-            android:launchMode="singleTop"
-            android:theme="@style/AppTheme.Translucent"
-            android:windowSoftInputMode="stateAlwaysHidden|adjustResize"/>
-    </application>
-
-</manifest>
\ No newline at end of file

mobile/src/core/java/cn/garymb/ygomobile/ui/online/MyCardActivity.java

-package cn.garymb.ygomobile.ui.online;
-
-import android.os.Bundle;
-import android.support.annotation.Nullable;
-
-import cn.garymb.ygomobile.ui.activities.BaseActivity;
-
-public class MyCardActivity extends BaseActivity{
-
-    @Override
-    protected void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-		finish();
-    }
-}

mobile/src/core/java/cn/garymb/ygomobile/ui/plus/X5WebView.java

-package cn.garymb.ygomobile.ui.plus;
-
-import android.annotation.SuppressLint;
-import android.content.Context;
-import android.graphics.Canvas;
-import android.util.AttributeSet;
-import android.view.View;
-
-import com.tencent.smtt.sdk.WebSettings;
-import com.tencent.smtt.sdk.WebView;
-import com.tencent.smtt.sdk.WebViewClient;
-
-public class X5WebView extends WebView {
-	private WebViewClient client = new WebViewClient() {
-		/**
-		 * 防止加载网页时调起系统浏览器
-		 */
-		public boolean shouldOverrideUrlLoading(WebView view, String url) {
-			view.loadUrl(url);
-			return true;
-		}
-	};
-
-	@SuppressLint("SetJavaScriptEnabled")
-	public X5WebView(Context arg0, AttributeSet arg1) {
-		super(arg0, arg1);
-		this.setWebViewClient(client);
-		// this.setWebChromeClient(chromeClient);
-		// WebStorage webStorage = WebStorage.getInstance();
-		initWebViewSettings();
-		this.getView().setClickable(true);
-	}
-
-	private void initWebViewSettings() {
-		WebSettings webSetting = this.getSettings();
-		webSetting.setJavaScriptEnabled(true);
-		webSetting.setJavaScriptCanOpenWindowsAutomatically(true);
-		webSetting.setAllowFileAccess(true);
-		//webSetting.setLayoutAlgorithm(LayoutAlgorithm.NARROW_COLUMNS);
-		webSetting.setSupportZoom(true);
-		webSetting.setBuiltInZoomControls(true);
-		webSetting.setUseWideViewPort(true);
-		//禁止多窗口
-		webSetting.setSupportMultipleWindows(false);
-		// webSetting.setLoadWithOverviewMode(true);
-		webSetting.setAppCacheEnabled(true);
-		// webSetting.setDatabaseEnabled(true);
-		webSetting.setDomStorageEnabled(true);
-		webSetting.setGeolocationEnabled(true);
-		webSetting.setAppCacheMaxSize(Long.MAX_VALUE);
-		// webSetting.setPageCacheCapacity(IX5WebSettings.DEFAULT_CACHE_CAPACITY);
-		webSetting.setPluginState(WebSettings.PluginState.ON_DEMAND);
-		// webSetting.setRenderPriority(WebSettings.RenderPriority.HIGH);
-		webSetting.setCacheMode(WebSettings.LOAD_NO_CACHE);
-
-		// this.getSettingsExtension().setPageCacheCapacity(IX5WebSettings.DEFAULT_CACHE_CAPACITY);//extension
-		// settings 的设计
-        webSetting.setSaveFormData(true);
-        webSetting.setDatabaseEnabled(true);
-        webSetting.setJavaScriptCanOpenWindowsAutomatically(true);
-        setScrollBarStyle(WebView.SCROLLBARS_OUTSIDE_OVERLAY);
-        setHorizontalScrollBarEnabled(false);
-        webSetting.setAllowContentAccess(true);
-        webSetting.setMixedContentMode(WebSettings.LOAD_NORMAL);
-	}
-
-	@Override
-	protected boolean drawChild(Canvas canvas, View child, long drawingTime) {
-		/*boolean ret = super.drawChild(canvas, child, drawingTime);
-		canvas.save();
-		Paint paint = new Paint();
-		paint.setColor(0x7fff0000);
-		paint.setTextSize(24.f);
-		paint.setAntiAlias(true);
-		if (getX5WebViewExtension() != null) {
-			canvas.drawText(this.getContext().getPackageName() + "-pid:"
-							+ android.os.Process.myPid(), 10, 50, paint);
-			canvas.drawText(
-				"X5  Core:" + QbSdk.getTbsVersion(this.getContext()), 10,
-				100, paint);
-		} else {
-			canvas.drawText(this.getContext().getPackageName() + "-pid:"
-							+ android.os.Process.myPid(), 10, 50, paint);
-			canvas.drawText("Sys Core", 10, 100, paint);
-		}
-		canvas.drawText(Build.MANUFACTURER, 10, 150, paint);
-		canvas.drawText(Build.MODEL, 10, 200, paint);
-		canvas.restore();
-		return ret;*/
-		return super.drawChild(canvas,child,drawingTime);
-	}
-
-	public X5WebView(Context arg0) {
-		super(arg0);
-		setBackgroundColor(85621);
-	}
-
-}
-

mobile/src/main/AndroidManifest.xml

@@ -154,17 +154,17 @@
             android:screenOrientation="portrait"
             android:theme="@style/AppTheme"/>
 		<activity
-            android:name="cn.garymb.ygomobile.ui.online.MyCardActivity"
+            android:name="cn.garymb.ygomobile.ui.mycard.MyCardActivity"
             android:configChanges="orientation|keyboardHidden|navigation|screenSize"
             android:launchMode="singleTop"
             android:theme="@style/AppTheme.Mycard"
             android:windowSoftInputMode="stateAlwaysHidden|adjustResize"/>
         <activity
-            android:name="cn.garymb.ygomobile.ui.online.mcchat.McchatActivity"
+            android:name="cn.garymb.ygomobile.ui.mycard.mcchat.McchatActivity"
             android:windowSoftInputMode="stateHidden|adjustResize"
             android:label="@string/app_name"/>
         <activity
-            android:name="cn.garymb.ygomobile.ui.online.mcchat.SplashActivity"/>
+            android:name="cn.garymb.ygomobile.ui.mycard.mcchat.SplashActivity"/>
         <service
             android:name="cn.garymb.ygomobile.ui.plus.ServiceDuelAssistant"/>
 

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

@@ -16,12 +16,10 @@ import android.support.v7.widget.Toolbar;
 import android.text.TextUtils;
 import android.view.MenuItem;
 import android.view.View;
-import android.view.Window;
-import android.view.WindowManager;
 import android.widget.Toast;
 
 import cn.garymb.ygomobile.lite.R;
-import cn.garymb.ygomobile.ui.activities.PermissionsActivity;
+
 
 public class BaseActivity extends AppCompatActivity {
     private final static int REQUEST_PERMISSIONS = 0x1000 + 1;

mobile/src/main/res/layout/activity_online_mycard.xml

@@ -16,7 +16,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <cn.garymb.ygomobile.ui.online.MyCardWebView
+        <cn.garymb.ygomobile.ui.mycard.MyCardWebView
             android:id="@+id/webbrowser"
             android:layout_width="match_parent"
             android:layout_height="match_parent" >
@@ -28,7 +28,7 @@
                 android:layout_height="5px"
                 />
 
-        </cn.garymb.ygomobile.ui.online.MyCardWebView>
+        </cn.garymb.ygomobile.ui.mycard.MyCardWebView>
 
     </RelativeLayout>
 

mobile/src/main/res/layout/item_chat.xml

@@ -5,7 +5,7 @@
 	android:layout_height="wrap_content"
 	android:background="#00000000">
 
-	<cn.garymb.ygomobile.ui.online.mcchat.view.YuanImage
+	<cn.garymb.ygomobile.ui.mycard.mcchat.view.YuanImage
 		android:layout_height="35dp"
 		android:layout_width="35dp"
 		android:id="@+id/ic_avatar"

mobile/src/main/res/layout/item_chat_me.xml

@@ -4,7 +4,7 @@
     android:layout_height="wrap_content"
     android:background="#00000000">
 
-    <cn.garymb.ygomobile.ui.online.mcchat.view.YuanImage
+    <cn.garymb.ygomobile.ui.mycard.mcchat.view.YuanImage
         android:id="@+id/icm_avatar"
         android:layout_width="35dp"
         android:layout_height="35dp"