Skip to content

Y
YDL-Component-Medical
Commit 40cea21d by 徐健
Options

Merge branch 'feature/v3' of… 

Merge branch 'feature/v3' of ssh://gitlab.yidianling.com:2224/app_android_lib/YDL-Component into feature/v3
parents 62f43467 fd2e5fd8
Showing with 532 additions and 389 deletions
app/src/main/java/com/ydl/component/MainActivity.kt
......@@ -71,8 +71,8 @@ class MainActivity : BaseLceActivity<DemoContract.View, DemoContract.Presenter>(
reLoadData()
}
tv_home.setOnClickListener {
mPresenter?.loadHome()
tv_home?.setOnClickListener {
mPresenter.loadHome()
}
bt_to_other.setOnClickListener {
......
config.gradle
......@@ -53,6 +53,7 @@ ext {
"m-tests" : "0.0.15.1",
"m-course" : "0.0.34.1",
"m-im" : "0.0.2",
"m-dynamic" : "0.0.1",
//-------------- 业务模块 API 层 --------------
"m-audioim-api" : "0.0.5",
......@@ -62,18 +63,19 @@ ext {
"m-fm-api" : "0.0.2",
"m-muse-api" : "0.0.1",
"m-tests-api" : "0.0.1",
"m-user-api" : "0.0.7",
"m-user-api" : "0.0.8",
"m-home-api" : "0.0.3",
"m-im-api" : "0.0.2",
"m-dynamic-api" : "0.0.1",
//-------------- 功能组件 --------------
//第一步
"ydl-platform" : "0.0.28.6",
"ydl-platform" : "0.0.28.7",
//第二步 若干
"ydl-webview" : "0.0.28.2",
"ydl-media" : "0.0.14.2",
"ydl-pay" : "0.0.11.2",
"ydl-pay" : "0.0.11.3",
"m-audioim" : "0.0.40.2",
//以下 几乎不会动
......@@ -93,6 +95,7 @@ ext {
"m-user" : "0.0.25",
"m-home" : "0.0.3",
"m-im" : "0.0.1",
"m-dynamic" : "0.0.1",
// 以下为接入flutter的模块
"m-muse" : "0.0.7",
......@@ -105,18 +108,19 @@ ext {
"m-fm-api" : "0.0.2",
"m-muse-api" : "0.0.1",
"m-tests-api" : "0.0.1",
"m-user-api" : "0.0.7",
"m-user-api" : "0.0.8",
"m-home-api" : "0.0.3",
"m-im-api" : "0.0.2",
"m-dynamic-api" : "0.0.1",
//-------------- 功能组件 --------------
//第一步
"ydl-platform" : "0.0.28.6",
"ydl-platform" : "0.0.28.7",
//第二步 若干
"ydl-webview" : "0.0.28.2",
"ydl-media" : "0.0.14.2",
"ydl-pay" : "0.0.11.2",
"ydl-pay" : "0.0.11.3",
"m-audioim" : "0.0.40.2",
//以下 几乎不会动
......@@ -283,6 +287,7 @@ ext {
"ydl-m-im-api" : "com.ydl:m-im-api:${ydlCompileVersion["m-im-api"]}",
"ydl-m-home-api" : "com.ydl:m-home-api:${ydlCompileVersion["m-home-api"]}",
"ydl-m-consultant-api" : "com.ydl:m-consultant-api:${ydlCompileVersion["m-consultant-api"]}",
"ydl-m-dynamic-api" : "com.ydl:m-dynamic-api:${ydlCompileVersion["m-dynamic-api"]}",
]
}
m-dynamic/build.gradle
......@@ -99,12 +99,12 @@ dependencies {
api project(':ydl-platform')
api project(":ydl-pay")
implementation modularPublication('com.ydl:m-user-api')
implementation modularPublication('com.ydl:m-audioim-api')
implementation modularPublication('com.ydl:m-dynamic-api')
}else {
//发布时使用
api rootProject.ext.dependencies["ydl-pay"]
compileOnly rootProject.ext.dependencies["ydl-m-user-api"]
compileOnly rootProject.ext.dependencies["ydl-m-audioim-api"]
compileOnly rootProject.ext.dependencies["ydl-m-dynamic-api"]
api rootProject.ext.dependencies["ydl-webview"]
api(rootProject.ext.dependencies["ydl-platform"]) {
transitive = true
......
m-dynamic/modular.gradle
......@@ -24,7 +24,7 @@ modular {
groupId = "com.ydl"
artifactId = "m-dynamic-api"
//开发时注释掉版本号，发布api时打开
//version = rootProject.ext.ydlPublishVersion[childProject.getName()+"-api"]
version = rootProject.ext.ydlPublishVersion[childProject.getName()+"-api"]
// API 层打包时需要引入的依赖
apiDependencies {
implementation "com.google.code.gson:gson:2.8.2"
......
m-dynamic/src/main/java/com/yidianling/dynamic/activity/MyTrendsActivity.kt
......@@ -6,6 +6,7 @@ import android.support.v4.app.FragmentPagerAdapter
import android.support.v4.view.ViewPager
import butterknife.ButterKnife
import com.ydl.ydlcommon.base.BaseActivity
import com.ydl.ydlcommon.bean.StatusBarOptions
import com.yidianling.dynamic.R
import com.yidianling.dynamic.router.DynamicIn
import com.yidianling.dynamic.trendList.TrendsListFragment
......@@ -32,6 +33,11 @@ class MyTrendsActivity : BaseActivity() {
private val fragmentList = ArrayList<TrendsListFragment>()
override fun getStatusViewOptions(): StatusBarOptions {
return StatusBarOptions(isAddStatusView = true, statusBarDarkMode = true)
}
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(R.layout.dynamic_activity_mytrends)
......
m-dynamic/src/main/java/com/yidianling/dynamic/activity/TrendsReplyInfoActivity.kt
......@@ -18,6 +18,7 @@ import com.ydl.ydl_image.module.GlideApp
import com.ydl.ydlcommon.adapter.BaseRecyclerAdapter
import com.ydl.ydlcommon.base.BaseActivity
import com.ydl.ydlcommon.base.config.YDLConstants
import com.ydl.ydlcommon.bean.StatusBarOptions
import com.ydl.ydlcommon.utils.MoonUtil
import com.ydl.ydlcommon.view.BaseViewHolder
import com.yidianling.common.tools.ToastUtil
......@@ -50,6 +51,10 @@ class TrendsReplyInfoActivity : BaseActivity() {
private var aid: String? = null//为空则是回复详情，否则为点赞详情
internal var header: MaterialHeader? = null
override fun getStatusViewOptions(): StatusBarOptions {
return StatusBarOptions(isAddStatusView = true, statusBarDarkMode = true)
}
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
......
m-dynamic/src/main/java/com/yidianling/dynamic/members/MembersActivity.java
......@@ -30,6 +30,7 @@ import com.ydl.ydl_image.module.GlideApp;
import com.ydl.ydlcommon.base.BaseActivity;
import com.ydl.ydlcommon.base.config.YDLConstants;
import com.ydl.ydlcommon.data.http.RxUtils;
import com.ydl.ydlcommon.utils.StatusBarUtils;
import com.ydl.ydlcommon.view.dialog.ListDialog;
import com.ydl.ydlcommon.view.widgets.BorderCircleImageView;
import com.ydl.ydlcommon.view.widgets.MyNestedScrollView;
......@@ -106,6 +107,8 @@ public class MembersActivity extends BaseActivity implements View.OnClickListene
private static final String USER_ID = "user_id";
public static Intent newIntent(Activity activity, String userId) {
Intent intent = new Intent(activity, MembersActivity.class);
Bundle bundle = new Bundle();
......@@ -134,6 +137,7 @@ public class MembersActivity extends BaseActivity implements View.OnClickListene
initListeners();
// initDatas();
setTabSelection(0);
StatusBarUtils.Companion.setCustomStatusView(this,members_title_rel,true);
}
private void initEvent() {
......@@ -182,7 +186,7 @@ public class MembersActivity extends BaseActivity implements View.OnClickListene
*/
private void initLoadMore() {
member_swrl.setOnRefreshListener(this);
member_swrl.setColorSchemeResources(R.color.dynamic_google_green);
member_swrl.setColorSchemeResources(R.color.dynamic_main_theme);
member_swrl.post(new Runnable() {
@Override
public void run() {
......@@ -806,7 +810,7 @@ public class MembersActivity extends BaseActivity implements View.OnClickListene
members_title_top_tv.setTextColor(getResources().getColor(R.color.dynamic_black));
members_title_top_tv.setText(name);
members_title_back_iv.setImageResource(R.drawable.platform_common_back);
members_title_top_right_tv.setImageResource(R.drawable.dynamic_more_green);
members_title_top_right_tv.setImageResource(R.drawable.platform_common_notice_more_un);
// members_top_view.setBackgroundColor(getResources().getColor(R.color.dynamic_black));
members_title_rel.setBackgroundDrawable(getResources().getDrawable(R.drawable.dynamic_layout_border));
}
......
m-dynamic/src/main/java/com/yidianling/dynamic/publishTrend/PublishTrendActivity.java
......@@ -15,6 +15,7 @@ import android.view.animation.AlphaAnimation;
import android.view.animation.Animation;
import android.view.animation.TranslateAnimation;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.PopupWindow;
import android.widget.TextView;
......@@ -54,7 +55,7 @@ public class PublishTrendActivity extends BaseActivity {
private List<Fragment> fragmentList = new ArrayList<>();
private PopupWindow noticePopupWindow;
private Handler handler;
private View mPublishTrendTitle;
private LinearLayout mPublishTrendTitle;
public static Intent newIntent(Activity activity, String url, String cover, String title) {
Intent intent = new Intent(activity, PublishTrendActivity.class);
......@@ -122,7 +123,7 @@ public class PublishTrendActivity extends BaseActivity {
mTableLayout = findViewById(R.id.tab_layout);
mToastView = findViewById(R.id.tv_coustom_toast_view);
initData();
StatusBarUtils.Companion.setCustomStatusView(this,mPublishTrendTitle,mPublishTrendTitle.getLayoutParams());
StatusBarUtils.Companion.setCustomStatusView(this,mPublishTrendTitle);
}
private void initData() {
......
m-dynamic/src/main/java/com/yidianling/dynamic/publishTrend/SelecTopicActivity.java
......@@ -7,6 +7,7 @@ import android.widget.RelativeLayout;
import android.widget.TextView;
import android.widget.Toast;
import com.ydl.ydlcommon.bean.StatusBarOptions;
import com.yidianling.dynamic.R;
import com.yidianling.dynamic.adapter.SelectTopicAdapter;
import com.yidianling.dynamic.common.net.DynamicApiUtils;
......@@ -16,6 +17,8 @@ import com.ydl.ydlcommon.view.widgets.RecyclerViewForScrollView;
import com.yidianling.dynamic.model.Command;
import com.yidianling.dynamic.model.RecommendTopic;
import org.jetbrains.annotations.NotNull;
import java.util.ArrayList;
import java.util.List;
......@@ -34,6 +37,12 @@ public class SelecTopicActivity extends BaseActivity {
SelectTopicAdapter adapterR, adapterF;
RelativeLayout select_topic_focus_hint_rel, select_topic_recommend_hint_rel;
@NotNull
@Override
public StatusBarOptions getStatusViewOptions() {
return new StatusBarOptions(true,true);
}
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
......
m-dynamic/src/main/java/com/yidianling/dynamic/publishTrend/fragment/PublishQuestionAndTrendFragment.java
......@@ -229,13 +229,13 @@ public class PublishQuestionAndTrendFragment extends BaseFragment implements Vie
topic_title = bundle.getString("topic_title");
publish_trend_bottom_topic_tv.setVisibility(View.VISIBLE);
publish_trend_bottom_topic_tv.setText("# " + topic_title);
publish_trend_bottom_topic_tv.setTextColor(ContextCompat.getColor(activity, R.color.platform_main_theme_blue));
publish_trend_bottom_topic_tv.setTextColor(ContextCompat.getColor(activity, R.color.dynamic_main_theme));
} else if ("topic_publish".equals(publish_type)) {// 从话题详情进来的发布
topic_id = bundle.getString("topic_id");
topic_title = bundle.getString("topic_title");
publish_trend_bottom_topic_tv.setVisibility(View.VISIBLE);
publish_trend_bottom_topic_tv.setText("# " + topic_title);
publish_trend_bottom_topic_tv.setTextColor(ContextCompat.getColor(activity, R.color.platform_main_theme_blue));
publish_trend_bottom_topic_tv.setTextColor(ContextCompat.getColor(activity, R.color.dynamic_main_theme));
} else if ("default_publish".equals(publish_type)) {// 默认发布类型
publish_trend_bottom_topic_tv.setVisibility(View.VISIBLE);
}
......@@ -848,7 +848,7 @@ public class PublishQuestionAndTrendFragment extends BaseFragment implements Vie
}
publish_trend_bottom_topic_tv.setVisibility(View.VISIBLE);
publish_trend_bottom_topic_tv.setText("# " + topic_title);
publish_trend_bottom_topic_tv.setTextColor(ContextCompat.getColor(activity, R.color.platform_main_theme_blue));
publish_trend_bottom_topic_tv.setTextColor(ContextCompat.getColor(activity, R.color.dynamic_main_theme));
// 获取编辑框焦点
publish_trend_content_editext.setFocusable(true);
......
m-dynamic/src/main/java/com/yidianling/dynamic/thank/ThankActivity.java
......@@ -9,6 +9,7 @@ import android.widget.RelativeLayout;
import android.widget.TextView;
import com.ydl.ydlcommon.bean.StatusBarOptions;
import com.yidianling.common.tools.LogUtil;
import com.yidianling.common.tools.ToastUtil;
import com.yidianling.dynamic.DynamicConstants;
......@@ -22,6 +23,8 @@ import com.yidianling.dynamic.thank.view.ThankHeadView;
import com.ydl.ydlcommon.base.BaseActivity;
import com.ydl.ydlcommon.data.http.RxUtils;
import org.jetbrains.annotations.NotNull;
import butterknife.BindView;
import butterknife.ButterKnife;
import de.greenrobot.event.EventBus;
......@@ -64,6 +67,11 @@ public class ThankActivity extends BaseActivity implements PtrHandler, LoadMoreH
WorryDetailAnswer worryDetailAnswerForEventBus;
@NotNull
@Override
public StatusBarOptions getStatusViewOptions() {
return new StatusBarOptions(true, true);
}
void init() {
// header
......
m-dynamic/src/main/java/com/yidianling/dynamic/topic/AllTopicActivity.java
......@@ -8,9 +8,12 @@ import android.support.v4.view.ViewPager;
import android.view.View;
import android.widget.ImageView;
import com.ydl.ydlcommon.bean.StatusBarOptions;
import com.yidianling.dynamic.R;
import com.ydl.ydlcommon.base.BaseActivity;
import org.jetbrains.annotations.NotNull;
import java.util.ArrayList;
import java.util.List;
......@@ -29,6 +32,12 @@ public class AllTopicActivity extends BaseActivity implements View.OnClickListen
private FragmentManager fragmentManager;
private AllTopicFragment alltopic_fragment;
@NotNull
@Override
public StatusBarOptions getStatusViewOptions() {
return new StatusBarOptions(true, true);
}
// private HotTopicFragment hottopic_fragmen;
@Override
protected void onCreate(Bundle savedInstanceState) {
......
m-dynamic/src/main/java/com/yidianling/dynamic/topic/topicDetail/TopicDetailActivity.java
......@@ -38,9 +38,9 @@ import com.ydl.webview.NewH5Activity;
import com.ydl.ydl_image.module.GlideApp;
import com.ydl.ydlcommon.actions.share.ShareUtils;
import com.ydl.ydlcommon.base.BaseMvpActivity;
import com.ydl.ydlcommon.bean.StatusBarOptions;
import com.ydl.ydlcommon.ui.LogoLoadingView;
import com.ydl.ydlcommon.utils.BuryPointUtils;
import com.ydl.ydlcommon.utils.StatusBarUtils;
import com.yidianling.common.tools.LogUtil;
import com.yidianling.dynamic.DynamicConstants;
import com.yidianling.dynamic.R;
......@@ -53,8 +53,6 @@ import com.yidianling.dynamic.router.DynamicIn;
import com.yidianling.dynamic.trendList.TrendListInFragment;
import com.yidianling.dynamic.trendList.adapter.RecommendTopAdapter;
import org.jetbrains.annotations.NotNull;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
......@@ -142,12 +140,6 @@ public class TopicDetailActivity extends BaseMvpActivity<TopicDetailView, TopicD
private static final String IS_SPLASH = "isSplash";
private static final String TOPIC_ID = "topic_id";
@NotNull
@Override
public StatusBarOptions getStatusViewOptions() {
return new StatusBarOptions(true,true);
}
public static Intent newIntent(Context context, boolean isSplash, String topicId) {
Intent intent = new Intent(context, TopicDetailActivity.class);
intent.putExtra(IS_SPLASH, isSplash);
......@@ -163,8 +155,8 @@ public class TopicDetailActivity extends BaseMvpActivity<TopicDetailView, TopicD
initDatas();
initViews();
fetchDatas();
initNetLossView();
StatusBarUtils.Companion.setCustomStatusView(this,mToolbar,true);
}
private void initNetLossView() {
......@@ -189,7 +181,7 @@ public class TopicDetailActivity extends BaseMvpActivity<TopicDetailView, TopicD
private void initViews() {
setSupportActionBar(mToolbar);
mSwl.setOnRefreshListener(this);
mSwl.setColorSchemeResources(R.color.platform_main_theme_blue);
mSwl.setColorSchemeResources(R.color.dynamic_main_theme);
mSwl.setProgressViewOffset(false, 0, 200);
topTrendsRcv.setLayoutManager(new LinearLayoutManager(this));
topTrendsRcv.setAdapter(mRecommendTopAdapter);
......@@ -247,7 +239,7 @@ public class TopicDetailActivity extends BaseMvpActivity<TopicDetailView, TopicD
mToolbar.setBackgroundColor(getResources().getColor(R.color.dynamic_white));
alPhaAnimation(mToolbar, 0, 1, null);
mTopicDetailTitleBackIv.setImageResource(R.drawable.platform_common_back);
mTopicDetailTitleTopRightTv.setImageResource(R.drawable.dynamic_more_green);
mTopicDetailTitleTopRightTv.setImageResource(R.drawable.platform_common_notice_more_un);
backgroundColor = R.color.dynamic_white;
}
collapsingToolbarLayout.setTitle(topicTitle);
......@@ -466,16 +458,16 @@ public class TopicDetailActivity extends BaseMvpActivity<TopicDetailView, TopicD
mTopicDetailVp.setCurrentItem(0);
}
selectTab = 0;
mItemTopicDetailNewTv.setTextColor(getResources().getColor(R.color.platform_main_theme_blue));
mItemTopicDetailNewHintTv.setBackgroundColor(getResources().getColor(R.color.platform_main_theme_blue));
mItemTopicDetailNewTv.setTextColor(getResources().getColor(R.color.dynamic_main_theme));
mItemTopicDetailNewHintTv.setBackgroundColor(getResources().getColor(R.color.dynamic_main_theme));
break;
case 1:
if (mTopicDetailVp.getCurrentItem() != 1) {
mTopicDetailVp.setCurrentItem(1);
}
selectTab = 1;
mItemTopicDetailHotTv.setTextColor(getResources().getColor(R.color.platform_main_theme_blue));
mItemTopicDetailHotHintTv.setBackgroundColor(getResources().getColor(R.color.platform_main_theme_blue));
mItemTopicDetailHotTv.setTextColor(getResources().getColor(R.color.dynamic_main_theme));
mItemTopicDetailHotHintTv.setBackgroundColor(getResources().getColor(R.color.dynamic_main_theme));
break;
}
......@@ -507,6 +499,7 @@ public class TopicDetailActivity extends BaseMvpActivity<TopicDetailView, TopicD
.error(R.drawable.dynamic_default_img)
.into(mTopicDetailTopBgIv);
mTopicDetailFocusTv.setBackgroundResource("1".equals(is_focused) ? R.drawable.dynamic_focused_topic_detail_bg : R.drawable.dynamic_focus_topic_detail_bg);
mTopicDetailFocusTv.setTextColor(getResources().getColor("1".equals(is_focused) ? R.color.platform_white : R.color.dynamic_but_text_color));
mTopicDetailFocusTv.setText("1".equals(is_focused) ? this.getString(R.string.dynamic_trend_foucused) : "+" + this.getString(R.string.dynamic_trend_foucus));
if (!"2".equals(topicId)) {
mTopicDetailFocusTv.setVisibility(View.VISIBLE);
......
m-dynamic/src/main/java/com/yidianling/dynamic/trendList/TrendsListFragment.kt
......@@ -208,7 +208,7 @@ class TrendsListFragment : BaseLazyFragment(), ITrendsListView,
} else {
trends_lastr_swl!!.setViewGroup(trends_rcv)
trends_lastr_swl!!.setOnRefreshListener(this)
trends_lastr_swl!!.setColorSchemeResources(R.color.platform_main_theme_blue)
trends_lastr_swl!!.setColorSchemeResources(R.color.dynamic_main_theme)
}
initRecyclerView()
}
......
m-dynamic/src/main/java/com/yidianling/dynamic/trendsDetail/TrendsDetailActivity.java
......@@ -780,7 +780,7 @@ public class TrendsDetailActivity extends BaseMvpActivity<ITrendsDetailView, ITr
});
}
swl.setOnRefreshListener(this);
swl.setColorSchemeResources(R.color.dynamic_google_green);
swl.setColorSchemeResources(R.color.dynamic_main_theme);
vpAds.getLayoutParams().height = ScreenUtil.getDisplayWidth() * 19 / 66;
vpAds.requestLayout();
vpAds.setOnTouchListener((v, event) -> {
......
m-dynamic/src/main/java/com/yidianling/dynamic/trendsHome/TrendsHomeFragment.java
package com.yidianling.dynamic.trendsHome;
import android.content.Intent;
import android.graphics.Color;
import android.os.Build;
import android.os.Bundle;
import android.os.Handler;
......@@ -135,8 +134,8 @@ public class TrendsHomeFragment extends BaseFragment implements ITrendHomeView,
public void initDataAndEvent() {
mUnbinder = ButterKnife.bind(this, getView());
initViews();
// TODO: 2019-12-13 by:HaoRui
initDatas();
}
@Override
......@@ -147,7 +146,7 @@ public class TrendsHomeFragment extends BaseFragment implements ITrendHomeView,
private void initViews() {
initBannerView();
swl.setOnRefreshListener(this);
swl.setColorSchemeResources(R.color.platform_main_theme_blue);
swl.setColorSchemeResources(R.color.dynamic_main_theme);
mAppBarLayout.addOnOffsetChangedListener(new AppBarLayout.OnOffsetChangedListener() {
@Override
public void onOffsetChanged(AppBarLayout appBarLayout, int verticalOffset) {
......@@ -289,11 +288,11 @@ public class TrendsHomeFragment extends BaseFragment implements ITrendHomeView,
mItemFocusTv.setSelected(false);
mItemFocusTv.setTextColor(getResources().getColor(R.color.dynamic_text_666666));
mItemHotTv.setSelected(true);
mItemHotTv.setTextColor(Color.WHITE);
mItemHotTv.setTextColor(getResources().getColor(R.color.dynamic_but_text_color));
break;
case 1:
mItemRecommendTv.setSelected(true);
mItemRecommendTv.setTextColor(Color.WHITE);
mItemRecommendTv.setTextColor(getResources().getColor(R.color.dynamic_but_text_color));
mItemFocusTv.setSelected(false);
mItemFocusTv.setTextColor(getResources().getColor(R.color.dynamic_text_666666));
mItemHotTv.setSelected(false);
......@@ -303,7 +302,7 @@ public class TrendsHomeFragment extends BaseFragment implements ITrendHomeView,
mItemRecommendTv.setSelected(false);
mItemRecommendTv.setTextColor(getResources().getColor(R.color.dynamic_text_666666));
mItemFocusTv.setSelected(true);
mItemFocusTv.setTextColor(Color.WHITE);
mItemFocusTv.setTextColor(getResources().getColor(R.color.dynamic_but_text_color));
mItemHotTv.setSelected(false);
mItemHotTv.setTextColor(getResources().getColor(R.color.dynamic_text_666666));
break;
......
m-dynamic/src/main/res/drawable/dynamic_background_publish_trend_top.xml
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_enabled="true">
<shape>
<corners android:radius="0dp"></corners>
<gradient android:endColor="@color/dynamic_main_theme_light" android:startColor="@color/dynamic_main_theme" />
<stroke android:width="0dp" android:color="@color/platform_bebebe" />
</shape>
</item>
</selector>
\ No newline at end of file
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<gradient
android:startColor="@color/dynamic_main_theme_light"
android:endColor="@color/dynamic_main_theme"
android:angle="0" />
</shape>
\ No newline at end of file
m-dynamic/src/main/res/drawable/dynamic_layout_border.xml
......@@ -11,9 +11,6 @@
android:bottomLeftRadius="0dp"
android:topLeftRadius="0dp"
android:topRightRadius="0dp"/>
<stroke
android:width="0.8dp"
android:color="#E3E3E3"/>
</shape>
</item>
</layer-list>
m-dynamic/src/main/res/layout/dynamic_activity_browse_pictures.xml
......@@ -3,7 +3,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#555e5e5e">
android:background="@color/platform_black">
<android.support.v4.view.ViewPager
android:id="@+id/browse_pictures_vp"
......
m-dynamic/src/main/res/layout/dynamic_activity_members.xml
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:myapp="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/dynamic_white"
tools:context=".members.MembersActivity">
<android.support.v4.widget.SwipeRefreshLayout
android:id="@+id/member_swrl"
android:layout_width="match_parent"
android:layout_height="match_parent">
<com.ydl.ydlcommon.view.widgets.MyNestedScrollView
android:id="@+id/members_myScrov"
xmlns:myapp="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fillViewport="true"
android:layout_alignParentTop="true"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true">
android:background="@color/dynamic_white"
tools:context=".members.MembersActivity">
<RelativeLayout
<android.support.v4.widget.SwipeRefreshLayout
android:id="@+id/member_swrl"
android:layout_width="match_parent"
android:layout_height="match_parent">
<RelativeLayout
android:id="@+id/members_top_head_rel"
<com.ydl.ydlcommon.view.widgets.MyNestedScrollView
android:id="@+id/members_myScrov"
android:layout_width="match_parent"
android:focusable="true"
android:focusableInTouchMode="true"
android:layout_height="345dp">
android:layout_height="match_parent"
android:layout_alignParentStart="true"
android:layout_alignParentLeft="true"
android:layout_alignParentTop="true"
android:fillViewport="true">
<RelativeLayout
android:id="@+id/members_top_head1_rel"
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="310dp"
android:layout_alignParentTop="true"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true">
android:layout_height="match_parent">
<LinearLayout
<RelativeLayout
android:id="@+id/members_top_head_rel"
android:layout_width="match_parent"
android:layout_height="315dp"
android:orientation="vertical">
android:layout_height="345dp"
android:focusable="true"
android:focusableInTouchMode="true">
<ImageView
android:id="@+id/members_top_bg_iv"
<RelativeLayout
android:id="@+id/members_top_head1_rel"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:scaleType="fitXY" />
android:layout_height="310dp"
android:layout_alignParentStart="true"
android:layout_alignParentLeft="true"
android:layout_alignParentTop="true">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="315dp"
android:orientation="vertical">
<ImageView
android:id="@+id/members_top_bg_iv"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:scaleType="fitXY" />
<View
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1" />
</LinearLayout>
<com.ydl.ydlcommon.view.widgets.BorderCircleImageView
android:id="@+id/members_top_head_iv"
android:layout_width="80dp"
android:layout_height="80dp"
android:layout_centerInParent="true"
android:src="@drawable/dynamic_head_place_hold_pic"
myapp:pa_border_color="@color/dynamic_white"
myapp:pa_border_width="2dp" />
<View
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
/>
</LinearLayout>
<com.ydl.ydlcommon.view.widgets.BorderCircleImageView
android:id="@+id/members_top_head_iv"
android:layout_width="80dp"
android:layout_height="80dp"
android:src="@drawable/dynamic_head_place_hold_pic"
myapp:pa_border_width="2dp"
myapp:pa_border_color="@color/dynamic_white"
android:layout_centerInParent="true" />
<LinearLayout
android:id="@+id/members_top_user_lin"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/members_top_head_iv"
android:layout_centerHorizontal="true"
android:layout_marginTop="10dp"
android:orientation="horizontal">
<TextView
android:id="@+id/members_top_user_tv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text=""
android:textColor="@color/dynamic_black"
android:textSize="18sp" />
<ImageView
android:id="@+id/members_top_user_gender_iv"
android:layout_width="15dp"
android:layout_height="15dp"
android:layout_gravity="center_vertical"
android:layout_marginLeft="5dp"
android:src="@drawable/dynamic_male" />
</LinearLayout>
<LinearLayout
android:id="@+id/members_top_user_focus_lin"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/members_top_user_lin"
android:layout_centerHorizontal="true"
android:layout_marginTop="10dp"
android:gravity="center_vertical"
android:orientation="horizontal">
<LinearLayout
android:id="@+id/members_top_user_lin"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/members_top_head_iv"
android:layout_centerHorizontal="true"
android:layout_marginTop="10dp"
android:orientation="horizontal">
<TextView
android:id="@+id/members_top_user_visit_num_tv"
<TextView
android:id="@+id/members_top_user_tv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text=""
android:textColor="@color/dynamic_black"
android:textSize="18sp" />
<ImageView
android:id="@+id/members_top_user_gender_iv"
android:layout_width="15dp"
android:layout_height="15dp"
android:layout_gravity="center_vertical"
android:layout_marginLeft="5dp"
android:src="@drawable/dynamic_male" />
</LinearLayout>
<LinearLayout
android:id="@+id/members_top_user_focus_lin"
android:layout_width="wrap_content"
android:layout_height="29dp"
android:text=""
android:textColor="@color/dynamic_text_gray" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="5dp"
android:layout_marginRight="5dp"
android:text="|"
android:textColor="@color/dynamic_text_gray" />
<TextView
android:id="@+id/members_top_user_fensi_num_tv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text=""
android:textColor="@color/dynamic_text_gray" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="5dp"
android:layout_marginRight="5dp"
android:text="|"
android:textColor="@color/dynamic_text_gray" />
<TextView
android:id="@+id/members_top_user_zan_num_tv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text=""
android:textColor="@color/dynamic_text_gray" />
</LinearLayout>
android:layout_height="wrap_content"
android:layout_below="@+id/members_top_user_lin"
android:layout_centerHorizontal="true"
android:layout_marginTop="10dp"
android:gravity="center_vertical"
android:orientation="horizontal">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:layout_below="@+id/members_top_user_focus_lin">
<TextView
android:id="@+id/members_top_user_visit_num_tv"
android:layout_width="wrap_content"
android:layout_height="29dp"
android:text=""
android:textColor="@color/dynamic_text_gray" />
<RelativeLayout
android:id="@+id/members_top_user_focus_ortion_rel"
android:layout_width="92dp"
android:layout_height="35dp"
android:layout_centerInParent="true"
android:visibility="gone"
android:background="@drawable/dynamic_focus_topic_detail_bg">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="5dp"
android:layout_marginRight="5dp"
android:text="|"
android:textColor="@color/dynamic_text_gray" />
<TextView
android:id="@+id/members_top_user_focus_ortion_tv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:text=""
android:textSize="@dimen/platform_dp_15"
android:drawablePadding="10dp"
android:textColor="@color/dynamic_white" />
android:id="@+id/members_top_user_fensi_num_tv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text=""
android:textColor="@color/dynamic_text_gray" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="5dp"
android:layout_marginRight="5dp"
android:text="|"
android:textColor="@color/dynamic_text_gray" />
<TextView
android:id="@+id/members_top_user_zan_num_tv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text=""
android:textColor="@color/dynamic_text_gray" />
</LinearLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/members_top_user_focus_lin"
android:layout_marginTop="10dp">
<RelativeLayout
android:id="@+id/members_top_user_focus_ortion_rel"
android:layout_width="92dp"
android:layout_height="35dp"
android:layout_centerInParent="true"
android:background="@drawable/dynamic_focus_topic_detail_bg"
android:visibility="gone">
<TextView
android:id="@+id/members_top_user_focus_ortion_tv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:drawablePadding="10dp"
android:text=""
android:textColor="@color/dynamic_white"
android:textSize="@dimen/platform_dp_15" />
</RelativeLayout>
<ImageView
android:id="@+id/members_top_user_focus_iv"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_centerVertical="true"
android:layout_marginLeft="5dp"
android:layout_toRightOf="@+id/members_top_user_focus_ortion_rel"
android:padding="4dp"
android:src="@drawable/dynamic_newsfeed_like"
android:visibility="gone" />
</RelativeLayout>
<ImageView
android:id="@+id/members_top_user_focus_iv"
android:layout_width="40dp"
android:layout_height="40dp"
android:padding="4dp"
android:layout_marginLeft="5dp"
android:layout_centerVertical="true"
android:visibility="gone"
android:layout_toRightOf="@+id/members_top_user_focus_ortion_rel"
android:src="@drawable/dynamic_newsfeed_like" />
</RelativeLayout>
<View
android:layout_width="match_parent"
android:layout_height="20dp"
android:layout_below="@+id/members_top_head1_rel"
android:layout_marginTop="15dp"
android:background="#f3f3f3" />
</RelativeLayout>
<View
android:layout_width="match_parent"
android:layout_height="20dp"
android:layout_marginTop="15dp"
android:layout_below="@+id/members_top_head1_rel"
android:background="#f3f3f3"/>
</RelativeLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@+id/members_top_head_rel"
android:layout_marginTop="50dp">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@+id/members_top_head_rel"
android:layout_marginTop="50dp">
<FrameLayout
android:id="@+id/members_content_frm"
android:layout_width="match_parent"
android:layout_height="match_parent" />
<FrameLayout
android:id="@+id/members_content_frm"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</RelativeLayout>
</RelativeLayout>
</RelativeLayout>
</com.ydl.ydlcommon.view.widgets.MyNestedScrollView>
</com.ydl.ydlcommon.view.widgets.MyNestedScrollView>
</android.support.v4.widget.SwipeRefreshLayout>
<!-- <View
android:id="@+id/members_top_view"
android:layout_width="match_parent"
android:layout_height="20dp"
android:layout_alignParentTop="true"
android:focusable="true"
android:focusableInTouchMode="true"
android:background="@color/dynamic_trend_transparent"
android:visibility="visible" />-->
<!-- <View
android:id="@+id/members_top_view"
android:layout_width="match_parent"
android:layout_height="20dp"
android:layout_alignParentTop="true"
android:focusable="true"
android:focusableInTouchMode="true"
android:background="@color/dynamic_trend_transparent"
android:visibility="visible" />-->
<RelativeLayout
android:id="@+id/members_title_rel"
android:layout_width="match_parent"
android:layout_alignParentTop="true"
android:layout_height="@dimen/dynamic_title_height"
android:background="@color/dynamic_trend_transparent">
android:id="@+id/members_title_rel"
android:layout_width="match_parent"
android:layout_height="@dimen/platform_action_bar_height"
android:layout_alignParentTop="true"
android:background="@color/dynamic_trend_transparent">
<ImageView
android:id="@+id/members_title_back_iv"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_alignParentLeft="true"
android:layout_centerInParent="true"
android:paddingLeft="15dp"
android:paddingRight="30dp"
android:src="@drawable/dynamic_titlebar_back2" />
android:id="@+id/members_title_back_iv"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_alignParentLeft="true"
android:layout_centerInParent="true"
android:paddingLeft="15dp"
android:paddingRight="30dp"
android:src="@drawable/dynamic_titlebar_back2" />
<TextView
android:id="@+id/members_title_top_tv"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:textColor="@color/dynamic_black"
android:gravity="center_horizontal"
android:layout_centerInParent="true"
android:layout_marginLeft="45dp"
android:layout_marginRight="45dp"
android:text=""
android:singleLine="true"
android:textSize="@dimen/dynamic_title_txt_sp"/>
android:id="@+id/members_title_top_tv"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:layout_centerVertical="true"
android:layout_marginLeft="45dp"
android:layout_marginRight="45dp"
android:gravity="center_horizontal"
android:singleLine="true"
android:text=""
android:textColor="@color/dynamic_black"
android:textSize="@dimen/dynamic_title_txt_sp" />
<ImageView
android:id="@+id/members_title_top_right_tv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:paddingLeft="15dp"
android:paddingRight="15dp"
android:paddingTop="15dp"
android:paddingBottom="15dp"
android:src="@drawable/dynamic_more_green2" />
android:id="@+id/members_title_top_right_tv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:paddingLeft="15dp"
android:paddingTop="15dp"
android:paddingRight="15dp"
android:paddingBottom="15dp"
android:src="@drawable/dynamic_more_green2" />
</RelativeLayout>
<LinearLayout
android:id="@+id/members_type_lin"
android:layout_width="match_parent"
android:layout_height="50dp"
android:layout_marginTop="345dp"
android:orientation="vertical">
android:id="@+id/members_type_lin"
android:layout_width="match_parent"
android:layout_height="50dp"
android:layout_marginTop="345dp"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="49.5dp"
android:orientation="horizontal"
android:background="@color/dynamic_white">
android:layout_width="match_parent"
android:layout_height="49.5dp"
android:background="@color/dynamic_white"
android:orientation="horizontal">
<RelativeLayout
android:id="@+id/members_trend_rel"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1">
android:id="@+id/members_trend_rel"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1">
<TextView
android:id="@+id/members_trend_tv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:paddingLeft="15dp"
android:paddingRight="15dp"
android:text="动态"
android:textColor="@color/dynamic_main_theme"
android:textSize="18sp" />
android:id="@+id/members_trend_tv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:paddingLeft="15dp"
android:paddingRight="15dp"
android:text="动态"
android:textColor="@color/dynamic_main_theme"
android:textSize="18sp" />
<TextView
android:id="@+id/members_trend_hint_tv"
android:layout_width="100dp"
android:layout_height="2dp"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:background="@color/dynamic_main_theme" />
android:id="@+id/members_trend_hint_tv"
android:layout_width="100dp"
android:layout_height="2dp"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:background="@color/dynamic_main_theme" />
</RelativeLayout>
<RelativeLayout
android:id="@+id/members_information_rel"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1">
android:id="@+id/members_information_rel"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1">
<TextView
android:id="@+id/members_information_tv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:paddingLeft="15dp"
android:paddingRight="15dp"
android:text="个人资料"
android:textColor="@color/dynamic_text_gray"
android:textSize="18sp" />
android:id="@+id/members_information_tv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:paddingLeft="15dp"
android:paddingRight="15dp"
android:text="个人资料"
android:textColor="@color/dynamic_text_gray"
android:textSize="18sp" />
<TextView
android:id="@+id/members_information_hint_tv"
android:layout_width="100dp"
android:layout_height="2dp"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:background="@color/dynamic_white" />
android:id="@+id/members_information_hint_tv"
android:layout_width="100dp"
android:layout_height="2dp"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:background="@color/dynamic_white" />
</RelativeLayout>
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="0.5dp"
android:layout_below="@+id/members_type_lin"
android:background="@color/dynamic_title_bottom_line_bg"/>
android:layout_width="match_parent"
android:layout_height="0.5dp"
android:layout_below="@+id/members_type_lin"
android:background="@color/dynamic_title_bottom_line_bg" />
</LinearLayout>
</RelativeLayout>
m-dynamic/src/main/res/layout/dynamic_activity_topic_detail.xml
......@@ -13,7 +13,7 @@
<android.support.design.widget.CoordinatorLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true">
>
<android.support.design.widget.AppBarLayout
android:id="@+id/app_bar"
......@@ -197,7 +197,7 @@
<android.support.v7.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:layout_height="@dimen/platform_action_bar_height"
app:layout_collapseMode="pin"
app:popupTheme="@style/AppTheme.PopupOverlay">
......@@ -249,7 +249,7 @@
android:paddingLeft="15dp"
android:paddingRight="15dp"
android:text="最新"
android:textColor="@color/platform_main_theme_blue"
android:textColor="@color/dynamic_main_theme"
android:textSize="18sp" />
<View
......@@ -258,7 +258,7 @@
android:layout_height="2dp"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:background="@color/platform_main_theme_blue" />
android:background="@color/dynamic_main_theme" />
</RelativeLayout>
<RelativeLayout
......
m-dynamic/src/main/res/layout/dynamic_activity_trend.xml
......@@ -6,51 +6,61 @@
android:layout_height="match_parent"
android:orientation="vertical">
<RelativeLayout
android:layout_gravity="center_vertical"
<LinearLayout
android:id="@+id/publish_trend_title_rel"
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="@dimen/dynamic_title_height"
android:background="@drawable/dynamic_background_publish_trend_top">
<ImageView
android:id="@+id/img_back"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_centerVertical="true"
android:paddingLeft="15dp"
android:paddingRight="@dimen/platform_dp_15"
android:src="@drawable/platform_common_back" />
<com.flyco.tablayout.CommonTabLayout
android:id="@+id/tab_layout"
android:layout_width="110dp"
android:layout_height="match_parent"
android:layout_centerInParent="true"
android:layout_marginBottom="6dp"
app:tl_indicator_anim_enable="false"
app:tl_indicator_height="0dp"
app:tl_tab_space_equal="true"
app:tl_textSelectColor="@color/platform_color_242424"
app:tl_textUnselectColor="@color/platform_color_50ffffff"
app:tl_textsize="17sp" />
android:layout_height="48dp"
android:background="@drawable/dynamic_background_publish_trend_top"
>
<RelativeLayout
android:layout_gravity="center_vertical"
android:layout_width="match_parent"
android:layout_height="48dp"
>
<ImageView
android:id="@+id/img_back"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_centerVertical="true"
android:paddingLeft="15dp"
android:paddingRight="@dimen/platform_dp_15"
android:src="@drawable/platform_common_back" />
<com.flyco.tablayout.CommonTabLayout
android:id="@+id/tab_layout"
android:layout_width="110dp"
android:layout_height="match_parent"
android:layout_centerInParent="true"
android:layout_marginBottom="6dp"
app:tl_indicator_anim_enable="false"
app:tl_indicator_height="0dp"
app:tl_tab_space_equal="true"
app:tl_textSelectColor="@color/platform_color_242424"
app:tl_textUnselectColor="@color/platform_white"
app:tl_textsize="17sp" />
<TextView
android:id="@+id/publish_trend_sure_tv"
android:layout_width="wrap_content"
android:layout_height="24dp"
android:layout_alignParentRight="true"
android:layout_centerInParent="true"
android:layout_marginRight="15dp"
android:background="@drawable/dynamic_bg_publish_button"
android:gravity="center"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:text="发布"
android:textColor="@color/dynamic_sel_but_text_color"
android:textSize="14sp" />
</RelativeLayout>
</LinearLayout>
<TextView
android:id="@+id/publish_trend_sure_tv"
android:layout_width="wrap_content"
android:layout_height="24dp"
android:layout_alignParentRight="true"
android:layout_centerInParent="true"
android:layout_marginRight="15dp"
android:background="@drawable/dynamic_bg_publish_button"
android:gravity="center"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:text="发布"
android:textColor="@color/dynamic_sel_but_text_color"
android:textSize="14sp" />
</RelativeLayout>
<RelativeLayout
android:layout_width="match_parent"
......
m-dynamic/src/main/res/layout/dynamic_fragment_moments.xml
......@@ -4,8 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/trend_home_swl"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true">
android:layout_height="match_parent">
<android.support.design.widget.CoordinatorLayout
android:layout_width="match_parent"
......
m-im/build.gradle
......@@ -96,6 +96,8 @@ dependencies {
api project(':ydl-platform')
implementation modularPublication('com.ydl:m-im-api')
implementation modularPublication('com.ydl:m-user-api')
implementation modularPublication('com.ydl:m-dynamic-api')
implementation modularPublication('com.ydl:m-tests-api')
}else {
//发布时使用
compileOnly rootProject.ext.dependencies["ydl-m-user-api"]
......
m-im/src/main/java/com/yidianling/im/ui/page/NewMultiMessageFragment.kt
......@@ -30,7 +30,6 @@ import com.yidianling.im.ui.page.fragment.bean.UnreadMessageBean
import com.yidianling.im.ui.page.popupWindow.ChatSettingPopupWindow
import com.yidianling.im.ui.param.ClearMessageParam
import com.yidianling.im.ui.param.UnreadParam
import com.yidianling.router.RouterManager
import de.greenrobot.event.EventBus
import io.reactivex.Observable
import io.reactivex.android.schedulers.AndroidSchedulers
......@@ -241,15 +240,11 @@ class NewMultiMessageFragment : BaseFragment() {
}
override fun onChatSettingClick() {
RouterManager.getAppRouter()?.let {
ARouter.getInstance().build("/main/notifysetting").navigation()
}
ARouter.getInstance().build("/main/notifysetting").navigation()
}
override fun onSafeInfoSetting() {
RouterManager.getAppRouter()?.let {
startActivity(ImIn.getUserService().privacyIntent(activity))
}
startActivity(ImIn.getUserService().privacyIntent(activity))
}
override fun onDismissAction() {
......
m-im/src/main/java/com/yidianling/im/ui/page/fragment/ChatFragment.kt
......@@ -302,13 +302,13 @@ class ChatFragment : BaseFragment(), XRecyclerView.LoadingListener {
chat_serviced_message.setTextColor(Color.parseColor("#666666"))
if (modelType == ChatModelType.ALL) {
chat_all_message.setTextColor(resources.getColor(R.color.im_but_text_color))
chat_all_message.setTextColor(resources.getColor(R.color.im_sel_but_text_color))
chat_all_message.setBackgroundResource(R.drawable.im_chat_model_selected_bg)
} else if (modelType == ChatModelType.SERVICING) {
chat_servicing_message.setTextColor(resources.getColor(R.color.im_but_text_color))
chat_servicing_message.setTextColor(resources.getColor(R.color.im_sel_but_text_color))
chat_servicing_message.setBackgroundResource(R.drawable.im_chat_model_selected_bg)
} else if (modelType == ChatModelType.SERVICED) {
chat_serviced_message.setTextColor(resources.getColor(R.color.im_but_text_color))
chat_serviced_message.setTextColor(resources.getColor(R.color.im_sel_but_text_color))
chat_serviced_message.setBackgroundResource(R.drawable.im_chat_model_selected_bg)
}
}
......
m-user/modular.gradle
......@@ -24,7 +24,7 @@ modular {
groupId = "com.ydl"
artifactId = "m-user-api"
//开发时注释掉版本号，发布api时打开
//version = rootProject.ext.ydlPublishVersion[childProject.getName()+"-api"]
// version = rootProject.ext.ydlPublishVersion[childProject.getName()+"-api"]
// API 层打包时需要引入的依赖
apiDependencies {
implementation "com.google.code.gson:gson:2.8.2"
......
m-user/src/main/java/com/yidianling/user/modular_service/AppServiceImpl.kt 0 → 100644
package com.yidianling.user.modular_service
import android.app.Activity
import android.content.Context
import com.alibaba.android.arouter.facade.annotation.Route
import com.yidianling.user.api.service.IAppService
@Route(path = "/user/AppService")
class AppServiceImpl: IAppService {
override fun mainIntent(activity: Activity) {
TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
}
override fun mainIntent(context: Context, selectTab: Int, animation: Boolean) {
TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
}
override fun myRedPockIntent(activity: Activity) {
TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
}
override fun receiverRedPacketIntent(activity: Activity, param: String) {
TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
}
override fun personalInfoIntent(activity: Activity) {
TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
}
override fun rechargeIntent(activity: Activity) {
TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
}
override fun splashIntent(activity: Activity) {
TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
}
override fun feedBackIntent(activity: Activity) {
TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
}
override fun sendRedPacketIntent(activity: Activity, toUid: String) {
TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
}
override fun notificationSettingIntent(activity: Activity) {
TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
}
override fun privacyIntent(activity: Activity) {
TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
}
override fun init(context: Context?) {
}
}
\ No newline at end of file
m-user/src/main/modular_api/com/yidianling/user/api/service/IAppService.kt 0 → 100644
package com.yidianling.user.api.service
import android.app.Activity
import android.content.Context
import com.alibaba.android.arouter.facade.template.IProvider
/**
* Created by haorui on 2019-12-18 .
* Des: App 壳应用 方法调用，临时解决方案
* 待壳应用组件化抽取后，放置于壳应用组件之下
*/
interface IAppService : IProvider {
fun mainIntent(activity: Activity)
fun mainIntent(context: Context, selectTab: Int, animation: Boolean)
fun myRedPockIntent(activity: Activity)
fun receiverRedPacketIntent(activity: Activity, param: String)
fun personalInfoIntent(activity: Activity)
fun rechargeIntent(activity: Activity)
fun splashIntent(activity: Activity)
fun feedBackIntent(activity: Activity)
fun sendRedPacketIntent(activity: Activity, toUid: String)
fun notificationSettingIntent(activity: Activity)
fun privacyIntent(activity: Activity)
}
\ No newline at end of file
ydl-platform/src/main/java/com/ydl/ydlcommon/utils/StatusBarUtils.kt
......@@ -1050,13 +1050,21 @@ class StatusBarUtils {
/**
* 设置自定义状态栏位置
*/
fun setCustomStatusView(context: Activity,statusView:View,params: ViewGroup.LayoutParams){
fun setCustomStatusView(context: Activity,statusView:View){
setCustomStatusView(context,statusView,false)
}
fun setCustomStatusView(context: Activity,statusView:View,isDarkMode:Boolean = false){
val params = statusView.layoutParams
setTransparentForImageView(context, null)
val statusBarHeight = StatusBarUtils.getStatusBarHeight(context)
params.height = RxImageTool.dp2px(48f) + statusBarHeight
statusView.setPadding(0, statusBarHeight, 0, 0)
if (isDarkMode) {
statusBarLightMode(context)
}
}
}
//====================设置Activity状态栏View END====================
......
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 to comment