Skip to content

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

基础搭建 

功能开发
1：1.0.1最终顶板
parent 2e2aae73
Hide whitespace changes
Inline Side-by-side
Showing with 22 additions and 90 deletions
.idea/workspace.xml
View file @ a72f1f5b
......@@ -9,7 +9,7 @@
<option name="autoReloadType" value="NONE" />
</component>
<component name="ChangeListManager">
<list default="true" id="1610d094-2fe0-4efc-9eff-ac55fbf06aaf" name="Changes" comment="基础搭建&#10;功能开发&#10;隐私协议目的提示，通用询问">
<list default="true" id="1610d094-2fe0-4efc-9eff-ac55fbf06aaf" name="Changes" comment="基础搭建&#10;功能开发&#10;1：1.0.0最终顶板">
<change beforePath="$PROJECT_DIR$/.gradle/8.0/executionHistory/executionHistory.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/8.0/executionHistory/executionHistory.bin" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/8.0/executionHistory/executionHistory.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/8.0/executionHistory/executionHistory.lock" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/8.0/fileHashes/fileHashes.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/8.0/fileHashes/fileHashes.bin" afterDir="false" />
......@@ -19,21 +19,7 @@
<change beforePath="$PROJECT_DIR$/.gradle/buildOutputCleanup/outputFiles.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/buildOutputCleanup/outputFiles.bin" afterDir="false" />
<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$/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$/app/src/main/java/com/xx/merchanthbh/ui/huanbohai/HuanBoHaiViewModel.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/huanbohai/HuanBoHaiViewModel.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/login/LoginViewModel.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/login/LoginViewModel.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/merchantinfo/MaterialInfoActivity.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/merchantinfo/MaterialInfoActivity.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/merchantinfo/MerchantInfoViewModel.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/merchantinfo/MerchantInfoViewModel.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/mine/MineFragment.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/mine/MineFragment.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/mine/MineViewModel.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/mine/MineViewModel.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/activity_material_info.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/activity_material_info.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/consumer/src/main/java/com/xx/hbhconsumer/ui/login/LoginViewModel.java" beforeDir="false" afterPath="$PROJECT_DIR$/consumer/src/main/java/com/xx/hbhconsumer/ui/login/LoginViewModel.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/hbhbcompany/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/hbhbcompany/build.gradle" afterDir="false" />
<change beforePath="$PROJECT_DIR$/hbhbcompany/src/main/java/com/xx/hbhbcompany/ui/home/HomeViewModel.java" beforeDir="false" afterPath="$PROJECT_DIR$/hbhbcompany/src/main/java/com/xx/hbhbcompany/ui/home/HomeViewModel.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/hbhbcompany/src/main/java/com/xx/hbhbcompany/ui/login/LoginViewModel.java" beforeDir="false" afterPath="$PROJECT_DIR$/hbhbcompany/src/main/java/com/xx/hbhbcompany/ui/login/LoginViewModel.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/hbhbcompany/src/main/java/com/xx/hbhbcompany/ui/mine/MineFragment.java" beforeDir="false" afterPath="$PROJECT_DIR$/hbhbcompany/src/main/java/com/xx/hbhbcompany/ui/mine/MineFragment.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/hbhbcompany/src/main/java/com/xx/hbhbcompany/ui/mine/MineViewModel.java" beforeDir="false" afterPath="$PROJECT_DIR$/hbhbcompany/src/main/java/com/xx/hbhbcompany/ui/mine/MineViewModel.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/login/LoginActivity.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/login/LoginActivity.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/hbhbcompany/src/main/java/com/xx/hbhbcompany/ui/work/WorkViewModel.java" beforeDir="false" afterPath="$PROJECT_DIR$/hbhbcompany/src/main/java/com/xx/hbhbcompany/ui/work/WorkViewModel.java" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
......@@ -107,7 +93,7 @@
<component name="Git.Settings">
<option name="RECENT_BRANCH_BY_REPOSITORY">
<map>
<entry key="$PROJECT_DIR$" value="dev1.0" />
<entry key="$PROJECT_DIR$" value="dev1.0.1" />
</map>
</option>
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
......@@ -130,7 +116,7 @@
"keyToString": {
"ApkExportedModule": "HBHFurniture.app",
"DEBUGGABLE_DEVICE": "oneplus-le2120-34612fa7",
"DEBUGGABLE_PROCESS": "com.xx.merchanthbh",
"DEBUGGABLE_PROCESS": "com.xx.hbhconsumer",
"DEBUGGER_ID": "Auto",
"ExportApk.ApkPathForHBHFurniture.app": "D:\\work\\APK\\hbh",
"ExportApk.ApkPathForHBHFurniture.consumer": "D:\\work\\APK\\hbh",
......@@ -158,11 +144,12 @@
"android-custom-viewD:/androidProJect/HBHFurniture/xxviewlibrary/src/main/java/com/xx/xxviewlibrary/witget/XxUploudPic.kt_SELECTED": "XxUploudPic",
"android-custom-viewD:/androidProJect/HBHFurniture/xxviewlibrary/src/main/java/com/xx/xxviewlibrary/witget/XxUploudPicSmall.kt_SELECTED": "XxUploudPicSmall",
"android-custom-viewD:/androidProJect/HBHFurniture/xxviewlibrary/src/main/java/com/xx/xxviewlibrary/witget/model/XxUploudPicSmall.kt_SELECTED": "XxUploudPicSmall",
"android-custom-viewD:/androidProJect/hbhandroid/xxviewlibrary/src/main/java/com/xx/xxviewlibrary/witget/XxUploudPicSmall.kt_SELECTED": "XxUploudPicSmall",
"cidr.known.project.marker": "true",
"com.google.services.firebase.aqiPopupShown": "true",
"dart.analysis.tool.window.visible": "false",
"last_directory_selection": "D:/androidProJect/HBHFurniture/hbhbcompany/src/main/res/mipmap-xhdpi",
"last_opened_file_path": "D:/work/key/merchant_hbh.jks",
"last_opened_file_path": "D:/androidProJect/hbhandroid",
"project.structure.last.edited": "Modules",
"project.structure.proportion": "0.17",
"project.structure.side.proportion": "0.2",
......@@ -810,12 +797,12 @@
<option name="project" value="LOCAL" />
<updated>1712912554572</updated>
</task>
<task id="LOCAL-00056" summary="基础搭建&#10;功能开发&#10;隐私协议目的提示，通用询问">
<created>1713149803668</created>
<task id="LOCAL-00056" summary="基础搭建&#10;功能开发&#10;1：1.0.0最终顶板">
<created>1713320240791</created>
<option name="number" value="00056" />
<option name="presentableId" value="LOCAL-00056" />
<option name="project" value="LOCAL" />
<updated>1713149803668</updated>
<updated>1713320240791</updated>
</task>
<option name="localTasksCounter" value="57" />
<servers />
......@@ -874,30 +861,30 @@
<MESSAGE value="基础搭建&#10;功能开发&#10;合并1.0" />
<MESSAGE value="基础搭建&#10;功能开发&#10;申请修改" />
<MESSAGE value="基础搭建&#10;功能开发&#10;1.1.0" />
<MESSAGE value="基础搭建&#10;功能开发&#10;隐私协议目的提示，通用询问" />
<option name="LAST_COMMIT_MESSAGE" value="基础搭建&#10;功能开发&#10;隐私协议目的提示，通用询问" />
<MESSAGE value="基础搭建&#10;功能开发&#10;1：1.0.0最终顶板" />
<option name="LAST_COMMIT_MESSAGE" value="基础搭建&#10;功能开发&#10;1：1.0.0最终顶板" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
<breakpoints>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/merchantenter/AddBrankViewModel.java</url>
<line>75</line>
<line>83</line>
<option name="timeStamp" value="479" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/merchantenter/AddBrankViewModel.java</url>
<line>220</line>
<line>231</line>
<option name="timeStamp" value="481" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/merchantenter/AddBrankViewModel.java</url>
<line>256</line>
<line>267</line>
<option name="timeStamp" value="499" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/merchantenter/AddBrankViewModel.java</url>
<line>229</line>
<line>240</line>
<option name="timeStamp" value="502" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
......@@ -912,7 +899,7 @@
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/login/LoginViewModel.java</url>
<line>172</line>
<line>173</line>
<option name="timeStamp" value="509" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
......@@ -967,7 +954,7 @@
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/mvvmhabit/src/main/java/me/goldze/mvvmhabit/base/BaseViewModel.java</url>
<line>217</line>
<line>214</line>
<option name="timeStamp" value="551" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
......@@ -982,49 +969,19 @@
</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>411</line>
<line>401</line>
<option name="timeStamp" value="556" />
</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>414</line>
<line>404</line>
<option name="timeStamp" value="557" />
</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>416</line>
<line>406</line>
<option name="timeStamp" value="558" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/merchantinfo/MerchantInfoViewModel.java</url>
<line>278</line>
<option name="timeStamp" value="559" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/merchantinfo/MerchantInfoViewModel.java</url>
<line>286</line>
<option name="timeStamp" value="560" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/merchantinfo/MerchantInfoViewModel.java</url>
<line>280</line>
<option name="timeStamp" value="561" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/merchantinfo/MerchantInfoViewModel.java</url>
<line>282</line>
<option name="timeStamp" value="562" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/merchantinfo/MerchantInfoViewModel.java</url>
<line>288</line>
<option name="timeStamp" value="568" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/merchantinfo/MerchantInfoViewModel.java</url>
<line>290</line>
<option name="timeStamp" value="569" />
</line-breakpoint>
<line-breakpoint enabled="true" type="kotlin-line">
<url>file://$PROJECT_DIR$/xxviewlibrary/src/main/java/com/xx/xxviewlibrary/witget/XxUploudPicSmall.kt</url>
<line>110</line>
......@@ -1115,31 +1072,6 @@
<line>39</line>
<option name="timeStamp" value="544" />
</line-breakpoint>
<line-breakpoint enabled="true" type="kotlin-line">
<url>file://$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/merchantinfo/MaterialInfoActivity.kt</url>
<line>42</line>
<option name="timeStamp" value="563" />
</line-breakpoint>
<line-breakpoint enabled="true" type="kotlin-line">
<url>file://$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/merchantinfo/MaterialInfoActivity.kt</url>
<line>43</line>
<option name="timeStamp" value="564" />
</line-breakpoint>
<line-breakpoint enabled="true" type="kotlin-line">
<url>file://$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/merchantinfo/MaterialInfoActivity.kt</url>
<line>44</line>
<option name="timeStamp" value="565" />
</line-breakpoint>
<line-breakpoint enabled="true" type="kotlin-line">
<url>file://$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/merchantinfo/MaterialInfoActivity.kt</url>
<line>45</line>
<option name="timeStamp" value="566" />
</line-breakpoint>
<line-breakpoint enabled="true" type="kotlin-line">
<url>file://$PROJECT_DIR$/app/src/main/java/com/xx/merchanthbh/ui/merchantinfo/MaterialInfoActivity.kt</url>
<line>41</line>
<option name="timeStamp" value="567" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-method">
<url>file://$PROJECT_DIR$/mvvmhabit/src/main/java/me/goldze/mvvmhabit/base/BaseViewModel.java</url>
<line>190</line>
......
app/src/main/java/com/xx/merchanthbh/ui/login/LoginActivity.kt
View file @ a72f1f5b
......@@ -110,14 +110,14 @@ class LoginActivity() : BaseActivity<ActivityLoginBinding, LoginViewModel>() {
}
}
})
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
/* if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
if (!Environment.isExternalStorageManager()) {
val intent = Intent(Settings.ACTION_MANAGE_APP_ALL_FILES_ACCESS_PERMISSION)
intent.setData(Uri.parse("package:$packageName"))
startActivityForResult(intent, 1024)
}
}
}*/
if (viewModel.isAgree)
{
binding.ivLoginAgreement.setImageDrawable(getDrawable(R.mipmap.login_icon_xuanze2))
......
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