version:1.0.1
update:优化屏幕适配,更换图标 bugfixes:
This commit is contained in:
@@ -31,7 +31,6 @@ import androidx.fragment.app.FragmentManager;
|
||||
import androidx.fragment.app.FragmentTransaction;
|
||||
import androidx.lifecycle.Observer;
|
||||
|
||||
import com.alarmclock.uiui.IAlarmAidlInterface;
|
||||
import com.blankj.utilcode.util.NetworkUtils;
|
||||
import com.google.gson.Gson;
|
||||
import com.google.gson.reflect.TypeToken;
|
||||
@@ -256,22 +255,6 @@ public class MainActivity extends BaseMvvmActivity<MainViewModel, PhoneActivityM
|
||||
// mViewModel.getAppList();
|
||||
|
||||
registReceiver();
|
||||
|
||||
mAlarmServiceConnection = new ServiceConnection() {
|
||||
@Override
|
||||
public void onServiceConnected(ComponentName name, IBinder service) {
|
||||
Log.e(TAG, "onServiceConnected: ");
|
||||
mIAlarmAidlInterface = IAlarmAidlInterface.Stub.asInterface(service);
|
||||
getAlarmData();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onServiceDisconnected(ComponentName name) {
|
||||
Log.e(TAG, "onServiceDisconnected: ");
|
||||
mIAlarmAidlInterface = null;
|
||||
}
|
||||
};
|
||||
bindAlarmService();
|
||||
RemoteManager.setListener(this);
|
||||
initAmap();
|
||||
}
|
||||
@@ -298,20 +281,7 @@ public class MainActivity extends BaseMvvmActivity<MainViewModel, PhoneActivityM
|
||||
}
|
||||
|
||||
private ServiceConnection mAlarmServiceConnection;
|
||||
private IAlarmAidlInterface mIAlarmAidlInterface;
|
||||
|
||||
private void bindAlarmService() {
|
||||
if (mIAlarmAidlInterface == null) {
|
||||
//这是连接aidl服务的代码
|
||||
Intent intent = new Intent();
|
||||
intent.setAction("com.alarmclock.uiui.IAlarmAidlInterface");
|
||||
intent.setPackage("com.alarmclock.uiui");
|
||||
intent.setComponent(new ComponentName("com.alarmclock.uiui", "com.alarmclock.uiui.AIDLAlarmService"));
|
||||
bindService(intent, mAlarmServiceConnection, Context.BIND_AUTO_CREATE);
|
||||
} else {
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
public static void toggleNotificationListenerService(Context context) {
|
||||
Log.e(TAG, "toggleNotificationListenerService");
|
||||
@@ -323,28 +293,6 @@ public class MainActivity extends BaseMvvmActivity<MainViewModel, PhoneActivityM
|
||||
PackageManager.COMPONENT_ENABLED_STATE_ENABLED, PackageManager.DONT_KILL_APP);
|
||||
}
|
||||
|
||||
private void getAlarmData() {
|
||||
if (mIAlarmAidlInterface == null) {
|
||||
bindAlarmService();
|
||||
return;
|
||||
}
|
||||
try {
|
||||
String json = mIAlarmAidlInterface.getAlarm();
|
||||
Log.e(TAG, "onServiceConnected: " + json);
|
||||
if ("暂无闹钟".equalsIgnoreCase(json) || TextUtils.isEmpty(json)) {
|
||||
// mCustomFragment.setAlarmItem(null);
|
||||
return;
|
||||
}
|
||||
Type type = new TypeToken<List<AlarmItem>>() {
|
||||
}.getType();
|
||||
List<AlarmItem> alarmItem = new Gson().fromJson(json, type);
|
||||
// mCustomFragment.setAlarmItem(alarmItem);
|
||||
} catch (RemoteException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
private void addData() {
|
||||
Log.e(TAG, "addData: ");
|
||||
List<Fragment> fragmentList = new ArrayList<>();
|
||||
@@ -425,7 +373,6 @@ public class MainActivity extends BaseMvvmActivity<MainViewModel, PhoneActivityM
|
||||
super.onStart();
|
||||
AppUsedTimeUtils.getInstance().setAppPackageName(BuildConfig.APPLICATION_ID);
|
||||
AppUsedTimeUtils.getInstance().setStartTime(System.currentTimeMillis());
|
||||
getAlarmData();
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -103,7 +103,7 @@ public class MainViewModel extends BaseViewModel<PhoneActivityMainBinding, Activ
|
||||
if (Code.OK == weatherBean.getCode()) {
|
||||
WeatherNowBean.NowBaseBean now = weatherBean.getNow();
|
||||
LiveEventBus
|
||||
.get("some_key1")
|
||||
.get("getWeatherNowKey")
|
||||
.post(now);
|
||||
mNowBaseBeanData.postValue(now);
|
||||
Log.d("getWeatherNow", "onSuccess: now " + new Gson().toJson(now));
|
||||
@@ -138,7 +138,7 @@ public class MainViewModel extends BaseViewModel<PhoneActivityMainBinding, Activ
|
||||
WeatherHourlyBean.HourlyBean now = hourly.get(0);
|
||||
mHourlyBeanData.postValue(now);
|
||||
LiveEventBus
|
||||
.get("some_key2")
|
||||
.get("getWeather24HourlyKey")
|
||||
.post(now);
|
||||
}
|
||||
} else {
|
||||
@@ -174,7 +174,7 @@ public class MainViewModel extends BaseViewModel<PhoneActivityMainBinding, Activ
|
||||
WeatherDailyBean.DailyBean dailyBean = weatherDailyBean.getDaily().get(0);
|
||||
DailyBeanData.postValue(dailyBean);
|
||||
LiveEventBus
|
||||
.get("some_key3")
|
||||
.get("getWeather7DKey")
|
||||
.post(dailyBean);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -210,7 +210,7 @@ public class WeatherViewModel extends BaseViewModel<ActivityWeatherBinding, Acti
|
||||
mWeatherNowData.setValue(weatherBean);
|
||||
WeatherNowBean.NowBaseBean now = weatherBean.getNow();
|
||||
LiveEventBus
|
||||
.get("some_key1")
|
||||
.get("getWeatherNowKey")
|
||||
.post(now);
|
||||
}
|
||||
});
|
||||
@@ -238,7 +238,7 @@ public class WeatherViewModel extends BaseViewModel<ActivityWeatherBinding, Acti
|
||||
mWeatherDailyData.setValue(weatherDailyBean);
|
||||
WeatherDailyBean.DailyBean dailyBean = weatherDailyBean.getDaily().get(0);
|
||||
LiveEventBus
|
||||
.get("some_key3")
|
||||
.get("getWeather7DKey")
|
||||
.post(dailyBean);
|
||||
}
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user