Commit 8d7807dc authored by linfeng's avatar linfeng

钱包

parent 9bff3d9e
...@@ -240,8 +240,6 @@ public class DetailPatActivity extends BaseStatusActivity<DiscoveryPresenter> { ...@@ -240,8 +240,6 @@ public class DetailPatActivity extends BaseStatusActivity<DiscoveryPresenter> {
// headMap.put("Authorization", OkGoUtil.getToken()); // headMap.put("Authorization", OkGoUtil.getToken());
// headMap.put("content-type ","application/json"); // headMap.put("content-type ","application/json");
} }
}); });
Window window = trillCommentInputDialog.getWindow(); Window window = trillCommentInputDialog.getWindow();
......
...@@ -63,14 +63,14 @@ public class OrderListActivity extends BaseStatusActivity<PickerPresenter> { ...@@ -63,14 +63,14 @@ public class OrderListActivity extends BaseStatusActivity<PickerPresenter> {
protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) { protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) {
menuPosition = intent.getIntExtra("position", 0); menuPosition = intent.getIntExtra("position", 0);
titleView.setTitle(mActivity.getString(R.string.rv_my_order)); titleView.setTitle(mActivity.getString(R.string.rv_my_order));
/*titleView.setText(R.id.tv_title_right, "开发票"); titleView.setText(R.id.tv_title_right, "开发票");
titleView.setChildClickListener(R.id.tv_title_right, new View.OnClickListener() { titleView.setChildClickListener(R.id.tv_title_right, new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
ARouter.getInstance().build(Constance.ACTIVITY_URL_INVOICINGACTIVITY) ARouter.getInstance().build(Constance.ACTIVITY_URL_INVOICINGACTIVITY)
.navigation(); .navigation();
} }
});*/ });
initRecyclerView(); initRecyclerView();
initViewpager(); initViewpager();
......
...@@ -92,6 +92,8 @@ public class WalletActivity extends BaseStatusActivity<WalletPresenter> implemen ...@@ -92,6 +92,8 @@ public class WalletActivity extends BaseStatusActivity<WalletPresenter> implemen
initRxbus(); initRxbus();
userInfo = getUserInfo(); userInfo = getUserInfo();
dialog = new ProgressDialog(this); dialog = new ProgressDialog(this);
showBindingDialog();
} }
private void initRxbus() { private void initRxbus() {
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/size_15" android:layout_marginLeft="@dimen/size_15"
android:layout_marginRight="@dimen/size_15" android:layout_marginRight="@dimen/size_15"
android:layout_marginBottom="@dimen/size_26" android:layout_marginBottom="@dimen/size_20"
android:text="提现有2种方式,提现到微信零钱或支付宝余额。需至少绑定一种方式:" android:text="提现有2种方式,提现到微信零钱或支付宝余额。需至少绑定一种方式:"
android:textColor="@color/textGray" android:textColor="@color/textGray"
android:textSize="@dimen/size_16" /> android:textSize="@dimen/size_16" />
...@@ -42,14 +42,13 @@ ...@@ -42,14 +42,13 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="@dimen/size_100"
android:orientation="horizontal"> android:orientation="horizontal">
<LinearLayout <LinearLayout
android:id="@+id/ll_item_alipay" android:id="@+id/ll_item_alipay"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:layout_marginBottom="@dimen/size_15"
android:layout_weight="1" android:layout_weight="1"
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:orientation="vertical"> android:orientation="vertical">
...@@ -62,12 +61,10 @@ ...@@ -62,12 +61,10 @@
android:textSize="@dimen/text_16" /> android:textSize="@dimen/text_16" />
<ImageView <ImageView
android:layout_width="@dimen/size_50" android:layout_width="@dimen/size_40"
android:layout_height="@dimen/size_50" android:layout_height="@dimen/size_40"
android:layout_marginTop="@dimen/size_10" android:layout_marginTop="@dimen/size_10"
android:src="@drawable/common_icon_wallet_alipay" /> android:src="@drawable/common_icon_wallet_alipay" />
</LinearLayout> </LinearLayout>
<View <View
...@@ -81,7 +78,7 @@ ...@@ -81,7 +78,7 @@
<LinearLayout <LinearLayout
android:id="@+id/ll_item_wechat" android:id="@+id/ll_item_wechat"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:layout_weight="1" android:layout_weight="1"
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:orientation="vertical"> android:orientation="vertical">
...@@ -94,8 +91,8 @@ ...@@ -94,8 +91,8 @@
android:textSize="@dimen/text_16" /> android:textSize="@dimen/text_16" />
<ImageView <ImageView
android:layout_width="@dimen/size_50" android:layout_width="@dimen/size_40"
android:layout_height="@dimen/size_50" android:layout_height="@dimen/size_40"
android:layout_marginTop="@dimen/size_10" android:layout_marginTop="@dimen/size_10"
android:src="@drawable/common_icon_wallet_weiwx" /> android:src="@drawable/common_icon_wallet_weiwx" />
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment