OpenSangokushi commit ML
sango****@lists*****
2011年 2月 4日 (金) 22:08:41 JST
akifumi3さん 裕之です。 修正頂きありがとうございました。 早かったですね。 暫く、環境を動かしてなかったので、 今アップデート中です。 アップデート完了後に動かしてみて、 問題なさそうであればリリースします。 で、A3 Winterにもそれこそだめもとで、一応エントリーしときます。 (2011/02/04 2:51), OpenSangokushi commit ML wrote: > Revision: 477 > http://sourceforge.jp/projects/sangokushi/svn/view?view=rev&revision=477 > Author: akifumi3 > Date: 2011-02-04 02:51:38 +0900 (Fri, 04 Feb 2011) > > Log Message: > ----------- > Twitter機能を外した簡易版です。 > オープニングのTwitter認証、戦闘画面のメッセージ部分を削除しました。 > > Modified Paths: > -------------- > branches/OpenSangokushi_without_twitter/default.properties > branches/OpenSangokushi_without_twitter/gen/jp/or/cute/sangokushi/R.java > branches/OpenSangokushi_without_twitter/res/layout/battle.xml > branches/OpenSangokushi_without_twitter/res/layout/opening.xml > branches/OpenSangokushi_without_twitter/src/jp/or/cute/sangokushi/Battle.java > branches/OpenSangokushi_without_twitter/src/jp/or/cute/sangokushi/Opening.java > branches/OpenSangokushi_without_twitter/src/jp/or/cute/sangokushi/view/MapView.java > > Added Paths: > ----------- > branches/OpenSangokushi_without_twitter/ > branches/OpenSangokushi_without_twitter/.settings/org.eclipse.ltk.core.refactoring.prefs > > Removed Paths: > ------------- > branches/OpenSangokushi_without_twitter/bin/OpenSangokushi.apk > branches/OpenSangokushi_without_twitter/bin/classes.dex > branches/OpenSangokushi_without_twitter/bin/jp/ > branches/OpenSangokushi_without_twitter/bin/resources.ap_ > > Added: branches/OpenSangokushi_without_twitter/.settings/org.eclipse.ltk.core.refactoring.prefs > =================================================================== > --- branches/OpenSangokushi_without_twitter/.settings/org.eclipse.ltk.core.refactoring.prefs (rev 0) > +++ branches/OpenSangokushi_without_twitter/.settings/org.eclipse.ltk.core.refactoring.prefs 2011-02-03 17:51:38 UTC (rev 477) > @@ -0,0 +1,3 @@ > +#Fri Feb 04 01:39:07 JST 2011 > +eclipse.preferences.version=1 > +org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false > > Deleted: branches/OpenSangokushi_without_twitter/bin/OpenSangokushi.apk > =================================================================== > (Binary files differ) > > Deleted: branches/OpenSangokushi_without_twitter/bin/classes.dex > =================================================================== > (Binary files differ) > > Deleted: branches/OpenSangokushi_without_twitter/bin/resources.ap_ > =================================================================== > (Binary files differ) > > Modified: branches/OpenSangokushi_without_twitter/default.properties > =================================================================== > --- trunk/OpenSangokushi/default.properties 2011-02-01 14:56:41 UTC (rev 476) > +++ branches/OpenSangokushi_without_twitter/default.properties 2011-02-03 17:51:38 UTC (rev 477) > @@ -10,4 +10,4 @@ > # Indicates whether an apk should be generated for each density. > split.density=false > # Project target. > -target=android-4 > +target=android-7 > > Modified: branches/OpenSangokushi_without_twitter/gen/jp/or/cute/sangokushi/R.java > =================================================================== > --- trunk/OpenSangokushi/gen/jp/or/cute/sangokushi/R.java 2011-02-01 14:56:41 UTC (rev 476) > +++ branches/OpenSangokushi_without_twitter/gen/jp/or/cute/sangokushi/R.java 2011-02-03 17:51:38 UTC (rev 477) > @@ -1,144 +1,141 @@ > -/* AUTO-GENERATED FILE. DO NOT MODIFY. > - * > - * This class was automatically generated by the > - * aapt tool from the resource data it found. It > - * should not be modified by hand. > - */ > - > -package jp.or.cute.sangokushi; > - > -public final class R { > - public static final class anim { > - public static final int logo_scale=0x7f040000; > - } > - public static final class attr { > - } > - public static final class color { > - public static final int solid_blue=0x7f060001; > - public static final int solid_green=0x7f060002; > - public static final int solid_red=0x7f060000; > - public static final int solid_white=0x7f060004; > - public static final int solid_yellow=0x7f060003; > - public static final int start_button=0x7f060005; > - } > - public static final class drawable { > - public static final int castle=0x7f020000; > - public static final int desert=0x7f020001; > - public static final int dra=0x7f020002; > - public static final int forest=0x7f020003; > - public static final int gi=0x7f020004; > - public static final int gi_bg=0x7f020005; > - public static final int go=0x7f020006; > - public static final int go_bg=0x7f020007; > - public static final int grass=0x7f020008; > - public static final int icon=0x7f020009; > - public static final int king=0x7f02000a; > - public static final int king_back=0x7f02000b; > - public static final int loading=0x7f02000c; > - public static final int logo=0x7f02000d; > - public static final int map_draft=0x7f02000e; > - public static final int mountain=0x7f02000f; > - public static final int openingback=0x7f020010; > - public static final int player=0x7f020011; > - public static final int player_back=0x7f020012; > - public static final int street=0x7f020013; > - public static final int syoku=0x7f020014; > - public static final int syoku_bg=0x7f020015; > - public static final int tree=0x7f020016; > - public static final int water=0x7f020017; > - } > - public static final class id { > - public static final int Button01=0x7f080025; > - public static final int ChatView=0x7f080007; > - public static final int EditText01=0x7f080024; > - public static final int LinearLayout01=0x7f080000; > - public static final int LinearLayout02=0x7f080001; > - public static final int LinearLayout03=0x7f08000a; > - public static final int LinearLayout04=0x7f080002; > - public static final int LinearLayout06=0x7f080014; > - public static final int ListView01=0x7f080015; > - public static final int MapView=0x7f080008; > - public static final int ScrollView01=0x7f08001e; > - public static final int StatusDetailView=0x7f080009; > - public static final int StatusView=0x7f080005; > - public static final int TableLayout01=0x7f080017; > - public static final int TableRow01=0x7f080018; > - public static final int TableRow02=0x7f080019; > - public static final int TableRow03=0x7f08001b; > - public static final int TextView01=0x7f08000b; > - public static final int TextView02=0x7f080003; > - public static final int TextView03=0x7f080004; > - public static final int TextView04=0x7f08001a; > - public static final int TextView05=0x7f08001c; > - public static final int TextView06=0x7f08001d; > - public static final int Title01=0x7f080012; > - public static final int Title02=0x7f080013; > - public static final int TweetListView=0x7f080026; > - public static final int WholeMap=0x7f080006; > - public static final int edittext_name=0x7f08000e; > - public static final int lobby_button=0x7f080023; > - public static final int loginBtn=0x7f080011; > - public static final int logo=0x7f08001f; > - public static final int map=0x7f080016; > - public static final int name=0x7f08000d; > - public static final int presetBtn=0x7f080010; > - public static final int serif=0x7f08000f; > - public static final int start_button=0x7f080021; > - public static final int title=0x7f08000c; > - public static final int tweet_name=0x7f080027; > - public static final int tweet_tweet=0x7f080028; > - public static final int twitter_button=0x7f080022; > - public static final int twitter_image=0x7f080020; > - } > - public static final class layout { > - public static final int battle=0x7f030000; > - public static final int initialization=0x7f030001; > - public static final int list=0x7f030002; > - public static final int lobby=0x7f030003; > - public static final int main=0x7f030004; > - public static final int map=0x7f030005; > - public static final int opening=0x7f030006; > - public static final int popup=0x7f030007; > - public static final int tweetlist=0x7f030008; > - } > - public static final class raw { > - public static final int bgm=0x7f050000; > - } > - public static final class string { > - public static final int app_name=0x7f070000; > - public static final int auth_progress_text=0x7f070008; > - public static final int auth_progress_title=0x7f070007; > - public static final int authenticate_button=0x7f070003; > - public static final int authenticated=0x7f070005; > - public static final int bad_value=0x7f070006; > - public static final int cancel=0x7f070019; > - public static final int chat_edit_hint=0x7f07000c; > - public static final int commander=0x7f07001c; > - public static final int compete=0x7f07001a; > - public static final int game_user=0x7f07001d; > - public static final int general=0x7f07001b; > - public static final int login_button=0x7f07000e; > - public static final int login_settings=0x7f07000d; > - public static final int menu_reset_userstate=0x7f07001f; > - public static final int menu_reset_userstate_comlplatemessage=0x7f070020; > - public static final int menu_reset_userstate_notregistered=0x7f070021; > - public static final int not_authenticated=0x7f070004; > - public static final int ok=0x7f070018; > - public static final int opening_message=0x7f070001; > - public static final int send=0x7f07000b; > - public static final int start_button=0x7f070002; > - public static final int title=0x7f070022; > - public static final int title_initialization=0x7f070009; > - public static final int title_start=0x7f07000a; > - public static final int tweet_error=0x7f07001e; > - public static final int tweet_progress_text=0x7f070017; > - public static final int tweet_progress_title=0x7f070016; > - public static final int twitter_id=0x7f070011; > - public static final int twitter_id_summary=0x7f070012; > - public static final int twitter_key_edit_hint=0x7f07000f; > - public static final int twitter_notauth_message=0x7f070015; > - public static final int twitter_password=0x7f070013; > - public static final int twitter_password_summary=0x7f070014; > - public static final int twitter_secret_edit_hint=0x7f070010; > - } > -} > +/* AUTO-GENERATED FILE. DO NOT MODIFY. > + * > + * This class was automatically generated by the > + * aapt tool from the resource data it found. It > + * should not be modified by hand. > + */ > + > +package jp.or.cute.sangokushi; > + > +public final class R { > + public static final class anim { > + public static final int logo_scale=0x7f040000; > + } > + public static final class attr { > + } > + public static final class color { > + public static final int solid_blue=0x7f060001; > + public static final int solid_green=0x7f060002; > + public static final int solid_red=0x7f060000; > + public static final int solid_white=0x7f060004; > + public static final int solid_yellow=0x7f060003; > + public static final int start_button=0x7f060005; > + } > + public static final class drawable { > + public static final int castle=0x7f020000; > + public static final int desert=0x7f020001; > + public static final int dra=0x7f020002; > + public static final int forest=0x7f020003; > + public static final int gi=0x7f020004; > + public static final int gi_bg=0x7f020005; > + public static final int go=0x7f020006; > + public static final int go_bg=0x7f020007; > + public static final int grass=0x7f020008; > + public static final int icon=0x7f020009; > + public static final int king=0x7f02000a; > + public static final int king_back=0x7f02000b; > + public static final int loading=0x7f02000c; > + public static final int logo=0x7f02000d; > + public static final int map_draft=0x7f02000e; > + public static final int mountain=0x7f02000f; > + public static final int openingback=0x7f020010; > + public static final int player=0x7f020011; > + public static final int player_back=0x7f020012; > + public static final int street=0x7f020013; > + public static final int syoku=0x7f020014; > + public static final int syoku_bg=0x7f020015; > + public static final int tree=0x7f020016; > + public static final int water=0x7f020017; > + } > + public static final class id { > + public static final int Button01=0x7f080022; > + public static final int EditText01=0x7f080021; > + public static final int LinearLayout01=0x7f080000; > + public static final int LinearLayout02=0x7f080001; > + public static final int LinearLayout03=0x7f080009; > + public static final int LinearLayout04=0x7f080002; > + public static final int LinearLayout06=0x7f080013; > + public static final int ListView01=0x7f080014; > + public static final int MapView=0x7f080007; > + public static final int ScrollView01=0x7f08001d; > + public static final int StatusDetailView=0x7f080008; > + public static final int StatusView=0x7f080005; > + public static final int TableLayout01=0x7f080016; > + public static final int TableRow01=0x7f080017; > + public static final int TableRow02=0x7f080018; > + public static final int TableRow03=0x7f08001a; > + public static final int TextView01=0x7f08000a; > + public static final int TextView02=0x7f080003; > + public static final int TextView03=0x7f080004; > + public static final int TextView04=0x7f080019; > + public static final int TextView05=0x7f08001b; > + public static final int TextView06=0x7f08001c; > + public static final int Title01=0x7f080011; > + public static final int Title02=0x7f080012; > + public static final int TweetListView=0x7f080023; > + public static final int WholeMap=0x7f080006; > + public static final int edittext_name=0x7f08000d; > + public static final int loginBtn=0x7f080010; > + public static final int logo=0x7f08001e; > + public static final int map=0x7f080015; > + public static final int name=0x7f08000c; > + public static final int presetBtn=0x7f08000f; > + public static final int serif=0x7f08000e; > + public static final int start_button=0x7f080020; > + public static final int title=0x7f08000b; > + public static final int tweet_name=0x7f080024; > + public static final int tweet_tweet=0x7f080025; > + public static final int twitter_image=0x7f08001f; > + } > + public static final class layout { > + public static final int battle=0x7f030000; > + public static final int initialization=0x7f030001; > + public static final int list=0x7f030002; > + public static final int lobby=0x7f030003; > + public static final int main=0x7f030004; > + public static final int map=0x7f030005; > + public static final int opening=0x7f030006; > + public static final int popup=0x7f030007; > + public static final int tweetlist=0x7f030008; > + } > + public static final class raw { > + public static final int bgm=0x7f050000; > + } > + public static final class string { > + public static final int app_name=0x7f070000; > + public static final int auth_progress_text=0x7f070008; > + public static final int auth_progress_title=0x7f070007; > + public static final int authenticate_button=0x7f070003; > + public static final int authenticated=0x7f070005; > + public static final int bad_value=0x7f070006; > + public static final int cancel=0x7f070019; > + public static final int chat_edit_hint=0x7f07000c; > + public static final int commander=0x7f07001c; > + public static final int compete=0x7f07001a; > + public static final int game_user=0x7f07001d; > + public static final int general=0x7f07001b; > + public static final int login_button=0x7f07000e; > + public static final int login_settings=0x7f07000d; > + public static final int menu_reset_userstate=0x7f07001f; > + public static final int menu_reset_userstate_comlplatemessage=0x7f070020; > + public static final int menu_reset_userstate_notregistered=0x7f070021; > + public static final int not_authenticated=0x7f070004; > + public static final int ok=0x7f070018; > + public static final int opening_message=0x7f070001; > + public static final int send=0x7f07000b; > + public static final int start_button=0x7f070002; > + public static final int title=0x7f070022; > + public static final int title_initialization=0x7f070009; > + public static final int title_start=0x7f07000a; > + public static final int tweet_error=0x7f07001e; > + public static final int tweet_progress_text=0x7f070017; > + public static final int tweet_progress_title=0x7f070016; > + public static final int twitter_id=0x7f070011; > + public static final int twitter_id_summary=0x7f070012; > + public static final int twitter_key_edit_hint=0x7f07000f; > + public static final int twitter_notauth_message=0x7f070015; > + public static final int twitter_password=0x7f070013; > + public static final int twitter_password_summary=0x7f070014; > + public static final int twitter_secret_edit_hint=0x7f070010; > + } > +} > > Modified: branches/OpenSangokushi_without_twitter/res/layout/battle.xml > =================================================================== > --- trunk/OpenSangokushi/res/layout/battle.xml 2011-02-01 14:56:41 UTC (rev 476) > +++ branches/OpenSangokushi_without_twitter/res/layout/battle.xml 2011-02-03 17:51:38 UTC (rev 477) > @@ -15,7 +15,7 @@ > <jp.or.cute.sangokushi.view.WholeMapView android:layout_height="80dip" android:layout_width="80dip" android:background="@color/solid_red" android:id="@+id/WholeMap"></jp.or.cute.sangokushi.view.WholeMapView> > > </LinearLayout> > -<jp.or.cute.sangokushi.view.ChatView android:layout_width="fill_parent" android:layout_height="53dip" android:background="@color/solid_white" android:id="@+id/ChatView" android:text="曹操>>こんにちは！\n夏侯惇>>よろしく" android:clickable="true"></jp.or.cute.sangokushi.view.ChatView> > + > <jp.or.cute.sangokushi.view.MapView android:clickable="true" android:focusable="true" android:focusableInTouchMode="true" android:layout_height="320dip" android:layout_width="320dip" android:id="@+id/MapView"></jp.or.cute.sangokushi.view.MapView> > <TextView android:layout_width="fill_parent" android:scrollbars="vertical" android:layout_height="48dip" android:id="@+id/StatusDetailView" android:text="選択地の詳細情報"></TextView> > <LinearLayout android:id="@+id/LinearLayout03" android:layout_width="fill_parent" android:gravity="right" android:layout_height="fill_parent" android:background="@color/solid_white"> > > Modified: branches/OpenSangokushi_without_twitter/res/layout/opening.xml > =================================================================== > --- trunk/OpenSangokushi/res/layout/opening.xml 2011-02-01 14:56:41 UTC (rev 476) > +++ branches/OpenSangokushi_without_twitter/res/layout/opening.xml 2011-02-03 17:51:38 UTC (rev 477) > @@ -9,27 +9,11 @@ > android:id="@+id/start_button" > android:layout_width="wrap_content" > android:layout_height="wrap_content" > - android:textSize="30px" > + android:textSize="40px" > android:padding="5px" > android:layout_gravity="center_horizontal" > android:textColor="@color/solid_white" > - android:layout_marginTop="270dp" android:text="@string/start_button" android:background="#00000000"></Button> > - <Button > - android:layout_width="wrap_content" > - android:layout_height="wrap_content" > - android:textSize="30px" > - android:padding="5px" > - android:layout_gravity="center_horizontal" > - android:textColor="@color/solid_white" > - android:text="@string/authenticate_button" android:id="@+id/twitter_button" android:layout_marginTop="5dp" android:background="#00000000"></Button> > - <Button > - android:layout_width="wrap_content" > - android:layout_height="wrap_content" > - android:textSize="30px" > - android:padding="5px" > - android:layout_gravity="center_horizontal" > - android:textColor="@color/solid_white" > - android:text="@string/login_button" android:id="@+id/lobby_button" android:layout_marginTop="5dp" android:background="#00000000"></Button> > + android:layout_marginTop="330dp" android:text="@string/start_button" android:background="#00000000"></Button> > > > </LinearLayout> > \ No newline at end of file > > Modified: branches/OpenSangokushi_without_twitter/src/jp/or/cute/sangokushi/Battle.java > =================================================================== > --- trunk/OpenSangokushi/src/jp/or/cute/sangokushi/Battle.java 2011-02-01 14:56:41 UTC (rev 476) > +++ branches/OpenSangokushi_without_twitter/src/jp/or/cute/sangokushi/Battle.java 2011-02-03 17:51:38 UTC (rev 477) > @@ -214,7 +214,7 @@ > setContentView(R.layout.battle); > SangokushiPreferences pref = new SangokushiPreferences(this); > > - mChatview = (ChatView) findViewById(R.id.ChatView); > + //mChatview = (ChatView) findViewById(R.id.ChatView); > //userid,roomid > Intent intent = getIntent(); > String msg = (String)intent.getSerializableExtra("String"); > @@ -233,7 +233,7 @@ > httpclient.setHttpCommand(command); > > String result = (String) httpclient.execute(); > - Log.d("getRoomInfo","rsult="+result); > + Log.d("getRoomInfo","result="+result); > String[] param = result.split(">>"); > String[] value = param[1].split(","); > int maxTurn = Integer.valueOf(value[0]); > @@ -307,19 +307,19 @@ > map.setUserAndRoom(mUserID,mRoomID); > map.setContent(this); > > - mChatview.init(this, mRoomID, mPlayer.getCountryName()); > + //mChatview.init(this, mRoomID, mPlayer.getCountryName()); > > // initPopUp(); > - mTweetList = mChatview.getTweetList(); > - mTweetEditor = mChatview.getTweetEditor(); > + // mTweetList = mChatview.getTweetList(); > + //mTweetEditor = mChatview.getTweetEditor(); > //mTweetList = (ListView) mChatview.findViewById(R.id.TweetListView); > // mChatTweetLists.add(new TweetItem("AB1")); > // mChatTweetLists.add(new TweetItem("AB2")); > // mChatTweetLists.add(new TweetItem("AB3")); > // mChatTweetLists.add(new TweetItem("AB4")); > > - mTweetArrayAdapter = new TweetArrayAdapter(this, R.layout.tweetlist, mChatTweetLists); > - mTweetList.setAdapter(mTweetArrayAdapter); > + // mTweetArrayAdapter = new TweetArrayAdapter(this, R.layout.tweetlist, mChatTweetLists); > + //mTweetList.setAdapter(mTweetArrayAdapter); > //mTweetList.setSelection(0); > } > > > Modified: branches/OpenSangokushi_without_twitter/src/jp/or/cute/sangokushi/Opening.java > =================================================================== > --- trunk/OpenSangokushi/src/jp/or/cute/sangokushi/Opening.java 2011-02-01 14:56:41 UTC (rev 476) > +++ branches/OpenSangokushi_without_twitter/src/jp/or/cute/sangokushi/Opening.java 2011-02-03 17:51:38 UTC (rev 477) > @@ -185,8 +185,12 @@ > //スタートボタンは認証終了まで非表示 > mStartButton = (Button)findViewById(R.id.start_button); > //mStartButton.setEnabled(false); > + > + //2011.2.3 > + //akifumi3 > + //一旦Twitter認証を外します。 > + /* > mTwitterButton = (Button)findViewById(R.id.twitter_button); > - > mLobbyButton = (Button)findViewById(R.id.lobby_button); > mLobbyButton.setOnClickListener(new OnClickListener() { > @Override > @@ -194,6 +198,7 @@ > startLobby(); > } > }); > + */ > > //保存している情報によって遷移を決定 > int startBtnTitle = R.string.title_start; > @@ -219,6 +224,10 @@ > Toast.makeText(this, "ようこそ" + mPlayer.getUserName() + "様", Toast.LENGTH_LONG).show(); > } > > + > + //2011.2.3 > + //akifumi3 > + /* > //Twitter認証チェック > //Opening画面表示中にTwitterの認証情報を確認させる > mOperator = new TwitterOperator(this); > @@ -232,6 +241,7 @@ > }else{ > mTwitterButton.setEnabled(false); > } > + */ > } > > @Override > > Modified: branches/OpenSangokushi_without_twitter/src/jp/or/cute/sangokushi/view/MapView.java > =================================================================== > --- trunk/OpenSangokushi/src/jp/or/cute/sangokushi/view/MapView.java 2011-02-01 14:56:41 UTC (rev 476) > +++ branches/OpenSangokushi_without_twitter/src/jp/or/cute/sangokushi/view/MapView.java 2011-02-03 17:51:38 UTC (rev 477) > @@ -112,24 +112,6 @@ > */ > public boolean onKeyDown(int keyCode, KeyEvent event) { > Log.d("MapView","onKeyDown code:"+keyCode); > - // if (keyCode == KeyEvent.KEYCODE_MENU) { > - // AlertDialog.Builder builder = new AlertDialog.Builder(activity); > - // builder.setMessage("Helpを表示しますか？") > - // .setCancelable(false) > - // .setPositiveButton("Yes", new DialogInterface.OnClickListener() { > - // public void onClick(DialogInterface dialog, int id) { > - > - // } > - // }) > - // .setNegativeButton("No", new DialogInterface.OnClickListener() { > - // public void onClick(DialogInterface dialog, int id) { > - // dialog.cancel(); > - // } > - // }); > - // AlertDialog alert = builder.create(); > - // alert.show(); > - // return true; > - // } > return false; > } > > > _______________________________________________ > Sangokushi-svn mailing list > Sango****@lists***** > http://lists.sourceforge.jp/mailman/listinfo/sangokushi-svn
Google Mobile/Open Romance of the Three Kingdoms"GoogleAndroid"
Fork