diff --git a/app/build.gradle b/app/build.gradle
index 0531e8e..ea7f365 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -101,6 +101,7 @@ android {
dependencies {
// 友盟封装库
implementation project(':library:umeng')
+ implementation files('libs/AMap_Location_V6.4.2_20231215.jar') // 高德定位sdk
implementation DEPENDENCIES['pager-bottom-tab-strip']
implementation DEPENDENCIES['pictureselector']
implementation DEPENDENCIES['pictureselector-compress']
diff --git a/app/libs/AMap_Location_V6.4.2_20231215.jar b/app/libs/AMap_Location_V6.4.2_20231215.jar
new file mode 100644
index 0000000..3b55ec6
Binary files /dev/null and b/app/libs/AMap_Location_V6.4.2_20231215.jar differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index f858c85..34440a7 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -7,10 +7,11 @@
-
+
-
+
+
+
@@ -28,6 +29,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -50,6 +64,13 @@
tools:replace="android:label"
tools:targetApi="q">
+
+
+
+
+
+
+
>>>>>>>>>>>>" + aMapLocation.getErrorCode() + ",错误信息: " + aMapLocation.getErrorInfo());
+ }
+ }
+
+ /**
+ * 通过startService()的方式启动Service的时候被调用的生命周期
+ * @param intent startService时传入的inten
+ * @param flags lags有三个可以传入的值:0,START_FLAG_REDELIVERY和START_FLAG_RETRY
+ * @param startId 唯一的启动请求
+ * @return
+ */
+ @Override
+ public int onStartCommand(Intent intent, int flags, int startId) {
+ // todo 开始定位
+ locationConfigure(true);
+ return super.onStartCommand(intent, flags, startId);
+ }
+
+ @Override
+ public void onDestroy() {
+ locationConfigure(false);
+ super.onDestroy();
+ }
+
+ /**
+ * 配置定位服务参数
+ * @param start 定位状态
+ */
+ private void locationConfigure(boolean start) {
+ if (start) { // 开始定位
+ try {
+ aMapLocationClient = new AMapLocationClient(getApplicationContext());
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ /** 这里要实现AMapLocationListener接口,AMapLocationListener接口只有onLocationChanged方法可以实现,用于接收异步返回的定位结果,参数是AMapLocation类型。 */
+ aMapLocationClient.setLocationListener(this); // 设置定位回调监听
+ AMapLocationClientOption aMapLocationClientOption = new AMapLocationClientOption();
+ /** Hight_Accuracy高精度模式,Battery_Saving为低功耗模式,Device_Sensors是仅设备模式 */
+// aMapLocationClientOption.setLocationMode(AMapLocationClientOption.AMapLocationMode.Hight_Accuracy);
+// aMapLocationClientOption.setLocationMode(AMapLocationClientOption.AMapLocationMode.Battery_Saving);
+ aMapLocationClientOption.setLocationMode(AMapLocationClientOption.AMapLocationMode.Device_Sensors);
+ aMapLocationClientOption.setNeedAddress(true); // 是否返回位置信息
+ aMapLocationClientOption.setOnceLocation(false); // 是否只定位一次(默认为false)
+ aMapLocationClientOption.setWifiScan(true); // 允许调用WIFI刷新-默认true
+ // aMapLocationClientOption.setMockEnable(false); // 是否允许虚拟定位
+ aMapLocationClientOption.setHttpTimeOut(1000 * 20); // http超时时间 20s
+ aMapLocationClientOption.setInterval(1000 * 5); // 返回定位间隔时间 3s返回一次
+ aMapLocationClientOption.setLocationCacheEnable(false); // 缓存机制
+
+ aMapLocationClient.setLocationOption(aMapLocationClientOption);
+ aMapLocationClient.startLocation(); // 开始定位
+ }else { // 结束定位 关闭定位服务
+ if (aMapLocationClient != null) aMapLocationClient.onDestroy();
+ LogUtils.d("aMapLocation ----------- 定位服务已关闭");
+ }
+ }
+}
diff --git a/app/src/main/java/com/kanglai/push/ui/activity/DocumentActivity.java b/app/src/main/java/com/kanglai/push/ui/activity/DocumentActivity.java
index 954bdb6..d7ddf00 100644
--- a/app/src/main/java/com/kanglai/push/ui/activity/DocumentActivity.java
+++ b/app/src/main/java/com/kanglai/push/ui/activity/DocumentActivity.java
@@ -42,8 +42,8 @@ public class DocumentActivity extends BaseActivity list = CollectionUtils.newArrayList(
+ new UserRecyclerAdapter.UserEntity().setCode("1").setTitle("Bate-测试退出定位服务").setBadge(0).setImage(R.drawable.icon_about).setHidesLeftImage(true),
new UserRecyclerAdapter.UserEntity().setCode("2").setTitle("关于我们").setBadge(0).setImage(R.drawable.icon_about).setHidesLeftImage(true),
new UserRecyclerAdapter.UserEntity().setCode("3").setTitle("退出登录").setBadge(0).setImage(R.drawable.icon_exit).setHidesLeftImage(true)
);
@@ -103,13 +108,13 @@ public class UserFragment extends BaseFragment mXBannerList = new ArrayList<>();
- // 加载网络图片
- mXBannerList.add("https://pic3.zhimg.com/v2-a011510812de21b7247e580cdca05cc6_r.jpg");
- mXBannerList.add("https://pic1.zhimg.com/v2-886e2dba494fff222a393afb11e51e04_r.jpg");
- mXBannerList.add("https://pic4.zhimg.com/v2-fdf0934bfdf41d6cecb7be2db478530f_r.jpg");
- mXBannerList.add("https://pic1.zhimg.com/v2-45eaefe3e324f8b8494cbec13b6589f0_r.jpg");
+ List mXBannerList = new ArrayList<>();
+ // 加载网络图片 就把list的类型设置为string
+ // mXBannerList.add("https://pic1.zhimg.com/v2-886e2dba494fff222a393afb11e51e04_r.jpg");
+ mXBannerList.add(R.drawable.bannar_customer_phone);
+ mXBannerList.add(R.drawable.bannar_more_service);
mXBanner.setData(mXBannerList, null);
mXBanner.loadImage(new XBanner.XBannerAdapter() { // 加载广告图片
@Override
diff --git a/app/src/main/java/com/kanglai/push/ui/vm/InstantViewModel.java b/app/src/main/java/com/kanglai/push/ui/vm/InstantViewModel.java
index fd345ea..1163db5 100644
--- a/app/src/main/java/com/kanglai/push/ui/vm/InstantViewModel.java
+++ b/app/src/main/java/com/kanglai/push/ui/vm/InstantViewModel.java
@@ -89,6 +89,7 @@ public class InstantViewModel extends ToolbarViewModel{
ToastUtil.showBottom("制定任务");
});
public BindingCommand regularTimeCommand = new BindingCommand(() -> {
+ // todo 定时消息
ToastUtil.showBottom("定时任务");
});
diff --git a/app/src/main/java/com/kanglai/push/ui/vm/LoginViewModel.java b/app/src/main/java/com/kanglai/push/ui/vm/LoginViewModel.java
index 1c0e073..8d0102a 100644
--- a/app/src/main/java/com/kanglai/push/ui/vm/LoginViewModel.java
+++ b/app/src/main/java/com/kanglai/push/ui/vm/LoginViewModel.java
@@ -215,7 +215,6 @@ public class LoginViewModel extends BaseViewModel {
Pair.create("identityProvider", "app"), // 用户类型
Pair.create("tenantId", CommonConstant.MULTI_TENANT_ID), // 租户类型
Pair.create("phone", phones.get()),
-
Pair.create("captcha", captcha.get())))
.compose(RxUtil.schedulersTransformer())
.compose(RxUtil.exceptionTransformer())
diff --git a/app/src/main/java/com/kanglai/push/ui/vm/UserViewModel.java b/app/src/main/java/com/kanglai/push/ui/vm/UserViewModel.java
index fd2dd78..05137df 100644
--- a/app/src/main/java/com/kanglai/push/ui/vm/UserViewModel.java
+++ b/app/src/main/java/com/kanglai/push/ui/vm/UserViewModel.java
@@ -7,20 +7,16 @@ import androidx.annotation.NonNull;
import androidx.lifecycle.LifecycleOwner;
import com.blankj.utilcode.util.CacheDiskUtils;
-import com.blankj.utilcode.util.LogUtils;
-import com.blankj.utilcode.util.StringUtils;
import com.blankj.utilcode.util.Utils;
import com.dolphin.core.http.api.ResultResponse;
import com.dolphin.core.util.PermissionUtil;
import com.dolphin.core.util.RxUtil;
import com.kanglai.push.app.AppApplication;
import com.kanglai.push.constant.CacheConstant;
-import com.kanglai.push.constant.CommonConstant;
import com.kanglai.push.di.component.DaggerServiceComponent;
import com.kanglai.push.entity.User;
import com.kanglai.push.service.LoginService;
import com.kanglai.push.ui.fragment.UserFragment;
-import com.umeng.message.PushAgent;
import javax.inject.Inject;
diff --git a/app/src/main/res/drawable-xxhdpi/bannar_customer_phone.jpg b/app/src/main/res/drawable-xxhdpi/bannar_customer_phone.jpg
new file mode 100644
index 0000000..f29e861
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/bannar_customer_phone.jpg differ
diff --git a/app/src/main/res/drawable-xxhdpi/bannar_more_service.jpg b/app/src/main/res/drawable-xxhdpi/bannar_more_service.jpg
new file mode 100644
index 0000000..3e51326
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/bannar_more_service.jpg differ
diff --git a/app/src/main/res/drawable-xxhdpi/icon_bannar_workbench.png b/app/src/main/res/drawable-xxhdpi/bannar_quest_lobby.png
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/icon_bannar_workbench.png
rename to app/src/main/res/drawable-xxhdpi/bannar_quest_lobby.png
diff --git a/app/src/main/res/layout/activity_instant.xml b/app/src/main/res/layout/activity_instant.xml
index 2e4244e..5ba7abd 100644
--- a/app/src/main/res/layout/activity_instant.xml
+++ b/app/src/main/res/layout/activity_instant.xml
@@ -138,7 +138,7 @@
-
+
diff --git a/app/src/main/res/layout/fragment_workbench.xml b/app/src/main/res/layout/fragment_workbench.xml
index 86e180c..fa5d96b 100644
--- a/app/src/main/res/layout/fragment_workbench.xml
+++ b/app/src/main/res/layout/fragment_workbench.xml
@@ -14,7 +14,7 @@
android:id="@+id/top_bg"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_160"
- android:background="@drawable/icon_bannar_workbench"/>
+ android:background="@drawable/bannar_quest_lobby"/>
释放立即加载
加载完成
加载失败
+
+ https://h5.kanglailab.com/app/userAgreement
+ https://h5.kanglailab.com/app/privacyPolicy
diff --git a/common.gradle b/common.gradle
index 678870f..5cf8922 100644
--- a/common.gradle
+++ b/common.gradle
@@ -26,7 +26,7 @@ android {
// 设置存放 so 文件的目录
sourceSets {
main {
- jniLibs.srcDirs = ['libs']
+ jniLibs.srcDirs = ['libs'] // jni库的调用会到资源文件夹下libs里面找so文件
}
test.root 'src/unitTest'
test.java.srcDirs 'src/unitTest/java'