OpenSangokushi commit ML
sango****@lists*****
2011年 2月 6日 (日) 00:42:02 JST
Google Mobile/Open Romance of the Three Kingdoms"GoogleAndroid"
ForkRevision: 484
http://sourceforge.jp/projects/sangokushi/svn/view?view=rev&revision=484
Author: hryksbt
Date: 2011-02-06 00:42:01 +0900 (Sun, 06 Feb 2011)
Log Message:
-----------
今日、もとの状態でテストしていましたが、akifumi3さんに行って頂いた修正と、プレイヤーの位置が飛んでしまうのは、無関係でした。
なので、位置の飛ぶバグは残っている状態ですが、再度trunkにマージします。
Modified Paths:
--------------
trunk/OpenSangokushi/src/jp/or/cute/sangokushi/Battle.java
trunk/OpenSangokushi/src/jp/or/cute/sangokushi/view/MapView.java
Modified: trunk/OpenSangokushi/src/jp/or/cute/sangokushi/Battle.java
===================================================================
--- trunk/OpenSangokushi/src/jp/or/cute/sangokushi/Battle.java 2011-02-04 18:29:56 UTC (rev 483)
+++ trunk/OpenSangokushi/src/jp/or/cute/sangokushi/Battle.java 2011-02-05 15:42:01 UTC (rev 484)
@@ -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: trunk/OpenSangokushi/src/jp/or/cute/sangokushi/view/MapView.java
===================================================================
--- trunk/OpenSangokushi/src/jp/or/cute/sangokushi/view/MapView.java 2011-02-04 18:29:56 UTC (rev 483)
+++ trunk/OpenSangokushi/src/jp/or/cute/sangokushi/view/MapView.java 2011-02-05 15:42:01 UTC (rev 484)
@@ -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;
}