Skip to content

android / dayu

Go to a project
Commit 5298ab57 by han xu
Options

页面UI 调整

parent 959f8c3f
Inline Side-by-side
Showing with 60 additions and 54 deletions
baseSDK/src/main/java/com/dayu/common/Constants.java
...@@ -45,21 +45,21 @@ public class Constants { ...@@ -45,21 +45,21 @@ public class Constants {
/** /**
* dev环境配置. * dev环境配置.
*/ */
public static String ENVIROMENT = "debug"; // public static String ENVIROMENT = "debug";
public static String PHOTO = "dev"; // public static String PHOTO = "dev";
public static int LOG_LEVEL = LogUtils.LEVEL_ALL; // public static int LOG_LEVEL = LogUtils.LEVEL_ALL;
public static String BASE_URL = "http://47.94.101.239:3112"; // public static String BASE_URL = "http://47.94.101.239:3112";
public static String WEB_SOP = "http://47.94.101.239:9004/#/sop"; // public static String WEB_SOP = "http://47.94.101.239:9004/#/sop";
public static String CHECK_MULTI_WEB_SOP = "http://47.94.101.239:9004/#/manyServiceResult"; // public static String CHECK_MULTI_WEB_SOP = "http://47.94.101.239:9004/#/manyServiceResult";
public static String MULTI_WEB_SOP = "http://47.94.101.239:9004/#/manySop"; // public static String MULTI_WEB_SOP = "http://47.94.101.239:9004/#/manySop";
public static String WEB_SOP_DETAIL = "http://47.94.101.239:9004/#/sopdetail"; // public static String WEB_SOP_DETAIL = "http://47.94.101.239:9004/#/sopdetail";
public static String WEB_ZHI_SHI = "http://47.94.101.239:9004/#/detail"; // public static String WEB_ZHI_SHI = "http://47.94.101.239:9004/#/detail";
public static final String UP_PHOTO = "/file/uploadMore?targetPath=dev/sp/mobile/android/business/checkApply"; // public static final String UP_PHOTO = "/file/uploadMore?targetPath=dev/sp/mobile/android/business/checkApply";
public static final String UP_VIDEO = "/file/uploadVideoOne?targetPath=dev/video"; // public static final String UP_VIDEO = "/file/uploadVideoOne?targetPath=dev/video";
public static boolean IS_DEBUG = true; // public static boolean IS_DEBUG = true;
public static String VIDEO_SHARE_URL = "http://uat.kf.ai:9099/#/shareVideo?type=_type&id="; //uat 学习视频分享链接 type(课程: course 直播: live) // public static String VIDEO_SHARE_URL = "http://uat.kf.ai:9099/#/shareVideo?type=_type&id="; //uat 学习视频分享链接 type(课程: course 直播: live)
public static int XLR_PID = 239; //小绿人商家id // public static int XLR_PID = 239; //小绿人商家id
public static String SCHEME_9099 = "http://dev.kf.ai:9099/#/"; // public static String SCHEME_9099 = "http://dev.kf.ai:9099/#/";
/** /**
...@@ -85,21 +85,21 @@ public class Constants { ...@@ -85,21 +85,21 @@ public class Constants {
/** /**
* 正式环境. * 正式环境.
*/ */
// public static String ENVIROMENT = "release"; public static String ENVIROMENT = "release";
// public static String PHOTO = "online"; public static String PHOTO = "online";
// public static int LOG_LEVEL = LogUtils.LEVEL_OFF; public static int LOG_LEVEL = LogUtils.LEVEL_OFF;
// public static String BASE_URL = "https://mobile.dayuspm.com"; public static String BASE_URL = "https://mobile.dayuspm.com";
// public static String WEB_SOP = "https://sop.kf.ai/#/sop"; public static String WEB_SOP = "https://sop.kf.ai/#/sop";
// public static String WEB_SOP_DETAIL = "https://sop.kf.ai/#/sopdetail"; public static String WEB_SOP_DETAIL = "https://sop.kf.ai/#/sopdetail";
// public static String WEB_ZHI_SHI = "https://sop.kf.ai/#/detail"; public static String WEB_ZHI_SHI = "https://sop.kf.ai/#/detail";
// public static String CHECK_MULTI_WEB_SOP = "https://sop.kf.ai/#/manyServiceResult"; public static String CHECK_MULTI_WEB_SOP = "https://sop.kf.ai/#/manyServiceResult";
// public static String MULTI_WEB_SOP = "https://sop.kf.ai/#/manySop"; public static String MULTI_WEB_SOP = "https://sop.kf.ai/#/manySop";
// public static final String UP_PHOTO = "/file/uploadMore?targetPath=online/sp/mobile/android/business/checkApply"; public static final String UP_PHOTO = "/file/uploadMore?targetPath=online/sp/mobile/android/business/checkApply";
// public static final String UP_VIDEO = "/file/uploadVideoOne?targetPath=online/video"; public static final String UP_VIDEO = "/file/uploadVideoOne?targetPath=online/video";
// public static boolean IS_DEBUG = false; public static boolean IS_DEBUG = false;
// public static String VIDEO_SHARE_URL = "http://app.dl.kf.ai/ext/#/shareVideo?type=_type&id="; //学习视频分享链接 type(课程: course 直播: live) public static String VIDEO_SHARE_URL = "http://app.dl.kf.ai/ext/#/shareVideo?type=_type&id="; //学习视频分享链接 type(课程: course 直播: live)
// public static int XLR_PID = 1936; //小绿人商家id public static int XLR_PID = 1936; //小绿人商家id
// public static String SCHEME_9099 = "http://app.dl.kf.ai/ext/#/"; public static String SCHEME_9099 = "http://app.dl.kf.ai/ext/#/";
/** /**
......
build.gradle
...@@ -5,8 +5,8 @@ buildscript { ...@@ -5,8 +5,8 @@ buildscript {
ext.build_tools_version = "29.0.2" ext.build_tools_version = "29.0.2"
ext.min_sdk_version = 21 ext.min_sdk_version = 21
ext.target_sdk_version = 30 ext.target_sdk_version = 30
ext.version_code = 322 ext.version_code = 323
ext.verson_name = "3.2.2" ext.verson_name = "3.2.3"
ext.gradle_version = '4.0.1' ext.gradle_version = '4.0.1'
ext.isReleaseMinify = false ext.isReleaseMinify = false
ext.isDebugMinify = false ext.isDebugMinify = false
......
userCenter/src/main/res/drawable/personal_center_selector.xml
...@@ -11,9 +11,9 @@ ...@@ -11,9 +11,9 @@
<item> <item>
<shape android:shape="rectangle"> <shape android:shape="rectangle">
<corners <corners
android:radius="6.7dp"/> android:radius="3.7dp"/>
<solid <solid
android:color="@color/cl_personal_center"/> android:color="@color/cl_work_raiod"/>
</shape> </shape>
</item> </item>
</selector> </selector>
\ No newline at end of file
userCenter/src/main/res/layout/fragment_home_user.xml
...@@ -369,7 +369,7 @@ ...@@ -369,7 +369,7 @@
android:layout_marginEnd="10dp" android:layout_marginEnd="10dp"
android:background="@drawable/personal_center_selector" android:background="@drawable/personal_center_selector"
android:gravity="center" android:gravity="center"
android:text="我可以接单的服务区域" android:text="我的服务区域"
android:textColor="@color/default_text_color" android:textColor="@color/default_text_color"
android:textSize="15dp" /> android:textSize="15dp" />
...@@ -461,7 +461,7 @@ ...@@ -461,7 +461,7 @@
<LinearLayout <LinearLayout
style="@style/ll_user_bottom" style="@style/ll_user_bottom"
android:layout_marginTop="10dp"> android:layout_marginTop="5dp">
<LinearLayout <LinearLayout
android:id="@+id/tv_fetch" android:id="@+id/tv_fetch"
...@@ -474,6 +474,7 @@ ...@@ -474,6 +474,7 @@
<TextView <TextView
android:id="@+id/tv_can_fetch" android:id="@+id/tv_can_fetch"
style="@style/tv_user_bottom2" style="@style/tv_user_bottom2"
android:layout_marginTop="10dp"
android:text="0" android:text="0"
android:textColor="@color/cl_order_item_date" /> android:textColor="@color/cl_order_item_date" />
</LinearLayout> </LinearLayout>
...@@ -490,6 +491,7 @@ ...@@ -490,6 +491,7 @@
<TextView <TextView
android:id="@+id/tv_cash_arrive" android:id="@+id/tv_cash_arrive"
style="@style/tv_user_bottom2" style="@style/tv_user_bottom2"
android:layout_marginTop="10dp"
android:text="0" android:text="0"
android:textColor="@color/cl_order_item_date" /> android:textColor="@color/cl_order_item_date" />
</LinearLayout> </LinearLayout>
...@@ -535,7 +537,7 @@ ...@@ -535,7 +537,7 @@
<LinearLayout <LinearLayout
style="@style/ll_user_bottom" style="@style/ll_user_bottom"
android:layout_marginTop="10dp"> android:layout_marginTop="1dp">
<LinearLayout <LinearLayout
style="@style/ll_user_bottom2" style="@style/ll_user_bottom2"
...@@ -573,8 +575,9 @@ ...@@ -573,8 +575,9 @@
<LinearLayout <LinearLayout
style="@style/ll_user_bottom" style="@style/ll_user_bottom"
android:layout_marginTop="10dp" android:layout_marginTop="1dp"
android:layout_marginBottom="10dp"> android:paddingTop="5dp"
android:layout_marginBottom="1dp">
<LinearLayout <LinearLayout
style="@style/ll_user_bottom2" style="@style/ll_user_bottom2"
...@@ -587,6 +590,7 @@ ...@@ -587,6 +590,7 @@
<TextView <TextView
android:id="@+id/tv_business_type" android:id="@+id/tv_business_type"
style="@style/tv_user_bottom2" style="@style/tv_user_bottom2"
android:layout_marginTop="10dp"
android:text="0" /> android:text="0" />
</LinearLayout> </LinearLayout>
...@@ -602,6 +606,7 @@ ...@@ -602,6 +606,7 @@
<TextView <TextView
android:id="@+id/tv_licence" android:id="@+id/tv_licence"
style="@style/tv_user_bottom2" style="@style/tv_user_bottom2"
android:layout_marginTop="10dp"
android:text="0" /> android:text="0" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
...@@ -660,32 +665,32 @@ ...@@ -660,32 +665,32 @@
<TextView <TextView
android:id="@+id/weChat" android:id="@+id/weChat"
android:layout_width="250dp" android:layout_width="290dp"
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="加入接单交流群"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="18dp" android:textSize="18dp"
android:layout_marginTop="15dp"/> android:layout_marginTop="5dp"/>
<TextView <TextView
android:id="@+id/transmitServer" android:id="@+id/transmitServer"
android:layout_width="250dp" android:layout_width="290dp"
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="转发我的服务名片"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="18dp" android:textSize="18dp"
android:layout_marginTop="20dp" android:layout_marginTop="5dp"
/> />
<RelativeLayout <RelativeLayout
android:id="@+id/rl_start" android:id="@+id/rl_start"
android:layout_width="250dp" android:layout_width="290dp"
android:layout_height="40dp" android:layout_height="50dp"
android:layout_marginTop="20dp" android:layout_marginTop="5dp"
android:background="@drawable/btn_green_react_4" android:background="@drawable/btn_green_react_4"
android:visibility="gone"> android:visibility="gone">
...@@ -703,9 +708,9 @@ ...@@ -703,9 +708,9 @@
<RelativeLayout <RelativeLayout
android:id="@+id/rl_stop" android:id="@+id/rl_stop"
android:layout_width="250dp" android:layout_width="290dp"
android:layout_height="40dp" android:layout_height="50dp"
android:layout_marginTop="15dp" android:layout_marginTop="5dp"
android:background="@drawable/btn_gray_react_4" android:background="@drawable/btn_gray_react_4"
android:visibility="gone"> android:visibility="gone">
...@@ -721,7 +726,7 @@ ...@@ -721,7 +726,7 @@
</RelativeLayout> </RelativeLayout>
<RelativeLayout <RelativeLayout
android:id="@+id/receiveOrderRl" android:id="@+id/receiveOrderRl"
android:layout_width="250dp" android:layout_width="290dp"
android:layout_height="54dp" android:layout_height="54dp"
android:gravity="center" android:gravity="center"
android:background="@color/cl_white" android:background="@color/cl_white"
......
userCenter/src/main/res/values/styles.xml
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
<style name="ll_user_bottom2"> <style name="ll_user_bottom2">
<item name="android:layout_width">0dp</item> <item name="android:layout_width">0dp</item>
<item name="android:layout_weight">1</item> <item name="android:layout_weight">1</item>
<item name="android:layout_height">56dp</item> <item name="android:layout_height">80dp</item>
<item name="android:orientation">vertical</item> <item name="android:orientation">vertical</item>
<item name="android:gravity">center_horizontal</item> <item name="android:gravity">center_horizontal</item>
<item name="android:background">@drawable/personal_center_selector</item> <item name="android:background">@drawable/personal_center_selector</item>
......
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