modify
modify
modify
modify
Merge branch 'master' of github.com:momoplan/Android

Conflicts:
	Ruyicai_General/main/v_main/bin/classes/com/alipay/android/secure/MobileSecurePayHelper$1.class
	Ruyicai_General/main/v_main/bin/classes/com/palmdream/RuyicaiAndroid/R$anim.class
	Ruyicai_General/main/v_main/bin/classes/com/palmdream/RuyicaiAndroid/R$array.class
	Ruyicai_General/main/v_main/bin/classes/com/palmdream/RuyicaiAndroid/R$attr.class
	Ruyicai_General/main/v_main/bin/classes/com/palmdream/RuyicaiAndroid/R$color.class
	Ruyicai_General/main/v_main/bin/classes/com/palmdream/RuyicaiAndroid/R$dimen.class
	Ruyicai_General/main/v_main/bin/classes/com/palmdream/RuyicaiAndroid/R$drawable.class
	Ruyicai_General/main/v_main/bin/classes/com/palmdream/RuyicaiAndroid/R$id.class
	Ruyicai_General/main/v_main/bin/classes/com/palmdream/RuyicaiAndroid/R$layout.class
	Ruyicai_General/main/v_main/bin/classes/com/palmdream/RuyicaiAndroid/R$menu.class
	Ruyicai_General/main/v_main/bin/classes/com/palmdream/RuyicaiAndroid/R$raw.class
	Ruyicai_General/main/v_main/bin/classes/com/palmdream/RuyicaiAndroid/R$string.class
	Ruyicai_General/main/v_main/bin/classes/com/palmdream/RuyicaiAndroid/R$style.class
	Ruyicai_General/main/v_main/bin/classes/com/ruyicai/activity/account/AccountListActivity$AccountAdapter.class
	Ruyicai_General/main/v_main/bin/classes/com/ruyicai/activity/account/AccountListActivity.class
	Ruyicai_General/main/v_main/bin/classes/com/ruyicai/activity/account/ExchangeGoldActivity.class
	Ruyicai_General/main/v_main/bin/classes/com/ruyicai/activity/buy/beijing/BeiJingSingleGameActivity.class
	Ruyicai_General/main/v_main/bin/classes/com/ruyicai/activity/buy/beijing/BeiJingSingleGameIndentActivity$2.class
	Ruyicai_General/main/v_main/bin/classes/com/ruyicai/activity/buy/beijing/adapter/HalfTheAudienceAdapter.class
	Ruyicai_General/main/v_main/bin/classes/com/ruyicai/activity/buy/beijing/adapter/OverAllAdapter.class
	Ruyicai_General/main/v_main/bin/classes/com/ruyicai/activity/buy/beijing/adapter/TotalGoalsAdapter.class
	Ruyicai_General/main/v_main/bin/classes/com/ruyicai/activity/buy/beijing/adapter/UpDownSingleDoubleAdapter.class
	Ruyicai_General/main/v_main/bin/classes/com/ruyicai/activity/buy/beijing/adapter/WinTieLossAdapter.class
	Ruyicai_General/main/v_main/bin/classes/com/ruyicai/activity/buy/dlc/Dlc$1.class
	Ruyicai_General/main/v_main/bin/classes/com/ruyicai/activity/buy/dlc/Dlc$10$1.class
	Ruyicai_General/main/v_main/bin/classes/com/ruyicai/activity/buy/dlc/Dlc$10$2.class
	Ruyicai_General/main/v_main/bin/classes/com/ruyicai/activity/buy/dlc/Dlc$10$3.class
	Ruyicai_General/main/v_main/bin/classes/com/ruyicai/activity/buy/dlc/Dlc$10.class
	Ruyicai_General/main/v_main/bin/classes/com/ruyicai/activity/buy/dlc/Dlc$11$1.class
	Ruyicai_General/main/v_main/bin/classes/com/ruyicai/activity/buy/dlc/Dlc$11$2.class
	Ruyicai_General/main/v_main/bin/classes/com/ruyicai/activity/buy/dlc/Dlc$11.class
	Ruyicai_General/main/v_main/bin/classes/com/ruyicai/activity/buy/dlc/Dlc$12.class
	Ruyicai_General/main/v_main/bin/classes/com/ruyicai/activity/buy/dlc/Dlc$13.class
	Ruyicai_General/main/v_main/bin/classes/com/ruyicai/activity/buy/dlc/Dlc$2.class
	Ruyicai_General/main/v_main/bin/classes/com/ruyicai/activity/buy/dlc/Dlc$3.class
	Ruyicai_General/main/v_main/bin/classes/com/ruyicai/activity/buy/dlc/Dlc$4.class
	Ruyicai_General/main/v_main/bin/classes/com/ruyicai/activity/buy/dlc/Dlc$5.class
	Ruyicai_General/main/v_main/bin/classes/com/ruyicai/activity/buy/dlc/Dlc$6.class
	Ruyicai_General/main/v_main/bin/classes/com/ruyicai/activity/buy/dlc/Dlc$7.class
	Ruyicai_General/main/v_main/bin/classes/com/ruyicai/activity/buy/dlc/Dlc$8.class
	Ruyicai_General/main/v_main/bin/classes/com/ruyicai/activity/buy/dlc/Dlc$9.class
	Ruyicai_General/main/v_main/bin/classes/com/ruyicai/activity/buy/dlc/Dlc.class
	Ruyicai_General/main/v_main/bin/classes/com/ruyicai/activity/buy/jc/JcMainActivity.class
	Ruyicai_General/main/v_main/bin/classes/com/ruyicai/activity/buy/jc/lq/view/HunHeLqView$JcInfoAdapter.class
	Ruyicai_General/main/v_main/bin/classes/com/ruyicai/activity/buy/jc/lq/view/SfView$JcInfoAdapter.class
	Ruyicai_General/main/v_main/bin/classes/com/ruyicai/activity/buy/jc/lq/view/SfcView$JcInfoAdapter.class
	Ruyicai_General/main/v_main/bin/classes/com/ruyicai/activity/buy/jc/touzhu/TouzhuDialog$2.class
	Ruyicai_General/main/v_main/bin/classes/com/ruyicai/activity/buy/jc/zq/view/BFView$JcInfoAdapter.class
	Ruyicai_General/main/v_main/bin/classes/com/ruyicai/activity/buy/jc/zq/view/BQCView$JcInfoAdapter.class
	Ruyicai_General/main/v_main/bin/classes/com/ruyicai/activity/buy/jc/zq/view/HunHeZqView$JcInfoAdapter.class
	Ruyicai_General/main/v_main/bin/classes/com/ruyicai/activity/buy/jc/zq/view/SPfView$JcInfoAdapter.class
	Ruyicai_General/main/v_main/bin/classes/com/ruyicai/activity/buy/jc/zq/view/ZJQView$JcInfoAdapter.class
	Ruyicai_General/main/v_main/bin/classes/com/ruyicai/activity/buy/jixuan/DanshiJiXuan$1.class
	Ruyicai_General/main/v_main/bin/classes/com/ruyicai/activity/buy/jixuan/DanshiJiXuan$2.class
	Ruyicai_General/main/v_main/bin/classes/com/ruyicai/activity/buy/jixuan/DanshiJiXuan$3.class
	Ruyicai_General/main/v_main/bin/classes/com/ruyicai/activity/buy/jixuan/DanshiJiXuan$4.class
	Ruyicai_General/main/v_main/bin/classes/com/ruyicai/activity/buy/jixuan/DanshiJiXuan$5.class
	Ruyicai_General/main/v_main/bin/classes/com/ruyicai/activity/buy/jixuan/DanshiJiXuan$6.class
	Ruyicai_General/main/v_main/bin/classes/com/ruyicai/activity/buy/jixuan/DanshiJiXuan$7.class
	Ruyicai_General/main/v_main/bin/classes/com/ruyicai/activity/buy/jixuan/DanshiJiXuan$8.class
	Ruyicai_General/main/v_main/bin/classes/com/ruyicai/activity/buy/jixuan/DanshiJiXuan$9.class
	Ruyicai_General/main/v_main/bin/classes/com/ruyicai/activity/buy/jixuan/DanshiJiXuan$SsqSensor.class
	Ruyicai_General/main/v_main/bin/classes/com/ruyicai/activity/buy/jixuan/DanshiJiXuan.class
	Ruyicai_General/main/v_main/bin/classes/com/ruyicai/activity/buy/nmk3/Nmk3Activity.class
	Ruyicai_General/main/v_main/bin/classes/com/ruyicai/activity/buy/pl5/PL5.class
	Ruyicai_General/main/v_main/bin/classes/com/ruyicai/activity/buy/pl5/PL5ZiJX.class
	Ruyicai_General/main/v_main/bin/classes/com/ruyicai/activity/buy/pl5/PL5ZiZhiXuan.class
	Ruyicai_General/main/v_main/bin/classes/com/ruyicai/activity/buy/qlc/Qlc.class
	Ruyicai_General/main/v_main/bin/classes/com/ruyicai/activity/buy/qlc/QlcZiDanTuo.class
	Ruyicai_General/main/v_main/bin/classes/com/ruyicai/activity/buy/qlc/QlcZiZhiXuan.class
	Ruyicai_General/main/v_main/bin/classes/com/ruyicai/activity/buy/qxc/QXC.class
	Ruyicai_General/main/v_main/bin/classes/com/ruyicai/activity/buy/qxc/QXCJX.class
	Ruyicai_General/main/v_main/bin/classes/com/ruyicai/activity/buy/qxc/QXCZhiXuan.class
	Ruyicai_General/main/v_main/bin/classes/com/ruyicai/activity/buy/zc/FootBallMainActivity.class
	Ruyicai_General/main/v_main/bin/classes/com/ruyicai/activity/common/PullRefreshListView.class
	Ruyicai_General/main/v_main/bin/classes/com/ruyicai/activity/join/JoinDingActivity.class
	Ruyicai_General/main/v_main/bin/classes/com/ruyicai/activity/notice/NoticeBallView$BallComparator.class
	Ruyicai_General/main/v_main/bin/classes/com/ruyicai/activity/notice/NoticeBallView$BallPosition.class
	Ruyicai_General/main/v_main/bin/classes/com/ruyicai/activity/notice/NoticeBallView$RowInfo.class
	Ruyicai_General/main/v_main/bin/classes/com/ruyicai/activity/notice/NoticeBallView.class
	Ruyicai_General/main/v_main/bin/classes/com/ruyicai/activity/usercenter/detail/WithdrawDetailActivity.class
	Ruyicai_General/main/v_main/bin/classes/com/ruyicai/util/PublicMethod$1.class
	Ruyicai_General/main/v_main/bin/classes/com/ruyicai/util/PublicMethod$10$1.class
	Ruyicai_General/main/v_main/bin/classes/com/ruyicai/util/PublicMethod$10.class
	Ruyicai_General/main/v_main/bin/classes/com/ruyicai/util/PublicMethod$8.class
	Ruyicai_General/main/v_main/bin/classes/com/ruyicai/util/PublicMethod$9.class
	Ruyicai_General/main/v_main/bin/classes/com/ruyicai/util/PublicMethod.class
	Ruyicai_General/main/v_main/bin/classes/com/unionpay/upomp/lthj/plugin/ui/R$drawable.class
	Ruyicai_General/main/v_main/gen/com/palmdream/RuyicaiAndroid/R.java
	Ruyicai_General/main/v_main/gen/com/unionpay/upomp/lthj/plugin/ui/R.java
	Ruyicai_General/v4.0.0_plugin/src/com/alipay/android/secure/AlipaySecurePayDialog.java
	Ruyicai_General/v4.0.0_plugin/src/com/ruyicai/activity/account/AlipaySecureActivity.java
	Ruyicai_General/v4.0.0_plugin/src/com/ruyicai/activity/buy/dlc/Dlc.java