From: Yuji Konishi Date: Sun, 10 Nov 2013 00:36:16 +0000 (+0900) Subject: ver1.3.0b X-Git-Url: http://git.osdn.net/view?p=jugglemaster%2Fsource.git;a=commitdiff_plain;h=35da750c891afbcde314b465f14e3b23267d14c8 ver1.3.0b --- diff --git a/workspace/JuggleMaster/gen/com/jm/R.java b/workspace/JuggleMaster/gen/com/jm/R.java index 76ad580..1fcfe4f 100644 --- a/workspace/JuggleMaster/gen/com/jm/R.java +++ b/workspace/JuggleMaster/gen/com/jm/R.java @@ -102,57 +102,58 @@ public final class R { public static final int simple_list_item_2=0x7f030008; } public static final class string { - public static final int action_settings=0x7f060032; - public static final int add=0x7f06000a; - public static final int andmode=0x7f060008; + public static final int action_settings=0x7f060033; + public static final int add=0x7f06000b; + public static final int andmode=0x7f060009; public static final int app_name=0x7f060001; - public static final int bheight=0x7f06001c; - public static final int calculating=0x7f060017; - public static final int cancel=0x7f06000d; - public static final int close=0x7f06000e; - public static final int common_settings=0x7f060014; - public static final int create=0x7f060016; - public static final int delete=0x7f06000c; - public static final int error_unexpected=0x7f060027; - public static final int generate=0x7f06001f; - public static final int handling=0x7f060011; - public static final int height=0x7f060012; - public static final int hello_world=0x7f060033; - public static final int help=0x7f060006; + public static final int bheight=0x7f06001d; + public static final int calculating=0x7f060018; + public static final int cancel=0x7f06000e; + public static final int close=0x7f06000f; + public static final int common_settings=0x7f060015; + public static final int create=0x7f060017; + public static final int delete=0x7f06000d; + public static final int error_unexpected=0x7f060028; + public static final int generate=0x7f060020; + public static final int handling=0x7f060012; + public static final int height=0x7f060013; + public static final int hello_world=0x7f060034; + public static final int help=0x7f060007; public static final int help1=0x7f060002; public static final int help2=0x7f060003; public static final int help3=0x7f060004; public static final int help4=0x7f060005; - public static final int hold=0x7f060013; + public static final int help5=0x7f060006; + public static final int hold=0x7f060014; public static final int lang=0x7f060000; - public static final int list0_1=0x7f060029; - public static final int list0_2=0x7f06002a; - public static final int list0_3=0x7f06002b; - public static final int list0_4=0x7f06002c; - public static final int list0_5=0x7f06002d; - public static final int list0_6=0x7f06002e; - public static final int list0_7=0x7f06002f; - public static final int list0_8=0x7f060030; - public static final int load=0x7f060009; - public static final int message_delete_pattern=0x7f060023; - public static final int message_delete_patternfile=0x7f060024; - public static final int message_nopattern=0x7f060026; - public static final int normal=0x7f060019; - public static final int number=0x7f06001b; - public static final int orgmode=0x7f060007; - public static final int patternFileTitle=0x7f060025; - public static final int patternMax=0x7f06001e; - public static final int patternTypes=0x7f060018; - public static final int pattern_name=0x7f06000f; - public static final int period=0x7f06001d; - public static final int save=0x7f06000b; - public static final int siteswap=0x7f060010; - public static final int siteswap_error=0x7f060028; - public static final int speed=0x7f060015; - public static final int synchronization=0x7f06001a; - public static final int title_activity_pattern_list=0x7f060031; - public static final int title_delete=0x7f060022; - public static final int title_system_error=0x7f060021; - public static final int update=0x7f060020; + public static final int list0_1=0x7f06002a; + public static final int list0_2=0x7f06002b; + public static final int list0_3=0x7f06002c; + public static final int list0_4=0x7f06002d; + public static final int list0_5=0x7f06002e; + public static final int list0_6=0x7f06002f; + public static final int list0_7=0x7f060030; + public static final int list0_8=0x7f060031; + public static final int load=0x7f06000a; + public static final int message_delete_pattern=0x7f060024; + public static final int message_delete_patternfile=0x7f060025; + public static final int message_nopattern=0x7f060027; + public static final int normal=0x7f06001a; + public static final int number=0x7f06001c; + public static final int orgmode=0x7f060008; + public static final int patternFileTitle=0x7f060026; + public static final int patternMax=0x7f06001f; + public static final int patternTypes=0x7f060019; + public static final int pattern_name=0x7f060010; + public static final int period=0x7f06001e; + public static final int save=0x7f06000c; + public static final int siteswap=0x7f060011; + public static final int siteswap_error=0x7f060029; + public static final int speed=0x7f060016; + public static final int synchronization=0x7f06001b; + public static final int title_activity_pattern_list=0x7f060032; + public static final int title_delete=0x7f060023; + public static final int title_system_error=0x7f060022; + public static final int update=0x7f060021; } } diff --git a/workspace/JuggleMaster/res/layout/help.xml b/workspace/JuggleMaster/res/layout/help.xml index 7386fa1..b346506 100644 --- a/workspace/JuggleMaster/res/layout/help.xml +++ b/workspace/JuggleMaster/res/layout/help.xml @@ -10,7 +10,7 @@ android:id="@+id/textView91" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_margin="5dp" - android:textSize="14dp" + android:textSize="14sp" > diff --git a/workspace/JuggleMaster/res/layout/pattern_manager.xml b/workspace/JuggleMaster/res/layout/pattern_manager.xml index 40c4f9c..e20e61e 100644 --- a/workspace/JuggleMaster/res/layout/pattern_manager.xml +++ b/workspace/JuggleMaster/res/layout/pattern_manager.xml @@ -11,7 +11,7 @@ diff --git a/workspace/JuggleMaster/res/values/strings.xml b/workspace/JuggleMaster/res/values/strings.xml index 6a4e44a..59c36f0 100644 --- a/workspace/JuggleMaster/res/values/strings.xml +++ b/workspace/JuggleMaster/res/values/strings.xml @@ -7,6 +7,7 @@ ●You can create a new figure by going into the menu [7] My patterns ●You can generate patterns by going to the menu [8] generator patterns ●You can change your point of view by draging the juggler + ●メニューから「オリジナルモード」を選択後、「パターンファイル選択」を選択する事で、パターンファイルの変更、追加ができます。 Help オリジナルモード Androidモード diff --git a/workspace/JuggleMaster/src/com/jm/Help.java b/workspace/JuggleMaster/src/com/jm/Help.java index 3af88b7..8f6823a 100644 --- a/workspace/JuggleMaster/src/com/jm/Help.java +++ b/workspace/JuggleMaster/src/com/jm/Help.java @@ -34,7 +34,7 @@ public class Help extends BaseActivity { getString(R.string.help2), getString(R.string.help3), getString(R.string.help4), - "" + getString(R.string.help5) }; int i = 0; if (DaoFactory.getInstance().getMode() == DaoFactory.Mode.ORIGINAL){ @@ -46,6 +46,7 @@ public class Help extends BaseActivity { textViews[i++].setText(messages[1]); textViews[i++].setText(messages[2]); textViews[i++].setText(messages[3]); + textViews[i++].setText(messages[4]); } textView1.setText(getString(R.string.help1)); diff --git a/workspace/JuggleMaster/src/com/jm/JuggleView.java b/workspace/JuggleMaster/src/com/jm/JuggleView.java index 428a210..89143b0 100644 --- a/workspace/JuggleMaster/src/com/jm/JuggleView.java +++ b/workspace/JuggleMaster/src/com/jm/JuggleView.java @@ -10,6 +10,7 @@ import com.jm.db.DaoFactory; import com.jm.db.IDao; import com.jm.opengl.JuggleDrawer; import com.jm.opengl.OpenGLActivityBase; +import com.jm.utility.Debug; import com.jm.utility.JmException; import com.jm.utility.Resource; @@ -79,9 +80,11 @@ public class JuggleView extends OpenGLActivityBase { drawer = new JuggleDrawer(this, jp); drawer.clear(); } catch (JmException e) { - showDialog(this, e); + Debug.d(this, e.getMessage()); + finish(); } catch (Exception e) { - showDialog(this, e); + Debug.d(this, e.getMessage()); + finish(); } } diff --git a/workspace/JuggleMaster/src/com/jm/Juggler.java b/workspace/JuggleMaster/src/com/jm/Juggler.java index 82b5855..94092a9 100644 --- a/workspace/JuggleMaster/src/com/jm/Juggler.java +++ b/workspace/JuggleMaster/src/com/jm/Juggler.java @@ -8,7 +8,7 @@ public class Juggler { private JuggleDrawer drawer; private Body body; private JugglingBalls balls; - private SiteswapWriter siteswap; + //private SiteswapWriter siteswap; private SiteSwap site; @@ -28,7 +28,8 @@ public class Juggler { throw new JmPatternException(); } site = jp.getSiteSwap(); - siteswap = new SiteswapWriter(site); + //siteswap = new SiteswapWriter(site); + new SiteswapWriter(site); } public void updateJuggler(){ diff --git a/workspace/JuggleMaster/src/com/jm/Menu1.java b/workspace/JuggleMaster/src/com/jm/Menu1.java index 8b69e0e..f75c88a 100644 --- a/workspace/JuggleMaster/src/com/jm/Menu1.java +++ b/workspace/JuggleMaster/src/com/jm/Menu1.java @@ -96,7 +96,8 @@ public class Menu1 extends BaseActivity { AsyncTaskCommand command = new AsyncTaskCommand(this, idb, getString(R.string.update), false); command.execute((String[]) null); - } else { + } + else { JmDao jdao = JmDao.getInstance(); jdao.init(null, this); } @@ -109,9 +110,12 @@ public class Menu1 extends BaseActivity { @Override public boolean onCreateOptionsMenu(Menu menu) { - menu.add(0, Menu.FIRST + 1, Menu.NONE, R.string.orgmode); - menu.add(0, Menu.FIRST + 2, Menu.NONE, R.string.andmode); - menu.add(0, Menu.FIRST + 3, Menu.NONE, R.string.load); + menu.add(0, Menu.FIRST + 1, Menu.NONE, R.string.orgmode).setIcon( + android.R.drawable.ic_menu_more); + menu.add(0, Menu.FIRST + 2, Menu.NONE, R.string.andmode).setIcon( + android.R.drawable.ic_menu_more); + menu.add(0, Menu.FIRST + 3, Menu.NONE, R.string.load).setIcon( + android.R.drawable.ic_menu_manage); boolean ret = super.onCreateOptionsMenu(menu); return ret; diff --git a/workspace/JuggleMaster/src/com/jm/SiteswapWriter.java b/workspace/JuggleMaster/src/com/jm/SiteswapWriter.java index 0fbc727..8460dfa 100644 --- a/workspace/JuggleMaster/src/com/jm/SiteswapWriter.java +++ b/workspace/JuggleMaster/src/com/jm/SiteswapWriter.java @@ -3,56 +3,14 @@ package com.jm; public class SiteswapWriter { - private String[] siteswap; - private int[] posX; - private int counter; + //private String[] siteswap; + //private int[] posX; + //private int counter; public SiteswapWriter(SiteSwap siteswap) { - this.siteswap = siteswap.getStrings(); - this.counter = -1; - this.posX = new int[this.siteswap.length]; + //this.siteswap = siteswap.getStrings(); + //this.counter = -1; + //this.posX = new int[this.siteswap.length]; } - -// private void initialize(JugglerCanvas jc) { -// int l = 0; -// for(int i = 0; i < siteswap.length; i++) { -// posX[i] = l; -// l += siteswap[i].length(); -// } -// int width = jc.getWidth() / l; -// if (width > Resource.charWidth()) width = Resource.charWidth(); -// int x = -width * l / 2; -// for(counter = 0; counter < siteswap.length; counter++) { -// posX[counter] = posX[counter] * width + x; -// drawString(jc, Color.BLACK); -// } -// counter--; -// } - -// public void drawSiteswap(JugglerCanvas jc) { -// if (counter < 0) { -// initialize(jc); -// } -//// edit { -//// drawString(jc); -// int counterBak = counter; -// for(int i = 0; i < siteswap.length; i++) { -// counter = i; -// drawString(jc, Color.BLACK); -// } -// counter = counterBak; -//// } -// jc.setEmphasisColor(); -// counter = (counter + 1) % siteswap.length; -// drawString(jc, Color.RED); -// jc.setForegroundColor(); -// } - -// private void drawString(JugglerCanvas jc, int color) { -//// edit { -//// jc.drawString(siteswap[counter], posX[counter], 1, Graphics.TOP|Graphics.LEFT); -// jc.drawString(siteswap[counter], posX[counter], Resource.charHeight() + 2, 0, color); -//// } -// } } \ No newline at end of file diff --git a/workspace/JuggleMaster/src/com/jm/db/DatabaseHelper.java b/workspace/JuggleMaster/src/com/jm/db/DatabaseHelper.java index 8482c7e..10eb10c 100644 --- a/workspace/JuggleMaster/src/com/jm/db/DatabaseHelper.java +++ b/workspace/JuggleMaster/src/com/jm/db/DatabaseHelper.java @@ -141,6 +141,11 @@ public class DatabaseHelper extends SQLiteOpenHelper { public boolean getConvFlag1to2() { return convFlag1to2; } + + public boolean getConvFlag2to3() { + return convFlag2to3; + } + public void setLangId(int id) { langId = id; } diff --git a/workspace/JuggleMaster/src/com/jm/db/InitDB.java b/workspace/JuggleMaster/src/com/jm/db/InitDB.java index 9a74c7e..5ab31d7 100644 --- a/workspace/JuggleMaster/src/com/jm/db/InitDB.java +++ b/workspace/JuggleMaster/src/com/jm/db/InitDB.java @@ -5,41 +5,68 @@ import android.database.sqlite.SQLiteDatabase; import com.jm.PatternList; import com.jm.utility.AsyncTaskIF; +import com.jm.utility.Debug; import com.jm.utility.JmException; public class InitDB implements AsyncTaskIF { + private Context context; + public InitDB(Context context) { - //this.context = context; + this.context = context; } @Override public void doExecute() { DatabaseHelper helper = DatabaseHelper.getInstance(); PatternList p = new PatternList(); - SQLiteDatabase db = helper.getWritableDatabase(); + boolean convFlag1to2 = helper.getConvFlag1to2(); + //boolean convFlag2to3 = helper.getConvFlag2to3(); + + SQLiteDatabase db = helper.getWritableDatabase(); try { helper.setLangId(DatabaseHelper.NONE_ID); int langId = helper.getLangId(); db.beginTransaction(); - boolean convFlag1to2 = helper.getConvFlag1to2(); + Dao dao = Dao.getInstance(); + int count = dao.countAll(); + +// if (helper.getConvFlag()){ +// // 1to2 or 2to3 +// helper.convert(db, langId); +// Dao.getInstance().start(db); +// +// // 1to2 +// helper.setLangId(DatabaseHelper.JAPANEASE_ID); +// p.update(); +// } +// else { +// // 0件 and 2 +// helper.setLangId(DatabaseHelper.JAPANEASE_ID); +// p.create(DatabaseHelper.JAPANEASE_ID); +// } + if (helper.getConvFlag()){ + // 1to2 or 2to3 helper.convert(db, langId); Dao.getInstance().start(db); } - if (convFlag1to2){ - if (helper.getConvFlag()){ - helper.setLangId(DatabaseHelper.JAPANEASE_ID); - p.update(); - } - else { + // 1to2 + helper.setLangId(DatabaseHelper.JAPANEASE_ID); + p.update(); + } + + if (count <= 0 || convFlag1to2){ + if (count <= 0){ + // 0件 and 2 helper.setLangId(DatabaseHelper.JAPANEASE_ID); p.create(DatabaseHelper.JAPANEASE_ID); } - + + // (0件 and 2) or 1to2 helper.setLangId(DatabaseHelper.ENGLISH_ID); p.create(DatabaseHelper.ENGLISH_ID); @@ -50,10 +77,15 @@ public class InitDB implements AsyncTaskIF { db.setTransactionSuccessful(); } catch (JmException e) { // 失敗 + Debug.d(this, null, e); + return; } finally { db.endTransaction(); } - helper.setLangId(DatabaseHelper.NONE_ID); + helper.setLangId(DatabaseHelper.NONE_ID); + + JmDao jdao = JmDao.getInstance(); + jdao.init(null, context); } @Override diff --git a/workspace/JuggleMaster/src/com/jm/gen/MainGen.java b/workspace/JuggleMaster/src/com/jm/gen/MainGen.java index 4157653..9924cbf 100644 --- a/workspace/JuggleMaster/src/com/jm/gen/MainGen.java +++ b/workspace/JuggleMaster/src/com/jm/gen/MainGen.java @@ -49,7 +49,8 @@ public class MainGen implements AsyncTaskIF { list = new ArrayList(); char[] p = StdLib.stoc(period); - int count = GetSiteswap(gs, list, balls, p); + //int count = GetSiteswap(gs, list, balls, p); + GetSiteswap(gs, list, balls, p); return list; } diff --git a/workspace/JuggleMaster/src/com/jm/pattern/PatternAnalyzer.java b/workspace/JuggleMaster/src/com/jm/pattern/PatternAnalyzer.java index 247656e..3477084 100644 --- a/workspace/JuggleMaster/src/com/jm/pattern/PatternAnalyzer.java +++ b/workspace/JuggleMaster/src/com/jm/pattern/PatternAnalyzer.java @@ -116,6 +116,8 @@ public class PatternAnalyzer { toArray(motionBuffer)); pattern.add(p); break; + default: + break; } break; case CALL_STYLE: @@ -214,6 +216,8 @@ public class PatternAnalyzer { break; } break; + default: + break; } // System.out.println(status + " " + t + "\t" + line + "\t" + sSkip); } diff --git a/workspace/JuggleMaster/src/com/jm/utility/BaseActivity.java b/workspace/JuggleMaster/src/com/jm/utility/BaseActivity.java index 5d7f8c9..476388e 100644 --- a/workspace/JuggleMaster/src/com/jm/utility/BaseActivity.java +++ b/workspace/JuggleMaster/src/com/jm/utility/BaseActivity.java @@ -17,23 +17,23 @@ import com.jm.db.DatabaseHelper; public class BaseActivity extends Activity { @Override - public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); Debug.d(this, Debug.ON_CREATE); - try { + try { DatabaseHelper.init(getApplicationContext()); } catch (JmException e) { terminate(e); } - } - - @Override + } + + @Override protected void onActivityResult(int requestCode, int resultCode, Intent data) { - super.onActivityResult(requestCode, resultCode, data); + super.onActivityResult(requestCode, resultCode, data); } - - @Override + + @Override protected void onRestart() { super.onRestart(); Debug.d(this, Debug.ON_RESTART); @@ -57,7 +57,7 @@ public class BaseActivity extends Activity { Debug.d(this, Debug.ON_STOP); } - @Override + @Override protected void onDestroy() { super.onDestroy(); Debug.d(this, Debug.ON_DESTROY); @@ -66,21 +66,21 @@ public class BaseActivity extends Activity { @Override public boolean onCreateOptionsMenu(Menu menu) { boolean ret = super.onCreateOptionsMenu(menu); - menu.add(0, Menu.FIRST, Menu.NONE, R.string.help); + menu.add(0, Menu.FIRST, Menu.NONE, R.string.help).setIcon( + android.R.drawable.ic_menu_help); return ret; } - - @Override - public boolean onOptionsItemSelected(MenuItem item) { - try { - Intent intent = new Intent(this, (Class)Help.class); + + @Override + public boolean onOptionsItemSelected(MenuItem item) { + try { + Intent intent = new Intent(this, (Class) Help.class); startActivity(intent); - } - catch (Exception e){ + } catch (Exception e) { terminate(e); - } + } return super.onOptionsItemSelected(item); - } + } @Override public boolean dispatchKeyEvent(KeyEvent event) { @@ -92,22 +92,26 @@ public class BaseActivity extends Activity { } return super.dispatchKeyEvent(event); } - + protected void setFullscreen() { - requestWindowFeature(Window.FEATURE_NO_TITLE); - getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, - WindowManager.LayoutParams.FLAG_FULLSCREEN); - } - + requestWindowFeature(Window.FEATURE_NO_TITLE); + getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, + WindowManager.LayoutParams.FLAG_FULLSCREEN); + } + protected void showDialog(String title, String msg, final boolean isFinish) { - new AlertDialog.Builder(this).setTitle(title).setMessage(msg) - .setNeutralButton(android.R.string.ok, new DialogInterface.OnClickListener() { - public void onClick(DialogInterface dialog, int whichButton) { - if (isFinish){ - finish(); - } - } - }).show(); + new AlertDialog.Builder(this) + .setTitle(title) + .setMessage(msg) + .setNeutralButton(android.R.string.ok, + new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, + int whichButton) { + if (isFinish) { + finish(); + } + } + }).show(); } protected void showDialog(String title, String msg) { @@ -115,17 +119,17 @@ public class BaseActivity extends Activity { } protected void showDialog(Object target, Throwable t) { - if (t != null){ - Debug.d(target, null, t); - } + if (t != null) { + Debug.d(target, null, t); + } showDialog(getString(R.string.title_system_error), getString(R.string.error_unexpected)); } - public void terminate(Throwable t){ - if (t != null){ - Debug.d(this, null, t); - } - moveTaskToBack(true); - } + public void terminate(Throwable t) { + if (t != null) { + Debug.d(this, null, t); + } + moveTaskToBack(true); + } }