Skip to content

HBHAndroid
HBHAndroid
Commit ed4d25bf authored by 小费同学阿's avatar 小费同学阿 💬
Browse files
Options

基础搭建 

功能开发
1：bug 修复
parent a703143c
Hide whitespace changes
Inline Side-by-side
Showing with 95 additions and 49 deletions
app/src/main/AndroidManifest.xml
View file @ ed4d25bf
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" > xmlns:tools="http://schemas.android.com/tools">
<uses-feature <uses-feature
android:name="android.hardware.camera" android:name="android.hardware.camera"
android:required="false" /> android:required="false" />
<uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" /> <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" /> <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
...@@ -14,10 +15,12 @@ ...@@ -14,10 +15,12 @@
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.READ_MEDIA_IMAGES" /> <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
<uses-permission android:name="android.permission.READ_MEDIA_VIDEO" /> <uses-permission android:name="android.permission.READ_MEDIA_VIDEO" />
<uses-permission android:name="android.permission.CAMERA"/> <uses-permission android:name="android.permission.CAMERA" />
<uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" /> <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
<uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" <uses-permission
android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"
tools:ignore="ProtectedPermissions" /> tools:ignore="ProtectedPermissions" />
<application <application
android:name=".app.AppApplication" android:name=".app.AppApplication"
android:allowBackup="true" android:allowBackup="true"
...@@ -25,11 +28,11 @@ ...@@ -25,11 +28,11 @@
android:fullBackupContent="@xml/backup_rules" android:fullBackupContent="@xml/backup_rules"
android:icon="@mipmap/ic_launcher" android:icon="@mipmap/ic_launcher"
android:label="@string/app_name" android:label="@string/app_name"
android:networkSecurityConfig="@xml/network_config"
android:preserveLegacyExternalStorage="true"
android:requestLegacyExternalStorage="true"
android:roundIcon="@mipmap/ic_launcher_round" android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true" android:supportsRtl="true"
android:requestLegacyExternalStorage="true"
android:preserveLegacyExternalStorage="true"
android:networkSecurityConfig="@xml/network_config"
android:theme="@style/Theme.HBHFurniture"> android:theme="@style/Theme.HBHFurniture">
...@@ -51,87 +54,88 @@ ...@@ -51,87 +54,88 @@
<!-- 注册首页页面--> <!-- 注册首页页面-->
<activity <activity
android:name=".ui.home.HomeActivity" android:name=".ui.home.HomeActivity"
android:exported="true"/> android:exported="true" />
<!-- 忘记密码页面--> <!-- 忘记密码页面-->
<activity <activity
android:name=".ui.pwd.ForgetPwdActivity" android:name=".ui.pwd.ForgetPwdActivity"
android:exported="true"/> android:exported="true" />
<!-- 设置密码页面--> <!-- 设置密码页面-->
<activity <activity
android:name=".ui.pwd.SetPwdActivity" android:name=".ui.pwd.SetPwdActivity"
android:exported="true"/> android:exported="true" />
<!-- 首页 注册店员管理页面--> <!-- 首页 注册店员管理页面-->
<activity <activity
android:name=".ui.assistant.AssistantManagementActivity" android:name=".ui.assistant.AssistantManagementActivity"
android:exported="true"/> android:exported="true" />
<!-- 首页 注册店铺积分页面--> <!-- 首页 注册店铺积分页面-->
<activity <activity
android:name=".ui.point.StorePointsActivity" android:name=".ui.point.StorePointsActivity"
android:exported="true"/> android:exported="true" />
<!-- 首页 注册诉求反馈页面--> <!-- 首页 注册诉求反馈页面-->
<activity <activity
android:name=".ui.appeal.AppealActivity" android:name=".ui.appeal.AppealActivity"
android:exported="true"/> android:exported="true" />
<!-- 首页 人才招聘页面--> <!-- 首页 人才招聘页面-->
<activity <activity
android:name=".ui.recruitment.RecruitmentActivity" android:name=".ui.recruitment.RecruitmentActivity"
android:exported="true"/> android:exported="true" />
<!-- 首页 注册订单管理页面--> <!-- 首页 注册订单管理页面-->
<activity <activity
android:name=".ui.order.OrderActivity" android:name=".ui.order.OrderActivity"
android:exported="true"/> android:exported="true" />
<!-- 我的 注册修改密码页面--> <!-- 我的 注册修改密码页面-->
<activity <activity
android:name=".ui.pwd.PwdActivity" android:name=".ui.pwd.PwdActivity"
android:exported="true"/> android:exported="true" />
<!-- 我的 注册修改手机号页面--> <!-- 我的 注册修改手机号页面-->
<activity <activity
android:name=".ui.phone.PhoneActivity" android:name=".ui.phone.PhoneActivity"
android:exported="true"/> android:exported="true" />
<!-- 首页 注册新建店员页面--> <!-- 首页 注册新建店员页面-->
<activity <activity
android:name=".ui.assistant.AssistantAddActivity" android:name=".ui.assistant.AssistantAddActivity"
android:exported="true"/> android:exported="true" />
<!-- 环渤海 活动中心页面--> <!-- 环渤海 活动中心页面-->
<activity <activity
android:name=".ui.activities.ActivitiesActivity" android:name=".ui.activities.ActivitiesActivity"
android:exported="true"/> android:exported="true" />
<!-- 环渤海 资讯列表页面--> <!-- 环渤海 资讯列表页面-->
<activity <activity
android:name=".ui.consult.ConsultationActivity" android:name=".ui.consult.ConsultationActivity"
android:exported="true"/> android:exported="true" />
<!-- 环渤海 消息列表页面--> <!-- 环渤海 消息列表页面-->
<activity <activity
android:name=".ui.msg.MessageActivity" android:name=".ui.msg.MessageActivity"
android:exported="true"/> android:exported="true" />
<!-- 环渤海 消息详情页面--> <!-- 环渤海 消息详情页面-->
<activity <activity
android:name=".ui.msg.MessageDetailActivity" android:name=".ui.msg.MessageDetailActivity"
android:exported="true"/> android:exported="true" />
<!-- 店铺信息--> <!-- 店铺信息-->
<activity <activity
android:name=".ui.merchantinfo.MaterialInfoActivity" android:name=".ui.merchantinfo.MaterialInfoActivity"
android:exported="true"/> android:exported="true" />
<!-- 订单详情--> <!-- 订单详情-->
<activity <activity
android:name=".ui.order.OrderDetailActivity" android:name=".ui.order.OrderDetailActivity"
android:exported="true"/> android:exported="true" />
<!-- 诉求编辑--> <!-- 诉求编辑-->
<activity <activity
android:name=".ui.appeal.AppealEditActivity" android:name=".ui.appeal.AppealEditActivity"
android:exported="true"/> android:exported="true" />
<!-- 诉求详情--> <!-- 诉求详情-->
<activity <activity
android:name=".ui.appeal.AppealDetailActivity" android:name=".ui.appeal.AppealDetailActivity"
android:exported="true"/> android:exported="true" />
<!-- 招聘详情--> <!-- 招聘详情-->
<activity <activity
android:name=".ui.recruitment.JobDetailActivity" android:name=".ui.recruitment.JobDetailActivity"
android:exported="true"/> android:exported="true" />
<!-- 添加商品--> <!-- 添加商品-->
<activity android:name=".ui.addproduct.AddProductActivity" <activity
android:name=".ui.addproduct.AddProductActivity"
android:exported="true" android:exported="true"
android:windowSoftInputMode="adjustPan"> android:windowSoftInputMode="adjustPan">
...@@ -139,40 +143,50 @@ ...@@ -139,40 +143,50 @@
<!-- 个人信息--> <!-- 个人信息-->
<activity android:name=".ui.userinfo.UserInfoActivity" <activity
android:name=".ui.userinfo.UserInfoActivity"
android:exported="true"> android:exported="true">
</activity> </activity>
<!-- 商品管理--> <!-- 商品管理-->
<activity android:name=".ui.productmanager.ProductManagerActivity" <activity
android:exported="true"/> android:name=".ui.productmanager.ProductManagerActivity"
android:exported="true" />
<!-- 添加商品--> <!-- 添加商品-->
<activity android:name=".ui.ordercreate.OrderCreateActivity" <activity
android:exported="true"/> android:name=".ui.ordercreate.OrderCreateActivity"
android:exported="true" />
<!--诉求列表--> <!--诉求列表-->
<activity android:name=".ui.appeallist.AppealListActivity" <activity
android:exported="true"/> android:name=".ui.appeallist.AppealListActivity"
android:exported="true" />
<!--H5展示--> <!--H5展示-->
<activity android:name=".ui.web.CommWabActivity" <activity
android:exported="true"/> android:name=".ui.web.CommWabActivity"
android:exported="true" />
<!--统计转发--> <!--统计转发-->
<activity android:name=".ui.share.ShareActivity" <activity
android:exported="true"/> android:name=".ui.share.ShareActivity"
android:exported="true" />
<activity android:name=".ui.web.PDFWebViewActivity" <activity
android:exported="true"/> android:name=".ui.web.PDFWebViewActivity"
android:exported="true" />
<activity android:name=".ui.productdetail.ProductDetailActivity" <activity
android:exported="true"/> android:name=".ui.productdetail.ProductDetailActivity"
android:exported="true" />
<!--我的-注销账户--> <!--我的-注销账户-->
<activity android:name=".ui.logoff.LogOffActivity" <activity
android:exported="true"/> android:name=".ui.logoff.LogOffActivity"
android:exported="true"
android:launchMode="singleTask" />
<!-- 适配标准 --> <!-- 适配标准 -->
<meta-data <meta-data
...@@ -194,8 +208,6 @@ ...@@ -194,8 +208,6 @@
</provider> </provider>
</application> </application>
<queries> <queries>
<package android:name="com.tencent.mm" /> <package android:name="com.tencent.mm" />
......
app/src/main/java/com/xx/merchanthbh/data/staticdata/StaticData.kt
View file @ ed4d25bf
...@@ -3,6 +3,11 @@ package com.xx.merchanthbh.data.staticdata ...@@ -3,6 +3,11 @@ package com.xx.merchanthbh.data.staticdata
object StaticData { object StaticData {
@JvmField @JvmField
var sUserType="02" var sUserType="02"
/**
* 注销状态 0-未注销 1-已注销
*/
@JvmField
var logOffData:Int=0
/** /**
* 订单详情-状态位 订单状态 1-待付款 2-已完成 3-已关闭 * 订单详情-状态位 订单状态 1-待付款 2-已完成 3-已关闭
*/ */
......
app/src/main/java/com/xx/merchanthbh/ui/logoff/LogOffActivity.java
View file @ ed4d25bf
...@@ -14,10 +14,13 @@ import com.xx.merchanthbh.BR; ...@@ -14,10 +14,13 @@ import com.xx.merchanthbh.BR;
import com.xx.merchanthbh.R; import com.xx.merchanthbh.R;
import com.xx.merchanthbh.data.http.requst.AssistantAddRequest; import com.xx.merchanthbh.data.http.requst.AssistantAddRequest;
import com.xx.merchanthbh.data.http.requst.LogOffRequest; import com.xx.merchanthbh.data.http.requst.LogOffRequest;
import com.xx.merchanthbh.data.staticdata.StaticData;
import com.xx.merchanthbh.databinding.ActivityLogOffBinding; import com.xx.merchanthbh.databinding.ActivityLogOffBinding;
import com.xx.merchanthbh.ui.assistant.AssistantAddViewModel; import com.xx.merchanthbh.ui.assistant.AssistantAddViewModel;
import com.xx.merchanthbh.ui.login.LoginActivity;
import me.goldze.mvvmhabit.base.BaseActivity; import me.goldze.mvvmhabit.base.BaseActivity;
import me.goldze.mvvmhabit.utils.ToastUtils;
public class LogOffActivity extends BaseActivity<ActivityLogOffBinding, LogOffViewModel> { public class LogOffActivity extends BaseActivity<ActivityLogOffBinding, LogOffViewModel> {
@Override @Override
...@@ -30,6 +33,26 @@ public class LogOffActivity extends BaseActivity<ActivityLogOffBinding, LogOffVi ...@@ -30,6 +33,26 @@ public class LogOffActivity extends BaseActivity<ActivityLogOffBinding, LogOffVi
return BR.logOffViewModel; return BR.logOffViewModel;
} }
@Override
public void onStart() {
super.onStart();
}
@Override
public void onResume() {
super.onResume();
// 手动更新页面UI内容
updateUI();
}
/*更新页面,注销标志位做判断*/
private void updateUI() {
if (StaticData.logOffData == 1) {
startActivity(LoginActivity.class);
}else {
}
}
// 重写初始方法调用参数 // 重写初始方法调用参数
@Override @Override
...@@ -101,6 +124,7 @@ public class LogOffActivity extends BaseActivity<ActivityLogOffBinding, LogOffVi ...@@ -101,6 +124,7 @@ public class LogOffActivity extends BaseActivity<ActivityLogOffBinding, LogOffVi
}); });
} }
@Override @Override
public LogOffViewModel initViewModel() { public LogOffViewModel initViewModel() {
LogOffRequest lm = new LogOffRequest(); LogOffRequest lm = new LogOffRequest();
......
app/src/main/java/com/xx/merchanthbh/ui/logoff/LogOffViewModel.java
View file @ ed4d25bf
...@@ -12,6 +12,7 @@ import androidx.databinding.ObservableField; ...@@ -12,6 +12,7 @@ import androidx.databinding.ObservableField;
import androidx.lifecycle.MutableLiveData; import androidx.lifecycle.MutableLiveData;
import com.xx.merchanthbh.data.http.requst.LogOffRequest; import com.xx.merchanthbh.data.http.requst.LogOffRequest;
import com.xx.merchanthbh.data.staticdata.StaticData;
import com.xx.merchanthbh.ui.appeal.AppealEditViewModel; import com.xx.merchanthbh.ui.appeal.AppealEditViewModel;
import com.xx.merchanthbh.ui.login.LoginActivity; import com.xx.merchanthbh.ui.login.LoginActivity;
...@@ -44,6 +45,7 @@ public class LogOffViewModel extends BaseViewModel<LogOffRequest> { ...@@ -44,6 +45,7 @@ public class LogOffViewModel extends BaseViewModel<LogOffRequest> {
public MutableLiveData<Boolean> getLogOffStatus() { public MutableLiveData<Boolean> getLogOffStatus() {
return logOffStatus; return logOffStatus;
} }
public LogOffViewModel(@NonNull Application application) { public LogOffViewModel(@NonNull Application application) {
super(application); super(application);
} }
...@@ -51,6 +53,7 @@ public class LogOffViewModel extends BaseViewModel<LogOffRequest> { ...@@ -51,6 +53,7 @@ public class LogOffViewModel extends BaseViewModel<LogOffRequest> {
public LogOffViewModel(@NonNull Application application, LogOffRequest model) { public LogOffViewModel(@NonNull Application application, LogOffRequest model) {
super(application, model); super(application, model);
} }
/** /**
* 按钮组判断注销原因 * 按钮组判断注销原因
*/ */
...@@ -109,9 +112,9 @@ public class LogOffViewModel extends BaseViewModel<LogOffRequest> { ...@@ -109,9 +112,9 @@ public class LogOffViewModel extends BaseViewModel<LogOffRequest> {
* 依次传入1-注销备注 2-注销原因 (1-需要解绑手机，2-安全/隐私顾虑，3-其他 ) * 依次传入1-注销备注 2-注销原因 (1-需要解绑手机，2-安全/隐私顾虑，3-其他 )
*/ */
public void submitLogOffMsg(View view) { public void submitLogOffMsg(View view) {
Log.v("备注:",logOffReasonMark.get()); Log.v("备注:", logOffReasonMark.get());
/*如果原因不为空则将其赋值给logOffReasonMarkValue*/ /*如果原因不为空则将其赋值给logOffReasonMarkValue*/
if (reasonValue.equals("3") && !logOffReasonMark.get().isEmpty()||reasonValue.equals("1") ||reasonValue.equals("2")) { if (reasonValue.equals("3") && !logOffReasonMark.get().isEmpty() || reasonValue.equals("1") || reasonValue.equals("2")) {
/*执行传参方法*/ /*执行传参方法*/
model.logOffUser(logOffReasonMark.get(), reasonValue) model.logOffUser(logOffReasonMark.get(), reasonValue)
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
...@@ -131,6 +134,8 @@ public class LogOffViewModel extends BaseViewModel<LogOffRequest> { ...@@ -131,6 +134,8 @@ public class LogOffViewModel extends BaseViewModel<LogOffRequest> {
public void onSuccess(Boolean resultBean) { public void onSuccess(Boolean resultBean) {
dismissDialog(); dismissDialog();
ToastUtils.showShort("账号已注销!"); ToastUtils.showShort("账号已注销!");
// 注销标志位改变
StaticData.logOffData = 1;
logOffStatus.setValue(true); logOffStatus.setValue(true);
} }
......
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