version:2.3

fix:
update:固定横屏,增加家庭空间
This commit is contained in:
2023-02-06 19:00:02 +08:00
parent 5cddcd0f8e
commit 75214f440a
27 changed files with 698 additions and 642 deletions

View File

@@ -1,6 +1,7 @@
package com.uiuios.aios.fragment;
import android.content.Context;
import android.content.Intent;
import android.content.pm.PackageManager;
import android.content.res.Configuration;
import android.os.Bundle;
@@ -21,6 +22,7 @@ import com.google.gson.JsonObject;
import com.trello.rxlifecycle4.RxLifecycle;
import com.trello.rxlifecycle4.android.FragmentEvent;
import com.uiuios.aios.R;
import com.uiuios.aios.activity.code.FamilySpaceActivity;
import com.uiuios.aios.base.BaseFragment;
import com.uiuios.aios.bean.BaseResponse;
import com.uiuios.aios.bean.DesktopIcon;
@@ -182,6 +184,9 @@ public class AppListFragment extends BaseFragment {
Log.e(TAG, "onItemClick: " + desktopIcon.getPackageName());
switch (desktopIcon.getPackageName()) {
case "aios.exit":
case "aios.family":
startActivity(new Intent(mContext, FamilySpaceActivity.class));
break;
case "com.android.dialer":
int qch_call_forbid = Settings.System.getInt(mContext.getContentResolver(), "aole_call_forbid", 0);
if (qch_call_forbid == 1) {

View File

@@ -34,9 +34,6 @@ import androidx.fragment.app.Fragment;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import com.baidu.location.BDAbstractLocationListener;
import com.baidu.location.BDLocation;
import com.baidu.location.LocationClient;
import com.blankj.utilcode.util.NetworkUtils;
import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
@@ -54,7 +51,7 @@ import com.uiuios.aios.activity.ControlActivity;
import com.uiuios.aios.activity.EmergencyActivity;
import com.uiuios.aios.activity.QuickAppActivity;
import com.uiuios.aios.activity.alarm.AlarmClockActivity;
import com.uiuios.aios.activity.code.HealthCodeActivity;
import com.uiuios.aios.activity.code.FamilySpaceActivity;
import com.uiuios.aios.activity.contact.ContactActivity;
import com.uiuios.aios.activity.weather.WeatherActivity;
import com.uiuios.aios.adapter.NotificationAdapter;
@@ -63,15 +60,13 @@ import com.uiuios.aios.alarm.AlarmUtils;
import com.uiuios.aios.base.BaseFragment;
import com.uiuios.aios.bean.AlarmClockData;
import com.uiuios.aios.bean.AlarmItem;
import com.uiuios.aios.bean.BaseResponse;
import com.uiuios.aios.bean.Contact;
import com.uiuios.aios.bean.HealthCode;
import com.uiuios.aios.bean.SnInfo;
import com.uiuios.aios.bean.UserAvatarInfo;
import com.uiuios.aios.dialog.PasswordDialog;
import com.uiuios.aios.dialog.SingleDialog;
import com.uiuios.aios.disklrucache.CacheHelper;
import com.uiuios.aios.manager.AmapManager;
import com.uiuios.aios.manager.RemoteManager;
import com.uiuios.aios.network.NetInterfaceManager;
import com.uiuios.aios.network.URLAddress;
import com.uiuios.aios.tpush.MessageReceiver;
@@ -89,9 +84,6 @@ import java.util.List;
import butterknife.BindView;
import butterknife.ButterKnife;
import io.reactivex.rxjava3.annotations.NonNull;
import io.reactivex.rxjava3.core.Observer;
import io.reactivex.rxjava3.disposables.Disposable;
/**
@@ -234,7 +226,9 @@ public class CustomFragment extends BaseFragment implements CustomContact.Custom
@Override
public void fetchData() {
Log.e(TAG, "fetchData: ");
initData();
RemoteManager.getInstance().getLocation();
}
@Override
@@ -289,6 +283,25 @@ public class CustomFragment extends BaseFragment implements CustomContact.Custom
return isOnline;
}
private RefreshBroadcastReceiver mRefreshBroadcastReceiver;
private void registerRefreshReceiver() {
if (mRefreshBroadcastReceiver == null) {
mRefreshBroadcastReceiver = new RefreshBroadcastReceiver();
}
IntentFilter filter = new IntentFilter();
filter.addAction(QuickAppActivity.QUICK_APP_REFRESH_KEY);
mContext.registerReceiver(mRefreshBroadcastReceiver, filter);
}
class RefreshBroadcastReceiver extends BroadcastReceiver {
@Override
public void onReceive(Context context, Intent intent) {
Log.e(TAG, "onReceive: " + intent.getAction());
setQuickApp();
}
}
private void registerAlarmClockReceiver() {
if (null == mAlarmClockReceiver) {
mAlarmClockReceiver = new AlarmClockReceiver();
@@ -393,6 +406,7 @@ public class CustomFragment extends BaseFragment implements CustomContact.Custom
private void initView() {
Log.e(TAG, "initView: " + Utils.getBatteryLevel(mContext));
registerRefreshReceiver();
registerBatteryReceiver();
registerAlarmClockReceiver();
wifi_ssid.requestFocus();
@@ -507,7 +521,10 @@ public class CustomFragment extends BaseFragment implements CustomContact.Custom
@Override
public void onClick(View view) {
if (TextUtils.isEmpty(quickAppPackagesName)) {
startActivity(new Intent(mContext, QuickAppActivity.class));
int is_quick = Settings.Global.getInt(mContext.getContentResolver(), QuickAppActivity.QUICK_APP_ENABLED_KEY, 0);
if (is_quick == 0) {
startActivity(new Intent(mContext, QuickAppActivity.class));
}
} else {
ApkUtils.openPackage(mContext, quickAppPackagesName);
}
@@ -516,7 +533,12 @@ public class CustomFragment extends BaseFragment implements CustomContact.Custom
cl_app.setOnLongClickListener(new View.OnLongClickListener() {
@Override
public boolean onLongClick(View view) {
startActivity(new Intent(mContext, QuickAppActivity.class));
int is_quick = Settings.Global.getInt(mContext.getContentResolver(), QuickAppActivity.QUICK_APP_ENABLED_KEY, 0);
if (is_quick == 0) {
startActivity(new Intent(mContext, QuickAppActivity.class));
} else {
ToastUtil.show("已在小程序设置");
}
return false;
}
});
@@ -692,7 +714,7 @@ public class CustomFragment extends BaseFragment implements CustomContact.Custom
private String quickAppPackagesName;
private void setQuickApp() {
quickAppPackagesName = mMMKV.getString(QuickAppActivity.QUICK_APP_KEY, "");
quickAppPackagesName = Settings.Global.getString(mCRv, QuickAppActivity.QUICK_APP_KEY);
if (!TextUtils.isEmpty(quickAppPackagesName)) {
ApplicationInfo applicationInfo = null;
PackageManager pm = mContext.getPackageManager();
@@ -780,28 +802,9 @@ public class CustomFragment extends BaseFragment implements CustomContact.Custom
}
private void initAmap() {
LocationClient locationClient = AmapManager.getInstance().getLocationClient();
locationClient.stop();
locationClient.start();
locationClient.registerLocationListener(new BDAbstractLocationListener() {
@Override
public void onReceiveLocation(BDLocation bdLocation) {
Log.e(TAG, "onReceiveLocation: ");
switch (bdLocation.getLocType()) {
case BDLocation.TypeGpsLocation:// GPS定位结果
case BDLocation.TypeNetWorkLocation:// 网络定位结果
case BDLocation.TypeOffLineLocation:// 离线定位结果
String city = bdLocation.getCity();
tv_location.setText(city);
getweather(bdLocation.getLongitude(), bdLocation.getLatitude());
break;
default:
BDLocation location = AmapManager.getInstance().getNowMapLocation();
getweather(location.getLongitude(), location.getLatitude());
break;
}
}
});
String city = RemoteManager.getInstance().getCity();
tv_location.setText(city);
getweather(RemoteManager.getInstance().getLongitude(), RemoteManager.getInstance().getLatitude());
}
private void getAlarm() {
@@ -892,7 +895,7 @@ public class CustomFragment extends BaseFragment implements CustomContact.Custom
NetInterfaceManager.getInstance().getHealthCode(new NetInterfaceManager.HealthCodeCallback() {
@Override
public void setHealthCode(List<HealthCode> healthCode) {
startActivity(new Intent(mContext, HealthCodeActivity.class));
startActivity(new Intent(mContext, FamilySpaceActivity.class));
}
@Override

View File

@@ -31,6 +31,7 @@ import com.uiuios.aios.bean.ArticleInfo;
import com.uiuios.aios.bean.DemandBean;
import com.uiuios.aios.bean.GoodsInfo;
import com.uiuios.aios.network.NetInterfaceManager;
import com.uiuios.aios.utils.JGYUtils;
import java.text.SimpleDateFormat;
import java.util.Date;
@@ -119,7 +120,7 @@ public class SecondFragment extends BaseFragment implements SecondContact.View,
@BindView(R.id.tv_info_more)
TextView tv_info_more;
private android.view.View rootView;
private View rootView;
private Context mContext;
private ContentResolver mCRv;
private SecondPresenter mPresenter;
@@ -144,7 +145,9 @@ public class SecondFragment extends BaseFragment implements SecondContact.View,
@Override
public void onConnected(NetworkUtils.NetworkType networkType) {
initData();
if (JGYUtils.getInstance().isScreenOn()) {
initData();
}
}
public SecondFragment() {
@@ -181,12 +184,12 @@ public class SecondFragment extends BaseFragment implements SecondContact.View,
@Override
public void fetchData() {
initData();
}
@Override
public android.view.View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
// Inflate the layout for this fragment
rootView = inflater.inflate(R.layout.fragment_second, container, false);
mContext = rootView.getContext();
@@ -196,7 +199,6 @@ public class SecondFragment extends BaseFragment implements SecondContact.View,
mPresenter.setLifecycle(lifecycleSubject);
ButterKnife.bind(this, rootView);
initView();
initData();
return rootView;
}
@@ -212,15 +214,15 @@ public class SecondFragment extends BaseFragment implements SecondContact.View,
rv_activity.setLayoutManager(new LinearLayoutManager(mContext));
rv_activity.setAdapter(mActivityAdapter);
cl_activity.setOnClickListener(new android.view.View.OnClickListener() {
cl_activity.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(android.view.View view) {
public void onClick(View view) {
openApp(0);
}
});
cl_demand.setOnClickListener(new android.view.View.OnClickListener() {
cl_demand.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(android.view.View view) {
public void onClick(View view) {
openApp(1);
}
});
@@ -255,16 +257,16 @@ public class SecondFragment extends BaseFragment implements SecondContact.View,
NetInterfaceManager.getInstance().getDemandList(true, lifecycleSubject, new NetInterfaceManager.DemandListCallback() {
@Override
public void setDemandList(List<DemandBean> demandBeans) {
cl4.setVisibility(android.view.View.VISIBLE);
iv4.setVisibility(android.view.View.GONE);
cl4.setVisibility(View.VISIBLE);
iv4.setVisibility(View.GONE);
DemandBean demandBean = demandBeans.get(0);
setDemand(demandBean);
}
@Override
public void noData() {
cl4.setVisibility(android.view.View.GONE);
iv4.setVisibility(android.view.View.VISIBLE);
cl4.setVisibility(View.GONE);
iv4.setVisibility(View.VISIBLE);
}
@Override
@@ -325,10 +327,10 @@ public class SecondFragment extends BaseFragment implements SecondContact.View,
@Override
public void setGoods(List<GoodsInfo> goodsInfos) {
if (goodsInfos != null && goodsInfos.size() != 0) {
iv1.setVisibility(android.view.View.GONE);
iv1.setVisibility(View.GONE);
mGoodsAdapter.setGoodsInfoList(goodsInfos);
} else {
iv1.setVisibility(android.view.View.VISIBLE);
iv1.setVisibility(View.VISIBLE);
}
}
@@ -336,23 +338,23 @@ public class SecondFragment extends BaseFragment implements SecondContact.View,
public void setArticle(List<ArticleInfo> articleInfoList) {
if (articleInfoList != null && articleInfoList.size() != 0) {
// cl2.setVisibility(View.VISIBLE);
iv2.setVisibility(android.view.View.GONE);
iv2.setVisibility(View.GONE);
mArticleAdapter.setArticleBeanList(articleInfoList);
} else {
// cl2.setVisibility(View.GONE);
iv2.setVisibility(android.view.View.VISIBLE);
iv2.setVisibility(View.VISIBLE);
}
}
@Override
public void setActivityList(List<ActivityBean> activityList) {
if (activityList != null && activityList.size() != 0) {
// cl3.setVisibility(android.view.View.VISIBLE);
iv3.setVisibility(android.view.View.GONE);
// cl3.setVisibility(View.VISIBLE);
iv3.setVisibility(View.GONE);
mActivityAdapter.setActivityBeans(activityList);
} else {
// cl3.setVisibility(android.view.View.GONE);
iv3.setVisibility(android.view.View.VISIBLE);
// cl3.setVisibility(View.GONE);
iv3.setVisibility(View.VISIBLE);
}
}
}