Commit 3aa868f9 authored by fallenstardust's avatar fallenstardust

update

parent c4d7c7f3
......@@ -15,4 +15,5 @@ org.gradle.jvmargs=-Xmx1536m
# This option should only be used with decoupled projects. More details, visit
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
# org.gradle.parallel=true
#android.useDeprecatedNdk=true
\ No newline at end of file
#android.useDeprecatedNdk=true
android.enableAapt2=false
\ No newline at end of file
......@@ -7,6 +7,7 @@ import android.widget.*;
import android.view.*;
import android.view.View.*;
import cn.garymb.ygomobile.lite.R;
import cn.garymb.ygomobile.ui.online.MyCardActivity;
import cn.garymb.ygomobile.ui.online.mcchat.util.*;
import cn.garymb.ygomobile.ui.online.mcchat.management.*;
......@@ -24,7 +25,7 @@ public class SplashActivity extends Activity
{
// TODO: Implement this method
super.onCreate(savedInstanceState);
setContentView(layout.activity_splash);
setContentView(R.layout.activity_splash);
initView();
/*String name=getIntent().getStringExtra("name");
......
package cn.garymb.ygomobile.ui.online.mcchat.management;
import android.content.*;
import cn.garymb.ygomobile.ui.online.mcchat.*;
public class UserManagement
{
......
......@@ -26,6 +26,7 @@ import cn.garymb.ygomobile.AppsSettings;
import cn.garymb.ygomobile.YGOStarter;
import cn.garymb.ygomobile.ui.cards.DeckManagerActivity;
import cn.garymb.ygomobile.ui.plus.DefWebViewClient;
import cn.garymb.ygomobile.ui.online.mcchat.management.UserManagement;
import static junit.framework.Assert.assertEquals;
......
......@@ -31,6 +31,7 @@ import cn.garymb.ygomobile.lite.BuildConfig;
import cn.garymb.ygomobile.lite.R;
import cn.garymb.ygomobile.ui.activities.BaseActivity;
import cn.garymb.ygomobile.ui.cards.DeckManagerActivity;
import cn.garymb.ygomobile.ui.online.mcchat.SplashActivity;
public class MyCardActivity extends BaseActivity implements MyCard.MyCardListener, NavigationView.OnNavigationItemSelectedListener {
......@@ -167,7 +168,7 @@ public class MyCardActivity extends BaseActivity implements MyCard.MyCardListene
case R.id.action_bbs:
mWebViewPlus.loadUrl(mMyCard.getBBSUrl());
break;
case android.R.id.action_chat:
case R.id.action_chat:
startActivity(new Intent(context,SplashActivity.class));
break;
default:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment