Commit 54464037 by luofan

ui修改

parent 87e8465e
...@@ -98,7 +98,7 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin ...@@ -98,7 +98,7 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin
private HomeLearnFragment learnFragment; private HomeLearnFragment learnFragment;
private HomeUserFragment fourFragment; private HomeUserFragment fourFragment;
private BusinessFragment businessFragment; private BusinessFragment businessFragment;
private int mFirstPositon = 2; private int mFirstPositon = 0;
private BadgeView mBadgeView; private BadgeView mBadgeView;
private BadgeView mOrderBadgeView; private BadgeView mOrderBadgeView;
private BadgeView mSaleBadgeView; private BadgeView mSaleBadgeView;
......
...@@ -5,8 +5,8 @@ buildscript { ...@@ -5,8 +5,8 @@ buildscript {
ext.build_tools_version = "27.0.3" ext.build_tools_version = "27.0.3"
ext.min_sdk_version = 19 ext.min_sdk_version = 19
ext.target_sdk_version = 26 ext.target_sdk_version = 26
ext.version_code = 297 ext.version_code = 298
ext.verson_name = "2.9.7" ext.verson_name = "2.9.8"
ext.gradle_version = '3.1.4' ext.gradle_version = '3.1.4'
ext.isReleaseMinify = false ext.isReleaseMinify = false
ext.isDebugMinify = false ext.isDebugMinify = false
......
...@@ -15,8 +15,8 @@ ...@@ -15,8 +15,8 @@
<ImageView <ImageView
android:id="@+id/iv_img" android:id="@+id/iv_img"
android:layout_width="@dimen/dp_89" android:layout_width="108dp"
android:layout_height="@dimen/dp_89" /> android:layout_height="108dp"/>
<LinearLayout <LinearLayout
android:layout_width="0dp" android:layout_width="0dp"
...@@ -46,11 +46,13 @@ ...@@ -46,11 +46,13 @@
<TextView <TextView
style="@style/sale_item_text" style="@style/sale_item_text"
android:text="地推奖励:" /> android:textSize="@dimen/dp_12"
android:text="商机奖励:" />
<TextView <TextView
android:id="@+id/tv_single_price" android:id="@+id/tv_single_price"
style="@style/sale_item_text2" style="@style/sale_item_text2"
android:textSize="@dimen/dp_12"
android:text="00" android:text="00"
android:textColor="@color/common_red" /> android:textColor="@color/common_red" />
...@@ -65,11 +67,13 @@ ...@@ -65,11 +67,13 @@
<TextView <TextView
style="@style/sale_item_text" style="@style/sale_item_text"
android:textSize="@dimen/dp_12"
android:text="销售提成:" /> android:text="销售提成:" />
<TextView <TextView
android:id="@+id/tv_commision" android:id="@+id/tv_commision"
style="@style/sale_item_text2" style="@style/sale_item_text2"
android:textSize="@dimen/dp_12"
android:text="00" android:text="00"
android:textColor="@color/common_red" /> android:textColor="@color/common_red" />
......
...@@ -15,8 +15,8 @@ ...@@ -15,8 +15,8 @@
<ImageView <ImageView
android:id="@+id/iv_img" android:id="@+id/iv_img"
android:layout_width="@dimen/dp_89" android:layout_width="108dp"
android:layout_height="@dimen/dp_89" /> android:layout_height="108dp" />
<LinearLayout <LinearLayout
android:layout_width="0dp" android:layout_width="0dp"
......
...@@ -15,8 +15,8 @@ ...@@ -15,8 +15,8 @@
<ImageView <ImageView
android:id="@+id/iv_img" android:id="@+id/iv_img"
android:layout_width="@dimen/dp_89" android:layout_width="108dp"
android:layout_height="@dimen/dp_89" /> android:layout_height="108dp" />
<LinearLayout <LinearLayout
android:layout_width="0dp" android:layout_width="0dp"
...@@ -56,11 +56,13 @@ ...@@ -56,11 +56,13 @@
<TextView <TextView
style="@style/sale_item_text" style="@style/sale_item_text"
android:text="地推奖励:" /> android:textSize="@dimen/dp_12"
android:text="商机奖励:" />
<TextView <TextView
android:id="@+id/tv_single_price" android:id="@+id/tv_single_price"
style="@style/sale_item_text2" style="@style/sale_item_text2"
android:textSize="@dimen/dp_12"
android:text="00" android:text="00"
android:textColor="@color/common_red" /> android:textColor="@color/common_red" />
...@@ -74,11 +76,13 @@ ...@@ -74,11 +76,13 @@
<TextView <TextView
style="@style/sale_item_text" style="@style/sale_item_text"
android:textSize="@dimen/dp_12"
android:text="销售提成:" /> android:text="销售提成:" />
<TextView <TextView
android:id="@+id/tv_commision" android:id="@+id/tv_commision"
style="@style/sale_item_text2" style="@style/sale_item_text2"
android:textSize="@dimen/dp_12"
android:text="00" android:text="00"
android:textColor="@color/common_red" /> android:textColor="@color/common_red" />
...@@ -93,7 +97,7 @@ ...@@ -93,7 +97,7 @@
<LinearLayout <LinearLayout
android:id="@+id/btn_share" android:id="@+id/btn_share"
android:layout_width="100dp" android:layout_width="120dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@drawable/btn_green_commom" android:background="@drawable/btn_green_commom"
android:gravity="center"> android:gravity="center">
...@@ -109,13 +113,15 @@ ...@@ -109,13 +113,15 @@
<TextView <TextView
android:id="@+id/award" android:id="@+id/award"
android:layout_width="100dp" android:layout_width="wrap_content"
android:layout_height="30dp" android:layout_height="30dp"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_gravity="right" android:layout_gravity="right"
android:layout_marginStart="10dp" android:layout_marginStart="10dp"
android:background="@drawable/btn_blue_react_4" android:background="@drawable/btn_blue_react_4"
android:gravity="center" android:gravity="center"
android:paddingStart="5dp"
android:paddingEnd="5dp"
android:text="申请商机奖励" android:text="申请商机奖励"
android:textColor="@color/white" /> android:textColor="@color/white" />
......
...@@ -562,6 +562,7 @@ ...@@ -562,6 +562,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingStart="15dp" android:paddingStart="15dp"
android:visibility="gone"
android:paddingBottom="10dp"> android:paddingBottom="10dp">
<TextView <TextView
...@@ -580,8 +581,8 @@ ...@@ -580,8 +581,8 @@
<TextView <TextView
android:id="@+id/transmitServer" android:id="@+id/transmitServer"
android:layout_width="200dp" android:layout_width="250dp"
android:layout_height="40dp" android:layout_height="50dp"
android:background="@drawable/btn_blue_react_4" android:background="@drawable/btn_blue_react_4"
android:gravity="center" android:gravity="center"
android:text="转发服务名片" android:text="转发服务名片"
......
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 sign in to comment