Skip to content

Commit

Permalink
android: release new version v2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@syalon
syalon committed Apr 11, 2019
1 parent 69100ab commit ad28616
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion android/app/src/main/assets/fowallet_config.json
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"internal_themes":[{"themeCode":"blue","themeName":"静谧蓝","themeNameLangKey":"kThemeNameBlue","themeStatusBarWhite":true,"colors":{"appBackColor":"131f30","contentBackColor":"333333","bottomLineColor":"1a273a","buyColor":"03c087","sellColor":"e76d42","zeroColor":"8c9fad","callOrderColor":"ffff00","textColorPercent":"ffffff","textColorHighlight":"5786d2","textColorGray":"3d526b","textColorNormal":"6d87a8","textColorMain":"ffffff","ma5Color":"f6dc93","ma10Color":"61d1c0","ma30Color":"cb92fe","navigationBarBackColor":"131f30","navigationBarTextColor":"ffffff","tabBarColor":"172941","blockButtonBackColor":"607D8B","blockButtonTextColor":"ffffff","mainButtonBackColor":"e76d42","mainButtonTextColor":"ffffff","frameButtonBorderColor":"607D8B","frameButtonTextColor":"607D8B","tintColor":"e76d42","iconColor":"fe6c5a","textColor01":"212121","textColor02":"727272","noticeColor":"fe6c5a","ticketColor":"8d9caa"}},{"themeCode":"white","themeName":"珍珠白","themeNameLangKey":"kThemeNameWhite","themeStatusBarWhite":false,"colors":{"appBackColor":"ffffff","contentBackColor":"333333","bottomLineColor":"e7ebee","buyColor":"03c087","sellColor":"e76d42","zeroColor":"8c9fad","callOrderColor":"ffff00","textColorPercent":"ffffff","textColorHighlight":"5786d2","textColorGray":"c5cfd5","textColorNormal":"8c9fad","textColorMain":"1f3f59","ma5Color":"f6dc93","ma10Color":"61d1c0","ma30Color":"cb92fe","navigationBarBackColor":"ffffff","navigationBarTextColor":"1f3f59","tabBarColor":"f2f2f2","blockButtonBackColor":"607D8B","blockButtonTextColor":"ffffff","mainButtonBackColor":"fe6c5a","mainButtonTextColor":"ffffff","frameButtonBorderColor":"607D8B","frameButtonTextColor":"607D8B","tintColor":"fe6c5a","iconColor":"fe6c5a","textColor01":"212121","textColor02":"727272","noticeColor":"fe6c5a","ticketColor":"8d9caa"}}],"internal_assets":{"BTS":{"symbol":"BTS","id":"1.3.0","precision":5},"CNY":{"symbol":"CNY","id":"1.3.113","precision":4,"bitasset_data_id":"2.4.13"},"USD":{"symbol":"USD","id":"1.3.121","precision":4,"bitasset_data_id":"2.4.21"},"EUR":{"symbol":"EUR","id":"1.3.120","precision":4,"bitasset_data_id":"2.4.20"},"JPY":{"symbol":"JPY","id":"1.3.119","precision":2,"bitasset_data_id":"2.4.19"},"KRW":{"symbol":"KRW","id":"1.3.102","precision":4,"bitasset_data_id":"2.4.2"},"YOYOW":{"symbol":"YOYOW","id":"1.3.1093","precision":5},"GDEX.BTC":{"symbol":"GDEX.BTC","id":"1.3.2241","precision":8},"GDEX.ETH":{"symbol":"GDEX.ETH","id":"1.3.2598","precision":6},"GDEX.EOS":{"symbol":"GDEX.EOS","id":"1.3.2635","precision":6},"GDEX.SEER":{"symbol":"GDEX.SEER","id":"1.3.3736","precision":5}},"estimate_unit":[{"namekey":"kSettingCurrencyNameCNY","symbol":"CNY"},{"namekey":"kSettingCurrencyNameUSD","symbol":"USD"},{"namekey":"kSettingCurrencyNameEUR","symbol":"EUR"},{"namekey":"kSettingCurrencyNameJPY","symbol":"JPY"},{"namekey":"kSettingCurrencyNameKRW","symbol":"KRW"},{"namekey":"kSettingCurrencyNameBTS","symbol":"BTS"}],"network_infos":{"max_parallel_num":5,"max_retry_num":3,"connect_timeout":5,"ws_node_list":[{"url":"wss://node.market.rudex.org","location":"Germany","enable":true,"username":"","password":""},{"url":"ws://47.111.36.252:9112","location":"China(btspp)","enable":true,"username":"","password":""},{"url":"wss://api.bts.mobi/ws","location":"USA","enable":true,"username":"","password":""},{"url":"wss://btsapi.magicw.net/ws","location":"China(MagicWallet)","enable":true,"username":"","password":""}]},"parameters":{"default_kline_index":{"kMain":"ma","kSub":"","ma_value":[5,10,30],"ema_value":[9,15,30],"boll_value":{"n":20,"p":2},"macd_value":{"s":12,"l":26,"m":9}},"kline_period_ary":[1,30,50,60,70],"kline_period_default":2,"display_precision":5,"display_min_fraction":2,"num_price_total_max_precision":10,"max_custom_pair_num":20,"order_book_num_kline":20,"order_book_num_trade":6,"wallet_import_account_max_num":20,"collateral_ratio_default":3.0,"mcr_default":1.75,"max_ratio":6.0,"max_target_ratio":4.0,"base_budget_id":"2.13.25084","base_budget_time":"2018-08-24T03:00:00","voting_proxy_to_self":"1.2.5","voting_proxy_max_level":3},"faucet":{"url":"http://120.26.136.190:7773/v1/chain/"},"call_order_ranking_list":["CNY","USD"],"detail_feedprice_list":["CNY","USD"],"debt_asset_list":["CNY","USD","EUR","JPY","KRW"],"fee_assets_list":["BTS","CNY","USD"],"internal_groups":{"MAIN":{"id":10,"key":"MAIN","name":"主区","name_key":"kLabelGroupNameMain","main":true,"intro":false},"GDEX":{"id":20,"key":"GDEX","issuer":["1.2.442525"],"name":"GDEX(网关)","name_key":"kLabelGroupNameGDEX","gateway":true,"prefix":"GDEX","intro":true},"WWW":{"id":30,"key":"WWW","issuer":["1.2.471972"],"name":"WWW(网关)","name_key":"kLabelGroupNameWWW","gateway":true,"prefix":"WWW"},"OPEN":{"id":40,"key":"OPEN","issuer":["1.2.96397","1.2.100614"],"name":"OPEN(网关)","name_key":"kLabelGroupNameOPEN","gateway":true,"prefix":"OPEN"},"WIN":{"id":50,"key":"WIN","issuer":["1.2.452990"],"name":"WIN(网关)","name_key":"kLabelGroupNameWIN","gateway":true,"prefix":"WIN"},"__OTHER":{"id":100,"key":"__OTHER","name":"其他","name_key":"kLabelGroupNameOther","other":true,"intro":false}},"markets":[{"base":{"symbol":"CNY","name":"BitCNY"},"group_list":[{"group_key":"MAIN","quote_list":["BTS","USD"]},{"group_key":"GDEX","quote_list":["GDEX.BTC","GDEX.ETH","GDEX.EOS","GDEX.SEER"]}]},{"base":{"symbol":"USD","name":"BitUSD"},"group_list":[{"group_key":"MAIN","quote_list":["BTS","CNY"]},{"group_key":"GDEX","quote_list":["GDEX.BTC","GDEX.EOS"]}]},{"base":{"symbol":"BTS","name":"BTS"},"group_list":[{"group_key":"MAIN","quote_list":["CNY","USD"]},{"group_key":"GDEX","quote_list":["GDEX.EOS"]}]}]}
{"internal_themes":[{"themeCode":"blue","themeName":"静谧蓝","themeNameLangKey":"kThemeNameBlue","themeStatusBarWhite":true,"colors":{"appBackColor":"131f30","contentBackColor":"333333","bottomLineColor":"1a273a","buyColor":"03c087","sellColor":"e76d42","zeroColor":"8c9fad","callOrderColor":"ffff00","textColorPercent":"ffffff","textColorHighlight":"5786d2","textColorGray":"3d526b","textColorNormal":"6d87a8","textColorMain":"ffffff","ma5Color":"f6dc93","ma10Color":"61d1c0","ma30Color":"cb92fe","navigationBarBackColor":"131f30","navigationBarTextColor":"ffffff","tabBarColor":"172941","blockButtonBackColor":"607D8B","blockButtonTextColor":"ffffff","mainButtonBackColor":"e76d42","mainButtonTextColor":"ffffff","frameButtonBorderColor":"607D8B","frameButtonTextColor":"607D8B","tintColor":"e76d42","iconColor":"fe6c5a","textColor01":"212121","textColor02":"727272","noticeColor":"fe6c5a","ticketColor":"8d9caa"}},{"themeCode":"white","themeName":"珍珠白","themeNameLangKey":"kThemeNameWhite","themeStatusBarWhite":false,"colors":{"appBackColor":"ffffff","contentBackColor":"333333","bottomLineColor":"e7ebee","buyColor":"03c087","sellColor":"e76d42","zeroColor":"8c9fad","callOrderColor":"ffff00","textColorPercent":"ffffff","textColorHighlight":"5786d2","textColorGray":"c5cfd5","textColorNormal":"8c9fad","textColorMain":"1f3f59","ma5Color":"f6dc93","ma10Color":"61d1c0","ma30Color":"cb92fe","navigationBarBackColor":"ffffff","navigationBarTextColor":"1f3f59","tabBarColor":"f2f2f2","blockButtonBackColor":"607D8B","blockButtonTextColor":"ffffff","mainButtonBackColor":"fe6c5a","mainButtonTextColor":"ffffff","frameButtonBorderColor":"607D8B","frameButtonTextColor":"607D8B","tintColor":"fe6c5a","iconColor":"fe6c5a","textColor01":"212121","textColor02":"727272","noticeColor":"fe6c5a","ticketColor":"8d9caa"}}],"internal_assets":{"BTS":{"symbol":"BTS","id":"1.3.0","precision":5},"CNY":{"symbol":"CNY","id":"1.3.113","precision":4,"bitasset_data_id":"2.4.13"},"USD":{"symbol":"USD","id":"1.3.121","precision":4,"bitasset_data_id":"2.4.21"},"EUR":{"symbol":"EUR","id":"1.3.120","precision":4,"bitasset_data_id":"2.4.20"},"JPY":{"symbol":"JPY","id":"1.3.119","precision":2,"bitasset_data_id":"2.4.19"},"KRW":{"symbol":"KRW","id":"1.3.102","precision":4,"bitasset_data_id":"2.4.2"},"YOYOW":{"symbol":"YOYOW","id":"1.3.1093","precision":5},"GDEX.BTC":{"symbol":"GDEX.BTC","id":"1.3.2241","precision":8},"GDEX.ETH":{"symbol":"GDEX.ETH","id":"1.3.2598","precision":6},"GDEX.EOS":{"symbol":"GDEX.EOS","id":"1.3.2635","precision":6},"GDEX.SEER":{"symbol":"GDEX.SEER","id":"1.3.3736","precision":5}},"estimate_unit":[{"namekey":"kSettingCurrencyNameCNY","symbol":"CNY"},{"namekey":"kSettingCurrencyNameUSD","symbol":"USD"},{"namekey":"kSettingCurrencyNameEUR","symbol":"EUR"},{"namekey":"kSettingCurrencyNameJPY","symbol":"JPY"},{"namekey":"kSettingCurrencyNameKRW","symbol":"KRW"},{"namekey":"kSettingCurrencyNameBTS","symbol":"BTS"}],"network_infos":{"max_parallel_num":5,"max_retry_num":3,"connect_timeout":5,"ws_node_list":[{"url":"wss://node.market.rudex.org","location":"Germany","enable":true,"username":"","password":""},{"url":"wss://api.weaccount.cn","location":"China(btspp)","enable":true,"username":"","password":""},{"url":"wss://api.bts.mobi/ws","location":"USA","enable":true,"username":"","password":""},{"url":"wss://btsapi.magicw.net/ws","location":"China(MagicWallet)","enable":true,"username":"","password":""}]},"parameters":{"default_kline_index":{"kMain":"ma","kSub":"","ma_value":[5,10,30],"ema_value":[9,15,30],"boll_value":{"n":20,"p":2},"macd_value":{"s":12,"l":26,"m":9}},"kline_period_ary":[1,30,50,60,70],"kline_period_default":2,"display_precision":5,"display_min_fraction":2,"num_price_total_max_precision":10,"max_custom_pair_num":20,"order_book_num_kline":20,"order_book_num_trade":6,"wallet_import_account_max_num":20,"collateral_ratio_default":3.0,"mcr_default":1.75,"max_ratio":6.0,"max_target_ratio":4.0,"base_budget_id":"2.13.25084","base_budget_time":"2018-08-24T03:00:00","voting_proxy_to_self":"1.2.5","voting_proxy_max_level":3},"faucet":{"url":"http://120.26.136.190:7773/v1/chain/"},"call_order_ranking_list":["CNY","USD"],"detail_feedprice_list":["CNY","USD"],"debt_asset_list":["CNY","USD","EUR","JPY","KRW"],"fee_assets_list":["BTS","CNY","USD"],"internal_groups":{"MAIN":{"id":10,"key":"MAIN","name":"主区","name_key":"kLabelGroupNameMain","main":true,"intro":false},"GDEX":{"id":20,"key":"GDEX","issuer":["1.2.442525"],"name":"GDEX(网关)","name_key":"kLabelGroupNameGDEX","gateway":true,"prefix":"GDEX","intro":true},"WWW":{"id":30,"key":"WWW","issuer":["1.2.471972"],"name":"WWW(网关)","name_key":"kLabelGroupNameWWW","gateway":true,"prefix":"WWW"},"OPEN":{"id":40,"key":"OPEN","issuer":["1.2.96397","1.2.100614"],"name":"OPEN(网关)","name_key":"kLabelGroupNameOPEN","gateway":true,"prefix":"OPEN"},"WIN":{"id":50,"key":"WIN","issuer":["1.2.452990"],"name":"WIN(网关)","name_key":"kLabelGroupNameWIN","gateway":true,"prefix":"WIN"},"__OTHER":{"id":100,"key":"__OTHER","name":"其他","name_key":"kLabelGroupNameOther","other":true,"intro":false}},"markets":[{"base":{"symbol":"CNY","name":"BitCNY"},"group_list":[{"group_key":"MAIN","quote_list":["BTS","USD"]},{"group_key":"GDEX","quote_list":["GDEX.BTC","GDEX.ETH","GDEX.EOS","GDEX.SEER"]}]},{"base":{"symbol":"USD","name":"BitUSD"},"group_list":[{"group_key":"MAIN","quote_list":["BTS","CNY"]},{"group_key":"GDEX","quote_list":["GDEX.BTC","GDEX.EOS"]}]},{"base":{"symbol":"BTS","name":"BTS"},"group_list":[{"group_key":"MAIN","quote_list":["CNY","USD"]},{"group_key":"GDEX","quote_list":["GDEX.EOS"]}]}]}
2 changes: 1 addition & 1 deletion android/app/src/main/java/com/btsplusplus/fowallet/FragmentTradeMainPage.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -840,7 +840,7 @@ class FragmentTradeMainPage : BtsppFragment() {

fun createNoOrderView(ctx: Context): TextView {
val tv = TextView(ctx)
tv.text = R.string.kVcOrderTipNoOpenOrder.xmlstring(ctx)
tv.text = R.string.kLabelNoOrder.xmlstring(ctx)
tv.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 12.0f)
tv.setTextColor(ctx.resources.getColor(R.color.theme01_textColorGray))
tv.setPadding(0, Utils.toDp(40f, ctx.resources), 0, 0)
Expand Down
18 changes: 9 additions & 9 deletions android/app/src/main/res/values-ja/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,9 +139,9 @@
<string name="kAccountMembershipMyRefCodeCopyOK">推薦コードがコピーされました</string>
<string name="kAccountUpgradeTipsMember">一生会員、あなたは80％の手数料償還報酬を受ける権利があります。</string>
<string name="kAccountUpgradeTipsNotMember">今すぐあなたの一生会員をアップグレードして、80％の返金手数料を得てください。</string>
<string name="kAccountUpgradeMemberSubmitTxFullOK">一生会員成功をアップグレードします。</string>
<string name="kAccountUpgradeMemberSubmitTxOK">一生会員成功をアップグレードします。 ただし、更新インターフェイスが失敗しました。しばらくしてからもう一度お試しください。</string>
<string name="kAccountUpgradeMemberCostAsk">一生会員資格をアップグレードするには %s かかります。続行しますか？</string>
<string name="kAccountUpgradeMemberSubmitTxFullOK">一生会員は正常にアップグレードされました。</string>
<string name="kAccountUpgradeMemberSubmitTxOK">一生会員は正常にアップグレードされました。 ただし、更新インターフェイスが失敗しました。しばらくしてからもう一度お試しください。</string>
<string name="kAccountUpgradeMemberCostAsk">一生会員をアップグレードするには %s かかります。続行しますか？</string>
<!-- 登录&注册&备份 -->
<string name="kLoginPageModePassword">アカウントモード</string>
<string name="kLoginPageModePrivateKey">キーファイルモード</string>
Expand Down Expand Up @@ -386,18 +386,18 @@
<string name="kBtnSell">売り</string>
<string name="kLableAvailable">可利用</string>
<string name="kLableTotalPrice">取引額</string>
<string name="kPlaceHolderBuyPrice">購い单价</string>
<string name="kPlaceHolderBuyAmount">購い数量</string>
<string name="kPlaceHolderSellPrice">売却価格</string>
<string name="kPlaceHolderSellAmount">売却価格</string>
<string name="kPlaceHolderBuyPrice">購い単価</string>
<string name="kPlaceHolderBuyAmount">購数量</string>
<string name="kPlaceHolderSellPrice">売却単価</string>
<string name="kPlaceHolderSellAmount">売数量</string>
<string name="kTailerBtnBid1">購一価</string>
<string name="kTailerBtnAsk1">売一価</string>
<string name="kLableBuyPrice">購い单价 </string>
<string name="kLableBuyAmount">購い数量 </string>
<string name="kLableBuyAmount">購数量 </string>
<string name="kLableSellPrice">売却価格 </string>
<string name="kLableSellAmount">売却価格 </string>
<string name="kLableBidBuy">購い</string>
<string name="kLableAskSell">売り出</string>
<string name="kLableAskSell">売り</string>
<string name="kLableBidAmount">数量</string>
<string name="kLableBidPrice">価格</string>
<string name="kLabelOpenOrders">現在の注文</string>
Expand Down

0 comments on commit ad28616

Please sign in to comment.