Skip to content

android / dayu

Go to a project
Commit dc4f5194 by han xu
Options

Merge branch 'dev' of http://47.94.101.239:82/android/dayu into dev 

* 'dev' of http://47.94.101.239:82/android/dayu:
  修改上传认证页面滑动问题
parents ddbe8a05 b450b5ea
Inline Side-by-side
Showing with 68 additions and 33 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/#/";
/** /**
......
learnCenter/src/main/java/com/dayu/learncenter/ui/fragment/HomeLearnFragment.java
...@@ -100,6 +100,8 @@ public class HomeLearnFragment extends BaseFragment<SImplePresenter, FragmentHom ...@@ -100,6 +100,8 @@ public class HomeLearnFragment extends BaseFragment<SImplePresenter, FragmentHom
Api.getService(LearnService.class).getLearTabNum(mUserId).compose(Api.applySchedulers()) Api.getService(LearnService.class).getLearTabNum(mUserId).compose(Api.applySchedulers())
.subscribe(mPresenter.baseObserver(data -> { .subscribe(mPresenter.baseObserver(data -> {
tabBean = data; tabBean = data;
String url = data.getPaperListUrl() + "?accountId=" + mUserInfo.getAccountId() + "&token=" + mUserInfo.getToken();
webFragment.setUrl(url);
if (data.getEnterKnowledge() == 1) { if (data.getEnterKnowledge() == 1) {
if (list_fragments.contains(commeWebViewFragment)) if (list_fragments.contains(commeWebViewFragment))
{ {
...@@ -107,8 +109,6 @@ public class HomeLearnFragment extends BaseFragment<SImplePresenter, FragmentHom ...@@ -107,8 +109,6 @@ public class HomeLearnFragment extends BaseFragment<SImplePresenter, FragmentHom
list_fragments.add(KnowledgeCenterFragment.newInstance()); list_fragments.add(KnowledgeCenterFragment.newInstance());
} }
} else { } else {
String url = data.getPaperListUrl() + "?accountId=" + mUserInfo.getAccountId() + "&token=" + mUserInfo.getToken();
webFragment.setUrl(url);
commeWebViewFragment.setUrl(data.getGptUrl() + "?accountId=" + mUserInfo.getAccountId() + "&token=" + mUserInfo.getToken()); commeWebViewFragment.setUrl(data.getGptUrl() + "?accountId=" + mUserInfo.getAccountId() + "&token=" + mUserInfo.getToken());
} }
setTabNum(); setTabNum();
......
userCenter/src/main/java/com/dayu/usercenter/ui/activity2/UploadSelfLicenceActivity.java
...@@ -95,7 +95,15 @@ public class UploadSelfLicenceActivity extends BaseActivity<SImplePresenter, Act ...@@ -95,7 +95,15 @@ public class UploadSelfLicenceActivity extends BaseActivity<SImplePresenter, Act
}); });
} }
}; };
mBind.rvType.setLayoutManager(new GridLayoutManager(this, 2));
GridLayoutManager mGridLayoutManager = new GridLayoutManager(this, 2){
@Override
public boolean canScrollVertically() {
return false;
}
};
mBind.rvType.setLayoutManager(mGridLayoutManager);
mBind.rvType.setAdapter(typeAdapter); mBind.rvType.setAdapter(typeAdapter);
} }
......
userCenter/src/main/res/layout/activity_upload_self_licence.xml
...@@ -25,6 +25,17 @@ ...@@ -25,6 +25,17 @@
<ImageView style="@style/card_line" /> <ImageView style="@style/card_line" />
<ScrollView
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
...@@ -52,6 +63,7 @@ ...@@ -52,6 +63,7 @@
</LinearLayout> </LinearLayout>
<RelativeLayout <RelativeLayout
android:id="@+id/rl_img" android:id="@+id/rl_img"
android:layout_width="match_parent" android:layout_width="match_parent"
...@@ -84,14 +96,26 @@ ...@@ -84,14 +96,26 @@
</RelativeLayout> </RelativeLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:descendantFocusability="blocksDescendants">
<androidx.recyclerview.widget.RecyclerView <androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_type" android:id="@+id/rv_type"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="20dp" android:layout_marginStart="20dp"
android:layout_marginTop="15dp" android:layout_marginTop="15dp"
android:nestedScrollingEnabled="false"
android:overScrollMode="never" /> android:overScrollMode="never" />
</RelativeLayout>
</LinearLayout>
</ScrollView>
<Button <Button
android:id="@+id/btn_upload" android:id="@+id/btn_upload"
android:layout_width="match_parent" android:layout_width="match_parent"
...@@ -99,8 +123,10 @@ ...@@ -99,8 +123,10 @@
android:layout_marginLeft="40dp" android:layout_marginLeft="40dp"
android:layout_marginTop="20dp" android:layout_marginTop="20dp"
android:layout_marginRight="40dp" android:layout_marginRight="40dp"
android:layout_marginBottom="20dp"
android:text="上传" android:text="上传"
/> />
</LinearLayout> </LinearLayout>
</layout> </layout>
\ No newline at end of file
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