Merge remote-tracking branch 'origin/新改版_poyo' into 新改版_poyo

main/src/main/java/com/yunbao/main/activity/EditProfileActivity.java

@@ -417,7 +417,7 @@ public class EditProfileActivity extends AbsActivity {
         dialog.findViewById(R.id.tv_into).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                String url = CommonAppConfig.HOST + "/index.php?g=Appapi&m=task&a=index&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&tabIndex=1";
+                String url = CommonAppConfig.HOST + "/h5/task/index.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&tabIndex=1";
                 WebViewActivity.forward(mContext, url,false);
                 dialog.dismiss();
             }

main/src/main/java/com/yunbao/main/views/MainMeViewHolder_PD.java

@@ -540,7 +540,7 @@ public class MainMeViewHolder_PD extends AbsMainViewHolder implements OnItemClic
         } else if (i == R.id.btn_gold) {
             MobclickAgent.onEvent(mContext, "my_receive", "充值旁边领取金豆的按钮");
             //            mContext.startActivity(new Intent(mContext, MyWalletActivity.class).putExtra("p", 2));
-            String url = CommonAppConfig.HOST + "/index.php?g=Appapi&m=task&a=index";
+            String url = CommonAppConfig.HOST + "/h5/task/index.html?1=1";
             RewardActivity.forward(mContext, url);
         } else if (i == R.id.rt_kefu) {
             WebViewActivity.forward(mContext, beanKefu.getHref(), false);

main/src/main/res/drawable/background_227bef.xml

@@ -2,7 +2,7 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
         <shape android:shape="rectangle">
-            <corners android:radius="25dp" />
+            <corners android:radius="30dp" />
             <solid android:color="@color/blue_227bef" />
         </shape>
     </item>

main/src/main/res/layout/activity_entry.xml

@@ -51,7 +51,7 @@
                     android:src="@mipmap/icon_facebook" />
 
                 <TextView
-                    android:layout_marginStart="25dp"
+                    android:layout_marginStart="35dp"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:text="@string/user_login_facebook"
@@ -86,7 +86,7 @@
                 <TextView
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginLeft="25dp"
+                    android:layout_marginLeft="35dp"
                     android:text="@string/user_login_google"
                     android:textColor="@color/black1"
                     android:textSize="14sp" />
@@ -120,7 +120,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:text="@string/login_use_phone"
-                    android:layout_marginLeft="25dp"
+                    android:layout_marginLeft="35dp"
                     android:textColor="@color/black1"
                     android:textSize="14sp" />
             </LinearLayout>
@@ -172,6 +172,7 @@
             android:id="@+id/lt_login_other"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_marginTop="100dp"
             android:layout_marginLeft="25dp"
             android:layout_marginRight="25dp"
             android:orientation="vertical">