diff --git a/main/src/main/java/com/yunbao/main/dialog/SigninDialog.java b/main/src/main/java/com/yunbao/main/dialog/SigninDialog.java index 85c3969fb..77e276dc0 100644 --- a/main/src/main/java/com/yunbao/main/dialog/SigninDialog.java +++ b/main/src/main/java/com/yunbao/main/dialog/SigninDialog.java @@ -1,6 +1,5 @@ package com.yunbao.main.dialog; -import static com.yunbao.common.utils.RouteUtil.PATH_REWARD; import android.annotation.SuppressLint; import android.content.DialogInterface; @@ -9,18 +8,14 @@ import android.view.Gravity; import android.view.View; import android.view.Window; import android.view.WindowManager; -import android.widget.Button; import android.widget.TextView; -import com.alibaba.android.arouter.launcher.ARouter; -import com.yunbao.common.CommonAppConfig; import com.yunbao.common.dialog.AbsDialogFragment; import com.yunbao.common.utils.DpUtil; -import com.yunbao.common.utils.WordUtil; import com.yunbao.main.R; public class SigninDialog extends AbsDialogFragment { - TextView gold, sign_day; + TextView gold; private DialogInterface.OnDismissListener onDismissListener; @Override @@ -47,9 +42,9 @@ public class SigninDialog extends AbsDialogFragment { protected void setWindowAttributes(Window window) { window.setWindowAnimations(com.yunbao.live.R.style.bottomToTopAnim); WindowManager.LayoutParams params = window.getAttributes(); - params.width = WindowManager.LayoutParams.MATCH_PARENT; - params.height = DpUtil.dp2px(400); - params.gravity = Gravity.BOTTOM; + params.width = WindowManager.LayoutParams.WRAP_CONTENT; + params.height = DpUtil.dp2px(375); + params.gravity = Gravity.CENTER_VERTICAL; window.setAttributes(params); } @@ -58,33 +53,17 @@ public class SigninDialog extends AbsDialogFragment { public void onActivityCreated(Bundle savedInstanceState) { super.onActivityCreated(savedInstanceState); gold = (TextView) findViewById(R.id.gold); - sign_day = (TextView) findViewById(R.id.sign_day); - Button goto_sign = (Button) findViewById(R.id.goto_sign); - Button confirm = (Button) findViewById(R.id.confirm); - - goto_sign.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View view) { - ARouter.getInstance().build(PATH_REWARD).withString("url", CommonAppConfig.HOST + "/index.php?g=Appapi&m=task&a=index" + "&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&isZh=" + (WordUtil.isNewZh() ? "1" : "0")).navigation(); - dismiss(); - - } - }); - - confirm.setOnClickListener(new View.OnClickListener() { + findViewById(R.id.confirm).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { dismiss(); } }); - Bundle bundle = getArguments(); if (bundle == null) { return; } gold.setText(bundle.getString("send_gold") + "金豆+" + bundle.getString("send_exp") + "EXP"); - - sign_day.setText(String.format(getString(R.string.this_month), bundle.getString("sign_day"))); } @Override diff --git a/main/src/main/res/drawable/sign_submit.xml b/main/src/main/res/drawable/sign_submit.xml new file mode 100644 index 000000000..7ec015f5b --- /dev/null +++ b/main/src/main/res/drawable/sign_submit.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/main/src/main/res/layout/signin_dialog.xml b/main/src/main/res/layout/signin_dialog.xml index c2eedc4f3..476e1092b 100644 --- a/main/src/main/res/layout/signin_dialog.xml +++ b/main/src/main/res/layout/signin_dialog.xml @@ -1,87 +1,56 @@ - - + + - - - + android:textColor="#FF333333" + android:textSize="13sp" /> - - - - - - - + android:text="200 金豆 + 2000 EXP" + android:textColor="#FFFF2D73" + android:textSize="14sp" + android:textStyle="bold" /> -