diff --git a/baseSDK/src/main/java/com/dayu/common/Constants.java b/baseSDK/src/main/java/com/dayu/common/Constants.java index 6755848..b7ae064 100755 --- a/baseSDK/src/main/java/com/dayu/common/Constants.java +++ b/baseSDK/src/main/java/com/dayu/common/Constants.java @@ -45,21 +45,21 @@ public class Constants { /** * dev环境配置. */ - public static String ENVIROMENT = "debug"; - public static String PHOTO = "dev"; - public static int LOG_LEVEL = LogUtils.LEVEL_ALL; - 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 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 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 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 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 int XLR_PID = 239; //小绿人商家id - public static String SCHEME_9099 = "http://dev.kf.ai:9099/#/"; +// public static String ENVIROMENT = "debug"; +// public static String PHOTO = "dev"; +// public static int LOG_LEVEL = LogUtils.LEVEL_ALL; +// 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 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 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 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 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 int XLR_PID = 239; //小绿人商家id +// public static String SCHEME_9099 = "http://dev.kf.ai:9099/#/"; /** @@ -85,21 +85,21 @@ public class Constants { /** * 正式环境. */ -// public static String ENVIROMENT = "release"; -// public static String PHOTO = "online"; -// public static int LOG_LEVEL = LogUtils.LEVEL_OFF; -// public static String BASE_URL = "https://mobile.dayuspm.com"; -// 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_ZHI_SHI = "https://sop.kf.ai/#/detail"; -// 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 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 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 int XLR_PID = 1936; //小绿人商家id -// public static String SCHEME_9099 = "http://app.dl.kf.ai/ext/#/"; + public static String ENVIROMENT = "release"; + public static String PHOTO = "online"; + public static int LOG_LEVEL = LogUtils.LEVEL_OFF; + public static String BASE_URL = "https://mobile.dayuspm.com"; + 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_ZHI_SHI = "https://sop.kf.ai/#/detail"; + 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 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 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 int XLR_PID = 1936; //小绿人商家id + public static String SCHEME_9099 = "http://app.dl.kf.ai/ext/#/"; /** diff --git a/build.gradle b/build.gradle index eba4cd4..f65c7c1 100755 --- a/build.gradle +++ b/build.gradle @@ -1,10 +1,10 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.compile_sdk_version = 29 + ext.compile_sdk_version = 30 ext.build_tools_version = "29.0.2" ext.min_sdk_version = 21 - ext.target_sdk_version = 29 + ext.target_sdk_version = 30 ext.version_code = 320 ext.verson_name = "3.2.0" ext.gradle_version = '4.0.1' diff --git a/userCenter/src/main/java/com/dayu/usercenter/api/UserService2.java b/userCenter/src/main/java/com/dayu/usercenter/api/UserService2.java index 7c6d234..e68c9cc 100644 --- a/userCenter/src/main/java/com/dayu/usercenter/api/UserService2.java +++ b/userCenter/src/main/java/com/dayu/usercenter/api/UserService2.java @@ -184,7 +184,7 @@ public interface UserService2 { * * @return */ - @GET(Constants.API_7100 + "/engineerCertificate") + @GET(Constants.API_7100 + "/engineerCertificate/byEngineer") Observable<BaseResponse<BasePageBean<SelfLicenceBean>>> getSelfLicence(@Query("engineerId") int engineerId, @Query("page") int page, @Query("pageSize") int pageSize); diff --git a/userCenter/src/main/res/layout/item_user_licence_new.xml b/userCenter/src/main/res/layout/item_user_licence_new.xml index a0e50b8..f1e5a92 100644 --- a/userCenter/src/main/res/layout/item_user_licence_new.xml +++ b/userCenter/src/main/res/layout/item_user_licence_new.xml @@ -31,6 +31,7 @@ android:id="@+id/tv_title" style="@style/sale_item_text" android:text="title" + android:maxLines="2" android:textStyle="bold" /> <TextView @@ -38,6 +39,7 @@ style="@style/sale_item_text" android:layout_marginTop="10dp" android:text="" + android:maxLines="2" /> </LinearLayout>