version:1.0.1
update:优化屏幕适配,更换图标 bugfixes:
This commit is contained in:
@@ -22,6 +22,7 @@ import com.tencent.mmkv.MMKV;
|
||||
import com.xxpatx.os.R;
|
||||
import com.xxpatx.os.activity.contact.AddWechatContactActivity;
|
||||
import com.xxpatx.os.activity.contact.EditContactActivity;
|
||||
import com.xxpatx.os.activity.weather.WeatherActivity;
|
||||
import com.xxpatx.os.adapter.WechatContactAdapter;
|
||||
import com.xxpatx.os.base.mvvm.fragment.BaseMvvmFragment;
|
||||
import com.xxpatx.os.bean.BaseResponse;
|
||||
@@ -31,6 +32,8 @@ import com.xxpatx.os.config.CommonConfig;
|
||||
import com.xxpatx.os.databinding.FragmentContactHomeBinding;
|
||||
import com.xxpatx.os.dialog.EditContactDialog;
|
||||
import com.xxpatx.os.utils.DayUtils;
|
||||
import com.xxpatx.os.utils.ScreenUtils;
|
||||
import com.xxpatx.os.view.EquallyDividedItemDecoration;
|
||||
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.Date;
|
||||
@@ -43,6 +46,7 @@ public class ContactFragment extends BaseMvvmFragment<ContactViewModel, Fragment
|
||||
|
||||
private FragmentActivity mContext;
|
||||
private WechatContactAdapter mContactAdapter;
|
||||
private int SPAN_COUNT;
|
||||
|
||||
@Override
|
||||
protected int getLayoutId() {
|
||||
@@ -68,10 +72,13 @@ public class ContactFragment extends BaseMvvmFragment<ContactViewModel, Fragment
|
||||
}
|
||||
});
|
||||
if (getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE) {
|
||||
mViewDataBinding.rvContact.setLayoutManager(new GridLayoutManager(getContext(), 3));
|
||||
SPAN_COUNT = 3;
|
||||
} else {
|
||||
mViewDataBinding.rvContact.setLayoutManager(new GridLayoutManager(getContext(), 2));
|
||||
SPAN_COUNT = 2;
|
||||
}
|
||||
mViewDataBinding.rvContact.setLayoutManager(new GridLayoutManager(getContext(), SPAN_COUNT));
|
||||
EquallyDividedItemDecoration equallyDividedItemDecoration = new EquallyDividedItemDecoration(SPAN_COUNT, ScreenUtils.dip2px(mContext, 6));
|
||||
mViewDataBinding.rvContact.addItemDecoration(equallyDividedItemDecoration);
|
||||
mViewDataBinding.rvContact.setAdapter(mContactAdapter);
|
||||
setTime();
|
||||
initAmap();
|
||||
@@ -105,7 +112,7 @@ public class ContactFragment extends BaseMvvmFragment<ContactViewModel, Fragment
|
||||
@Override
|
||||
protected void initData(Bundle savedInstanceState) {
|
||||
LiveEventBus
|
||||
.get("some_key1", WeatherNowBean.NowBaseBean.class)
|
||||
.get("getWeatherNowKey", WeatherNowBean.NowBaseBean.class)
|
||||
.observe(this, new Observer<WeatherNowBean.NowBaseBean>() {
|
||||
@Override
|
||||
public void onChanged(@Nullable WeatherNowBean.NowBaseBean nowBaseBean) {
|
||||
@@ -132,7 +139,7 @@ public class ContactFragment extends BaseMvvmFragment<ContactViewModel, Fragment
|
||||
});
|
||||
|
||||
LiveEventBus
|
||||
.get("some_key2", WeatherHourlyBean.HourlyBean.class)
|
||||
.get("getWeather24HourlyKey", WeatherHourlyBean.HourlyBean.class)
|
||||
.observe(this, new Observer<WeatherHourlyBean.HourlyBean>() {
|
||||
@Override
|
||||
public void onChanged(@Nullable WeatherHourlyBean.HourlyBean hourlyBean) {
|
||||
@@ -152,7 +159,7 @@ public class ContactFragment extends BaseMvvmFragment<ContactViewModel, Fragment
|
||||
});
|
||||
|
||||
LiveEventBus
|
||||
.get("some_key3", WeatherDailyBean.DailyBean.class)
|
||||
.get("getWeather7DKey", WeatherDailyBean.DailyBean.class)
|
||||
.observe(this, new Observer<WeatherDailyBean.DailyBean>() {
|
||||
@Override
|
||||
public void onChanged(@Nullable WeatherDailyBean.DailyBean dailyBean) {
|
||||
@@ -256,5 +263,9 @@ public class ContactFragment extends BaseMvvmFragment<ContactViewModel, Fragment
|
||||
Intent intent = new Intent(getContext(), AddWechatContactActivity.class);
|
||||
startActivity(intent);
|
||||
}
|
||||
|
||||
public void toWeather(View view) {
|
||||
startActivity(new Intent(mContext, WeatherActivity.class));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -224,7 +224,7 @@ public class HomeFragment extends BaseMvvmFragment<HomeViewModel, FragmentHomeBi
|
||||
}
|
||||
});
|
||||
LiveEventBus
|
||||
.get("some_key1", WeatherNowBean.NowBaseBean.class)
|
||||
.get("getWeatherNowKey", WeatherNowBean.NowBaseBean.class)
|
||||
.observe(this, new Observer<WeatherNowBean.NowBaseBean>() {
|
||||
@Override
|
||||
public void onChanged(@Nullable WeatherNowBean.NowBaseBean nowBaseBean) {
|
||||
@@ -251,7 +251,7 @@ public class HomeFragment extends BaseMvvmFragment<HomeViewModel, FragmentHomeBi
|
||||
});
|
||||
|
||||
LiveEventBus
|
||||
.get("some_key2", WeatherHourlyBean.HourlyBean.class)
|
||||
.get("getWeather24HourlyKey", WeatherHourlyBean.HourlyBean.class)
|
||||
.observe(this, new Observer<WeatherHourlyBean.HourlyBean>() {
|
||||
@Override
|
||||
public void onChanged(@Nullable WeatherHourlyBean.HourlyBean hourlyBean) {
|
||||
@@ -271,7 +271,7 @@ public class HomeFragment extends BaseMvvmFragment<HomeViewModel, FragmentHomeBi
|
||||
});
|
||||
|
||||
LiveEventBus
|
||||
.get("some_key3", WeatherDailyBean.DailyBean.class)
|
||||
.get("getWeather7DKey", WeatherDailyBean.DailyBean.class)
|
||||
.observe(this, new Observer<WeatherDailyBean.DailyBean>() {
|
||||
@Override
|
||||
public void onChanged(@Nullable WeatherDailyBean.DailyBean dailyBean) {
|
||||
@@ -509,7 +509,7 @@ public class HomeFragment extends BaseMvvmFragment<HomeViewModel, FragmentHomeBi
|
||||
}
|
||||
|
||||
public void toVideoplayer(View view) {
|
||||
ApkUtils.openPackage(mContext, "com.uiui.videoplayer", "com.uiui.videoplayer.activity.main.MainActivity");
|
||||
ApkUtils.openPackage(mContext, "com.xxpatx.jtxc", "com.xxpatx.jtxc.activity.main.MainActivity");
|
||||
}
|
||||
|
||||
public void openSettings(View view) {
|
||||
|
||||
@@ -104,7 +104,7 @@ public class SettingsFragment extends BaseMvvmFragment<SettingsViewModel, Fragme
|
||||
}
|
||||
});
|
||||
LiveEventBus
|
||||
.get("some_key1", WeatherNowBean.NowBaseBean.class)
|
||||
.get("getWeatherNowKey", WeatherNowBean.NowBaseBean.class)
|
||||
.observe(this, new Observer<WeatherNowBean.NowBaseBean>() {
|
||||
@Override
|
||||
public void onChanged(@Nullable WeatherNowBean.NowBaseBean nowBaseBean) {
|
||||
@@ -131,7 +131,7 @@ public class SettingsFragment extends BaseMvvmFragment<SettingsViewModel, Fragme
|
||||
});
|
||||
|
||||
LiveEventBus
|
||||
.get("some_key2", WeatherHourlyBean.HourlyBean.class)
|
||||
.get("getWeather24HourlyKey", WeatherHourlyBean.HourlyBean.class)
|
||||
.observe(this, new Observer<WeatherHourlyBean.HourlyBean>() {
|
||||
@Override
|
||||
public void onChanged(@Nullable WeatherHourlyBean.HourlyBean hourlyBean) {
|
||||
@@ -151,7 +151,7 @@ public class SettingsFragment extends BaseMvvmFragment<SettingsViewModel, Fragme
|
||||
});
|
||||
|
||||
LiveEventBus
|
||||
.get("some_key3", WeatherDailyBean.DailyBean.class)
|
||||
.get("getWeather7DKey", WeatherDailyBean.DailyBean.class)
|
||||
.observe(this, new Observer<WeatherDailyBean.DailyBean>() {
|
||||
@Override
|
||||
public void onChanged(@Nullable WeatherDailyBean.DailyBean dailyBean) {
|
||||
|
||||
Reference in New Issue
Block a user