Skip to content

HBHAndroid
HBHAndroid
Commit 8f555d20 authored by 杨秀秀's avatar 杨秀秀
Browse files
Options

基础搭建 

功能开发
1：自动登陆
parent 93be33e7
Hide whitespace changes
Inline Side-by-side
Showing with 55 additions and 30 deletions
.idea/workspace.xml
View file @ 8f555d20
......@@ -23,9 +23,10 @@
<change beforePath="$PROJECT_DIR$/.gradle/file-system.probe" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/file-system.probe" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/app/build.gradle" afterDir="false" />
<change beforePath="$PROJECT_DIR$/consumer/src/main/res/layout/activity_map_overview.xml" beforeDir="false" afterPath="$PROJECT_DIR$/consumer/src/main/res/layout/activity_map_overview.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/consumer/src/main/res/values/strings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/consumer/src/main/res/values/strings.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/hbhbcompany/src/main/res/values/strings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/hbhbcompany/src/main/res/values/strings.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/home/HomeActivity.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/home/HomeActivity.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/home/HomeViewModel.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/home/HomeViewModel.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/consumer/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/consumer/build.gradle" afterDir="false" />
<change beforePath="$PROJECT_DIR$/hbhbcompany/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/hbhbcompany/build.gradle" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
......@@ -154,7 +155,7 @@
"com.google.services.firebase.aqiPopupShown": "true",
"dart.analysis.tool.window.visible": "false",
"last_directory_selection": "D:/androidProJect/hbhandroid/consumer/src/main/res/mipmap-mdpi",
"last_opened_file_path": "D:/androidProJect/hbhandroid/consumer/src/main/res/mipmap-mdpi",
"last_opened_file_path": "D:/work/key/merchant_hbh.jks",
"project.structure.last.edited": "Modules",
"project.structure.proportion": "0.17",
"project.structure.side.proportion": "0.2",
......@@ -224,7 +225,7 @@
<recent name="com.xx.hbhbcompany.utils" />
</key>
</component>
<component name="RunManager" selected="Android App.consumer">
<component name="RunManager" selected="Android App.app">
<configuration name="app" type="AndroidRunConfigurationType" factoryName="Android App">
<module name="HBHFurniture.app.main" />
<option name="DEPLOY" value="true" />
......@@ -467,20 +468,6 @@
<option name="presentableId" value="Default" />
<updated>1687161738436</updated>
</task>
<task id="LOCAL-00012" summary="&#10;功能开发1.0正式">
<created>1689659423560</created>
<option name="number" value="00012" />
<option name="presentableId" value="LOCAL-00012" />
<option name="project" value="LOCAL" />
<updated>1689659423560</updated>
</task>
<task id="LOCAL-00013" summary="&#10;矫正">
<created>1689670806714</created>
<option name="number" value="00013" />
<option name="presentableId" value="LOCAL-00013" />
<option name="project" value="LOCAL" />
<updated>1689670806714</updated>
</task>
<task id="LOCAL-00014" summary="功能开发&#10;1：添加banner功能">
<created>1689748786833</created>
<option name="number" value="00014" />
......@@ -810,7 +797,21 @@
<option name="project" value="LOCAL" />
<updated>1721873461243</updated>
</task>
<option name="localTasksCounter" value="61" />
<task id="LOCAL-00061" summary="基础搭建&#10;功能开发&#10;1：添加map总览页面 7.25">
<created>1721874768124</created>
<option name="number" value="00061" />
<option name="presentableId" value="LOCAL-00061" />
<option name="project" value="LOCAL" />
<updated>1721874768124</updated>
</task>
<task id="LOCAL-00062" summary="基础搭建&#10;功能开发&#10;1：添加map总览页面 7.25">
<created>1721875117097</created>
<option name="number" value="00062" />
<option name="presentableId" value="LOCAL-00062" />
<option name="project" value="LOCAL" />
<updated>1721875117097</updated>
</task>
<option name="localTasksCounter" value="63" />
<servers />
</component>
<component name="Vcs.Log.Tabs.Properties">
......@@ -824,7 +825,7 @@
<entry key="branch">
<value>
<list>
<option value="dev1.0" />
<option value="dev1.0.3" />
</list>
</value>
</entry>
......@@ -898,6 +899,25 @@
<line>394</line>
<option name="timeStamp" value="606" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/mvvmhabit/src/main/java/me/goldze/mvvmhabit/base/BaseActivity.java</url>
<line>114</line>
<option name="timeStamp" value="611" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/mvvmhabit/src/main/java/me/goldze/mvvmhabit/base/BaseActivity.java</url>
<line>643</line>
<option name="timeStamp" value="612" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-method">
<url>file://$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/home/HomeViewModel.java</url>
<line>256</line>
<properties class="com.xx.merchanthbh.ui.home.HomeViewModel" method="updataApk">
<option name="EMULATED" value="true" />
<option name="WATCH_EXIT" value="false" />
</properties>
<option name="timeStamp" value="613" />
</line-breakpoint>
</breakpoints>
</breakpoint-manager>
<pin-to-top-manager>
......
app/build.gradle
View file @ 8f555d20
......@@ -37,8 +37,8 @@ android {
applicationId "com.xx.merchanthbh"
minSdk 23
targetSdk 31
versionCode 3
versionName "1.2.0"
versionCode 5
versionName "1.3.0"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
signingConfig signingConfigs.reseale
......@@ -57,7 +57,7 @@ android {
debuggable true
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
signingConfig signingConfigs.reseale
buildConfigField "String", "URL", URL_DEBUG
buildConfigField "String", "URL", URL_RELEASE
buildConfigField "String", "URL_H5", URL_DEBUG_H5
}
}
......
app/src/main/java/com/xx/merchanthbh/ui/home/HomeActivity.java
View file @ 8f555d20
......@@ -72,6 +72,7 @@ public class HomeActivity extends BaseActivity<ActivityHomeBinding, HomeViewMode
@Override
public void initData() {
super.initData();
// 获取Intent对象
Intent intent = getIntent();
......@@ -101,7 +102,7 @@ public class HomeActivity extends BaseActivity<ActivityHomeBinding, HomeViewMode
}
}
}
super.initData();
// 初始化底部导航栏
BottomNavigationView bottomNavigationView = findViewById(R.id.bottom_navigation_view);
......
app/src/main/java/com/xx/merchanthbh/ui/home/HomeViewModel.java
View file @ 8f555d20
......@@ -76,7 +76,7 @@ public class HomeViewModel extends BaseViewModel<HomeRequest> {
/*权限*/
RxPermissions rxPermissions;
public ObservableField<String> title = new ObservableField<>(LocalData.getMerchant().getStoreName());
public ObservableField<String> title = new ObservableField<>("");
//今日成交的绑定
public ObservableField<String> totalMoney = new ObservableField<>("");
//今日订单的绑定
......@@ -97,6 +97,10 @@ public class HomeViewModel extends BaseViewModel<HomeRequest> {
public HomeViewModel(@NonNull Application application, HomeRequest model) {
super(application, model);
if(LocalData.getMerchant()!=null && LocalData.getMerchant().getStoreName()!=null)
{
title.set(LocalData.getMerchant().getStoreName());
}
}
/*设置消息初始状态是0*/
......
consumer/build.gradle
View file @ 8f555d20
......@@ -34,8 +34,8 @@ android {
applicationId "com.xx.hbhconsumer"
minSdk 23
targetSdk 31
versionCode 2
versionName "1.1.0"
versionCode 3
versionName "1.2.0"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
signingConfig signingConfigs.release
}
......
hbhbcompany/build.gradle
View file @ 8f555d20
......@@ -37,8 +37,8 @@ android {
applicationId "com.xx.hbhbcompany"
minSdk 24
targetSdk 31
versionCode 2
versionName "1.1.0"
versionCode 3
versionName "1.2.0"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
vectorDrawables {
......
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