Commit 51cc70cb by konghaorui

移动MineFragment至main目录下

parent d8586cc0
......@@ -148,8 +148,8 @@ class MainActivity : BaseLceActivity<DemoContract.View, DemoContract.Presenter>(
.navigation()
}
bt_to_home.setOnClickListener {
// FragmentContainerActivity.start(this, "YdlHomeFragment")
startActivity(Intent(this, TestAppActivity::class.java))
FragmentContainerActivity.start(this, "MineFragment")
// startActivity(Intent(this, TestAppActivity::class.java))
}
}
......
......@@ -6,7 +6,7 @@ import android.support.v4.app.FragmentPagerAdapter
import android.support.v7.app.AppCompatActivity
import com.yidianling.dynamic.trendsHome.TrendsHomeFragment
import com.yidianling.home.ui.fragment.YdlHomeFragment
import com.yidianling.user.MineFragment
import com.yidianling.user.mine.MineFragment
import kotlinx.android.synthetic.main.activity_test_app.*
import java.util.*
......
......@@ -13,12 +13,14 @@ import com.yidianling.home.ui.fragment.YdlHomeFragment
//import com.yidianling.dynamic.trendsHome.TrendsHomeFragment
//import com.yidianling.home.ui.fragment.YdlHomeFragment
import com.yidianling.im.ui.page.NewMultiMessageFragment
import com.yidianling.user.mine.MineFragment
class FragmentContainerActivity : BaseLceActivity<DemoContract.View, DemoContract.Presenter>(), DemoContract.View {
class FragmentContainerActivity : BaseLceActivity<DemoContract.View, DemoContract.Presenter>(),
DemoContract.View {
companion object{
fun start(context: Context,fragmentName : String = "") {
companion object {
fun start(context: Context, fragmentName: String = "") {
val intent = Intent(context, FragmentContainerActivity::class.java)
intent.putExtra("fragmentName", fragmentName)
context.startActivity(intent)
......@@ -36,6 +38,7 @@ class FragmentContainerActivity : BaseLceActivity<DemoContract.View, DemoContra
override fun getStateViewId(): Int {
return com.ydl.component.R.id.lce_state_view
}
override fun createPresenter(): DemoContract.Presenter {
return DemoPresenter()
}
......@@ -60,7 +63,7 @@ class FragmentContainerActivity : BaseLceActivity<DemoContract.View, DemoContra
}
private fun getFragment(): Fragment {
val fragmentName = intent.getStringExtra("fragmentName")?:""
val fragmentName = intent.getStringExtra("fragmentName") ?: ""
if ("NewMultiMessageFragment" == fragmentName) {
return NewMultiMessageFragment()
}
......@@ -73,6 +76,9 @@ class FragmentContainerActivity : BaseLceActivity<DemoContract.View, DemoContra
if ("ExpertSearchFragment" == fragmentName) {
return ExpertSearchFragment()
}
if ("MineFragment" == fragmentName) {
return MineFragment()
}
return PlayFragment()
}
}
ext {
kotlin_version = "1.3.21"
dev_mode = false
dev_mode = true
ydl_app = [
appName : "心理咨询壹点灵",
......
package com.yidianling.user;
package com.yidianling.user.mine;
import android.annotation.SuppressLint;
import android.content.Intent;
......@@ -31,15 +31,13 @@ import com.ydl.ydlcommon.view.widgets.BorderCircleImageView;
import com.yidianling.dynamic.api.IDynamicService;
import com.yidianling.im.api.service.IImService;
import com.yidianling.im.message.param.MsgListParam;
import com.yidianling.user.BuildConfig;
import com.yidianling.user.R;
import com.yidianling.user.UserHelper;
import com.yidianling.user.api.bean.UserResponseBean;
import com.yidianling.user.api.event.RefreshRecentContactListEvent;
import com.yidianling.user.api.service.IAppService;
import com.yidianling.user.mine.AboutUsActivity;
import com.yidianling.user.mine.AccountHistoryActivity;
import com.yidianling.user.mine.AccountSettingActivity;
import com.yidianling.user.mine.PersonalInfoActivity;
import com.yidianling.user.mine.UserChangeEvent;
import com.yidianling.user.mine.data.AppDataManager;
import com.yidianling.user.api.event.RefreshRecentContactListEvent;
import com.yidianling.user.mine.http.MineHttpImpl;
import com.yidianling.user.safePrivate.PrivacyActivity;
import com.yidianling.user.ui.login.RegisterAndLoginActivity;
......
......@@ -22,6 +22,7 @@ import com.yidianling.user.api.listener.UserInfoFromApiListener
import com.yidianling.user.api.listener.VersionUpdateStatusListener
import com.yidianling.user.api.service.IUserService
import com.yidianling.user.http.UserHttpImpl
import com.yidianling.user.mine.MineFragment
import com.yidianling.user.mine.data.AppDataManager
import com.yidianling.user.mine.utils.UpdateUtil
import com.yidianling.user.route.UserIn
......
......@@ -40,5 +40,5 @@
<!--动态-->
<!--动态顶部title背景变色-->
<color name="user_with_status_fail">#fcff6600</color>
</resources>
<resources>
<style name="user_new_divide_color_style">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">0.5dp</item>
<item name="android:background">@color/platform_color_F0F0F0</item>
</style>
</resources>
......@@ -6,6 +6,4 @@
<color name="user_main_theme_light">#60BDF5</color>
<!--主题亮色-->
<color name="user_main_theme_bright">#E8F6FF</color>
<color name="user_with_status_fail">#fcff6600</color>
</resources>
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="user_new_divide_color_style">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">0.5dp</item>
<item name="android:background">@color/platform_color_F0F0F0</item>
</style>
</resources>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment