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" />
-
+
-
-
-
\ No newline at end of file
diff --git a/main/src/main/res/layout/view_homemain.xml b/main/src/main/res/layout/view_homemain.xml
index 52e31bdfe..66b6922d3 100644
--- a/main/src/main/res/layout/view_homemain.xml
+++ b/main/src/main/res/layout/view_homemain.xml
@@ -15,20 +15,20 @@
+ android:layout_alignParentBottom="true" />
@@ -137,16 +140,8 @@
-
-
+ android:layout_marginBottom="10dp"
+ android:visibility="gone" />
+ android:layout_marginRight="25dp" />
- - @mipmap/home_00000
- - @mipmap/home_00001
- - @mipmap/home_00002
- - @mipmap/home_00003
- - @mipmap/home_00004
- - @mipmap/home_00005
- - @mipmap/home_00006
- - @mipmap/home_00007
- - @mipmap/home_00008
- - @mipmap/home_00009
- - @mipmap/home_00010
- - @mipmap/home_00011
- - @mipmap/home_00012
- - @mipmap/home_00013
- - @mipmap/home_00014
- - @mipmap/home_00015
- - @mipmap/home_00016
- - @mipmap/home_00017
- - @mipmap/home_00018
- - @mipmap/home_00019
- - @mipmap/home_00020
- - @mipmap/home_00021
- - @mipmap/home_00022
- - @mipmap/home_00023
- - @mipmap/home_00024
- - @mipmap/home_00025
- - @mipmap/home_00026
- - @mipmap/home_00027
- - @mipmap/home_00028
- - @mipmap/home_00029
- - @mipmap/home_00030
- - @mipmap/home_00031
- - @mipmap/home_00032
- - @mipmap/home_00033
- - @mipmap/home_00034
- - @mipmap/home_00035
- - @mipmap/home_00036
- - @mipmap/home_00037
- - @mipmap/home_00038
- - @mipmap/home_00039
- - @mipmap/home_00040
- - @mipmap/home_00041
- - @mipmap/home_00042
- - @mipmap/home_00043
- - @mipmap/home_00044
- - @mipmap/home_00045
- - @mipmap/home_00046
- - @mipmap/home_00047
- - @mipmap/home_00048
- - @mipmap/home_00049
- - @mipmap/home_00050
- - @mipmap/home_00051
- - @mipmap/home_00052
- - @mipmap/home_00053
- - @mipmap/home_00054
- - @mipmap/home_00055
- - @mipmap/home_00056
- - @mipmap/home_00057
- - @mipmap/home_00058
- - @mipmap/home_00059
+ - @mipmap/main_home_select
+ - @mipmap/main_home_selected
-
- - @mipmap/community_00000
- - @mipmap/community_00001
- - @mipmap/community_00002
- - @mipmap/community_00003
- - @mipmap/community_00004
- - @mipmap/community_00005
- - @mipmap/community_00006
- - @mipmap/community_00007
- - @mipmap/community_00008
- - @mipmap/community_00009
- - @mipmap/community_00010
- - @mipmap/community_00011
- - @mipmap/community_00012
- - @mipmap/community_00013
- - @mipmap/community_00014
- - @mipmap/community_00015
- - @mipmap/community_00016
- - @mipmap/community_00017
- - @mipmap/community_00018
- - @mipmap/community_00019
- - @mipmap/community_00020
- - @mipmap/community_00021
- - @mipmap/community_00022
- - @mipmap/community_00023
- - @mipmap/community_00024
- - @mipmap/community_00025
- - @mipmap/community_00026
- - @mipmap/community_00027
- - @mipmap/community_00028
- - @mipmap/community_00029
- - @mipmap/community_00030
- - @mipmap/community_00031
- - @mipmap/community_00032
- - @mipmap/community_00033
- - @mipmap/community_00034
- - @mipmap/community_00035
- - @mipmap/community_00036
- - @mipmap/community_00037
- - @mipmap/community_00038
- - @mipmap/community_00039
- - @mipmap/community_00040
- - @mipmap/community_00041
- - @mipmap/community_00042
- - @mipmap/community_00043
- - @mipmap/community_00044
- - @mipmap/community_00045
- - @mipmap/community_00046
- - @mipmap/community_00047
- - @mipmap/community_00048
- - @mipmap/community_00049
- - @mipmap/community_00050
- - @mipmap/community_00051
- - @mipmap/community_00052
- - @mipmap/community_00053
- - @mipmap/community_00054
- - @mipmap/community_00055
- - @mipmap/community_00056
- - @mipmap/community_00057
- - @mipmap/community_00058
- - @mipmap/community_00059
-
-
-
-
-
-
-
-
-
-
-
-
-
+ - @mipmap/main_yule_select
+ - @mipmap/main_yule_selected
- - @mipmap/message_00000
- - @mipmap/message_00001
- - @mipmap/message_00002
- - @mipmap/message_00003
- - @mipmap/message_00004
- - @mipmap/message_00005
- - @mipmap/message_00006
- - @mipmap/message_00007
- - @mipmap/message_00008
- - @mipmap/message_00009
- - @mipmap/message_00010
- - @mipmap/message_00011
- - @mipmap/message_00012
- - @mipmap/message_00013
- - @mipmap/message_00014
- - @mipmap/message_00015
- - @mipmap/message_00016
- - @mipmap/message_00017
- - @mipmap/message_00018
- - @mipmap/message_00019
- - @mipmap/message_00020
- - @mipmap/message_00021
- - @mipmap/message_00022
- - @mipmap/message_00023
- - @mipmap/message_00024
- - @mipmap/message_00025
- - @mipmap/message_00026
- - @mipmap/message_00027
- - @mipmap/message_00028
- - @mipmap/message_00029
- - @mipmap/message_00030
- - @mipmap/message_00031
- - @mipmap/message_00032
- - @mipmap/message_00033
- - @mipmap/message_00034
- - @mipmap/message_00035
- - @mipmap/message_00036
- - @mipmap/message_00037
- - @mipmap/message_00038
- - @mipmap/message_00039
- - @mipmap/message_00040
- - @mipmap/message_00041
- - @mipmap/message_00042
- - @mipmap/message_00043
- - @mipmap/message_00044
- - @mipmap/message_00045
- - @mipmap/message_00046
- - @mipmap/message_00047
- - @mipmap/message_00048
- - @mipmap/message_00049
- - @mipmap/message_00050
- - @mipmap/message_00051
- - @mipmap/message_00052
- - @mipmap/message_00053
- - @mipmap/message_00054
- - @mipmap/message_00055
- - @mipmap/message_00056
- - @mipmap/message_00057
- - @mipmap/message_00058
- - @mipmap/message_00059
+ - @mipmap/main_square_select
+ - @mipmap/main_square_selected
- - @mipmap/me_00000
- - @mipmap/me_00001
- - @mipmap/me_00002
- - @mipmap/me_00003
- - @mipmap/me_00004
- - @mipmap/me_00005
- - @mipmap/me_00006
- - @mipmap/me_00007
- - @mipmap/me_00008
- - @mipmap/me_00009
- - @mipmap/me_00010
- - @mipmap/me_00011
- - @mipmap/me_00012
- - @mipmap/me_00013
- - @mipmap/me_00014
- - @mipmap/me_00015
- - @mipmap/me_00016
- - @mipmap/me_00017
- - @mipmap/me_00018
- - @mipmap/me_00019
- - @mipmap/me_00020
- - @mipmap/me_00021
- - @mipmap/me_00022
- - @mipmap/me_00023
- - @mipmap/me_00024
- - @mipmap/me_00025
- - @mipmap/me_00026
- - @mipmap/me_00027
- - @mipmap/me_00028
- - @mipmap/me_00029
- - @mipmap/me_00030
- - @mipmap/me_00031
- - @mipmap/me_00032
- - @mipmap/me_00033
- - @mipmap/me_00034
- - @mipmap/me_00035
- - @mipmap/me_00036
- - @mipmap/me_00037
- - @mipmap/me_00038
- - @mipmap/me_00039
- - @mipmap/me_00040
- - @mipmap/me_00041
- - @mipmap/me_00042
- - @mipmap/me_00043
- - @mipmap/me_00044
- - @mipmap/me_00045
- - @mipmap/me_00046
- - @mipmap/me_00047
- - @mipmap/me_00048
- - @mipmap/me_00049
- - @mipmap/me_00050
- - @mipmap/me_00051
- - @mipmap/me_00052
- - @mipmap/me_00053
- - @mipmap/me_00054
- - @mipmap/me_00055
- - @mipmap/me_00056
- - @mipmap/me_00057
- - @mipmap/me_00058
- - @mipmap/me_00059
+ - @mipmap/main_me_select
+ - @mipmap/main_me_selected
+
+
\ No newline at end of file