Commit 193b3e72 by 徐健

backup

parents 2189334b 65dc9745
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
<!-- <activity android:name=".MainActivity"/> --> <!-- <activity android:name=".MainActivity"/> -->
<activity <activity
android:name=".MainActivity" android:name=".MainActivity"
android:launchMode="singleTask"
android:theme="@style/platform_NoTitleTheme"> android:theme="@style/platform_NoTitleTheme">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
......
...@@ -11,6 +11,7 @@ import android.net.Uri ...@@ -11,6 +11,7 @@ import android.net.Uri
import android.os.IBinder import android.os.IBinder
import android.provider.Settings import android.provider.Settings
import android.util.Log import android.util.Log
import com.alibaba.android.arouter.facade.annotation.Route
import com.alibaba.android.arouter.launcher.ARouter import com.alibaba.android.arouter.launcher.ARouter
import com.tbruyelle.rxpermissions2.RxPermissions import com.tbruyelle.rxpermissions2.RxPermissions
import com.umeng.analytics.MobclickAgent import com.umeng.analytics.MobclickAgent
...@@ -27,7 +28,6 @@ import com.ydl.ydlcommon.router.IYDLRouterConstant ...@@ -27,7 +28,6 @@ import com.ydl.ydlcommon.router.IYDLRouterConstant
import com.yidianling.common.tools.ToastUtil import com.yidianling.common.tools.ToastUtil
import com.yidianling.consultant.ExpertSearchActivity.Companion.HOT_SEARCH_DOCTOR_NAME import com.yidianling.consultant.ExpertSearchActivity.Companion.HOT_SEARCH_DOCTOR_NAME
import com.yidianling.consultant.api.IConsultantService import com.yidianling.consultant.api.IConsultantService
import com.yidianling.dynamic.activity.MyTrendsActivity
import com.yidianling.fm.api.service.IFMService import com.yidianling.fm.api.service.IFMService
import com.yidianling.tests.home.NewTestHomeActivity import com.yidianling.tests.home.NewTestHomeActivity
import kotlinx.android.synthetic.main.activity_main.* import kotlinx.android.synthetic.main.activity_main.*
...@@ -36,6 +36,7 @@ import kotlinx.android.synthetic.main.activity_main.* ...@@ -36,6 +36,7 @@ import kotlinx.android.synthetic.main.activity_main.*
* Created by haorui on 2019-09-01 . * Created by haorui on 2019-09-01 .
* Des: * Des:
*/ */
@Route(path = "/main/main")
class MainActivity : BaseLceActivity<DemoContract.View, DemoContract.Presenter>(), class MainActivity : BaseLceActivity<DemoContract.View, DemoContract.Presenter>(),
DemoContract.View { DemoContract.View {
...@@ -99,9 +100,7 @@ class MainActivity : BaseLceActivity<DemoContract.View, DemoContract.Presenter>( ...@@ -99,9 +100,7 @@ class MainActivity : BaseLceActivity<DemoContract.View, DemoContract.Presenter>(
FragmentContainerActivity.start(this,"NewMultiMessageFragment") FragmentContainerActivity.start(this,"NewMultiMessageFragment")
} }
bt_to_dynamic.setOnClickListener { bt_to_dynamic.setOnClickListener {
// FragmentContainerActivity.start(this,"TrendsHomeFragment") FragmentContainerActivity.start(this,"TrendsHomeFragment")
val intentm = Intent(this, MyTrendsActivity::class.java)
startActivity(intentm)
} }
bt_to_tests.setOnClickListener { bt_to_tests.setOnClickListener {
startActivity(Intent(this, NewTestHomeActivity::class.java)) startActivity(Intent(this, NewTestHomeActivity::class.java))
......
...@@ -46,14 +46,14 @@ ext { ...@@ -46,14 +46,14 @@ ext {
"m-confide" : "0.0.41.3", "m-confide" : "0.0.41.3",
"m-consultant" : "0.0.51.14", "m-consultant" : "0.0.51.14",
"m-fm" : "0.0.23.5", "m-fm" : "0.0.23.5",
"m-user" : "0.0.41.2", "m-user" : "0.0.41.3",
"m-home" : "0.0.6.26", "m-home" : "0.0.6.26",
"m-im" : "0.0.3.9", "m-im" : "0.0.3.9",
"m-dynamic" : "0.0.1.7", "m-dynamic" : "0.0.1.7",
"m-muse" : "0.0.20.8", "m-muse" : "0.0.20.8",
"m-tests" : "0.0.15.8", "m-tests" : "0.0.15.8",
"m-course" : "0.0.34.8", "m-course" : "0.0.34.10",
//-------------- 业务模块 API 层 -------------- //-------------- 业务模块 API 层 --------------
"m-audioim-api" : "0.0.5", "m-audioim-api" : "0.0.5",
...@@ -74,7 +74,7 @@ ext { ...@@ -74,7 +74,7 @@ ext {
//第二步 若干 //第二步 若干
"ydl-webview" : "0.0.28.13", "ydl-webview" : "0.0.28.13",
"ydl-media" : "0.0.14.4", "ydl-media" : "0.0.14.5",
"ydl-pay" : "0.0.11.6", "ydl-pay" : "0.0.11.6",
"m-audioim" : "0.0.40.5", "m-audioim" : "0.0.40.5",
......
...@@ -10,7 +10,9 @@ ...@@ -10,7 +10,9 @@
<!--课程首页--> <!--课程首页-->
<activity <activity
android:name=".CourseActivity" android:name=".CourseActivity"
android:screenOrientation="portrait" /> android:screenOrientation="portrait"
android:theme="@style/platform_NoTitleTheme"
/>
<activity <activity
android:name=".CoursePosterActivity" android:name=".CoursePosterActivity"
android:hardwareAccelerated="false" android:hardwareAccelerated="false"
...@@ -43,7 +45,9 @@ ...@@ -43,7 +45,9 @@
/> />
<activity <activity
android:name=".courseNew.mine.MyCourseActivity" android:name=".courseNew.mine.MyCourseActivity"
android:screenOrientation="portrait" /> android:screenOrientation="portrait"
android:theme="@style/platform_NoTitleTheme"
/>
<activity <activity
android:name=".course_special_list.activity.CourseSpecialListActivity" android:name=".course_special_list.activity.CourseSpecialListActivity"
android:screenOrientation="portrait" /> android:screenOrientation="portrait" />
......
package com.yidianling.course; package com.yidianling.course;
import android.os.Bundle;
import android.support.v4.app.Fragment; import android.support.v4.app.Fragment;
import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.facade.annotation.Route;
import com.ydl.ydlcommon.base.BaseActivity; import com.ydl.ydlcommon.base.BaseActivity;
import com.ydl.ydlcommon.utils.StatusBarUtils;
import org.jetbrains.annotations.Nullable;
/** /**
* 课程首页Activity(心理课程) * 课程首页Activity(心理课程)
...@@ -11,6 +16,13 @@ import com.ydl.ydlcommon.base.BaseActivity; ...@@ -11,6 +16,13 @@ import com.ydl.ydlcommon.base.BaseActivity;
public class CourseActivity extends BaseActivity { public class CourseActivity extends BaseActivity {
@Override @Override
protected void onCreate(@Nullable Bundle savedInstanceState) {
StatusBarUtils.Companion.setTransparentForImageView(this, null);
StatusBarUtils.Companion.statusBarLightMode(this);
super.onCreate(savedInstanceState);
}
@Override
protected int layoutResId() { protected int layoutResId() {
return R.layout.activity_course; return R.layout.activity_course;
} }
......
...@@ -38,6 +38,7 @@ import java.util.* ...@@ -38,6 +38,7 @@ import java.util.*
*/ */
class FlutterCourseHomeFragment : BaseFlutterFragment() { class FlutterCourseHomeFragment : BaseFlutterFragment() {
private var hasRequestCoupon = false private var hasRequestCoupon = false
private var dialog: CourseCouponDialog? = null private var dialog: CourseCouponDialog? = null
......
...@@ -15,12 +15,15 @@ import android.widget.LinearLayout; ...@@ -15,12 +15,15 @@ import android.widget.LinearLayout;
import android.widget.TextView; import android.widget.TextView;
import com.ydl.ydlcommon.base.BaseActivity; import com.ydl.ydlcommon.base.BaseActivity;
import com.ydl.ydlcommon.bean.StatusBarOptions;
import com.ydl.ydlcommon.utils.DisplayUtils; import com.ydl.ydlcommon.utils.DisplayUtils;
import com.yidianling.course.CourseListFragment; import com.yidianling.course.CourseListFragment;
import com.yidianling.course.R; import com.yidianling.course.R;
import com.yidianling.course.widget.CourseRedPacketView; import com.yidianling.course.widget.CourseRedPacketView;
import com.yidianling.course.widget.SearchBarView; import com.yidianling.course.widget.SearchBarView;
import org.jetbrains.annotations.NotNull;
import java.lang.reflect.Field; import java.lang.reflect.Field;
/** /**
...@@ -36,6 +39,11 @@ public class MyCourseActivity extends BaseActivity { ...@@ -36,6 +39,11 @@ public class MyCourseActivity extends BaseActivity {
private int tabIndex; private int tabIndex;
@NotNull
@Override
public StatusBarOptions getStatusViewOptions() {
return new StatusBarOptions(true,true);
}
public static void start(Context context) { public static void start(Context context) {
Intent i = new Intent(context, MyCourseActivity.class); Intent i = new Intent(context, MyCourseActivity.class);
......
...@@ -1135,7 +1135,6 @@ public class TrendsDetailActivity extends BaseMvpActivity<ITrendsDetailView, ITr ...@@ -1135,7 +1135,6 @@ public class TrendsDetailActivity extends BaseMvpActivity<ITrendsDetailView, ITr
} else if (v.getId() == R.id.image_back) { } else if (v.getId() == R.id.image_back) {
if (isFromSplash) { if (isFromSplash) {
DynamicIn.INSTANCE.mainIntent(this); DynamicIn.INSTANCE.mainIntent(this);
finish();
} }
setResultForActivity(); setResultForActivity();
this.finish(); this.finish();
......
...@@ -39,6 +39,7 @@ import com.netease.nimlib.sdk.uinfo.model.NimUserInfo; ...@@ -39,6 +39,7 @@ import com.netease.nimlib.sdk.uinfo.model.NimUserInfo;
import com.ydl.ydl_image.module.GlideApp; import com.ydl.ydl_image.module.GlideApp;
import com.ydl.ydlcommon.modular.ModularServiceManager; import com.ydl.ydlcommon.modular.ModularServiceManager;
import com.ydl.ydlcommon.utils.SharedPreferencesEditor; import com.ydl.ydlcommon.utils.SharedPreferencesEditor;
import com.ydl.ydlcommon.utils.YdlBuryPointUtil;
import com.ydl.ydlcommon.utils.log.LogHelper; import com.ydl.ydlcommon.utils.log.LogHelper;
import com.ydl.ydlcommon.view.CircleImageView; import com.ydl.ydlcommon.view.CircleImageView;
import com.yidianling.common.tools.ToastUtil; import com.yidianling.common.tools.ToastUtil;
...@@ -193,6 +194,12 @@ public class YDLMessageFragment extends TFragment implements ModuleProxy { ...@@ -193,6 +194,12 @@ public class YDLMessageFragment extends TFragment implements ModuleProxy {
rl_common_question_enter.postDelayed(() -> openOrCloseCommonQuestionLayout(true), 300); rl_common_question_enter.postDelayed(() -> openOrCloseCommonQuestionLayout(true), 300);
} else { } else {
getCommonQuestionListData(); getCommonQuestionListData();
try {
YdlBuryPointUtil.sendPv("快捷短语弹起");
}catch (Exception e){
}
} }
ChatStatusCacheHelper.clearDataByKey("chatEvent"); ChatStatusCacheHelper.clearDataByKey("chatEvent");
} }
...@@ -217,6 +224,13 @@ public class YDLMessageFragment extends TFragment implements ModuleProxy { ...@@ -217,6 +224,13 @@ public class YDLMessageFragment extends TFragment implements ModuleProxy {
if (!getActivity().isFinishing()) { if (!getActivity().isFinishing()) {
collectInfoPopupWindow.show(top_expert_info_cl); collectInfoPopupWindow.show(top_expert_info_cl);
} }
try {
YdlBuryPointUtil.sendPv("用户信息收集页面");
}catch (Exception e){
}
} }
ChatStatusCacheHelper.clearDataByKey("collectEvent"); ChatStatusCacheHelper.clearDataByKey("collectEvent");
} }
......
...@@ -2,7 +2,6 @@ package com.yidianling.user.modular_service ...@@ -2,7 +2,6 @@ package com.yidianling.user.modular_service
import android.app.Activity import android.app.Activity
import android.content.Context import android.content.Context
import android.content.Intent
import android.os.Bundle import android.os.Bundle
import com.alibaba.android.arouter.facade.annotation.Route import com.alibaba.android.arouter.facade.annotation.Route
import com.alibaba.android.arouter.launcher.ARouter import com.alibaba.android.arouter.launcher.ARouter
...@@ -13,7 +12,9 @@ import com.yidianling.user.api.service.IAppService ...@@ -13,7 +12,9 @@ import com.yidianling.user.api.service.IAppService
class AppServiceImpl: IAppService { class AppServiceImpl: IAppService {
override fun mainIntent(activity: Activity) { override fun mainIntent(activity: Activity) {
ARouter.getInstance().build("/main/main").navigation() ARouter.getInstance()
.build("/main/main")
.navigation()
} }
override fun mainIntent(context: Context, selectTab: Int, animation: Boolean) { override fun mainIntent(context: Context, selectTab: Int, animation: Boolean) {
...@@ -22,7 +23,6 @@ class AppServiceImpl: IAppService { ...@@ -22,7 +23,6 @@ class AppServiceImpl: IAppService {
bundle.putBoolean("animation", animation) bundle.putBoolean("animation", animation)
ARouter.getInstance().build("/main/main") ARouter.getInstance().build("/main/main")
.withFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
.withBundle("bundle",bundle) .withBundle("bundle",bundle)
.navigation() .navigation()
} }
......
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