Skip to content

Y
YDL-Component-Medical
Commit aeff1b11 by konghaorui
Options

修改动态模块样式

parent f1b324e6
Showing with 172 additions and 101 deletions
m-audioim/src/main/res/drawable/audioim_home_button_autoaxb_background.xml
......@@ -3,7 +3,7 @@
<corners android:radius="20dp" />
<gradient android:startColor="#1DA1F2"
android:endColor="#23B2FA"
android:endColor="@color/dynamic_main_theme_light"
android:angle="180"/>
</shape>
\ No newline at end of file
m-dynamic/src/main/AndroidManifest.xml
......@@ -7,39 +7,49 @@
<application>
<activity
android:name=".trendsDetail.TrendsDetailActivity"
android:screenOrientation="portrait" />
android:screenOrientation="portrait"
android:theme="@style/platform_NoTitleTheme" />
<activity
android:name=".topic.topicDetail.TopicDetailActivity"
android:screenOrientation="portrait"
/>
android:theme="@style/platform_NoTitleTheme" />
<activity
android:name=".publishTrend.PublishTrendActivity"
android:screenOrientation="portrait" />
android:screenOrientation="portrait"
android:theme="@style/platform_NoTitleTheme" />
<activity
android:name=".activity.TrendsReplyInfoActivity"
android:screenOrientation="portrait" />
android:screenOrientation="portrait"
android:theme="@style/platform_NoTitleTheme" />
<activity
android:name=".activity.MyTrendsActivity"
android:screenOrientation="portrait" />
android:screenOrientation="portrait"
android:theme="@style/platform_NoTitleTheme" />
<activity
android:name=".common.browsePictures.BrowsePicturesActivity"
android:screenOrientation="portrait" />
android:screenOrientation="portrait"
android:theme="@style/platform_NoTitleTheme" />
<activity
android:name=".common.browsePictures.BrowsePicturesActivity2"
android:screenOrientation="portrait" />
android:screenOrientation="portrait"
android:theme="@style/platform_NoTitleTheme" />
<activity
android:name=".members.MembersActivity"
android:launchMode="singleTop"
android:screenOrientation="portrait" />
android:screenOrientation="portrait"
android:theme="@style/platform_NoTitleTheme" />
<activity
android:name=".publishTrend.SelecTopicActivity"
android:screenOrientation="portrait" />
android:screenOrientation="portrait"
android:theme="@style/platform_NoTitleTheme" />
<activity
android:name=".topic.AllTopicActivity"
android:screenOrientation="portrait" />
android:screenOrientation="portrait"
android:theme="@style/platform_NoTitleTheme" />
<activity
android:name=".thank.ThankActivity"
android:screenOrientation="portrait" />
android:screenOrientation="portrait"
android:theme="@style/platform_NoTitleTheme" />
</application>
</manifest>
\ No newline at end of file
m-dynamic/src/main/java/com/yidianling/dynamic/activity/MyTrendsActivity.kt
......@@ -104,9 +104,9 @@ class MyTrendsActivity : BaseActivity() {
//切换标签选中状态
private fun changeLabel(position: Int, isChangeFragment: Boolean) {
if (position == 0) {
item_topic_detail_new_tv!!.setTextColor(resources.getColor(R.color.dynamic_title_green))
item_topic_detail_new_tv!!.setTextColor(resources.getColor(R.color.dynamic_main_theme))
item_topic_detail_new_hint_tv!!.setBackgroundColor(resources.getColor(R.color.dynamic_title_green))
item_topic_detail_new_hint_tv!!.setBackgroundColor(resources.getColor(R.color.dynamic_main_theme))
item_topic_detail_hot_tv!!.setTextColor(resources.getColor(R.color.dynamic_text_gray))
item_topic_detail_hot_hint_tv!!.setBackgroundColor(resources.getColor(R.color.dynamic_white))
......@@ -116,8 +116,8 @@ class MyTrendsActivity : BaseActivity() {
item_topic_detail_new_hint_tv!!.setBackgroundColor(resources.getColor(R.color.dynamic_white))
item_topic_detail_hot_tv!!.setTextColor(resources.getColor(R.color.dynamic_title_green))
item_topic_detail_hot_hint_tv!!.setBackgroundColor(resources.getColor(R.color.dynamic_title_green))
item_topic_detail_hot_tv!!.setTextColor(resources.getColor(R.color.dynamic_main_theme))
item_topic_detail_hot_hint_tv!!.setBackgroundColor(resources.getColor(R.color.dynamic_main_theme))
}
if (isChangeFragment) {
......
m-dynamic/src/main/java/com/yidianling/dynamic/members/MembersActivity.java
......@@ -286,7 +286,7 @@ public class MembersActivity extends BaseActivity implements View.OnClickListene
// members_top_user_focus_ortion_hint_iv.setVisibility(View.VISIBLE);
members_top_user_focus_ortion_tv.setText("已关注");
members_top_user_focus_ortion_tv.setTextColor(Color.parseColor("#1DA1F2"));
members_top_user_focus_ortion_tv.setTextColor(getResources().getColor(R.color.dynamic_main_theme));
focus_state = "1";
} else {
members_top_user_focus_ortion_rel.setBackgroundResource(R.drawable.dynamic_focus_topic_detail_bg);
......@@ -462,7 +462,7 @@ public class MembersActivity extends BaseActivity implements View.OnClickListene
members_top_user_focus_ortion_tv.setCompoundDrawablePadding(20);
members_top_user_focus_ortion_tv.setCompoundDrawables(null, null, drawable, null);
members_top_user_focus_ortion_tv.setText("已关注");
members_top_user_focus_ortion_tv.setTextColor(Color.parseColor("#1DA1F2"));
members_top_user_focus_ortion_tv.setTextColor(getResources().getColor(R.color.dynamic_main_theme));
} else {
members_top_user_focus_ortion_rel.setBackgroundResource(R.drawable.dynamic_focus_topic_detail_bg);
fans_count = (fans_counti - 1) + "";
......@@ -554,7 +554,7 @@ public class MembersActivity extends BaseActivity implements View.OnClickListene
members_top_user_focus_ortion_tv.setCompoundDrawablePadding(20);
members_top_user_focus_ortion_tv.setCompoundDrawables(null, null, drawable, null);
members_top_user_focus_ortion_tv.setText("已关注");
members_top_user_focus_ortion_tv.setTextColor(Color.parseColor("#1DA1F2"));
members_top_user_focus_ortion_tv.setTextColor(getResources().getColor(R.color.dynamic_main_theme));
} else {
members_top_user_focus_ortion_rel.setBackgroundResource(R.drawable.dynamic_focus_topic_detail_bg);
members_top_user_focus_ortion_tv.setCompoundDrawables(null, null, null, null);
......@@ -805,7 +805,7 @@ public class MembersActivity extends BaseActivity implements View.OnClickListene
} else { //滑动到banner下面设置普通颜色
members_title_top_tv.setTextColor(getResources().getColor(R.color.dynamic_black));
members_title_top_tv.setText(name);
members_title_back_iv.setImageResource(R.drawable.dynamic_toolbar_back);
members_title_back_iv.setImageResource(R.drawable.platform_common_back);
members_title_top_right_tv.setImageResource(R.drawable.dynamic_more_green);
// 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
......@@ -25,6 +25,7 @@ import com.flyco.tablayout.listener.OnTabSelectListener;
import com.ydl.ydlcommon.base.BaseActivity;
import com.ydl.ydlcommon.base.config.YDLConstants;
import com.ydl.ydlcommon.utils.SharedPreferencesEditor;
import com.ydl.ydlcommon.utils.StatusBarUtils;
import com.ydl.ydlcommon.view.NoScrollViewPager;
import com.yidianling.dynamic.DynamicConstants;
import com.yidianling.dynamic.R;
......@@ -53,6 +54,7 @@ public class PublishTrendActivity extends BaseActivity {
private List<Fragment> fragmentList = new ArrayList<>();
private PopupWindow noticePopupWindow;
private Handler handler;
private View mPublishTrendTitle;
public static Intent newIntent(Activity activity, String url, String cover, String title) {
Intent intent = new Intent(activity, PublishTrendActivity.class);
......@@ -103,6 +105,7 @@ public class PublishTrendActivity extends BaseActivity {
SharedPreferencesEditor.putString("trend_state", "");
handler = new Handler();
mBackIv = findViewById(R.id.img_back);
mPublishTrendTitle= findViewById(R.id.publish_trend_title_rel);
mBackIv.setOnClickListener(v -> {
finish();
......@@ -119,6 +122,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());
}
private void initData() {
......
m-dynamic/src/main/java/com/yidianling/dynamic/topic/topicDetail/TopicDetailActivity.java
......@@ -38,6 +38,7 @@ 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.yidianling.common.tools.LogUtil;
......@@ -52,6 +53,8 @@ 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;
......@@ -139,6 +142,12 @@ 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);
......@@ -237,7 +246,7 @@ public class TopicDetailActivity extends BaseMvpActivity<TopicDetailView, TopicD
if (backgroundColor != R.color.dynamic_white) {
mToolbar.setBackgroundColor(getResources().getColor(R.color.dynamic_white));
alPhaAnimation(mToolbar, 0, 1, null);
mTopicDetailTitleBackIv.setImageResource(R.drawable.dynamic_toolbar_back);
mTopicDetailTitleBackIv.setImageResource(R.drawable.platform_common_back);
mTopicDetailTitleTopRightTv.setImageResource(R.drawable.dynamic_more_green);
backgroundColor = R.color.dynamic_white;
}
......
m-dynamic/src/main/java/com/yidianling/dynamic/trendsDetail/TrendsDetailActivity.java
......@@ -50,6 +50,7 @@ import com.ydl.ydlcommon.actions.share.ShareMoreBean;
import com.ydl.ydlcommon.actions.share.ShareUtils;
import com.ydl.ydlcommon.base.BaseMvpActivity;
import com.ydl.ydlcommon.base.config.YDLConstants;
import com.ydl.ydlcommon.bean.StatusBarOptions;
import com.ydl.ydlcommon.data.http.BaseResponse;
import com.ydl.ydlcommon.router.IYDLRouterConstant;
import com.ydl.ydlcommon.ui.LogoLoadingView;
......@@ -296,6 +297,12 @@ public class TrendsDetailActivity extends BaseMvpActivity<ITrendsDetailView, ITr
private Runnable showEmojiRunnable;
private Runnable showTextRunnable;
@NotNull
@Override
public StatusBarOptions getStatusViewOptions() {
return new StatusBarOptions(true,true);
}
public static Intent newIntent(Activity activity, int trendId, boolean isScrollToZan) {
Intent intent = new Intent(activity, TrendsDetailActivity.class);
Bundle bundle = new Bundle();
......
m-dynamic/src/main/res/drawable/dynamic_background_publish_trend_top.xml
......@@ -5,7 +5,7 @@
<item android:state_enabled="true">
<shape>
<corners android:radius="0dp"></corners>
<gradient android:endColor="#05cbfc" android:startColor="#3484da" />
<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>
......
m-dynamic/src/main/res/drawable/dynamic_bg_fcous_selected.xml
......@@ -3,7 +3,7 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid
android:color="#1DA1F2"/>
android:color="@color/dynamic_main_theme"/>
<corners
android:bottomRightRadius="5dp"
android:topRightRadius="5dp"/>
......
m-dynamic/src/main/res/drawable/dynamic_bg_hot_selected.xml
......@@ -3,7 +3,7 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid
android:color="#1DA1F2"/>
android:color="@color/dynamic_main_theme"/>
<corners
android:bottomLeftRadius="5dp"
android:topLeftRadius="5dp"/>
......
m-dynamic/src/main/res/drawable/dynamic_bg_radius_line_green_20.xml
......@@ -3,6 +3,6 @@
<corners android:radius="20dp"></corners>
<solid android:color="@color/dynamic_white" />
<stroke android:width="1dp" android:color="@color/dynamic_google_green"/>
<stroke android:width="1dp" android:color="@color/dynamic_main_theme"/>
</shape>
m-dynamic/src/main/res/drawable/dynamic_bg_recommend_selected.xml
......@@ -3,5 +3,5 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid
android:color="#1DA1F2"/>
android:color="@color/dynamic_main_theme"/>
</shape>
\ No newline at end of file
m-dynamic/src/main/res/drawable/dynamic_cancel_focus_text_bg.xml
......@@ -3,8 +3,8 @@
android:shape="rectangle">
<gradient
android:startColor="#1DA1F2"
android:endColor="#23B2FA"/>
android:startColor="@color/dynamic_main_theme"
android:endColor="@color/dynamic_main_theme_light"/>
<corners android:bottomRightRadius="8dp"/>
......
m-dynamic/src/main/res/drawable/dynamic_focus_btn_bg2.xml
......@@ -13,7 +13,7 @@
android:topRightRadius="20dp"/>
<stroke
android:width="1dp"
android:color="@color/dynamic_google_green"/>
android:color="@color/dynamic_main_theme"/>
</shape>
</item>
</layer-list>
m-dynamic/src/main/res/drawable/dynamic_focus_topic_detail_bg.xml
......@@ -5,7 +5,7 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid
android:color="@color/dynamic_google_green"/>
android:color="@color/dynamic_main_theme"/>
<corners
android:bottomRightRadius="20dp"
android:bottomLeftRadius="20dp"
......@@ -13,7 +13,7 @@
android:topRightRadius="20dp"/>
<stroke
android:width="0.5dp"
android:color="@color/dynamic_google_green"/>
android:color="@color/dynamic_main_theme"/>
</shape>
</item>
</layer-list>
m-dynamic/src/main/res/drawable/dynamic_has_focus_bg.xml
......@@ -5,6 +5,6 @@
<corners android:radius="17.5dp"/>
<stroke android:width="1dp"
android:color="#1DA1F2"/>
android:color="@color/dynamic_main_theme"/>
</shape>
\ No newline at end of file
m-dynamic/src/main/res/drawable/dynamic_shape_green_border_trend_info_bg.xml
......@@ -6,7 +6,7 @@
<stroke
android:width="1dp"
android:color="@color/dynamic_google_green" />
android:color="@color/dynamic_main_theme" />
<solid android:color="@color/dynamic_transparent" />
</shape>
m-dynamic/src/main/res/layout/dynamic_activity_all_topic.xml
......@@ -14,7 +14,7 @@
android:id="@+id/topic_title_back_iv"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:src="@drawable/dynamic_toolbar_back"
android:src="@drawable/platform_common_back"
android:layout_centerInParent="true"
android:paddingLeft="15dp"
android:paddingRight="30dp"
......
m-dynamic/src/main/res/layout/dynamic_activity_members.xml
......@@ -108,7 +108,7 @@
<TextView
android:id="@+id/members_top_user_visit_num_tv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_height="29dp"
android:text=""
android:textColor="@color/dynamic_text_gray" />
......@@ -289,7 +289,7 @@
android:paddingLeft="15dp"
android:paddingRight="15dp"
android:text="动态"
android:textColor="@color/dynamic_title_green"
android:textColor="@color/dynamic_main_theme"
android:textSize="18sp" />
<TextView
......@@ -298,7 +298,7 @@
android:layout_height="2dp"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:background="@color/dynamic_title_green" />
android:background="@color/dynamic_main_theme" />
</RelativeLayout>
......
m-dynamic/src/main/res/layout/dynamic_activity_mytrends.xml
......@@ -16,7 +16,7 @@
android:paddingLeft="15dp"
android:paddingRight="30dp"
android:gravity="center_vertical"
android:src="@drawable/dynamic_toolbar_back" />
android:src="@drawable/platform_common_back" />
<TextView
android:id="@+id/tv_center_title"
......@@ -68,7 +68,7 @@
android:paddingRight="15dp"
android:gravity="center_vertical"
android:text="我发布的"
android:textColor="@color/dynamic_title_green"
android:textColor="@color/dynamic_main_theme"
android:textSize="18sp" />
<TextView
......@@ -77,7 +77,7 @@
android:layout_height="2dp"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:background="@color/dynamic_title_green" />
android:background="@color/dynamic_main_theme" />
</RelativeLayout>
<RelativeLayout
......
m-dynamic/src/main/res/layout/dynamic_activity_selec_topic.xml
......@@ -29,7 +29,7 @@
android:paddingLeft="15dp"
android:paddingRight="15dp"
android:text="取消"
android:textColor="@color/dynamic_google_green"
android:textColor="@color/platform_color_242424"
android:textSize="18sp" />
</RelativeLayout>
<ScrollView
......
m-dynamic/src/main/res/layout/dynamic_activity_topic_detail.xml
......@@ -124,7 +124,7 @@
android:background="@drawable/dynamic_focus_topic_detail_bg"
android:gravity="center"
android:text=""
android:textColor="@color/dynamic_white"
android:textColor="@color/dynamic_but_text_color"
android:textSize="14sp"
android:visibility="gone" />
</LinearLayout>
......@@ -161,7 +161,7 @@
android:paddingLeft="15dp"
android:paddingRight="15dp"
android:text=""
android:textColor="@color/dynamic_google_green" />
android:textColor="@color/dynamic_main_theme" />
<android.support.v7.widget.RecyclerView
android:id="@+id/topic_detail_users_rcv"
......@@ -306,7 +306,7 @@
android:layout_marginBottom="20dp"
android:elevation="3dp"
android:src="@drawable/dynamic_newsfeed_new2"
app:backgroundTint="@color/dynamic_google_green"
app:backgroundTint="@color/dynamic_main_theme"
app:borderWidth="0dp"
app:fabSize="normal" />
......@@ -315,7 +315,7 @@
</android.support.v4.widget.SwipeRefreshLayout>
<com.ydl.ydlcommon.viewui.LogoLoadingView
<com.ydl.ydlcommon.ui.LogoLoadingView
android:id="@+id/v_loading"
android:layout_width="match_parent"
android:layout_height="match_parent" />
......
m-dynamic/src/main/res/layout/dynamic_activity_trend.xml
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="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:layout_height="match_parent"
android:orientation="vertical">
<RelativeLayout
android:layout_gravity="center_vertical"
android:id="@+id/publish_trend_title_rel"
android:layout_width="match_parent"
android:layout_height="@dimen/dynamic_title_height"
......@@ -29,7 +31,7 @@
app:tl_indicator_anim_enable="false"
app:tl_indicator_height="0dp"
app:tl_tab_space_equal="true"
app:tl_textSelectColor="@color/dynamic_white"
app:tl_textSelectColor="@color/platform_color_242424"
app:tl_textUnselectColor="@color/platform_color_50ffffff"
app:tl_textsize="17sp" />
......@@ -46,22 +48,24 @@
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:text="发布"
android:textColor="@color/platform_color_0CC1F7"
android:textColor="@color/dynamic_sel_but_text_color"
android:textSize="14sp" />
</RelativeLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<com.ydl.ydlcommon.view.NoScrollViewPager
android:id="@+id/view_pager"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="45dp" />
android:layout_height="match_parent" />
<TextView
android:id="@+id/tv_coustom_toast_view"
android:layout_width="match_parent"
android:layout_height="40dp"
android:layout_marginTop="45dp"
android:layout_alignParentTop="true"
android:background="@color/platform_color_FFEBE0"
android:gravity="center"
android:textColor="@color/platform_color_FF5B05"
......@@ -70,6 +74,8 @@
tools:text="请选择在选择话题后进行发布哦～"
tools:visibility="visible" />
</RelativeLayout>
<!--<RelativeLayout-->
<!--android:id="@+id/rl_notice_layout"-->
......@@ -97,4 +103,4 @@
<!--android:background="@drawable/dynamic_background_publish_triangle_view" />-->
<!--</RelativeLayout>-->
</FrameLayout>
</LinearLayout>
m-dynamic/src/main/res/layout/dynamic_activity_trend_details.xml
......@@ -19,7 +19,7 @@
android:gravity="center_vertical"
android:paddingLeft="15dp"
android:paddingRight="30dp"
android:src="@drawable/dynamic_toolbar_back" />
android:src="@drawable/platform_common_back" />
<TextView
android:id="@+id/tv_center_title"
......@@ -42,7 +42,7 @@
android:gravity="center_vertical"
android:paddingLeft="15dp"
android:paddingRight="15dp"
android:src="@drawable/dynamic_more_green" />
android:src="@drawable/platform_common_notice_more_un" />
<ImageView
android:layout_width="match_parent"
......@@ -420,7 +420,7 @@
android:paddingRight="20dp"
android:paddingTop="8dp"
android:text="显示所有评论"
android:textColor="@color/dynamic_google_green"
android:textColor="@color/dynamic_main_theme"
android:textSize="15sp"
android:visibility="gone"
tools:visibility="visible" />
......
m-dynamic/src/main/res/layout/dynamic_activity_trends_reply_info.xml
......@@ -19,7 +19,7 @@
android:gravity="center_vertical"
android:paddingLeft="15dp"
android:paddingRight="30dp"
android:src="@drawable/dynamic_toolbar_back" />
android:src="@drawable/platform_common_back" />
<TextView
android:id="@+id/tv_center_title"
......@@ -278,7 +278,7 @@
android:layout_marginRight="15dp"
android:background="@drawable/dynamic_shape_green_border_trend_info_bg"
android:gravity="center"
android:textColor="@color/dynamic_google_green"
android:textColor="@color/dynamic_main_theme"
tools:visibility="visible"
android:visibility="gone"
android:text="私聊"/>
......@@ -345,7 +345,7 @@
android:layout_marginBottom="10dp"
android:layout_marginLeft="40dp"
android:layout_marginRight="40dp"
android:textColor="@color/dynamic_google_green"
android:textColor="@color/dynamic_main_theme"
android:background="@drawable/dynamic_bg_radius_line_green_20"
android:text="回到主贴"/>
......
m-dynamic/src/main/res/layout/dynamic_cancel_focus_dialog_layout.xml
......@@ -75,7 +75,7 @@
android:layout_height="match_parent"
android:layout_weight="1"
android:text="确定"
android:textColor="@color/dynamic_white"
android:textColor="@color/dynamic_but_text_color"
android:textSize="@dimen/dynamic_text_size_16"
android:gravity="center"
android:background="@drawable/dynamic_cancel_focus_text_bg"
......
m-dynamic/src/main/res/layout/dynamic_fragment_moments.xml
......@@ -197,7 +197,7 @@
android:layout_width="match_parent"
android:layout_height="@dimen/title_bar_height"
android:alpha="1"
android:background="@color/platform_main_theme_blue"
android:background="@color/dynamic_main_theme"
app:layout_collapseMode="pin">
......@@ -207,7 +207,7 @@
android:layout_marginRight="15dp"
android:gravity="center"
android:text="问答"
android:textColor="@color/dynamic_white"
android:textColor="@color/dynamic_but_text_color"
android:textSize="20sp" />
......@@ -293,7 +293,7 @@
android:layout_marginBottom="40dp"
android:elevation="3dp"
android:src="@drawable/dynamic_publish_trend"
app:backgroundTint="#1DA1F2"
app:backgroundTint="@color/dynamic_main_theme"
app:borderWidth="0dp"
app:fabSize="normal" />
......
m-dynamic/src/main/res/layout/dynamic_fragment_trends_list.xml
......@@ -52,11 +52,11 @@
android:layout_height="wrap_content"
android:layout_marginBottom="20dp"
android:layout_marginRight="20dp"
android:background="@color/dynamic_google_green"
android:background="@color/dynamic_main_theme"
android:elevation="3dp"
android:padding="0dp"
android:src="@drawable/dynamic_newsfeed_new2"
app:backgroundTint="@color/dynamic_google_green"
app:backgroundTint="@color/dynamic_main_theme"
app:borderWidth="0dp"
app:fabSize="normal"
app:layout_anchor="@+id/trends_rcv"
......
m-dynamic/src/main/res/layout/dynamic_item_alltopic.xml
......@@ -83,7 +83,7 @@
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:text="+ 关注"
android:textColor="@color/dynamic_google_green"
android:textColor="@color/dynamic_main_theme"
android:textSize="16sp" />
</RelativeLayout>
......
m-dynamic/src/main/res/layout/dynamic_item_talk_list.xml
......@@ -121,7 +121,7 @@
android:background="@drawable/dynamic_shape_green_border_trend_info_bg"
android:gravity="center"
android:text="私聊"
android:textColor="@color/dynamic_google_green"
android:textColor="@color/dynamic_main_theme"
android:visibility="gone"
tools:visibility="visible" />
......
m-dynamic/src/xlzx/res/values/colors.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!--主题色-->
<color name="dynamic_main_theme">#fdbd00</color>
<!--主题浅色-->
<color name="dynamic_main_theme_light">#FFEC8C</color>
<!--主题亮色-->
<color name="dynamic_main_theme_bright">#fffae0</color>
<!--确认按钮背景颜色-->
<color name="dynamic_confirm_bg_color">#FFDD33</color>
<!--按钮文字颜色 YDL 为白色-->
<color name="dynamic_but_text_color">#242424</color>
<!--选择按钮文字颜色 YDL 为蓝色-->
<color name="dynamic_sel_but_text_color">#242424</color>
</resources>
m-dynamic/src/ydl/res/values/colors.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!--主题色-->
<color name="dynamic_main_theme">#1da1f2</color>
<!--主题浅色-->
<color name="dynamic_main_theme_light">#60BDF5</color>
<!--主题亮色-->
<color name="dynamic_main_theme_bright">#E8F6FF</color>
<!--确认按钮背景颜色-->
<color name="dynamic_confirm_bg_color">#1da1f2</color>
<!--按钮文字颜色-->
<color name="dynamic_but_text_color">#ffffff</color>
<!--选择按钮文字颜色-->
<color name="dynamic_sel_but_text_color">#1da1f2</color>
</resources>
m-home/src/xlzx/java/com/yidianling/home/presenter/HomePresenterImpl.kt
......@@ -189,7 +189,8 @@ class HomePresenterImpl : BaseHomePresenterImpl<IHomeContract.View, IHomeContrac
ModularServiceManager.provide(IConsultantService::class.java).setHotSearch(it)
}
},
mModel.consultRequest(mConsultType).map {
mModel.consultRequest(mConsultType)
.map {
//首页咨询数据
homeList.add(getHomeItemFromTempData(it, YdlHomeViewHolderConstract.CONSULT_VIEW))
},
......
m-user/src/main/java/com/yidianling/user/constants/UserBIConstants.kt
......@@ -19,8 +19,8 @@ class UserBIConstants {
//百度监测 用户注册行为
const val APP_REGISTER_PAGE = "app_register_page"
const val POSITION_LOGIN_CLICK = "login_click" //登录点击
const val POSITION_LOGIN_SUCCESS_CLICK = "login_success_click" //登录成功点击
const val POSITION_LOGIN_CLICK = "login_main|login_click" //登录点击
const val POSITION_LOGIN_SUCCESS_CLICK = "login_main|login_success_click" //登录成功点击
//百度监测 应用启动
const val POSITION_APP_START_UP_CLICK = "app_start_up_click" //应用启动
......@@ -42,12 +42,12 @@ class UserBIConstants {
* action type
* 行为数据埋点，sign1字段 是对同一key下多种不同行为的描述
*/
const val ACTION_TYPE_CODE_LOGIN: String = PART_ID_LOGIN_MAIN_PREFIX+"code_login" //验证码登录
const val ACTION_TYPE_RESET_PWD: String = PART_ID_LOGIN_MAIN_PREFIX+"reset_pwd" //重置密码登录
const val ACTION_TYPE_PWD_LOGIN: String = PART_ID_LOGIN_MAIN_PREFIX+"pwd_login" //手机号密码登录
const val ACTION_TYPE_DIRECT_LOGIN: String = PART_ID_LOGIN_MAIN_PREFIX+"direct_login" //一键登录
const val ACTION_TYPE_QQ_THIRD_LOGIN: String = PART_ID_LOGIN_MAIN_PREFIX+"qq_login" //QQ登录
const val ACTION_TYPE_WX_THIRD_LOGIN: String = PART_ID_LOGIN_MAIN_PREFIX+"wx_login" //WX登录
const val ACTION_TYPE_CODE_LOGIN: String = "code_login" //验证码登录
const val ACTION_TYPE_RESET_PWD: String = "reset_pwd" //重置密码登录
const val ACTION_TYPE_PWD_LOGIN: String = "pwd_login" //手机号密码登录
const val ACTION_TYPE_DIRECT_LOGIN: String = "direct_login" //一键登录
const val ACTION_TYPE_QQ_THIRD_LOGIN: String = "qq_login" //QQ登录
const val ACTION_TYPE_WX_THIRD_LOGIN: String = "wx_login" //WX登录
}
//====================壹点灵用户版首页（ydl_user_main_page）====================
......
m-user/src/main/java/com/yidianling/user/ui/SmsLoginActivity.kt
......@@ -18,9 +18,9 @@ import com.ydl.ydlcommon.utils.remind.ToastHelper
import com.yidianling.home.api.service.IHomeService
import com.yidianling.router.im.IMLoginInfo
import com.yidianling.router.im.IMRequestCallback
import com.yidianling.user.api.bean.UserResponseBean
import com.yidianling.user.LoginUtils
import com.yidianling.user.UserConstants
import com.yidianling.user.api.bean.UserResponseBean
import com.yidianling.user.constants.UserBIConstants
import com.yidianling.user.http.UserHttp
import com.yidianling.user.http.UserHttpImpl
......@@ -136,7 +136,7 @@ class SmsLoginActivity : BaseActivity() {
return
}
ActionCountUtils.count( UserBIConstants.ACTION_TYPE_CODE_LOGIN)
ActionCountUtils.count(UserBIConstants.POSITION_LOGIN_CLICK, UserBIConstants.ACTION_TYPE_CODE_LOGIN)
Log.e("短信验证码：", code + " - " + phoneNum + " - " + et_code.text.toString());
loginSub = userHttp.login(LoginParam(code, phoneNum, null, 2, et_code.text.toString()))
......@@ -153,7 +153,7 @@ class SmsLoginActivity : BaseActivity() {
ModularServiceManager.provide(IHomeService::class.java).setDouble11ShowType(true)
baiduActionBury()
}else {
ActionCountUtils.countUid(it.uid!!,UserBIConstants.ACTION_TYPE_CODE_LOGIN)
ActionCountUtils.countUid(UserBIConstants.POSITION_LOGIN_SUCCESS_CLICK,it.uid!!,UserBIConstants.ACTION_TYPE_CODE_LOGIN)
}
ActivityManager.finishActivity(LoginActivity::class.java)
if (ActivityManager.getActivitySize() <= 1) {
......
m-user/src/main/java/com/yidianling/user/ui/login/presenter/InputPassWordPresenterImpl.kt
......@@ -6,14 +6,13 @@ import com.ydl.ydlcommon.modular.ModularServiceManager
import com.ydl.ydlcommon.mvp.base.BasePresenter
import com.ydl.ydlcommon.router.YdlCommonOut
import com.ydl.ydlcommon.utils.StringUtils
import com.ydl.ydlcommon.utils.YDLCacheUtils
import com.ydl.ydlcommon.utils.actionutil.ActionCountUtils
import com.ydl.ydlcommon.utils.log.LogHelper
import com.yidianling.common.tools.ToastUtil
import com.yidianling.home.api.service.IHomeService
import com.yidianling.user.api.bean.UserResponseBean
import com.yidianling.user.LoginUtils
import com.yidianling.user.api.bean.UserResponseBean
import com.yidianling.user.constants.UserBIConstants
import com.yidianling.user.http.request.PhoneLoginPwdParam
import com.yidianling.user.http.request.PhoneResetPwdParam
......@@ -41,7 +40,7 @@ class InputPassWordPresenterImpl : BasePresenter<IInputPassWordContract.View, II
*/
override fun resetPwd(newPassword: String, phone: String, msgCode: String, phoneCountryCode: String) {
ActionCountUtils.count(UserBIConstants.ACTION_TYPE_RESET_PWD)
ActionCountUtils.count(UserBIConstants.POSITION_LOGIN_CLICK, UserBIConstants.ACTION_TYPE_RESET_PWD)
var param = PhoneResetPwdParam(StringUtils.md5(newPassword), phoneCountryCode, msgCode, phone)
mModel.resetPwd(param)
......@@ -58,7 +57,7 @@ class InputPassWordPresenterImpl : BasePresenter<IInputPassWordContract.View, II
} else {
ToastUtil.toastShort("修改密码成功")
saveUserData(it.data)
ActionCountUtils.count(UserBIConstants.ACTION_TYPE_RESET_PWD)
ActionCountUtils.count(UserBIConstants.POSITION_LOGIN_SUCCESS_CLICK,UserBIConstants.ACTION_TYPE_RESET_PWD)
if (it.data.firstLogin == 1) {//第一次登录：是注册
ModularServiceManager.provide(IHomeService::class.java).setDouble11ShowType(true)
// 重设密码登录已经不可能是首次登录，所以不进行百度埋点
......@@ -81,6 +80,7 @@ class InputPassWordPresenterImpl : BasePresenter<IInputPassWordContract.View, II
override fun userLoginByPassword(inputPassword: String, phone: String, phoneCountryCode: String) {
ActionCountUtils.count(UserBIConstants.ACTION_TYPE_PWD_LOGIN)
ActionCountUtils.count(UserBIConstants.POSITION_LOGIN_CLICK, UserBIConstants.ACTION_TYPE_RESET_PWD)
var param = PhoneLoginPwdParam(StringUtils.md5(inputPassword), phoneCountryCode, phone)
......@@ -102,7 +102,7 @@ class InputPassWordPresenterImpl : BasePresenter<IInputPassWordContract.View, II
ModularServiceManager.provide(IHomeService::class.java).setDouble11ShowType(true)
mView.baiduActionBury()
} else {
ActionCountUtils.countUid(UserBIConstants.ACTION_TYPE_PWD_LOGIN,it.data.uid!!)
ActionCountUtils.countUid(UserBIConstants.POSITION_LOGIN_SUCCESS_CLICK,it.data.uid!!,UserBIConstants.ACTION_TYPE_PWD_LOGIN)
}
mView.closeActivity()
}
......
m-user/src/main/java/com/yidianling/user/ui/login/presenter/LoginPresenterImpl.kt
......@@ -7,15 +7,13 @@ import com.umeng.socialize.bean.SHARE_MEDIA
import com.ydl.ydlcommon.modular.ModularServiceManager
import com.ydl.ydlcommon.mvp.base.BasePresenter
import com.ydl.ydlcommon.router.YdlCommonOut
import com.ydl.ydlcommon.utils.YDLCacheUtils
import com.ydl.ydlcommon.utils.actionutil.ActionCountUtils
import com.ydl.ydlcommon.utils.log.LogHelper
import com.yidianling.common.tools.ToastUtil
import com.yidianling.home.api.service.IHomeService
import com.yidianling.user.api.bean.UserResponseBean
import com.yidianling.user.LoginUtils
import com.yidianling.user.UserHelper
import com.yidianling.user.api.bean.UserResponseBean
import com.yidianling.user.constants.UserBIConstants
import com.yidianling.user.http.UserHttpImpl
import com.yidianling.user.http.request.BindPhoneJavaParam
......@@ -76,8 +74,7 @@ class LoginPresenterImpl(view: ILoginContract.View) : BasePresenter<ILoginContra
ModularServiceManager.provide(IHomeService::class.java).setDouble11ShowType(true)
mView.baiduActionBury(it.data.uid, UserBIConstants.POSITION_ALIYUN_REGISTER_CLICK)
} else {
ActionCountUtils.count(UserBIConstants.ACTION_TYPE_DIRECT_LOGIN)
ActionCountUtils.countUid(UserBIConstants.POSITION_LOGIN_SUCCESS_CLICK,it.data.uid!!,UserBIConstants.ACTION_TYPE_DIRECT_LOGIN)
}
mView.autoLoginSuccess()
} else {
......@@ -178,9 +175,7 @@ class LoginPresenterImpl(view: ILoginContract.View) : BasePresenter<ILoginContra
override fun loginByThird(activity: Activity, media: SHARE_MEDIA) {
val sign1 = if (media == SHARE_MEDIA.QQ) UserBIConstants.ACTION_TYPE_QQ_THIRD_LOGIN else UserBIConstants.ACTION_TYPE_WX_THIRD_LOGIN
ActionCountUtils.count(UserHelper.getUserInfo()!!.uid, UserBIConstants.PART_ID_LOGIN_MAIN,
UserBIConstants.POSITION_LOGIN_CLICK, "友盟三方登录url无法获取",
"友盟三方登录api无法获取", sign1)
ActionCountUtils.count(UserBIConstants.POSITION_LOGIN_CLICK, sign1)
UserHttpImpl.getInstance()
......@@ -207,18 +202,14 @@ class LoginPresenterImpl(view: ILoginContract.View) : BasePresenter<ILoginContra
ModularServiceManager.provide(IHomeService::class.java).setDouble11ShowType(true)
mView.baiduActionBury(it.data.uid,UserBIConstants.POSITION_QQ_REGISTER_CLICK)
} else {
ActionCountUtils.count(UserHelper.getUserInfo()!!.uid, UserBIConstants.PART_ID_LOGIN_MAIN,
UserBIConstants.POSITION_LOGIN_SUCCESS_CLICK, "友盟三方登录url无法获取",
"友盟三方登录api无法获取", sign1)
ActionCountUtils.count(UserBIConstants.POSITION_LOGIN_SUCCESS_CLICK, sign1)
}
} else {
if (it.data.firstLogin == 1) {//第一次登录：是注册
ModularServiceManager.provide(IHomeService::class.java).setDouble11ShowType(true)
mView.baiduActionBury(it.data.uid,UserBIConstants.POSITION_WX_REGISTER_CLICK)
} else {
ActionCountUtils.count(UserHelper.getUserInfo()!!.uid, UserBIConstants.PART_ID_LOGIN_MAIN,
UserBIConstants.POSITION_LOGIN_SUCCESS_CLICK, "友盟三方登录url无法获取",
"友盟三方登录api无法获取", sign1)
ActionCountUtils.count(UserBIConstants.POSITION_LOGIN_SUCCESS_CLICK, sign1)
}
}
}, {
......
m-user/src/main/java/com/yidianling/user/ui/login/presenter/VerificationCodePresenterImpl.kt
......@@ -3,14 +3,13 @@ package com.yidianling.user.ui.login.presenter
import android.text.TextUtils
import com.ydl.ydlcommon.modular.ModularServiceManager
import com.ydl.ydlcommon.mvp.base.BasePresenter
import com.ydl.ydlcommon.utils.YDLCacheUtils
import com.ydl.ydlcommon.utils.actionutil.ActionCountUtils
import com.ydl.ydlcommon.utils.log.LogHelper
import com.yidianling.common.tools.ToastUtil
import com.yidianling.home.api.service.IHomeService
import com.yidianling.user.api.bean.UserResponseBean
import com.yidianling.user.LoginUtils
import com.yidianling.user.api.bean.UserResponseBean
import com.yidianling.user.constants.UserBIConstants
import com.yidianling.user.http.request.BindPhoneJavaParam
import com.yidianling.user.http.request.PhoneLoginCodeParam
......@@ -149,7 +148,7 @@ class VerificationCodePresenterImpl(view: IVerificationCodeContract.View) : Base
ModularServiceManager.provide(IHomeService::class.java).setDouble11ShowType(true)
mView.baiduActionBury()
} else {
ActionCountUtils.countUid(UserBIConstants.ACTION_TYPE_CODE_LOGIN,it.data.uid!!)
ActionCountUtils.countUid(UserBIConstants.POSITION_LOGIN_SUCCESS_CLICK,it.data.uid!!,UserBIConstants.ACTION_TYPE_CODE_LOGIN)
}
mView.closeActivity()
} else {
......
ydl-platform/src/main/java/com/ydl/ydlcommon/utils/StatusBarUtils.kt
......@@ -18,6 +18,7 @@ import android.view.WindowManager
import android.widget.LinearLayout
import com.ydl.ydlcommon.R
import com.ydl.ydlcommon.bean.StatusBarOptions
import com.yidianling.common.tools.RxImageTool
/**
......@@ -1046,8 +1047,17 @@ class StatusBarUtils {
}
return statusView
}
/**
* 设置自定义状态栏位置
*/
fun setCustomStatusView(context: Activity,statusView:View,params: ViewGroup.LayoutParams){
setTransparentForImageView(context, null)
val statusBarHeight = StatusBarUtils.getStatusBarHeight(context)
params.height = RxImageTool.dp2px(48f) + statusBarHeight
statusView.setPadding(0, statusBarHeight, 0, 0)
}
}
//====================设置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