收藏页面 改成商品详情页面

小程序分享 是体验版
appid 替换
手机号修改

.idea/appInsightsSettings.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="AppInsightsSettings">
+    <option name="selectedTabId" value="Android Vitals" />
+  </component>
+</project>

.idea/compiler.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="11" />
+    <bytecodeTargetLevel target="17" />
   </component>
 </project>

.idea/dbnavigator.xml

@@ -0,0 +1,417 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="DBNavigator.Project.DDLFileAttachmentManager">
+    <mappings />
+    <preferences />
+  </component>
+  <component name="DBNavigator.Project.DatabaseBrowserManager">
+    <autoscroll-to-editor value="false" />
+    <autoscroll-from-editor value="true" />
+    <show-object-properties value="true" />
+    <loaded-nodes />
+  </component>
+  <component name="DBNavigator.Project.DatabaseFileManager">
+    <open-files />
+  </component>
+  <component name="DBNavigator.Project.ExecutionManager">
+    <retain-sticky-names value="false" />
+  </component>
+  <component name="DBNavigator.Project.Settings">
+    <connections />
+    <browser-settings>
+      <general>
+        <display-mode value="TABBED" />
+        <navigation-history-size value="100" />
+        <show-object-details value="false" />
+        <enable-sticky-paths value="true" />
+      </general>
+      <filters>
+        <object-type-filter>
+          <object-type name="SCHEMA" enabled="true" />
+          <object-type name="USER" enabled="true" />
+          <object-type name="ROLE" enabled="true" />
+          <object-type name="PRIVILEGE" enabled="true" />
+          <object-type name="CHARSET" enabled="true" />
+          <object-type name="TABLE" enabled="true" />
+          <object-type name="VIEW" enabled="true" />
+          <object-type name="MATERIALIZED_VIEW" enabled="true" />
+          <object-type name="NESTED_TABLE" enabled="true" />
+          <object-type name="COLUMN" enabled="true" />
+          <object-type name="INDEX" enabled="true" />
+          <object-type name="CONSTRAINT" enabled="true" />
+          <object-type name="DATASET_TRIGGER" enabled="true" />
+          <object-type name="DATABASE_TRIGGER" enabled="true" />
+          <object-type name="SYNONYM" enabled="true" />
+          <object-type name="SEQUENCE" enabled="true" />
+          <object-type name="PROCEDURE" enabled="true" />
+          <object-type name="FUNCTION" enabled="true" />
+          <object-type name="PACKAGE" enabled="true" />
+          <object-type name="TYPE" enabled="true" />
+          <object-type name="TYPE_ATTRIBUTE" enabled="true" />
+          <object-type name="ARGUMENT" enabled="true" />
+          <object-type name="DIMENSION" enabled="true" />
+          <object-type name="CLUSTER" enabled="true" />
+          <object-type name="DBLINK" enabled="true" />
+        </object-type-filter>
+      </filters>
+      <sorting>
+        <object-type name="COLUMN" sorting-type="NAME" />
+        <object-type name="FUNCTION" sorting-type="NAME" />
+        <object-type name="PROCEDURE" sorting-type="NAME" />
+        <object-type name="ARGUMENT" sorting-type="POSITION" />
+        <object-type name="TYPE ATTRIBUTE" sorting-type="POSITION" />
+      </sorting>
+      <default-editors>
+        <object-type name="VIEW" editor-type="SELECTION" />
+        <object-type name="PACKAGE" editor-type="SELECTION" />
+        <object-type name="TYPE" editor-type="SELECTION" />
+      </default-editors>
+    </browser-settings>
+    <navigation-settings>
+      <lookup-filters>
+        <lookup-objects>
+          <object-type name="SCHEMA" enabled="true" />
+          <object-type name="USER" enabled="false" />
+          <object-type name="ROLE" enabled="false" />
+          <object-type name="PRIVILEGE" enabled="false" />
+          <object-type name="CHARSET" enabled="false" />
+          <object-type name="TABLE" enabled="true" />
+          <object-type name="VIEW" enabled="true" />
+          <object-type name="MATERIALIZED VIEW" enabled="true" />
+          <object-type name="INDEX" enabled="true" />
+          <object-type name="CONSTRAINT" enabled="true" />
+          <object-type name="DATASET TRIGGER" enabled="true" />
+          <object-type name="DATABASE TRIGGER" enabled="true" />
+          <object-type name="SYNONYM" enabled="false" />
+          <object-type name="SEQUENCE" enabled="true" />
+          <object-type name="PROCEDURE" enabled="true" />
+          <object-type name="FUNCTION" enabled="true" />
+          <object-type name="PACKAGE" enabled="true" />
+          <object-type name="TYPE" enabled="true" />
+          <object-type name="DIMENSION" enabled="false" />
+          <object-type name="CLUSTER" enabled="false" />
+          <object-type name="DBLINK" enabled="true" />
+        </lookup-objects>
+        <force-database-load value="false" />
+        <prompt-connection-selection value="true" />
+        <prompt-schema-selection value="true" />
+      </lookup-filters>
+    </navigation-settings>
+    <dataset-grid-settings>
+      <general>
+        <enable-zooming value="true" />
+        <enable-column-tooltip value="true" />
+      </general>
+      <sorting>
+        <nulls-first value="true" />
+        <max-sorting-columns value="4" />
+      </sorting>
+      <audit-columns>
+        <column-names value="" />
+        <visible value="true" />
+        <editable value="false" />
+      </audit-columns>
+    </dataset-grid-settings>
+    <dataset-editor-settings>
+      <text-editor-popup>
+        <active value="false" />
+        <active-if-empty value="false" />
+        <data-length-threshold value="100" />
+        <popup-delay value="1000" />
+      </text-editor-popup>
+      <values-actions-popup>
+        <show-popup-button value="true" />
+        <element-count-threshold value="1000" />
+        <data-length-threshold value="250" />
+      </values-actions-popup>
+      <general>
+        <fetch-block-size value="100" />
+        <fetch-timeout value="30" />
+        <trim-whitespaces value="true" />
+        <convert-empty-strings-to-null value="true" />
+        <select-content-on-cell-edit value="true" />
+        <large-value-preview-active value="true" />
+      </general>
+      <filters>
+        <prompt-filter-dialog value="true" />
+        <default-filter-type value="BASIC" />
+      </filters>
+      <qualified-text-editor text-length-threshold="300">
+        <content-types>
+          <content-type name="Text" enabled="true" />
+          <content-type name="Properties" enabled="true" />
+          <content-type name="XML" enabled="true" />
+          <content-type name="DTD" enabled="true" />
+          <content-type name="HTML" enabled="true" />
+          <content-type name="XHTML" enabled="true" />
+          <content-type name="Java" enabled="true" />
+          <content-type name="SQL" enabled="true" />
+          <content-type name="PL/SQL" enabled="true" />
+          <content-type name="JSON" enabled="true" />
+          <content-type name="JSON5" enabled="true" />
+          <content-type name="Groovy" enabled="true" />
+          <content-type name="AIDL" enabled="true" />
+          <content-type name="YAML" enabled="true" />
+          <content-type name="Manifest" enabled="true" />
+        </content-types>
+      </qualified-text-editor>
+      <record-navigation>
+        <navigation-target value="VIEWER" />
+      </record-navigation>
+    </dataset-editor-settings>
+    <code-editor-settings>
+      <general>
+        <show-object-navigation-gutter value="false" />
+        <show-spec-declaration-navigation-gutter value="true" />
+        <enable-spellchecking value="true" />
+        <enable-reference-spellchecking value="false" />
+      </general>
+      <confirmations>
+        <save-changes value="false" />
+        <revert-changes value="true" />
+        <exit-on-changes value="ASK" />
+      </confirmations>
+    </code-editor-settings>
+    <code-completion-settings>
+      <filters>
+        <basic-filter>
+          <filter-element type="RESERVED_WORD" id="keyword" selected="true" />
+          <filter-element type="RESERVED_WORD" id="function" selected="true" />
+          <filter-element type="RESERVED_WORD" id="parameter" selected="true" />
+          <filter-element type="RESERVED_WORD" id="datatype" selected="true" />
+          <filter-element type="RESERVED_WORD" id="exception" selected="true" />
+          <filter-element type="OBJECT" id="schema" selected="true" />
+          <filter-element type="OBJECT" id="role" selected="true" />
+          <filter-element type="OBJECT" id="user" selected="true" />
+          <filter-element type="OBJECT" id="privilege" selected="true" />
+          <user-schema>
+            <filter-element type="OBJECT" id="table" selected="true" />
+            <filter-element type="OBJECT" id="view" selected="true" />
+            <filter-element type="OBJECT" id="materialized view" selected="true" />
+            <filter-element type="OBJECT" id="index" selected="true" />
+            <filter-element type="OBJECT" id="constraint" selected="true" />
+            <filter-element type="OBJECT" id="trigger" selected="true" />
+            <filter-element type="OBJECT" id="synonym" selected="false" />
+            <filter-element type="OBJECT" id="sequence" selected="true" />
+            <filter-element type="OBJECT" id="procedure" selected="true" />
+            <filter-element type="OBJECT" id="function" selected="true" />
+            <filter-element type="OBJECT" id="package" selected="true" />
+            <filter-element type="OBJECT" id="type" selected="true" />
+            <filter-element type="OBJECT" id="dimension" selected="true" />
+            <filter-element type="OBJECT" id="cluster" selected="true" />
+            <filter-element type="OBJECT" id="dblink" selected="true" />
+          </user-schema>
+          <public-schema>
+            <filter-element type="OBJECT" id="table" selected="false" />
+            <filter-element type="OBJECT" id="view" selected="false" />
+            <filter-element type="OBJECT" id="materialized view" selected="false" />
+            <filter-element type="OBJECT" id="index" selected="false" />
+            <filter-element type="OBJECT" id="constraint" selected="false" />
+            <filter-element type="OBJECT" id="trigger" selected="false" />
+            <filter-element type="OBJECT" id="synonym" selected="false" />
+            <filter-element type="OBJECT" id="sequence" selected="false" />
+            <filter-element type="OBJECT" id="procedure" selected="false" />
+            <filter-element type="OBJECT" id="function" selected="false" />
+            <filter-element type="OBJECT" id="package" selected="false" />
+            <filter-element type="OBJECT" id="type" selected="false" />
+            <filter-element type="OBJECT" id="dimension" selected="false" />
+            <filter-element type="OBJECT" id="cluster" selected="false" />
+            <filter-element type="OBJECT" id="dblink" selected="false" />
+          </public-schema>
+          <any-schema>
+            <filter-element type="OBJECT" id="table" selected="true" />
+            <filter-element type="OBJECT" id="view" selected="true" />
+            <filter-element type="OBJECT" id="materialized view" selected="true" />
+            <filter-element type="OBJECT" id="index" selected="true" />
+            <filter-element type="OBJECT" id="constraint" selected="true" />
+            <filter-element type="OBJECT" id="trigger" selected="true" />
+            <filter-element type="OBJECT" id="synonym" selected="true" />
+            <filter-element type="OBJECT" id="sequence" selected="true" />
+            <filter-element type="OBJECT" id="procedure" selected="true" />
+            <filter-element type="OBJECT" id="function" selected="true" />
+            <filter-element type="OBJECT" id="package" selected="true" />
+            <filter-element type="OBJECT" id="type" selected="true" />
+            <filter-element type="OBJECT" id="dimension" selected="true" />
+            <filter-element type="OBJECT" id="cluster" selected="true" />
+            <filter-element type="OBJECT" id="dblink" selected="true" />
+          </any-schema>
+        </basic-filter>
+        <extended-filter>
+          <filter-element type="RESERVED_WORD" id="keyword" selected="true" />
+          <filter-element type="RESERVED_WORD" id="function" selected="true" />
+          <filter-element type="RESERVED_WORD" id="parameter" selected="true" />
+          <filter-element type="RESERVED_WORD" id="datatype" selected="true" />
+          <filter-element type="RESERVED_WORD" id="exception" selected="true" />
+          <filter-element type="OBJECT" id="schema" selected="true" />
+          <filter-element type="OBJECT" id="user" selected="true" />
+          <filter-element type="OBJECT" id="role" selected="true" />
+          <filter-element type="OBJECT" id="privilege" selected="true" />
+          <user-schema>
+            <filter-element type="OBJECT" id="table" selected="true" />
+            <filter-element type="OBJECT" id="view" selected="true" />
+            <filter-element type="OBJECT" id="materialized view" selected="true" />
+            <filter-element type="OBJECT" id="index" selected="true" />
+            <filter-element type="OBJECT" id="constraint" selected="true" />
+            <filter-element type="OBJECT" id="trigger" selected="true" />
+            <filter-element type="OBJECT" id="synonym" selected="true" />
+            <filter-element type="OBJECT" id="sequence" selected="true" />
+            <filter-element type="OBJECT" id="procedure" selected="true" />
+            <filter-element type="OBJECT" id="function" selected="true" />
+            <filter-element type="OBJECT" id="package" selected="true" />
+            <filter-element type="OBJECT" id="type" selected="true" />
+            <filter-element type="OBJECT" id="dimension" selected="true" />
+            <filter-element type="OBJECT" id="cluster" selected="true" />
+            <filter-element type="OBJECT" id="dblink" selected="true" />
+          </user-schema>
+          <public-schema>
+            <filter-element type="OBJECT" id="table" selected="true" />
+            <filter-element type="OBJECT" id="view" selected="true" />
+            <filter-element type="OBJECT" id="materialized view" selected="true" />
+            <filter-element type="OBJECT" id="index" selected="true" />
+            <filter-element type="OBJECT" id="constraint" selected="true" />
+            <filter-element type="OBJECT" id="trigger" selected="true" />
+            <filter-element type="OBJECT" id="synonym" selected="true" />
+            <filter-element type="OBJECT" id="sequence" selected="true" />
+            <filter-element type="OBJECT" id="procedure" selected="true" />
+            <filter-element type="OBJECT" id="function" selected="true" />
+            <filter-element type="OBJECT" id="package" selected="true" />
+            <filter-element type="OBJECT" id="type" selected="true" />
+            <filter-element type="OBJECT" id="dimension" selected="true" />
+            <filter-element type="OBJECT" id="cluster" selected="true" />
+            <filter-element type="OBJECT" id="dblink" selected="true" />
+          </public-schema>
+          <any-schema>
+            <filter-element type="OBJECT" id="table" selected="true" />
+            <filter-element type="OBJECT" id="view" selected="true" />
+            <filter-element type="OBJECT" id="materialized view" selected="true" />
+            <filter-element type="OBJECT" id="index" selected="true" />
+            <filter-element type="OBJECT" id="constraint" selected="true" />
+            <filter-element type="OBJECT" id="trigger" selected="true" />
+            <filter-element type="OBJECT" id="synonym" selected="true" />
+            <filter-element type="OBJECT" id="sequence" selected="true" />
+            <filter-element type="OBJECT" id="procedure" selected="true" />
+            <filter-element type="OBJECT" id="function" selected="true" />
+            <filter-element type="OBJECT" id="package" selected="true" />
+            <filter-element type="OBJECT" id="type" selected="true" />
+            <filter-element type="OBJECT" id="dimension" selected="true" />
+            <filter-element type="OBJECT" id="cluster" selected="true" />
+            <filter-element type="OBJECT" id="dblink" selected="true" />
+          </any-schema>
+        </extended-filter>
+      </filters>
+      <sorting enabled="true">
+        <sorting-element type="RESERVED_WORD" id="keyword" />
+        <sorting-element type="RESERVED_WORD" id="datatype" />
+        <sorting-element type="OBJECT" id="column" />
+        <sorting-element type="OBJECT" id="table" />
+        <sorting-element type="OBJECT" id="view" />
+        <sorting-element type="OBJECT" id="materialized view" />
+        <sorting-element type="OBJECT" id="index" />
+        <sorting-element type="OBJECT" id="constraint" />
+        <sorting-element type="OBJECT" id="trigger" />
+        <sorting-element type="OBJECT" id="synonym" />
+        <sorting-element type="OBJECT" id="sequence" />
+        <sorting-element type="OBJECT" id="procedure" />
+        <sorting-element type="OBJECT" id="function" />
+        <sorting-element type="OBJECT" id="package" />
+        <sorting-element type="OBJECT" id="type" />
+        <sorting-element type="OBJECT" id="dimension" />
+        <sorting-element type="OBJECT" id="cluster" />
+        <sorting-element type="OBJECT" id="dblink" />
+        <sorting-element type="OBJECT" id="schema" />
+        <sorting-element type="OBJECT" id="role" />
+        <sorting-element type="OBJECT" id="user" />
+        <sorting-element type="RESERVED_WORD" id="function" />
+        <sorting-element type="RESERVED_WORD" id="parameter" />
+      </sorting>
+      <format>
+        <enforce-code-style-case value="true" />
+      </format>
+    </code-completion-settings>
+    <execution-engine-settings>
+      <statement-execution>
+        <fetch-block-size value="100" />
+        <execution-timeout value="20" />
+        <debug-execution-timeout value="600" />
+        <focus-result value="false" />
+        <prompt-execution value="false" />
+      </statement-execution>
+      <script-execution>
+        <command-line-interfaces />
+        <execution-timeout value="300" />
+      </script-execution>
+      <method-execution>
+        <execution-timeout value="30" />
+        <debug-execution-timeout value="600" />
+        <parameter-history-size value="10" />
+      </method-execution>
+    </execution-engine-settings>
+    <operation-settings>
+      <transactions>
+        <uncommitted-changes>
+          <on-project-close value="ASK" />
+          <on-disconnect value="ASK" />
+          <on-autocommit-toggle value="ASK" />
+        </uncommitted-changes>
+        <multiple-uncommitted-changes>
+          <on-commit value="ASK" />
+          <on-rollback value="ASK" />
+        </multiple-uncommitted-changes>
+      </transactions>
+      <session-browser>
+        <disconnect-session value="ASK" />
+        <kill-session value="ASK" />
+        <reload-on-filter-change value="false" />
+      </session-browser>
+      <compiler>
+        <compile-type value="KEEP" />
+        <compile-dependencies value="ASK" />
+        <always-show-controls value="false" />
+      </compiler>
+    </operation-settings>
+    <ddl-file-settings>
+      <extensions>
+        <mapping file-type-id="VIEW" extensions="vw" />
+        <mapping file-type-id="TRIGGER" extensions="trg" />
+        <mapping file-type-id="PROCEDURE" extensions="prc" />
+        <mapping file-type-id="FUNCTION" extensions="fnc" />
+        <mapping file-type-id="PACKAGE" extensions="pkg" />
+        <mapping file-type-id="PACKAGE_SPEC" extensions="pks" />
+        <mapping file-type-id="PACKAGE_BODY" extensions="pkb" />
+        <mapping file-type-id="TYPE" extensions="tpe" />
+        <mapping file-type-id="TYPE_SPEC" extensions="tps" />
+        <mapping file-type-id="TYPE_BODY" extensions="tpb" />
+      </extensions>
+      <general>
+        <lookup-ddl-files value="true" />
+        <create-ddl-files value="false" />
+        <synchronize-ddl-files value="true" />
+        <use-qualified-names value="false" />
+        <make-scripts-rerunnable value="true" />
+      </general>
+    </ddl-file-settings>
+    <general-settings>
+      <regional-settings>
+        <date-format value="MEDIUM" />
+        <number-format value="UNGROUPED" />
+        <locale value="SYSTEM_DEFAULT" />
+        <use-custom-formats value="false" />
+      </regional-settings>
+      <environment>
+        <environment-types>
+          <environment-type id="development" name="Development" description="Development environment" color="-2430209/-12296320" readonly-code="false" readonly-data="false" />
+          <environment-type id="integration" name="Integration" description="Integration environment" color="-2621494/-12163514" readonly-code="true" readonly-data="false" />
+          <environment-type id="production" name="Production" description="Productive environment" color="-11574/-10271420" readonly-code="true" readonly-data="true" />
+          <environment-type id="other" name="Other" description="" color="-1576/-10724543" readonly-code="false" readonly-data="false" />
+        </environment-types>
+        <visibility-settings>
+          <connection-tabs value="true" />
+          <dialog-headers value="true" />
+          <object-editor-tabs value="true" />
+          <script-editor-tabs value="false" />
+          <execution-result-tabs value="true" />
+        </visibility-settings>
+      </environment>
+    </general-settings>
+  </component>
+</project>

.idea/deploymentTargetSelector.xml

@@ -4,6 +4,14 @@
     <selectionStates>
       <SelectionState runConfigName="app">
         <option name="selectionMode" value="DROPDOWN" />
+        <DropdownSelection timestamp="2025-04-19T06:37:06.884508Z">
+          <Target type="DEFAULT_BOOT">
+            <handle>
+              <DeviceId pluginId="LocalEmulator" identifier="path=/Users/swj/.android/avd/Pixel4API30.avd" />
+            </handle>
+          </Target>
+        </DropdownSelection>
+        <DialogSelection />
       </SelectionState>
     </selectionStates>
   </component>

.idea/gradle.xml

@@ -4,9 +4,9 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="testRunner" value="CHOOSE_PER_TEST" />
+        <option name="testRunner" value="GRADLE" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
+        <option name="gradleJvm" value="jbr-17" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />

.idea/misc.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="temurin-11" project-jdk-type="JavaSDK" />
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK" />
 </project>

app/build.gradle

@@ -15,8 +15,6 @@ android {
         versionName "1.0"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-        //必须要保证所有的flavor 都属于同一个维度
-        flavorDimensions "default"
         ndk {
             //选择要添加的对应cpu类型的.so库。
             //热修复支持五种
@@ -35,7 +33,7 @@ android {
         targetCompatibility JavaVersion.VERSION_11
     }
     viewBinding {
-        enabled = true;
+        enabled = true
     }
 
     dependenciesInfo {
@@ -43,7 +41,7 @@ android {
         includeInApk false
     }
 
-    applicationVariants.all { variant ->
+    applicationVariants.configureEach { variant ->
         variant.outputs.all { output ->
             def outputFile = output.outputFile
             if (outputFile != null && outputFile.name.endsWith('.apk')) {
@@ -52,24 +50,36 @@ android {
 //                def fileName = outputFile.name.replace(".apk", ".apk")
 //                outputFileName = fileName
                 //Cxb_xiaomi_20200808_V3.0.0.apk
-                def fileName = outputFile.name.replace("app-", "").replace("-release.apk", "");
-                outputFileName = "Cxb_" + fileName + "_" + new Date().format("yyyyMMdd") + "_V" + defaultConfig.versionName + ".apk"
+                def fileName = outputFile.name.replace("app-", "").replace("-release.apk", "")
+                outputFileName = "XFB_" + fileName + "_" + new Date().format("yyyyMMdd") + "_V" + defaultConfig.versionName + ".apk"
             }
         }
     }
     signingConfigs {
         debug {
+            storeFile file('yihucha.keystore')
+            storePassword "yihucha123"
+            keyAlias "yihucha"
+            keyPassword "yihucha123"
+        }
+        release {
+            storeFile file('yihucha.keystore')
+            storePassword "yihucha123"
+            keyAlias "yihucha"
+            keyPassword "yihucha123"
+        }
+/*        debug {
             storeFile file('chuxubao.keystore')
             storePassword "tdba123"
             keyAlias "chuxubao"
             keyPassword "tdba123"
-        }
+        }*/
     }
 }
 
 dependencies {
     configurations {
-        all {
+        configureEach {
             exclude group: 'androidx.lifecycle', module: 'lifecycle-viewmodel-ktx'
         }
     }
@@ -84,12 +94,12 @@ dependencies {
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
     implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.3.1'
     implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.1'
-    implementation 'androidx.navigation:navigation-fragment:2.3.5'
-    implementation 'androidx.navigation:navigation-ui:2.3.5'
-    implementation 'org.chromium.net:cronet-api:76.3809.111'
+//    implementation 'androidx.navigation:navigation-fragment:2.3.5'
+//    implementation 'androidx.navigation:navigation-ui:2.3.5'
+//    implementation 'org.chromium.net:cronet-api:76.3809.111'
 
 
-    implementation(fileTree("libs"));
+    implementation(fileTree("libs"))
 
 
     //图片加载框架
@@ -97,8 +107,6 @@ dependencies {
 //    https://github.com/bumptech/glide
     api 'com.github.bumptech.glide:glide:4.12.0'
     annotationProcessor 'com.github.bumptech.glide:compiler:4.12.0'
-    //Glide 用到的 BitmapTransformation
-    //https://github.com/wasabeef/glide-transformations
     api 'jp.wasabeef:glide-transformations:4.3.0'
     //微信
 //    api 'com.tencent.mm.opensdk:wechat-sdk-android:+'
@@ -124,7 +132,7 @@ dependencies {
     implementation 'io.github.youth5201314:banner:2.2.2'
     //刷新
     implementation 'com.lcodecorex:tkrefreshlayout:1.0.7'
-//AndroidUtilCode
+//AndroidUtilCode  包含常用工具库
     implementation 'com.blankj:utilcodex:1.31.0'
     //状态栏
 // After AndroidX
@@ -134,13 +142,13 @@ dependencies {
     })
     //适配器
     implementation 'com.github.CymChad:BaseRecyclerViewAdapterHelper:2.9.30'
-    //搜索历史
+    //搜索历史 流式布局 tab选项
 //    implementation 'com.hyman:flowlayout-lib:1.1.2'
     implementation project(':flowlayout-lib')
     //json
     implementation 'com.alibaba:fastjson:1.1.54.android'
     //视频播放 https://www.jianshu.com/p/8f1af9790c69
-    implementation 'cn.jzvd:jiaozivideoplayer:6.2.12'
+//    implementation 'cn.jzvd:jiaozivideoplayer:6.2.12'
     //瀑布流LayoutManager
     implementation 'com.google.android.flexbox:flexbox:3.0.0'
     //okhttp网络下载
@@ -151,10 +159,6 @@ dependencies {
     implementation 'com.github.liys666666:LDialog:V2.1.2'
     //事件传递
     implementation 'org.greenrobot:eventbus:3.0.0'
-    //照相图片选择
-//    implementation 'com.github.HuanTanSheng:EasyPhotos:3.1.5'  //androidx版本，支持android 10、11，永久维护
-    //滑动选择器
-//    implementation 'com.contrarywind:wheelview:4.1.0'
     //时间选择器
     implementation 'com.contrarywind:Android-PickerView:4.1.9'
     //评分
@@ -175,14 +179,12 @@ dependencies {
     implementation 'androidx.work:work-runtime:2.7.1'
     //二维码
     implementation 'com.google.zxing:core:3.3.0'
-    //类似酒店入驻时间选择器
-//    implementation 'com.github.atuan07:CustomHotelCalender:V1.0.2'
     //日历选择开始和结束时间
     implementation 'com.github.TurnTears:CalendarRangeSelect:1.1.1'
     //京东联盟
     api project(':jd_sdk_lib')
     //穿山甲
-    implementation 'com.pangle.cn:ads-sdk-pro:4.4.0.9'
+//    implementation 'com.pangle.cn:ads-sdk-pro:4.4.0.9'
 // 友盟基础组件库（所有友盟业务SDK都依赖基础组件库）
     implementation 'com.umeng.umsdk:common:9.5.2'// (必选)
     implementation 'com.umeng.umsdk:asms:1.6.3'// 必选

app/src/main/AndroidManifest.xml

@@ -5,6 +5,7 @@
 
     <queries>
         <package android:name="com.tencent.mm" />
+        <package android:name="com.laolaixiang.bjtdba" />
     </queries>
 
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" /> <!-- 网络权限 -->
@@ -38,23 +39,22 @@
     <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" /> <!-- 切换网络通道 -->
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" /> <!-- 开关Wi-Fi状态，解决国内机型移动网络权限问题需要 -->
     <permission-group android:name=".andpermission" /> <!-- 必要权限，解决安全风险漏洞，发送和注册广播事件需要调用带有传递权限的接口 -->
-    <permission
-        android:name="com.yihucha.hbyhc.openadsdk.permission.TT_PANGOLIN"
-        android:protectionLevel="signature" />
+    <uses-feature
+        android:name="android.hardware.camera"
+        android:required="false" />
+    <uses-feature
+        android:name="android.hardware.telephony"
+        android:required="false" />
 
-    <uses-permission android:name="com.yihucha.hbyhc.openadsdk.permission.TT_PANGOLIN" /> <!-- 可选权限 -->
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
-    <uses-permission android:name="android.permission.GET_TASKS" /> <!-- 可选，穿山甲提供“获取地理位置权限”和“不给予地理位置权限，开发者传入地理位置参数”两种方式上报用户位置，两种方式均可不选，添加位置权限或参数将帮助投放定位广告 -->
-    <!-- 请注意：无论通过何种方式提供给穿山甲用户地理位置，均需向用户声明地理位置权限将应用于穿山甲广告投放，穿山甲不强制获取地理位置信息 -->
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" /> <!-- 如果视频广告使用textureView播放，请务必添加，否则黑屏 -->
     <uses-permission android:name="android.permission.WAKE_LOCK" /> <!-- demo场景用到的权限，不是必须的 -->
     <uses-permission android:name="android.permission.RECEIVE_USER_PRESENT" />
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
-    <uses-permission android:name="android.permission.EXPAND_STATUS_BAR" /> <!-- 穿山甲3400版本新增：建议添加“query_all_package”权限，穿山甲将通过此权限在Android R系统上判定广告对应的应用是否在用户的app上安装，避免投放错误的广告，以此提高用户的广告体验。若添加此权限，需要在您的用户隐私文档中声明！ -->
     <!--
-<uses-permission
+        <uses-permission
         android:name="android.permission.QUERY_ALL_PACKAGES"
         tools:ignore="QueryAllPackagesPermission" />
     -->
@@ -68,20 +68,124 @@
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"
-        android:icon="@mipmap/logo_220607"
+        android:icon="@mipmap/logo"
         android:label="@string/app_name"
         android:networkSecurityConfig="@xml/network_security_config"
-        android:roundIcon="@mipmap/ic_launcher_round"
+        android:requestLegacyExternalStorage="true"
         android:supportsRtl="true"
         android:theme="@style/TranslucentTheme"
         android:usesCleartextTraffic="true"
         tools:replace="android:theme"
         tools:targetApi="31">
         <activity
+            android:name=".presentation.login.PhoneSettingActivity"
+            android:exported="false" />
+        <activity
+            android:name=".presentation.pyyx.activity.MovieHomeActivity"
+            android:exported="false" />
+        <activity
+            android:name=".presentation.pyyx.activity.MerActivity"
+            android:exported="false" />
+        <activity
+            android:name=".presentation.pyyx.activity.SXYDetailActivity"
+            android:exported="false"
+            android:label="详情" />
+        <activity
+            android:name=".presentation.pyyx.activity.SXYActivity"
+            android:exported="false"
+            android:label="商学院" />
+        <activity
+            android:name=".presentation.pyyx.activity.TranVRRecordActivity"
+            android:exported="false"
+            android:label="佣金转VR记录" />
+        <activity
+            android:name=".presentation.pyyx.activity.RecordDetailActivity"
+            android:exported="false"
+            android:label="充值记录详情" />
+        <activity
+            android:name=".presentation.pyyx.activity.RechargeRecordActivity"
+            android:exported="false"
+            android:label="充值记录"
+            android:launchMode="singleTask" />
+        <activity
+            android:name=".presentation.pyyx.activity.ActivityPhoneRecharge"
+            android:exported="false"
+            android:launchMode="singleTop" />
+        <activity
+            android:name=".presentation.login.PwdSettingActivity"
+            android:exported="false"
+            android:label="密码设置" />
+        <activity
+            android:name=".presentation.pyyx.activity.JDouActivity"
+            android:exported="false" />
+        <activity
+            android:name=".presentation.pyyx.activity.HBActivity"
+            android:exported="false" />
+        <activity
+            android:name=".presentation.pyyx.activity.GXZActivity"
+            android:exported="false" />
+        <activity
+            android:name=".presentation.pyyx.activity.FGJActivity"
+            android:exported="false" />
+        <activity
+            android:name=".presentation.pyyx.activity.VRActivity"
+            android:exported="false" />
+        <activity
+            android:name=".presentation.pyyx.activity.MyGongxianzhiActivity"
+            android:exported="false"
+            android:label="" />
+        <activity
+            android:name=".presentation.pyyx.activity.MyJiFenActivity"
+            android:exported="false"
+            android:label="" />
+        <activity
+            android:name=".presentation.pyyx.activity.PyyxProductDetailActivity"
+            android:exported="false"
+            android:label="店铺管理"
+            android:launchMode="singleTask"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name=".presentation.pyyx.activity.ShopManagerActivity"
+            android:exported="false" />
+        <activity
+            android:name=".presentation.pyyx.activity.DYActivity"
+            android:exported="false" />
+        <activity
+            android:name=".presentation.pyyx.activity.JDActivity"
+            android:exported="false" />
+        <activity
+            android:name=".presentation.pyyx.activity.PDDActivity"
+            android:exported="false" />
+        <activity
+            android:name=".presentation.pyyx.activity.SNActivity"
+            android:exported="false" />
+        <activity
+            android:name=".presentation.pyyx.activity.VIPActivity"
+            android:exported="false" />
+        <activity
+            android:name=".presentation.pyyx.activity.TBActivity"
+            android:exported="false" /> <!-- 平易优选启动页（首页） -->
+        <activity
+            android:name=".presentation.pyyx.activity.FGQActivity"
+            android:exported="false"
+            android:label="复购区" />
+        <activity
+            android:name=".presentation.pyyx.activity.SMQActivity"
+            android:exported="false"
+            android:label="商贸专区" />
+        <activity
+            android:name=".presentation.pyyx.activity.JCSHActivity"
+            android:exported="false"
+            android:label="精彩生活" />
+        <activity
+            android:name=".presentation.pyyx.PyyxMainActivity"
+            android:exported="false"
+            android:launchMode="singleTask"
+            android:screenOrientation="portrait" />
+        <activity
             android:name=".presentation.invitation.AddBankCardActivity"
             android:exported="false"
-            android:label="添加银行卡"
-            />
+            android:label="添加银行卡" />
         <activity
             android:name=".presentation.pay.ShareFriendsPayActivity"
             android:exported="false"
@@ -105,7 +209,7 @@
         <activity
             android:name=".presentation.mine.MyTeamActivity"
             android:exported="false"
-            android:label="我的团队" />
+            android:label="我的部门" />
         <activity
             android:name=".presentation.mine.TiXianRecordActivity"
             android:exported="false"
@@ -644,6 +748,11 @@
             android:launchMode="singleTask"
             android:screenOrientation="portrait" />
         <activity
+            android:name=".presentation.pyyx.activity.ThirdPartProductDetailActivity"
+            android:label=""
+            android:launchMode="singleTask"
+            android:screenOrientation="portrait" />
+        <activity
             android:name=".presentation.product.OtherMerchandiseDetailsActivity"
             android:label=""
             android:launchMode="singleTask"
@@ -697,24 +806,19 @@
             android:name=".presentation.login.ali.OneKeyLoginActivity"
             android:configChanges="orientation|keyboardHidden|screenSize|uiMode|fontScale"
             android:screenOrientation="sensorPortrait" /> <!-- 拍照用得 -->
+        <activity android:name=".presentation.mine.ChangePhoneActivity"
+            android:label="@string/set_phone"
+            android:exported="true"
+            android:launchMode="singleTask"/>
         <provider
             android:name="androidx.core.content.FileProvider"
-            android:authorities=".fileprovider"
+            android:authorities="com.yihucha.hbyhc.fileprovider2"
             android:exported="false"
             android:grantUriPermissions="true">
             <meta-data
                 android:name="android.support.FILE_PROVIDER_PATHS"
                 android:resource="@xml/file_paths_public" />
         </provider>
-        <provider
-            android:name="com.bytedance.sdk.openadsdk.TTFileProvider"
-            android:authorities=".TTFileProvider"
-            android:exported="false"
-            android:grantUriPermissions="true">
-            <meta-data
-                android:name="android.support.FILE_PROVIDER_PATHS"
-                android:resource="@xml/file_paths" />
-        </provider>
     </application>
 
 </manifest>

app/src/main/java/com/yihucha/hbyhc/alipay/Base64.java

@@ -9,9 +9,9 @@ public final class Base64 {
 	private static final int SIXTEENBIT = 16;
 	private static final int FOURBYTE = 4;
 	private static final int SIGN = -128;
-	private static char PAD = '=';
-	private static byte[] base64Alphabet = new byte[BASELENGTH];
-	private static char[] lookUpBase64Alphabet = new char[LOOKUPLENGTH];
+	private static final char PAD = '=';
+	private static final byte[] base64Alphabet = new byte[BASELENGTH];
+	private static final char[] lookUpBase64Alphabet = new char[LOOKUPLENGTH];
 
 	static {
 		for (int i = 0; i < BASELENGTH; ++i) {
@@ -42,8 +42,8 @@ public final class Base64 {
 		for (int i = 52, j = 0; i <= 61; i++, j++) {
 			lookUpBase64Alphabet[i] = (char) ('0' + j);
 		}
-		lookUpBase64Alphabet[62] = (char) '+';
-		lookUpBase64Alphabet[63] = (char) '/';
+		lookUpBase64Alphabet[62] = '+';
+		lookUpBase64Alphabet[63] = '/';
 
 	}
 
@@ -81,7 +81,7 @@ public final class Base64 {
 		int numberTriplets = lengthDataBits / TWENTYFOURBITGROUP;
 		int numberQuartet = fewerThan24bits != 0 ? numberTriplets + 1
 				: numberTriplets;
-		char encodedData[] = null;
+		char[] encodedData = null;
 
 		encodedData = new char[numberQuartet * 4];
 
@@ -169,7 +169,7 @@ public final class Base64 {
 			return new byte[0];
 		}
 
-		byte decodedData[] = null;
+		byte[] decodedData = null;
 		byte b1 = 0, b2 = 0, b3 = 0, b4 = 0;
 		char d1 = 0, d2 = 0, d3 = 0, d4 = 0;
 

app/src/main/java/com/yihucha/hbyhc/alipay/PayDemoActivity.java

@@ -8,7 +8,6 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
-
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.View;
@@ -23,7 +22,6 @@ import com.yihucha.hbyhc.R;
 import com.yihucha.hbyhc.alipay.util.OrderInfoUtil2_0;
 import com.yihucha.hbyhc.presentation.pay.PaySucceedActivity;
 
-
 import java.util.Map;
 
 /**
@@ -76,7 +74,7 @@ public class PayDemoActivity extends AppCompatActivity {
 	private static final int SDK_AUTH_FLAG = 2;
 
 	@SuppressLint("HandlerLeak")
-	private Handler mHandler = new Handler() {
+	private final Handler mHandler = new Handler() {
 		@SuppressWarnings("unused")
 		public void handleMessage(Message msg) {
 			switch (msg.what) {
@@ -119,8 +117,8 @@ public class PayDemoActivity extends AppCompatActivity {
 			default:
 				break;
 			}
-		};
-	};
+		}
+    };
 
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {

app/src/main/java/com/yihucha/hbyhc/application/MyApplication.java

@@ -12,13 +12,16 @@ import android.view.WindowManager;
 import android.webkit.WebView;
 
 import com.blankj.utilcode.util.Utils;
-import com.bytedance.sdk.openadsdk.TTAdConfig;
-import com.bytedance.sdk.openadsdk.TTAdConstant;
-import com.bytedance.sdk.openadsdk.TTAdSdk;
 import com.hjq.toast.Toaster;
 import com.kepler.jd.Listener.AsyncInitListener;
 import com.kepler.jd.login.KeplerApiManager;
-import com.yihucha.hbyhc.callback.AgreeToADealListener;
+import com.lcodecore.tkrefreshlayout.TwinklingRefreshLayout;
+import com.tencent.mm.opensdk.openapi.IWXAPI;
+import com.tencent.mm.opensdk.openapi.WXAPIFactory;
+import com.tencent.mmkv.MMKV;
+import com.umeng.commonsdk.UMConfigure;
+import com.umeng.socialize.PlatformConfig;
+import com.xunmeng.duoduojinbao.JinbaoUtil;
 import com.yihucha.hbyhc.config.Constants;
 import com.yihucha.hbyhc.manager.AgreeToADealManager;
 import com.yihucha.hbyhc.network.NetworkApi;
@@ -27,13 +30,6 @@ import com.yihucha.hbyhc.utils.LogUtil;
 import com.yihucha.hbyhc.utils.MVUtils;
 import com.yihucha.hbyhc.utils.pic33.ActivityCallBacks;
 import com.yihucha.hbyhc.view.CustomHeader;
-import com.lcodecore.tkrefreshlayout.TwinklingRefreshLayout;
-import com.tencent.mm.opensdk.openapi.IWXAPI;
-import com.tencent.mm.opensdk.openapi.WXAPIFactory;
-import com.tencent.mmkv.MMKV;
-import com.umeng.commonsdk.UMConfigure;
-import com.umeng.socialize.PlatformConfig;
-import com.xunmeng.duoduojinbao.JinbaoUtil;
 
 import org.litepal.LitePal;
 
@@ -58,9 +54,12 @@ public class MyApplication extends Application {
     /**
      * 京东联盟
      */
-    public static final String appKey = "ea33c2c3eacb3dd06aaa9633e8cf2ae6";
+/*    public static final String appKey = "ea33c2c3eacb3dd06aaa9633e8cf2ae6";
     public static final String keySecret = "67152015a9004f1188a69bf87e16e9c6";
-    public static final String jdId = "4100873178";
+    public static final String jdId = "4100873178";*/
+    public static final String appKey = "e99703d01cbb6a2e48a8a34f19af9d87";
+    public static final String keySecret = "cea7578d5a314ef88086daa4ee3a5b4d";
+    public static final String jdId = "4101490811";
 
     /**
      * 获取屏幕的宽
@@ -156,96 +155,24 @@ public class MyApplication extends Application {
 
         // 微信设置
         PlatformConfig.setWeixin(Constants.WX_APP_ID, Constants.WX_APP_SECRET);
-        PlatformConfig.setWXFileProvider("com.laolaixiang.bjtdba.fileprovider");
-
-        AgreeToADealManager.addListener("", new AgreeToADealListener() {
-            @Override
-            public void successful() {
-                if (MVUtils.getString(Constants.AGREE_TO_THE_PRIVACY).equals("1")) {
-                    LogUtil.LogInfo("UMConfigure", "1111");
-                    //友盟正式初始化
-                    //appkey和channl必须保持和预初始化一致！！！
-                    //
-                    //deviceType：设备类型，UMConfigure.DEVICE_TYPE_PHONE为手机、UMConfigure.DEVICE_TYPE_BOX为盒子
-                    //
-                    //pushSecret：Push推送业务的secret
-                    UMConfigure.init(instance, Constants.UM_KEY, getChannel(), UMConfigure.DEVICE_TYPE_PHONE, "");
-                    UMConfigure.setLogEnabled(true);
-                    LogUtil.LogInfo("UMConfigure", "UMConfigure");
-                    //穿山甲初始化
-                    //强烈建议在应用对应的Application#onCreate()方法中调用，避免出现content为null的异常
-                    TTAdSdk.init(context,
-                            new TTAdConfig.Builder()
-                                    .appId(Constants.PANGOLIN_APPID)
-                                    .useTextureView(true) //默认使用SurfaceView播放视频广告,当有SurfaceView冲突的场景，可以使用TextureView
-                                    .appName("一壶茶")
-                                    .titleBarTheme(TTAdConstant.TITLE_BAR_THEME_DARK)//落地页主题
-                                    .allowShowNotify(true) //是否允许sdk展示通知栏提示,若设置为false则会导致通知栏不显示下载进度
-                                    .debug(true) //测试阶段打开，可以通过日志排查问题，上线时去除该调用
-                                    .directDownloadNetworkType(TTAdConstant.NETWORK_STATE_WIFI) //允许直接下载的网络状态集合,没有设置的网络下点击下载apk会有二次确认弹窗，弹窗中会披露应用信息
-                                    .supportMultiProcess(false) //是否支持多进程，true支持
-                                    .asyncInit(true) //是否异步初始化sdk,设置为true可以减少SDK初始化耗时。3450版本开始废弃~~
-                                    //.httpStack(new MyOkStack3())//自定义网络库，demo中给出了okhttp3版本的样例，其余请自行开发或者咨询工作人员。
-                                    .build(), new TTAdSdk.InitCallback() {
-                                @Override
-                                public void success() {
-                                    LogUtil.LogError("TTAdSdk", "初始化成功");
-                                }
-
-                                @Override
-                                public void fail(int i, String s) {
-                                    LogUtil.LogError("TTAdSdk", "初始化失败:" + s);
-                                }
-                            });
-                }
-
-                //拼多多
-                JinbaoUtil.init(instance, new JinbaoUtil.IOnInitCallback() {
-                    @Override
-                    public void onInitEnd(boolean b) {
-                        LogUtil.LogInfo("JinbaoUtil", b + "");
-                    }
-                });
-
+        PlatformConfig.setWXFileProvider(Constants.FILE_PROVIDER);
+
+        AgreeToADealManager.addListener("", () -> {
+            if (MVUtils.getString(Constants.AGREE_TO_THE_PRIVACY).equals("1")) {
+                LogUtil.LogInfo("UMConfigure", "1111");
+                UMConfigure.init(instance, Constants.UM_KEY, getChannel(), UMConfigure.DEVICE_TYPE_PHONE, "");
+                UMConfigure.setLogEnabled(true);
+                LogUtil.LogInfo("UMConfigure", "UMConfigure");
             }
+
+            //拼多多
+            JinbaoUtil.init(instance, b -> LogUtil.LogInfo("JinbaoUtil", b + ""));
         });
         if (MVUtils.getString(Constants.AGREE_TO_THE_PRIVACY).equals("1")) {
             LogUtil.LogInfo("UMConfigure", "1111");
-            //友盟正式初始化
-            //appkey和channl必须保持和预初始化一致！！！
-            //
-            //deviceType：设备类型，UMConfigure.DEVICE_TYPE_PHONE为手机、UMConfigure.DEVICE_TYPE_BOX为盒子
-            //
-            //pushSecret：Push推送业务的secret
             UMConfigure.init(instance, Constants.UM_KEY, getChannel(), UMConfigure.DEVICE_TYPE_PHONE, "");
             UMConfigure.setLogEnabled(true);
             LogUtil.LogInfo("UMConfigure", "UMConfigure");
-            //穿山甲初始化
-            //强烈建议在应用对应的Application#onCreate()方法中调用，避免出现content为null的异常
-            TTAdSdk.init(context,
-                    new TTAdConfig.Builder()
-                            .appId(Constants.PANGOLIN_APPID)
-                            .useTextureView(true) //默认使用SurfaceView播放视频广告,当有SurfaceView冲突的场景，可以使用TextureView
-                            .appName("一壶茶")
-                            .titleBarTheme(TTAdConstant.TITLE_BAR_THEME_DARK)//落地页主题
-                            .allowShowNotify(true) //是否允许sdk展示通知栏提示,若设置为false则会导致通知栏不显示下载进度
-                            .debug(true) //测试阶段打开，可以通过日志排查问题，上线时去除该调用
-                            .directDownloadNetworkType(TTAdConstant.NETWORK_STATE_WIFI) //允许直接下载的网络状态集合,没有设置的网络下点击下载apk会有二次确认弹窗，弹窗中会披露应用信息
-                            .supportMultiProcess(false) //是否支持多进程，true支持
-                            .asyncInit(true) //是否异步初始化sdk,设置为true可以减少SDK初始化耗时。3450版本开始废弃~~
-                            //.httpStack(new MyOkStack3())//自定义网络库，demo中给出了okhttp3版本的样例，其余请自行开发或者咨询工作人员。
-                            .build(), new TTAdSdk.InitCallback() {
-                        @Override
-                        public void success() {
-                            LogUtil.LogError("TTAdSdk", "初始化成功");
-                        }
-
-                        @Override
-                        public void fail(int i, String s) {
-                            LogUtil.LogError("TTAdSdk", "初始化失败:" + s);
-                        }
-                    });
-
             //拼多多
             JinbaoUtil.init(instance, new JinbaoUtil.IOnInitCallback() {
                 @Override

app/src/main/java/com/yihucha/hbyhc/base/ActivityStack.java

@@ -12,9 +12,9 @@ import java.util.Stack;
  */
 public class ActivityStack {
 
-    private static Stack<Activity> mActivityStack = new Stack<Activity>();
+    private static final Stack<Activity> mActivityStack = new Stack<Activity>();
 
-    private static ActivityStack instance = new ActivityStack();
+    private static final ActivityStack instance = new ActivityStack();
 
     private ActivityStack() {
     }

app/src/main/java/com/yihucha/hbyhc/base/BaseActivity.java

@@ -2,6 +2,7 @@ package com.yihucha.hbyhc.base;
 
 import android.app.Activity;
 import android.app.Dialog;
+import android.content.Context;
 import android.content.pm.ActivityInfo;
 import android.os.Build;
 import android.os.Bundle;
@@ -40,6 +41,7 @@ public abstract class BaseActivity extends AppCompatActivity  {
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
         setStatusBar();
         this.context = this;
         // 加入stack
@@ -180,6 +182,15 @@ public abstract class BaseActivity extends AppCompatActivity  {
         return flag;
     }
 
+    public static int getStatusBarHeight(Context context) {
+        int result = 0;
+        int resourceId = context.getResources().getIdentifier("status_bar_height", "dimen", "android");
+        if (resourceId > 0) {
+            result = context.getResources().getDimensionPixelSize(resourceId);
+        }
+        return result;
+    }
+
     @Override
     protected void onDestroy() {
         super.onDestroy();

app/src/main/java/com/yihucha/hbyhc/base/BaseFragment.java

@@ -2,8 +2,6 @@ package com.yihucha.hbyhc.base;
 
 import androidx.fragment.app.Fragment;
 
-import com.yihucha.hbyhc.R;
-
 
 /**
  * 基类Fragment，普通Fragment继承即可。

app/src/main/java/com/yihucha/hbyhc/base/BaseViewModel.java

@@ -3,8 +3,6 @@ package com.yihucha.hbyhc.base;
 import androidx.lifecycle.MutableLiveData;
 import androidx.lifecycle.ViewModel;
 
-import com.yihucha.hbyhc.R;
-
 /**
  * @author qmzh
  * @date 2022/6/15

app/src/main/java/com/yihucha/hbyhc/base/H5TitleActivity.java

@@ -26,6 +26,8 @@ import com.github.lzyzsd.jsbridge.BridgeHandler;
 import com.github.lzyzsd.jsbridge.BridgeWebView;
 import com.github.lzyzsd.jsbridge.BridgeWebViewClient;
 import com.github.lzyzsd.jsbridge.CallBackFunction;
+import com.yihucha.hbyhc.wxapi.WeChatShareUtils;
+import com.tencent.mm.opensdk.modelmsg.SendMessageToWX;
 import com.yihucha.hbyhc.R;
 import com.yihucha.hbyhc.base.h5_bean.CopyTextBean;
 import com.yihucha.hbyhc.base.h5_bean.H5DCShareBean;
@@ -57,8 +59,6 @@ import com.yihucha.hbyhc.utils.PermissionUtils;
 import com.yihucha.hbyhc.utils.Tools;
 import com.yihucha.hbyhc.view.CustomDialog;
 import com.yihucha.hbyhc.view.ShowLoadingDialog;
-import com.yihucha.hbyhc.wxapi.WeChatShareUtils;
-import com.tencent.mm.opensdk.modelmsg.SendMessageToWX;
 
 import java.io.File;
 
@@ -109,6 +109,7 @@ public class H5TitleActivity extends TitleBaseActivity {
         });
 
         url = getIntent().getStringExtra(INTENT_URL);
+        System.out.println("weburl--->"+url);
         id = getIntent().getStringExtra(INTENT_ID);
         String title = getIntent().getStringExtra(INTENT_TITLE);
         //加载网络url
@@ -516,7 +517,7 @@ public class H5TitleActivity extends TitleBaseActivity {
     @Override
     public boolean onKeyDown(int keyCode, KeyEvent event) {
         //如果用户按的是返回键 并且WebView页面可以返回
-        if (keyCode == event.KEYCODE_BACK && wv.canGoBack()) {
+        if (keyCode == KeyEvent.KEYCODE_BACK && wv.canGoBack()) {
             //让WebView返回
             wv.goBack();
             return true;
@@ -558,7 +559,7 @@ public class H5TitleActivity extends TitleBaseActivity {
 
                 textIntent.setComponent(componentName);
                 textIntent.setType("image/*");
-                Uri uri = FileProvider.getUriForFile(context, "com.laolaixiang.bjtdba.fileprovider", file);
+                Uri uri = FileProvider.getUriForFile(context, Constants.FILE_PROVIDER, file);
                 textIntent.putExtra(Intent.EXTRA_STREAM, uri);
                 startActivity(Intent.createChooser(textIntent, "分享"));
 

app/src/main/java/com/yihucha/hbyhc/base/NewBaseFragment.kt

@@ -0,0 +1,44 @@
+package com.yihucha.hbyhc.base
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.Fragment
+import androidx.viewbinding.ViewBinding
+import java.lang.reflect.ParameterizedType
+
+/**
+ *  author : 86175
+ *  time   : 2024/12/25 14:16
+ *  com.yihucha.hbyhc.base
+ */
+abstract class NewBaseFragment<T:ViewBinding>:Fragment() {
+    lateinit var binding:T
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        var view:View? = null
+        val type = this.javaClass.genericSuperclass
+        if (type is ParameterizedType) {
+            try {
+                val clz = type.actualTypeArguments[0] as Class<T>
+                val method = clz.getDeclaredMethod("inflate", LayoutInflater::class.java)
+                binding = method.invoke(null,layoutInflater) as T
+                view = binding.root
+            }catch (e:Exception){
+                e.printStackTrace()
+            }
+        }
+        initView()
+        initListener()
+        initData()
+        return view
+    }
+
+    abstract fun initView()
+    abstract fun initListener()
+    abstract fun initData()
+}

app/src/main/java/com/yihucha/hbyhc/base/TitleBaseActivity.java

@@ -185,6 +185,12 @@ public abstract class TitleBaseActivity extends BaseActivity implements View.OnC
             mRightTv.setCompoundDrawablePadding(3);
         }
     }
+
+    protected void  showRightTv(String str){
+        mRightTv.setVisibility(View.VISIBLE);
+        mRightTv.setText(str);
+    }
+
     /**
      * 隐藏右上角按钮
      */

app/src/main/java/com/yihucha/hbyhc/base/ViewBindingChangeTitleColorTitleBaseActivity.java

@@ -232,7 +232,7 @@ public class ViewBindingChangeTitleColorTitleBaseActivity<T extends ViewBinding>
         } else {
             int firstVisiblePosition = listView.getFirstVisiblePosition();
             int top = c.getTop();
-            float scale = (float) (0 - top) / rootScrollHeight;
+            float scale = (float) (-top) / rootScrollHeight;
 //            LogUtil.i("scale","scale="+scale+"---rootScrollHeight="+rootScrollHeight+"---c.getHeight()="+c.getHeight()+"--top="+top);
             mCustomTitleBarView.setBgAlpha(scale);
 

app/src/main/java/com/yihucha/hbyhc/base/WebViewTitleBaseActivity.java

@@ -112,7 +112,7 @@ public class WebViewTitleBaseActivity extends TitleBaseActivity{
     @Override
     public boolean onKeyDown(int keyCode, KeyEvent event) {
         //如果用户按的是返回键 并且WebView页面可以返回
-        if (keyCode==event.KEYCODE_BACK&&wv.canGoBack()){
+        if (keyCode== KeyEvent.KEYCODE_BACK &&wv.canGoBack()){
             //让WebView返回
             wv.goBack();
             return true;

app/src/main/java/com/yihucha/hbyhc/base/adapter/FragmentBaseAdapter.java

@@ -12,7 +12,7 @@ import java.util.List;
  * note:
  */
 public class FragmentBaseAdapter extends FragmentPagerAdapter {
-    private List<Fragment> fragmentList;
+    private final List<Fragment> fragmentList;
     public FragmentBaseAdapter(FragmentManager fm, List<Fragment> fragments) {
         super(fm);
         this.fragmentList=fragments;

app/src/main/java/com/yihucha/hbyhc/config/BusinessConstants.java

@@ -8,7 +8,7 @@ public class BusinessConstants {
     /**
      * 正式，测试平台切换，只需修改这个开关
      */
-    public static  String HOST = HttpUrl.IS_RELEASE ? HttpUrl.BASE_URL_RELEASE : HttpUrl.BASE_URL_DEBUG;
+    public static String HOST = HttpUrl.IS_RELEASE ? HttpUrl.BASE_URL_RELEASE : HttpUrl.BASE_URL_DEBUG;
 //    public static  String HOST =  HttpUrl.BASE_URL_RELEASE;
 
     /**

app/src/main/java/com/yihucha/hbyhc/config/HttpUrl.java

@@ -5,13 +5,16 @@ package com.yihucha.hbyhc.config;
  */
 public class HttpUrl {
     // 生产还是测试
-    public static boolean IS_RELEASE = true;
+    public static boolean IS_RELEASE = false;
     //生成·
 //    public static String BASE_URL_RELEASE = "https://app.bjtdba.com/";
-    public static String BASE_URL_RELEASE = "https://api.hebeiyhc.com";
+    public static String BASE_URL_RELEASE = "https://api.hxxfb.com/";
+//    public static String BASE_URL_RELEASE = "https://api.hebeiyhc.com/";
+    public static String PYYX_BASE_URL_RELEASE = "https://openapi.dataoke.com/";
     //测试
 //    public static String BASE_URL_DEBUG="https://test.bjtdba.com/";
-    public static String BASE_URL_DEBUG="https://test.hebeiyhc.com";
+    public static String BASE_URL_DEBUG="https://testapi.hxxfb.com/";
+//    public static String BASE_URL_DEBUG="https://api.hxxfb.com/";
     //预生产
 //    public static String BASE_URL_DEBUG = "https://pre.bjtdba.com/";
     public static String CHANNEL_NAME = "友盟";

app/src/main/java/com/yihucha/hbyhc/db/UserDB.java

@@ -53,4 +53,15 @@ public class UserDB extends LitePalSupport {
     public void setTheFirstTime(Long theFirstTime) {
         this.theFirstTime = theFirstTime;
     }
+
+    @Override
+    public String toString() {
+        return "UserDB{" +
+                "userId='" + userId + '\'' +
+                ", advertisingMilliseconds=" + advertisingMilliseconds +
+                ", theFirstTime=" + theFirstTime +
+                ", isPush=" + isPush +
+                ", isActivity=" + isActivity +
+                '}';
+    }
 }

app/src/main/java/com/yihucha/hbyhc/manager/AgreeToADealManager.java

@@ -14,7 +14,7 @@ public class AgreeToADealManager {
     // 保存成功关闭弹框
     public static final String SUCCESSFUL = "successful";
 
-    private static Map<String, AgreeToADealListener> mAgreeToADealListener = new HashMap<>();
+    private static final Map<String, AgreeToADealListener> mAgreeToADealListener = new HashMap<>();
 
     /**
      * 添加listener
@@ -32,7 +32,7 @@ public class AgreeToADealManager {
      * @param key key
      */
     public static void removeListener(String key){
-        if (mAgreeToADealListener != null && mAgreeToADealListener.containsKey(key)) {
+        if (mAgreeToADealListener != null) {
             mAgreeToADealListener.remove(key);
         }
     }

app/src/main/java/com/yihucha/hbyhc/manager/H5NeedUpdateManager.java

@@ -14,7 +14,7 @@ public class H5NeedUpdateManager {
     // 保存成功关闭弹框
     public static final String H5_THE_DIALOG_BOX_IS_CLOSED = "the_dialog_box_is_closed";
 
-    private static Map<String, H5NeedUpdateListener> mH5NeedUpdateListenerList = new HashMap<>();
+    private static final Map<String, H5NeedUpdateListener> mH5NeedUpdateListenerList = new HashMap<>();
 
     /**
      * 添加listener
@@ -32,7 +32,7 @@ public class H5NeedUpdateManager {
      * @param key key
      */
     public static void removeListener(String key){
-        if (mH5NeedUpdateListenerList != null && mH5NeedUpdateListenerList.containsKey(key)) {
+        if (mH5NeedUpdateListenerList != null) {
             mH5NeedUpdateListenerList.remove(key);
         }
     }

app/src/main/java/com/yihucha/hbyhc/manager/OtherSearchUpdateManager.java

@@ -14,7 +14,7 @@ public class OtherSearchUpdateManager {
     // 保存成功关闭弹框
     public static final String H5_THE_DIALOG_BOX_IS_CLOSED = "the_dialog_box_is_closed";
 
-    private static Map<String, OtherSearchNeedUpdateListener> mOtherSearchNeedUpdateListener = new HashMap<>();
+    private static final Map<String, OtherSearchNeedUpdateListener> mOtherSearchNeedUpdateListener = new HashMap<>();
 
     /**
      * 添加listener
@@ -32,7 +32,7 @@ public class OtherSearchUpdateManager {
      * @param key key
      */
     public static void removeListener(String key){
-        if (mOtherSearchNeedUpdateListener != null && mOtherSearchNeedUpdateListener.containsKey(key)) {
+        if (mOtherSearchNeedUpdateListener != null) {
             mOtherSearchNeedUpdateListener.remove(key);
         }
     }

app/src/main/java/com/yihucha/hbyhc/network/JsonLoggingInterceptor.java

@@ -0,0 +1,49 @@
+package com.yihucha.hbyhc.network;
+
+/**
+ * author : 86175
+ * time   : 2025/3/22 23:18
+ * com.yihucha.hbyhc.network
+ */
+
+import org.greenrobot.eventbus.EventBus;
+
+import java.io.IOException;
+
+import okhttp3.Interceptor;
+import okhttp3.MediaType;
+import okhttp3.Request;
+import okhttp3.Response;
+import okhttp3.ResponseBody;
+
+public class JsonLoggingInterceptor implements Interceptor {
+    @Override
+    public Response intercept(Chain chain) throws IOException {
+        Request request = chain.request();
+
+        // 打印请求信息（可选）
+        System.out.println("Request URL: " + request.url());
+        System.out.println("Request Method: " + request.method());
+
+        // 继续处理请求
+        Response response = chain.proceed(request);
+
+        // 获取响应的 Content-Type
+        MediaType contentType = response.body().contentType();
+        if (contentType != null && contentType.toString().contains("json")) {
+            // 获取响应体的字节内容，注意：response.body().string() 只能调用一次
+            String responseBody = response.body().string();
+            // 打印响应的 JSON 字符串
+//            System.out.println("Response JSON: " + responseBody);
+            if (responseBody.contains("\"status\":40000")) {
+                EventBus.getDefault().post("logout");
+            }
+            // 重新构建响应体，以便后续处理可以继续使用响应体
+            response = response.newBuilder()
+                    .body(ResponseBody.create(contentType, responseBody))
+                    .build();
+        }
+
+        return response;
+    }
+}

app/src/main/java/com/yihucha/hbyhc/network/NetworkApi.java

@@ -5,6 +5,9 @@ import com.yihucha.hbyhc.network.errorhandler.ExceptionHandle;
 import com.yihucha.hbyhc.network.errorhandler.HttpErrorHandler;
 import com.yihucha.hbyhc.network.interceptor.RequestInterceptor;
 import com.yihucha.hbyhc.network.interceptor.ResponseInterceptor;
+import com.yihucha.hbyhc.utils.EmptyCheckUtils;
+
+import org.jetbrains.annotations.NotNull;
 
 import java.util.HashMap;
 import java.util.concurrent.TimeUnit;
@@ -12,6 +15,7 @@ import java.util.concurrent.TimeUnit;
 import io.reactivex.Observable;
 import io.reactivex.ObservableTransformer;
 import io.reactivex.Observer;
+import io.reactivex.SingleTransformer;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.functions.Function;
 import io.reactivex.schedulers.Schedulers;
@@ -23,6 +27,7 @@ import retrofit2.converter.gson.GsonConverterFactory;
 
 /**
  * 网络Api
+ *
  * @author qmzh
  * @description NetworkApi
  */
@@ -56,6 +61,13 @@ public class NetworkApi {
     }
 
     /**
+     * 创建serviceClass实例，携带BaseUrl
+     */
+    public static <T> T createServiceWithBaseUrl(@NotNull String baseUrl, Class<T> serviceClass) {
+        return getRetrofit(baseUrl, serviceClass).create(serviceClass);
+    }
+
+    /**
      * 配置OkHttp
      *
      * @return OkHttpClient
@@ -73,6 +85,7 @@ public class NetworkApi {
             builder.addInterceptor(new RequestInterceptor(iNetworkRequiredInfo));
             //添加返回拦截器，可用于查看接口的请求耗时，对于网络优化有帮助
             builder.addInterceptor(new ResponseInterceptor());
+            builder.addInterceptor(new JsonLoggingInterceptor());
             //当程序在debug过程中则打印数据日志，方便调试用。
             if (iNetworkRequiredInfo != null && iNetworkRequiredInfo.isDebug()) {
                 //iNetworkRequiredInfo不为空且处于debug状态下则初始化日志拦截器
@@ -94,16 +107,26 @@ public class NetworkApi {
      * @param serviceClass 服务类
      * @return Retrofit
      */
-    private static Retrofit getRetrofit(Class serviceClass) {
-        if (retrofitHashMap.get(BusinessConstants.getServerUrl() + serviceClass.getName()) != null) {
+    private static Retrofit getRetrofit(Class serviceClass){
+        return getRetrofit(null,serviceClass);
+    }
+    private static Retrofit getRetrofit(String baseUrl, Class serviceClass) {
+        String url;
+        if (EmptyCheckUtils.isEmpty(baseUrl)){
+            url = BusinessConstants.getServerUrl();
+        }else {
+            url = baseUrl;
+        }
+        if (retrofitHashMap.get(url + serviceClass.getName()) != null) {
             //刚才上面定义的Map中键是String，值是Retrofit，当键不为空时，必然有值，有值则直接返回。
-            return retrofitHashMap.get(BusinessConstants.getServerUrl() + serviceClass.getName());
+            return retrofitHashMap.get(url + serviceClass.getName());
         }
         //初始化Retrofit  Retrofit是对OKHttp的封装，通常是对网络请求做处理，也可以处理返回数据。
         //Retrofit构建器
         Retrofit.Builder builder = new Retrofit.Builder();
         //设置访问地址
-        builder.baseUrl(BusinessConstants.getServerUrl());
+        builder.baseUrl(url);
+        System.out.println(url);
         //设置OkHttp客户端，传入上面写好的方法即可获得配置后的OkHttp客户端。
         builder.client(getOkHttpClient());
         //设置数据解析器 会自动把请求返回的结果（json字符串）通过Gson转化工厂自动转化成与其结构相符的实体Bean
@@ -113,7 +136,7 @@ public class NetworkApi {
         //retrofit配置完成
         Retrofit retrofit = builder.build();
         //放入Map中
-        retrofitHashMap.put(BusinessConstants.getServerUrl() + serviceClass.getName(), retrofit);
+        retrofitHashMap.put(url + serviceClass.getName(), retrofit);
         //最后返回即可
         return retrofit;
     }
@@ -154,4 +177,11 @@ public class NetworkApi {
             return response;
         };
     }
+
+    public static <T> ObservableTransformer<T, T> applyObservableSchedulers() {
+        return upstream -> upstream
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread());
+    }
+
 }

app/src/main/java/com/yihucha/hbyhc/network/interceptor/RequestInterceptor.java

@@ -1,10 +1,10 @@
 package com.yihucha.hbyhc.network.interceptor;
 
+import com.yihucha.hbyhc.config.Constants;
 import com.yihucha.hbyhc.network.INetworkRequiredInfo;
 import com.yihucha.hbyhc.utils.Base64Converter;
-import com.yihucha.hbyhc.utils.DateUtil;
-import com.yihucha.hbyhc.config.Constants;
 import com.yihucha.hbyhc.utils.DESUtil;
+import com.yihucha.hbyhc.utils.DateUtil;
 import com.yihucha.hbyhc.utils.LogUtil;
 import com.yihucha.hbyhc.utils.MVUtils;
 
@@ -23,7 +23,7 @@ public class RequestInterceptor implements Interceptor {
     /**
      * 网络请求信息
      */
-    private INetworkRequiredInfo iNetworkRequiredInfo;
+    private final INetworkRequiredInfo iNetworkRequiredInfo;
 
     public RequestInterceptor(INetworkRequiredInfo iNetworkRequiredInfo) {
         this.iNetworkRequiredInfo = iNetworkRequiredInfo;
@@ -43,8 +43,8 @@ public class RequestInterceptor implements Interceptor {
         builder.addHeader("appVersionCode", this.iNetworkRequiredInfo.getAppVersionCode());
         //添加版本名
         builder.addHeader("appVersionName", this.iNetworkRequiredInfo.getAppVersionName());
-        builder.addHeader("merId", "496");
-        builder.addHeader("source", "yhc");
+//        builder.addHeader("merId", "496");
+//        builder.addHeader("source", "yhc");
         //添加日期时间
         builder.addHeader("datetime", nowDateTime);
         if (!"".equals(MVUtils.getString(Constants.TOKEN))) {

app/src/main/java/com/yihucha/hbyhc/network/interceptor/ResponseInterceptor.java

@@ -24,10 +24,6 @@ public class ResponseInterceptor implements Interceptor {
         long requestTime = System.currentTimeMillis();
         Response response = chain.proceed(chain.request());
         KLog.i(TAG, "requestSpendTime=" + (System.currentTimeMillis() - requestTime) + "ms");
-        /*if (chain.request().url().toString().contains("order/check")) {
-            String string = response.body().string();
-
-        }*/
         return response;
     }
 }

app/src/main/java/com/yihucha/hbyhc/network/request_bean/CartIdRequest.java

@@ -11,6 +11,7 @@ import java.util.List;
 public class CartIdRequest {
     private List<String> cart_id;//购物车id，数组
     private String address_id;//地址
+    private int is_commercetrade=0;
 
     public String getAddress_id() {
         return address_id == null ? "" : address_id;
@@ -30,4 +31,12 @@ public class CartIdRequest {
     public void setCart_id(List<String> cart_id) {
         this.cart_id = cart_id;
     }
+
+    public int getIs_commercetrade() {
+        return is_commercetrade;
+    }
+
+    public void setIs_commercetrade(int is_commercetrade) {
+        this.is_commercetrade = is_commercetrade;
+    }
 }

app/src/main/java/com/yihucha/hbyhc/network/request_bean/CreateOrderRequest.java

@@ -12,12 +12,39 @@ import java.util.Map;
 public class CreateOrderRequest {
     private String address_id;//地址id
     private String distribution_mode;//配送方式:  1: 快递, 2: 自提
-    private List<String> cart_id;//购物车id
+    private String cart_id;//购物车id
     private Map<String, Object> mark;//备注
     private String dacang_id;//大仓id
     private String pay_type;//支付方式：0: 余额;1: 微信;2: 小程序;4: 支付宝;5: 特殊商户积分 6：红积分支付
     private String mer_id;//商户id
     private String phone;//开通账号
+    private String decScore;//消耗积分值
+    private String decJingScore;//小号京豆
+    private String fzone_paytype;
+
+    public String getFzone_paytype() {
+        return fzone_paytype;
+    }
+
+    public void setFzone_paytype(String fzone_paytype) {
+        this.fzone_paytype = fzone_paytype;
+    }
+
+    public String getDecScore() {
+        return decScore;
+    }
+
+    public void setDecScore(String decScore) {
+        this.decScore = decScore;
+    }
+
+    public String getDecJingScore() {
+        return decJingScore;
+    }
+
+    public void setDecJingScore(String decJingScore) {
+        this.decJingScore = decJingScore;
+    }
 
     public String getPhone() {
         return phone;
@@ -67,14 +94,14 @@ public class CreateOrderRequest {
         this.distribution_mode = distribution_mode;
     }
 
-    public List<String> getCart_id() {
+    public String getCart_id() {
         if (cart_id == null) {
-            return new ArrayList<>();
+            return "";
         }
         return cart_id;
     }
 
-    public void setCart_id(List<String> cart_id) {
+    public void setCart_id(String cart_id) {
         this.cart_id = cart_id;
     }
 

app/src/main/java/com/yihucha/hbyhc/network/request_bean/TaobaoGoodsListRequest.java

@@ -9,6 +9,15 @@ public class TaobaoGoodsListRequest {
     private String pageNum;
     private String pageSize;
     private String title;
+    private Integer cid = null;
+
+    public int getCid() {
+        return cid;
+    }
+
+    public void setCid(int cid) {
+        this.cid = cid;
+    }
 
     public String getPageNum() {
         return pageNum == null ? "" : pageNum;

app/src/main/java/com/yihucha/hbyhc/network/service/ApiService.java

@@ -34,7 +34,6 @@ import retrofit2.http.POST;
 import retrofit2.http.Part;
 import retrofit2.http.Path;
 import retrofit2.http.QueryMap;
-import retrofit2.http.Url;
 
 public interface ApiService {
 

app/src/main/java/com/yihucha/hbyhc/network/service/AuthService.java

@@ -35,6 +35,17 @@ public interface AuthService {
     Observable<DataResponse<LoginModel>> smslogin(@QueryMap Map<String, Object> request);
 
     /**
+     * 手机号+验证码 修改密码
+     * @param request
+     * @return
+     */
+    @POST("api/auth/reset")
+    Observable<DataResponse<Object>> updatePwd(@QueryMap Map<String, Object> request);
+
+    @POST("api/user/update/user")
+    Observable<DataResponse<Integer>> updatePhone(@QueryMap Map<String, Object> request);
+
+    /**
      * 手机号+密码登录
      * @param request
      * @return
@@ -103,6 +114,13 @@ public interface AuthService {
      */
     @POST("api/auth/query_uid")
     Observable<DataResponse<UidAndPhoneBean>> getUidByPhone(@Query("phone")String phone);
+
+    @POST("api/user/update/user")
+    Observable<DataResponse<Integer>>  updateUserPhone(@QueryMap Map<String, Object> request);
+
+    @POST("api/user/unbindAccount")
+    Observable<DataResponse>  unbindAccount(@QueryMap Map<String, Object> request);
+
 }
 
 

app/src/main/java/com/yihucha/hbyhc/network/service/BigWarehouseServicr.java

@@ -12,6 +12,7 @@ import com.yihucha.hbyhc.presentation.big_storehouse.model.DcSeckillBean;
 import com.yihucha.hbyhc.presentation.big_storehouse.model.RecommendListBean;
 import com.yihucha.hbyhc.presentation.home.model.BannerDataBean;
 import com.yihucha.hbyhc.presentation.home.model.DingShengDataBean;
+import com.yihucha.hbyhc.presentation.pyyx.bean.JDLinkBean;
 
 import java.util.List;
 import java.util.Map;
@@ -59,6 +60,12 @@ public interface BigWarehouseServicr {
     Observable<DataResponse<List<DcProductBean>>> dacangproductlst(@QueryMap Map<String, Object> request);
 
     /**
+     * 大仓商品列表
+     */
+    @GET("api/jd/chang_link")
+    Observable<DataResponse<JDLinkBean>> getJDLink(@QueryMap Map<String, Object> request);
+
+    /**
      * 秒杀商品
      */
     @GET("api/dacang/nologin/seckill")

app/src/main/java/com/yihucha/hbyhc/network/service/OrderService.java

@@ -17,7 +17,6 @@ import com.yihucha.hbyhc.presentation.order.model.MailCommonBean;
 import com.yihucha.hbyhc.presentation.order.model.OrderCheckBean;
 import com.yihucha.hbyhc.presentation.order.model.OrderCreateBean;
 import com.yihucha.hbyhc.presentation.order.model.OrderCreateShoppingBean;
-import com.yihucha.hbyhc.presentation.order.model.OrderDetailBean;
 import com.yihucha.hbyhc.presentation.order.model.OrderListBean;
 import com.yihucha.hbyhc.presentation.order.model.OrderListObligationBean;
 import com.yihucha.hbyhc.presentation.order.model.RefundApplyBean;
@@ -222,7 +221,7 @@ public interface OrderService {
      * @param
      * @return
      */
-    @GET("api/user/third_order")
+    @GET("api/user/third_order_bill")
     Observable<DataResponse<ThirdOrderBean>> getThirdOrder(@QueryMap Map<String, Object> request);
 
     /**

app/src/main/java/com/yihucha/hbyhc/network/service/ProductService.java

@@ -5,6 +5,7 @@ import com.yihucha.hbyhc.network.DataResponse;
 import com.yihucha.hbyhc.network.request_bean.IdRequest;
 import com.yihucha.hbyhc.network.request_bean.TaobaoGoodsListRequest;
 import com.yihucha.hbyhc.network.request_bean.TaobaoLinkRequest;
+import com.yihucha.hbyhc.presentation.home.model.DingShengDataBean;
 import com.yihucha.hbyhc.presentation.home.model.HomeProductBean;
 import com.yihucha.hbyhc.presentation.home.model.HomeProductListBean;
 import com.yihucha.hbyhc.presentation.home.model.ProductListBean;
@@ -28,6 +29,9 @@ import com.yihucha.hbyhc.presentation.product.model.TaobaoProductDetailsBean;
 import com.yihucha.hbyhc.presentation.product.model.TaobaoProductListBean;
 import com.yihucha.hbyhc.presentation.product.model.VipProductDetailsBean;
 import com.yihucha.hbyhc.presentation.product.model.VipProductListBean;
+import com.yihucha.hbyhc.presentation.pyyx.bean.ClassesTypeBean;
+import com.yihucha.hbyhc.presentation.pyyx.bean.HotMovieBean;
+import com.yihucha.hbyhc.presentation.pyyx.bean.NearbyMovieBean;
 
 import java.util.List;
 import java.util.Map;
@@ -54,6 +58,7 @@ public interface ProductService {
 
     /**
      * 一壶茶首页商品列表、搜索接口
+     *
      * @param request
      * @return
      */
@@ -105,6 +110,12 @@ public interface ProductService {
     Observable<DataJavaResponse<SearchGoodsListBean>> searchGoodsList(@QueryMap Map<String, Object> request);
 
     /**
+     * 商贸区获取三个商品
+     */
+    @GET("api/store/merchant/product/type_lst")
+    Observable<DataJavaResponse<DingShengDataBean>> getMerGoodsList(@QueryMap Map<String, Object> request);
+
+    /**
      * 京东商品详情
      *
      * @param
@@ -184,6 +195,7 @@ public interface ProductService {
      */
     @GET("api/su/detail/{id}")
     Observable<DataResponse<SuningProductDetailsBean>> getSuningProductDetail(@Path("id") String id);
+
     /**
      * 淘宝商品列表
      *
@@ -193,6 +205,9 @@ public interface ProductService {
     @POST("gateway/thirdPartyWares_service/taobao_service/selectTaobaoWaresList")
     Observable<DataResponse<TaobaoProductListBean>> getTaobaoProductList(@Body TaobaoGoodsListRequest request);
 
+    @GET("api/get_third_category")
+    Observable<DataResponse<List<ClassesTypeBean>>> getClassesType(@QueryMap Map<String, Object> map);
+
     /**
      * 淘宝商品详情
      *
@@ -201,11 +216,19 @@ public interface ProductService {
      */
     @POST("gateway/thirdPartyWares_service/taobao_service/taobaoWaresDetail")
     Observable<DataResponse<TaobaoProductDetailsBean>> getTaobaoProductDetail(@Body IdRequest request);
+
     /**
      * 淘宝跳转
      */
     @POST("gateway/thirdPartyWares_service/taobao_service/dtkchangeLink")
     Observable<DataResponse<TaobaoLinkBean>> getDtkchangeLink(@Body TaobaoLinkRequest request);
+
+    /**
+     * 淘宝跳转
+     */
+    @GET("taobao_service/taobaoService/dtkchangeLinkGet")
+    Observable<DataResponse<TaobaoLinkBean>> getDtkchangeLink2(@QueryMap Map<String,Object> map);
+
     /**
      * 拼多多商品列表
      *
@@ -270,6 +293,7 @@ public interface ProductService {
      */
     @GET("api/dy/live_product_share")
     Observable<DataResponse<DouyinLiveProductShareBean>> getLiveProductShare(@QueryMap Map<String, Object> request);
+
     /**
      * 拼多多商品列表搜索
      *
@@ -288,4 +312,15 @@ public interface ProductService {
     @GET("api/dy/get_detail")
     Observable<DataResponse<DouyinProductDetailsBean>> getDouyinProductDetail(@QueryMap Map<String, Object> request);
 
+    /**
+     * 获取热映、即将上映电影
+     */
+    @GET("/api/movie/film")
+    Observable<DataResponse<HotMovieBean>> getHotMoveBean(@QueryMap Map<String, Object> request);
+
+    /**
+     * 获取影院信息
+     */
+    @GET("/api/movie/cinema")
+    Observable<DataResponse<NearbyMovieBean>> getNearbyMovieBean(@QueryMap Map<String, Object> request);
 }

app/src/main/java/com/yihucha/hbyhc/network/service/PyyxService.java

@@ -0,0 +1,72 @@
+package com.yihucha.hbyhc.network.service;
+
+import com.yihucha.hbyhc.network.DataResponse;
+import com.yihucha.hbyhc.presentation.pyyx.bean.GoodsBean;
+import com.yihucha.hbyhc.presentation.pyyx.bean.GoodsResponseBean;
+import com.yihucha.hbyhc.presentation.pyyx.bean.PddClassesBean;
+import com.yihucha.hbyhc.presentation.pyyx.bean.RechargeItemBean;
+import com.yihucha.hbyhc.presentation.pyyx.bean.RechargeOrderBean;
+import com.yihucha.hbyhc.presentation.pyyx.bean.RechargeRecordCountBean;
+import com.yihucha.hbyhc.presentation.pyyx.bean.ResponseCountBean;
+import com.yihucha.hbyhc.presentation.pyyx.bean.SXYClassesBean;
+import com.yihucha.hbyhc.presentation.pyyx.bean.SXYDetailBean;
+import com.yihucha.hbyhc.presentation.pyyx.bean.SXYListBean;
+import com.yihucha.hbyhc.presentation.pyyx.bean.TokenListBean;
+import com.yihucha.hbyhc.presentation.pyyx.bean.TransitionVCountBean;
+import com.yihucha.hbyhc.presentation.pyyx.bean.VrNameBean;
+
+import java.util.List;
+import java.util.Map;
+
+import io.reactivex.Observable;
+import retrofit2.http.GET;
+import retrofit2.http.POST;
+import retrofit2.http.QueryMap;
+
+/**
+ * author : 86175
+ * time   : 2025/1/3 10:52
+ * com.yihucha.hbyhc.network.service
+ */
+public interface PyyxService {
+    @GET("api/goods/nine/op-goods-list")
+    Observable<GoodsResponseBean<GoodsBean>> getHomeGoods(@QueryMap Map<String, String> map);
+
+    @POST("api/tokenList")
+    Observable<TokenListBean> requestTokenList();
+
+    @GET("api/pdd/cat")
+    Observable<DataResponse<PddClassesBean>> requestPddCat(@QueryMap Map<String, Object> map);
+
+    @POST("api/huafei/denomination")
+    Observable<DataResponse<List<RechargeItemBean>>> requestRechargeItems();
+
+
+    @POST("api/huafei/recharge")
+    Observable<DataResponse<RechargeOrderBean>> recharge(@QueryMap Map<String,Object> map);
+
+    @POST("api/huafei/record")
+    Observable<DataResponse<RechargeRecordCountBean>> rechargeRecord(@QueryMap Map<String,Object> map);
+
+    //佣金转VR
+    @POST("api/user/transition_vr")
+    Observable<DataResponse<Object>> yongjinToVR(@QueryMap Map<String,Object> map);
+
+    @GET("api/user/transition_vr_log")
+    Observable<DataResponse<TransitionVCountBean>> yongjinToVRecord(@QueryMap Map<String,Object> map);
+
+    @GET("api/user/vr_name")
+    Observable<DataResponse<VrNameBean>> getVRName(@QueryMap Map<String,Object> map);
+
+    @POST("api/business_school/classify_list") //商学院分类
+    Observable<DataResponse<List<SXYClassesBean>>> sxyClasses();
+
+    @POST("api/business_school/list") //商学院列表
+    Observable<DataResponse<ResponseCountBean<SXYListBean>>> sxyList(@QueryMap Map<String,Object> map);
+
+    @POST("api/business_school/detail") //商学院详情
+    Observable<DataResponse<SXYDetailBean>> sxyDetail(@QueryMap Map<String,Object> map);
+
+
+
+}

app/src/main/java/com/yihucha/hbyhc/network/service/StoreService.java

@@ -4,6 +4,7 @@ import com.yihucha.hbyhc.network.DataJavaResponse;
 import com.yihucha.hbyhc.network.DataResponse;
 import com.yihucha.hbyhc.presentation.home.model.SearchStoreBean;
 import com.yihucha.hbyhc.presentation.nearby.model.ClassifyBean;
+import com.yihucha.hbyhc.presentation.pyyx.bean.SMQPageBean;
 import com.yihucha.hbyhc.presentation.shop.model.ShopClassifyBean;
 import com.yihucha.hbyhc.presentation.shop.model.ShopInfoBean;
 import com.yihucha.hbyhc.presentation.shop.model.VipAreaBean;
@@ -12,7 +13,6 @@ import java.util.List;
 import java.util.Map;
 
 import io.reactivex.Observable;
-import retrofit2.Call;
 import retrofit2.http.GET;
 import retrofit2.http.Path;
 import retrofit2.http.Query;
@@ -63,6 +63,12 @@ public interface StoreService {
     @GET("gateway/wares_service/waresServiceMerchant/selectMerchantSort")
     Observable<DataJavaResponse<ClassifyBean>> getClassify();
 
+    /**
+     * 商贸区页面
+     */
+    @GET("/api/store/merchant/product/commerce_list")
+    Observable<DataJavaResponse<SMQPageBean>> getSmqPageBean(@QueryMap Map<String, Object> request);
+
 
     /**
      * 店铺信息

app/src/main/java/com/yihucha/hbyhc/network/service/UserService.java

@@ -55,6 +55,7 @@ import com.yihucha.hbyhc.presentation.mine.model.UserInfoModel;
 import com.yihucha.hbyhc.presentation.mine.model.UserVipInfoBean;
 import com.yihucha.hbyhc.presentation.mine.model.YanglaojinBean;
 import com.yihucha.hbyhc.presentation.mine.view_model.MineSpreadInfo;
+import com.yihucha.hbyhc.presentation.pyyx.bean.YongjinBean;
 import com.yihucha.hbyhc.presentation.shopping.model.CollectBean;
 import com.yihucha.hbyhc.presentation.shopping.model.ShoppingBean;
 
@@ -88,6 +89,16 @@ public interface UserService {
     @GET("/api/user/spread_info_yhc")
     Observable<DataResponse<MineSpreadInfo>> getSpreadInfoYhc();
 
+    @GET("api/user/get_brokerage_info")
+    Observable<DataResponse<YongjinBean>> getYongjin();
+
+
+    @GET("/api/user/gongxian_info")
+    Observable<DataResponse<MineSpreadInfo>> getGongxianInfo();
+
+    @GET("/api/user/{path}")
+    Observable<DataResponse<MineSpreadInfo>> getInfo(@Path("path") String path);
+
     /**
      * 团队列表
      */
@@ -376,6 +387,7 @@ public interface UserService {
 
     /**
      * 收益详情页
+     *
      * @param request
      * @return
      */
@@ -560,13 +572,19 @@ public interface UserService {
     Observable<DataResponse> cancleCollect(@Body CancleCollectBean body);
 
     @GET("api/user/green_integral_list")
-    Observable<DataResponse<List<RedIntegralListBean>>> getRedIntegralBean(@QueryMap Map<String,Object> map);
+    Observable<DataResponse<List<RedIntegralListBean>>> getRedIntegralBean(@QueryMap Map<String, Object> map);
+
+    @GET("api/user/gongxian_list")
+    Observable<DataResponse<List<RedIntegralListBean>>> getGongxianList(@QueryMap Map<String, Object> map);
+
+    @GET("api/user/{path}")
+    Observable<DataResponse<List<RedIntegralListBean>>> getInfoList(@Path("path") String path, @QueryMap Map<String, Object> map);
 
     @GET("api/bank/list")
     Observable<DataJavaResponse<List<BankCardBean>>> getBankCardList();
 
     @POST("/api/bank/create")
-    Observable<DataJavaResponse<String>> addBankCard(@QueryMap Map<String,Object> map);
+    Observable<DataJavaResponse<String>> addBankCard(@QueryMap Map<String, Object> map);
 
 
 //    /**

app/src/main/java/com/yihucha/hbyhc/network/utils/SignMD5Util.java

@@ -0,0 +1,103 @@
+package com.yihucha.hbyhc.network.utils;
+
+import java.security.MessageDigest;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeMap;
+
+/**
+ * @Title: SignMD5Util
+ * @Description: 签名相关工具类
+ * @Version V1.0
+ */
+public class SignMD5Util {
+
+    /**
+     * 获取签名的util
+     * @param map 请求参数
+     * @param secretKey 密钥
+     * @return
+     */
+    public static String getSignStr(Map<String,String> map, String secretKey){
+
+        if (map.size() == 0 ){
+            return "";
+        }
+
+        StringBuffer sb = new StringBuffer("");
+
+        Set<String> keySet = map.keySet();
+        Iterator<String> iter = keySet.iterator();
+        while (iter.hasNext()) {
+            String key = iter.next();
+            sb.append("&"+ key + "=" + map.get(key));
+        }
+        sb.deleteCharAt(0);
+        return sign(sb.toString(), secretKey);
+    }
+
+    /**
+     * 获取签名的util
+     * @param map 请求参数
+     * @param secretKey 密钥
+     * @return
+     */
+    public static String getSignStrNew(TreeMap<String,String> map, String secretKey){
+
+        if (map.size() == 0 ){
+            return "";
+        }
+        StringBuilder sb = new StringBuilder();
+        sb.append("appKey=");
+        sb.append(map.get("appKey"));
+        sb.append("&timer=");
+        sb.append(map.get("timer"));
+        sb.append("&nonce=");
+        sb.append(map.get("nonce"));
+        System.out.println(sb.toString());
+        return sign(sb.toString(), secretKey);
+    }
+
+    public static String sign(String content, String key)
+    {
+        String signStr = "";
+        signStr = content + "&key=" + key;
+        //MD5加密后，字符串所有字符转换为大写
+        return MD5(signStr).toUpperCase();
+    }
+
+    /**
+     *
+     * MD5加密算法
+     *
+     * @param s
+     * @return
+     * @see [类、类#方法、类#成员]
+     */
+    public final static String MD5(String s) {
+        char hexDigits[] = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'};
+        try {
+            byte[] btInput = s.getBytes("utf-8");
+            MessageDigest mdInst = MessageDigest.getInstance("MD5");
+            mdInst.update(btInput);
+            byte[] md = mdInst.digest();
+            int j = md.length;
+            char str[] = new char[j * 2];
+            int k = 0;
+            for (int i = 0; i < j; i++)
+            {
+                byte byte0 = md[i];
+                str[k++] = hexDigits[byte0 >>> 4 & 0xf];
+                str[k++] = hexDigits[byte0 & 0xf];
+            }
+            return new String(str).toLowerCase();
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+
+
+}
+

app/src/main/java/com/yihucha/hbyhc/presentation/MainActivity.java

@@ -39,6 +39,7 @@ import com.yihucha.hbyhc.presentation.mine.model.CheckUpdatesBean;
 import com.yihucha.hbyhc.presentation.mine.model.SignInBean;
 import com.yihucha.hbyhc.presentation.mine.model.SignInInfoBean;
 import com.yihucha.hbyhc.presentation.nearby.NearbyFragment;
+import com.yihucha.hbyhc.presentation.pyyx.PyyxMainActivity;
 import com.yihucha.hbyhc.presentation.shopping.ShoppingFragment;
 import com.yihucha.hbyhc.utils.DateUtil;
 import com.yihucha.hbyhc.utils.LocationUtils;
@@ -132,8 +133,8 @@ public class MainActivity extends BaseActivity implements View.OnClickListener {
         //判断隐私协议
         String str = MVUtils.getString(Constants.AGREE_TO_THE_PRIVACY);
         if (TextUtils.isEmpty(str) || str.equals("0")) {
-            LogUtil.LogInfo("AGREE_TO_THE_PRIVACY2", str + "");
-            mDialog.getInstace().message("").sure("同意").cancle("暂不使用")
+            LogUtil.LogInfo("AGREE_TO_THE_PRIVACY2", str);
+            PrivateDialog.getInstace().message("").sure("同意").cancle("暂不使用")
                     .setOnTipItemClickListener(new PrivateDialog.OnTipItemClickListener() {
                         @Override
                         public void cancleClick() {
@@ -145,11 +146,11 @@ public class MainActivity extends BaseActivity implements View.OnClickListener {
                         @Override
                         public void sureClick() {
                             //同意
-                            mDialog.getInstace().dismiss();
+                            PrivateDialog.getInstace().dismiss();
                             MVUtils.put(Constants.AGREE_TO_THE_PRIVACY, "1");
                             AgreeToADealManager.agreeToADealUpdate();
                             //建议在测试阶段建议设置成true，发布时设置为false。
-                            CrashReport.initCrashReport(getApplicationContext(), Constants.BUGLY_APPID, HttpUrl.IS_RELEASE ? false : true);
+                            CrashReport.initCrashReport(getApplicationContext(), Constants.BUGLY_APPID, !HttpUrl.IS_RELEASE);
                             upgrade();
                         }
 
@@ -176,7 +177,7 @@ public class MainActivity extends BaseActivity implements View.OnClickListener {
                     }).create(this);
         } else {
             //建议在测试阶段建议设置成true，发布时设置为false。
-            CrashReport.initCrashReport(getApplicationContext(), Constants.BUGLY_APPID, HttpUrl.IS_RELEASE ? false : true);
+            CrashReport.initCrashReport(getApplicationContext(), Constants.BUGLY_APPID, !HttpUrl.IS_RELEASE);
             upgrade();
         }
     }
@@ -248,7 +249,7 @@ public class MainActivity extends BaseActivity implements View.OnClickListener {
     }
 
     long startTime = 0;
-    private MutableLiveData<Integer> process = new MutableLiveData<>();
+    private final MutableLiveData<Integer> process = new MutableLiveData<>();
     boolean isForceUpgrade = false;
     private void upgrade() {
         mMainActivityViewModel.getCheckupdates(context);
@@ -462,7 +463,7 @@ public class MainActivity extends BaseActivity implements View.OnClickListener {
     /**
      * 保存MyTouchListener接口的列表
      */
-    private ArrayList<MyTouchListener> myTouchListeners = new ArrayList<>();
+    private final ArrayList<MyTouchListener> myTouchListeners = new ArrayList<>();
 
     /**
      * 提供给Fragment通过getActivity()方法来注册自己的触摸事件的方法
@@ -618,7 +619,7 @@ public class MainActivity extends BaseActivity implements View.OnClickListener {
     @Override
     protected void onDestroy() {
         if (mDialog != null) {
-            mDialog.getInstace().dismiss();
+            PrivateDialog.getInstace().dismiss();
         }
         super.onDestroy();
     }
@@ -640,18 +641,18 @@ public class MainActivity extends BaseActivity implements View.OnClickListener {
     }
 
     public static void launch(Context context) {
-        Intent intent = new Intent(context, MainActivity.class);
+        Intent intent = new Intent(context, PyyxMainActivity.class);
         context.startActivity(intent);
     }
 
     public static void launch(Context context, String type) {
-        Intent intent = new Intent(context, MainActivity.class);
+        Intent intent = new Intent(context, PyyxMainActivity.class);
         intent.putExtra(INTENT_TYPE, type);
         context.startActivity(intent);
     }
 
     public static void launch(Context context, String type, String store_category_id) {
-        Intent intent = new Intent(context, MainActivity.class);
+        Intent intent = new Intent(context, PyyxMainActivity.class);
         intent.putExtra(INTENT_TYPE, type);
         intent.putExtra(INTENT_STORE_CATEGORY_ID, store_category_id);
         context.startActivity(intent);

app/src/main/java/com/yihucha/hbyhc/presentation/MainActivityViewModel.java

@@ -38,7 +38,7 @@ public class MainActivityViewModel extends BaseViewModel {
         UserRepository.getCheckupdates(map, new NormalListener<CheckUpdatesBean>() {
             @Override
             public void success(CheckUpdatesBean checkUpdatesBean) {
-//                mCheckUpdatesData.postValue(checkUpdatesBean);
+                mCheckUpdatesData.postValue(checkUpdatesBean);
             }
 
             @Override

app/src/main/java/com/yihucha/hbyhc/presentation/agent/AgentRegionalDistributionActivity.java

@@ -18,7 +18,7 @@ import java.util.List;
  * 区域内代理分布
  */
 public class AgentRegionalDistributionActivity extends ViewBindingTitleBaseActivity<ActivityAgentRegionalDistributionBinding> {
-    private List<AgentDistributionBean> datas= new ArrayList<>();
+    private final List<AgentDistributionBean> datas= new ArrayList<>();
     private AgentRegionalAdapter adapter;
     @Override
     protected void onCreate(Bundle savedInstanceState) {

app/src/main/java/com/yihucha/hbyhc/presentation/agent/IncomeDetailActivity.java

@@ -23,7 +23,7 @@ public class IncomeDetailActivity extends ViewBindingTitleBaseActivity<ActivityI
     private IncomeDetailPopWindow popWindow;
     private ChangeDatePopwindow datePopwindow;
     private IncomeDetailAdapter adapter;
-    private int[] datas = {1, 2, 3, 4, 5, 6, 7, 8, 9, 11, 12, 13, 14, 15};
+    private final int[] datas = {1, 2, 3, 4, 5, 6, 7, 8, 9, 11, 12, 13, 14, 15};
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {

app/src/main/java/com/yihucha/hbyhc/presentation/agent/MyIncomeActivity.java

@@ -13,14 +13,14 @@ import android.widget.Toast;
 import androidx.recyclerview.widget.DividerItemDecoration;
 import androidx.recyclerview.widget.LinearLayoutManager;
 
+import com.lcodecore.tkrefreshlayout.RefreshListenerAdapter;
+import com.lcodecore.tkrefreshlayout.TwinklingRefreshLayout;
 import com.yihucha.hbyhc.R;
 import com.yihucha.hbyhc.base.ViewBindingTitleBaseActivity;
 import com.yihucha.hbyhc.databinding.ActivityMyIncomeBinding;
 import com.yihucha.hbyhc.presentation.agent.adapter.MyIncomeAdapter;
 import com.yihucha.hbyhc.presentation.agent.view.ChangeDatePopwindow;
 import com.yihucha.hbyhc.presentation.agent.view.YuePopwindow;
-import com.lcodecore.tkrefreshlayout.RefreshListenerAdapter;
-import com.lcodecore.tkrefreshlayout.TwinklingRefreshLayout;
 
 /**
  * 我的收益
@@ -29,7 +29,7 @@ public class MyIncomeActivity extends ViewBindingTitleBaseActivity<ActivityMyInc
     private ChangeDatePopwindow popwindow;
     private MyIncomeAdapter adapter;
     private YuePopwindow yuePopwindow;
-    private int[] datas = {1,2,3,4,5,6,7,8,9,11,12,13,14,15};
+    private final int[] datas = {1,2,3,4,5,6,7,8,9,11,12,13,14,15};
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);

app/src/main/java/com/yihucha/hbyhc/presentation/agent/adapter/ArrayWheelAdapter.java

@@ -6,7 +6,7 @@ public class ArrayWheelAdapter<T> implements WheelAdapter {
 
 
     // items
-    private List<T> items;
+    private final List<T> items;
 
     /**
      * Constructor

app/src/main/java/com/yihucha/hbyhc/presentation/agent/adapter/IncomeDetailAdapter.java

@@ -14,7 +14,7 @@ import com.yihucha.hbyhc.view.BoldText;
 
 public class IncomeDetailAdapter extends RecyclerView.Adapter<IncomeDetailAdapter.IncomeDetailHolder> {
     private int[] datas;
-    private Context mContext;
+    private final Context mContext;
 
     public IncomeDetailAdapter(int[] datas,Context mContext) {
         this.mContext = mContext;
@@ -58,9 +58,9 @@ public class IncomeDetailAdapter extends RecyclerView.Adapter<IncomeDetailAdapte
 
         public IncomeDetailHolder(@NonNull View itemview) {
             super(itemview);
-            mTvName = (TextView) itemview.findViewById(R.id.tv_name);
-            mTvTime = (TextView) itemview.findViewById(R.id.tv_time);
-            mTvNumber = (BoldText) itemview.findViewById(R.id.tv_number);
+            mTvName = itemview.findViewById(R.id.tv_name);
+            mTvTime = itemview.findViewById(R.id.tv_time);
+            mTvNumber = itemview.findViewById(R.id.tv_number);
         }
     }
 }

app/src/main/java/com/yihucha/hbyhc/presentation/agent/adapter/IncomeDetailPopAdapter.java

@@ -15,7 +15,7 @@ import java.util.List;
 
 public class IncomeDetailPopAdapter extends RecyclerView.Adapter<IncomeDetailPopAdapter.PopViewHolder> {
     private List<String> datas;
-    private Context mContext;
+    private final Context mContext;
     public IncomeDetailPopAdapter(List<String> datas,Context mContext) {
         this.mContext = mContext;
         this.datas = datas;

app/src/main/java/com/yihucha/hbyhc/presentation/agent/view/ChangeDatePopwindow.java

@@ -2,7 +2,6 @@ package com.yihucha.hbyhc.presentation.agent.view;
 
 import android.content.Context;
 import android.graphics.drawable.ColorDrawable;
-import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.PopupWindow;
@@ -23,17 +22,17 @@ import java.util.Calendar;
  */
 public class ChangeDatePopwindow extends PopupWindow implements View.OnClickListener {
 
-    private Context context;
-    private WheelView wvYear;
-    private WheelView wvMonth;
+    private final Context context;
+    private final WheelView wvYear;
+    private final WheelView wvMonth;
 
-    private TextView btnSure;
-    private TextView btnCancel;
+    private final TextView btnSure;
+    private final TextView btnCancel;
 
-    private ArrayList<String> arry_years = new ArrayList<String>();
-    private ArrayList<String> arry_months = new ArrayList<String>();
-    private WheelAdapter<String> yearAdapter;
-    private WheelAdapter<String> monthAdapter;
+    private final ArrayList<String> arry_years = new ArrayList<String>();
+    private final ArrayList<String> arry_months = new ArrayList<String>();
+    private final WheelAdapter<String> yearAdapter;
+    private final WheelAdapter<String> monthAdapter;
     private String month;
     private String day;
 
@@ -41,8 +40,8 @@ public class ChangeDatePopwindow extends PopupWindow implements View.OnClickList
     private String currentMonth = getMonth();
     private String currentDay = getDay();
 
-    private int maxTextSize = 24;
-    private int minTextSize = 14;
+    private final int maxTextSize = 24;
+    private final int minTextSize = 14;
 
     private boolean issetdata = false;
 
@@ -54,10 +53,10 @@ public class ChangeDatePopwindow extends PopupWindow implements View.OnClickList
         super(context);
         this.context = context;
         View view=View.inflate(context, R.layout.pop_date_select,null);
-        wvYear = (WheelView) view.findViewById(R.id.wv_date_year);
-        wvMonth = (WheelView) view.findViewById(R.id.wv_date_month);
-        btnSure = (TextView) view.findViewById(R.id.btn_myinfo_sure);
-        btnCancel = (TextView) view.findViewById(R.id.btn_myinfo_cancel);
+        wvYear = view.findViewById(R.id.wv_date_year);
+        wvMonth = view.findViewById(R.id.wv_date_month);
+        btnSure = view.findViewById(R.id.btn_myinfo_sure);
+        btnCancel = view.findViewById(R.id.btn_myinfo_cancel);
         wvYear.setCyclic(false);
         wvMonth.setCyclic(false);
         //设置SelectPicPopupWindow的View
@@ -123,7 +122,6 @@ public class ChangeDatePopwindow extends PopupWindow implements View.OnClickList
                 selectYear = arry_years.get(wvYear.getCurrentItem());
                 selectMonth = arry_months.get(wvMonth.getCurrentItem());
                 onDateListener.onClick(selectYear, selectMonth);
-                Log.d("cy",""+selectYear+""+selectMonth+"");
             }
         }
         dismiss();
@@ -131,7 +129,7 @@ public class ChangeDatePopwindow extends PopupWindow implements View.OnClickList
     }
 
     public interface OnDateListener {
-        public void onClick(String year, String month);
+        void onClick(String year, String month);
     }
 
 
@@ -227,11 +225,7 @@ public class ChangeDatePopwindow extends PopupWindow implements View.OnClickList
      */
     public void calDays(String year, String month) {
         boolean leayyear = false;
-        if (Integer.parseInt(year) % 4 == 0 && Integer.parseInt(year) % 100 != 0) {
-            leayyear = true;
-        } else {
-            leayyear = false;
-        }
+        leayyear = Integer.parseInt(year) % 4 == 0 && Integer.parseInt(year) % 100 != 0;
         for (int i = 1; i <= 12; i++) {
             switch (Integer.parseInt(month)) {
                 case 1:

app/src/main/java/com/yihucha/hbyhc/presentation/agent/view/IncomeDetailPopWindow.java

@@ -24,11 +24,11 @@ public class IncomeDetailPopWindow extends PopupWindow implements View.OnClickLi
     private TextView tvReset;
     private TextView tvConfirm;
     private View bottomView;
-    private Context mContext;
+    private final Context mContext;
     private IncomeDetailPopAdapter incomeAdapter;
     private IncomeDetailPopAdapter outcomeAdapter;
-    private static List<String> income;
-    private static List<String> outcome;
+    private static final List<String> income;
+    private static final List<String> outcome;
 
     static {
         income = new ArrayList<>();

app/src/main/java/com/yihucha/hbyhc/presentation/agent/view/InertiaTimerTask.java

@@ -22,7 +22,7 @@ public final class InertiaTimerTask extends TimerTask {
     }
 
     @Override
-    public final void run() {
+    public void run() {
 
         //防止闪动，对速度做一个限制。
         if (mCurrentVelocityY == Integer.MAX_VALUE) {

app/src/main/java/com/yihucha/hbyhc/presentation/agent/view/LoopViewGestureListener.java

@@ -14,7 +14,7 @@ public final class LoopViewGestureListener extends android.view.GestureDetector.
     }
 
     @Override
-    public final boolean onFling(MotionEvent e1, MotionEvent e2, float velocityX, float velocityY) {
+    public boolean onFling(MotionEvent e1, MotionEvent e2, float velocityX, float velocityY) {
         wheelView.scrollBy(velocityY);
         return true;
     }

app/src/main/java/com/yihucha/hbyhc/presentation/agent/view/MessageHandler.java

@@ -23,7 +23,7 @@ public final class MessageHandler extends Handler {
     }
 
     @Override
-    public final void handleMessage(Message msg) {
+    public void handleMessage(Message msg) {
         switch (msg.what) {
             case WHAT_INVALIDATE_LOOP_VIEW:
                 wheelView.invalidate();

app/src/main/java/com/yihucha/hbyhc/presentation/agent/view/SmoothScrollTimerTask.java

@@ -8,7 +8,7 @@ public final class SmoothScrollTimerTask extends TimerTask {
 
     private int realTotalOffset;
     private int realOffset;
-    private int offset;
+    private final int offset;
     private final WheelView wheelView;
 
     public SmoothScrollTimerTask(WheelView wheelView, int offset) {
@@ -19,7 +19,7 @@ public final class SmoothScrollTimerTask extends TimerTask {
     }
 
     @Override
-    public final void run() {
+    public void run() {
         if (realTotalOffset == Integer.MAX_VALUE) {
             realTotalOffset = offset;
         }

app/src/main/java/com/yihucha/hbyhc/presentation/agent/view/WheelView.java

@@ -51,7 +51,7 @@ public class WheelView extends View {
     private boolean isCenterLabel = true;
 
     // Timer mTimer;
-    private ScheduledExecutorService mExecutor = Executors.newSingleThreadScheduledExecutor();
+    private final ScheduledExecutorService mExecutor = Executors.newSingleThreadScheduledExecutor();
     private ScheduledFuture<?> mFuture;
 
     private Paint paintOuterText;
@@ -501,14 +501,14 @@ public class WheelView extends View {
                     canvas.restore();
                     canvas.save();
                     canvas.clipRect(0, firstLineY - translateY, measuredWidth, (int) (itemHeight));
-                    canvas.scale(1.0F, (float) Math.sin(radian) * 1.0F);
+                    canvas.scale(1.0F, (float) Math.sin(radian));
                     canvas.drawText(contentText, drawCenterContentStart, maxTextHeight - CENTER_CONTENT_OFFSET, paintCenterText);
                     canvas.restore();
                 } else if (translateY <= secondLineY && maxTextHeight + translateY >= secondLineY) {
                     // 条目经过第二条线
                     canvas.save();
                     canvas.clipRect(0, 0, measuredWidth, secondLineY - translateY);
-                    canvas.scale(1.0F, (float) Math.sin(radian) * 1.0F);
+                    canvas.scale(1.0F, (float) Math.sin(radian));
                     canvas.drawText(contentText, drawCenterContentStart, maxTextHeight - CENTER_CONTENT_OFFSET, paintCenterText);
                     canvas.restore();
                     canvas.save();

app/src/main/java/com/yihucha/hbyhc/presentation/agent/view/YuePopwindow.java

@@ -20,8 +20,8 @@ import com.yihucha.hbyhc.R;
  */
 public class YuePopwindow extends PopupWindow implements View.OnClickListener {
 
-    private Context context;
-    private ImageView close;
+    private final Context context;
+    private final ImageView close;
 
     public YuePopwindow(final Context context) {
         super(context);

app/src/main/java/com/yihucha/hbyhc/presentation/annuity/AlreadyRealNameActivity.java

@@ -5,15 +5,11 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.view.View;
 
-import androidx.lifecycle.Observer;
 import androidx.lifecycle.ViewModelProvider;
 
 import com.yihucha.hbyhc.base.ViewBindingTitleBaseActivity;
 import com.yihucha.hbyhc.databinding.ActivityAlreadyrealnameBinding;
-import com.yihucha.hbyhc.databinding.ActivityAnnuityBinding;
-import com.yihucha.hbyhc.network.request_bean.AutonymRequest;
 import com.yihucha.hbyhc.presentation.annuity.view_model.RealNameAuthenticationViewModel;
-import com.yihucha.hbyhc.utils.GlideUtils;
 import com.yihucha.hbyhc.utils.StringsUtil;
 
 import java.util.HashMap;

app/src/main/java/com/yihucha/hbyhc/presentation/annuity/AnnuityActivity.java

@@ -8,35 +8,33 @@ import android.view.View;
 import androidx.lifecycle.Observer;
 import androidx.lifecycle.ViewModelProvider;
 
+import com.tencent.mm.opensdk.modelbiz.WXLaunchMiniProgram;
+import com.tencent.mm.opensdk.openapi.IWXAPI;
+import com.tencent.mm.opensdk.openapi.WXAPIFactory;
 import com.yihucha.hbyhc.R;
-import com.yihucha.hbyhc.base.BaseActivity;
 import com.yihucha.hbyhc.base.ViewBindingChangeTitleColorTitleBaseActivity;
 import com.yihucha.hbyhc.base.WebViewTitleBaseActivity;
 import com.yihucha.hbyhc.callback.CustomTitleBarClickListener;
 import com.yihucha.hbyhc.callback.TwoButtonsListener;
 import com.yihucha.hbyhc.config.Constants;
 import com.yihucha.hbyhc.config.HttpUrl;
-import com.yihucha.hbyhc.databinding.ActivityAnnuityBinding;
+import com.yihucha.hbyhc.databinding.ActivityAnnuity2Binding;
 import com.yihucha.hbyhc.presentation.annuity.model.AmountFromGzcBean;
 import com.yihucha.hbyhc.presentation.mine.ThirdPartyBindingActivity;
 import com.yihucha.hbyhc.presentation.mine.model.UserAnnuityInfoBean;
 import com.yihucha.hbyhc.presentation.mine.model.UserInfoModel;
-import com.yihucha.hbyhc.presentation.mine.model.YanglaojinBean;
 import com.yihucha.hbyhc.presentation.mine.view_model.MineViewModel;
 import com.yihucha.hbyhc.utils.GlideUtils;
 import com.yihucha.hbyhc.utils.NumberUtil;
 import com.yihucha.hbyhc.view.CustomDialog;
-import com.tencent.mm.opensdk.modelbiz.WXLaunchMiniProgram;
-import com.tencent.mm.opensdk.openapi.IWXAPI;
-import com.tencent.mm.opensdk.openapi.WXAPIFactory;
 
 /**
  * @author qmzh
  * @date 2022/7/13
  * note:养老金主页
  */
-public class AnnuityActivity extends BaseActivity/* extends ViewBindingChangeTitleColorTitleBaseActivity<ActivityAnnuityBinding> implements View.OnClickListener*/ {
-    /*private MineViewModel mMineViewModel;
+public class AnnuityActivity  extends ViewBindingChangeTitleColorTitleBaseActivity<ActivityAnnuity2Binding> implements View.OnClickListener {
+    private MineViewModel mMineViewModel;
     private   String is_certification;//是否实名认证:1是
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -51,47 +49,41 @@ public class AnnuityActivity extends BaseActivity/* extends ViewBindingChangeTit
     private void initData() {
         //养老金数据
         mMineViewModel.getYanglaojin();
-        mMineViewModel.yanglaojinBeanMutableLiveData.observe(this, new Observer<YanglaojinBean>() {
-            @Override
-            public void onChanged(YanglaojinBean yanglaojinBean) {
-                mViewBinding.btvAllYanglao.setText("¥" + yanglaojinBean.getAll_yanglao());
-                mViewBinding.btvAllYanglaoA.setText("¥" + yanglaojinBean.getAll_yanglao_a());
+        mMineViewModel.yanglaojinBeanMutableLiveData.observe(this, yanglaojinBean -> {
+            mViewBinding.btvAllYanglao.setText("¥" + yanglaojinBean.getAll_yanglao());
+            mViewBinding.btvAllYanglaoA.setText("¥" + yanglaojinBean.getAll_yanglao_a());
 
-                mViewBinding.btvOnLineTakeNo.setText("¥" + NumberUtil.subtract(yanglaojinBean.getAll_yanglao(),yanglaojinBean.getAll_yanglao_a(),2));
-            }
+            mViewBinding.btvOnLineTakeNo.setText("¥" + NumberUtil.subtract(yanglaojinBean.getAll_yanglao(),yanglaojinBean.getAll_yanglao_a(),2));
         });
 
-        mMineViewModel.userAnnuityInfoBeanMutableLiveData.observe(this, new Observer<UserAnnuityInfoBean>() {
-            @Override
-            public void onChanged(UserAnnuityInfoBean userAnnuityInfoBean) {
-                 is_certification=userAnnuityInfoBean.getIs_certification();
+        mMineViewModel.userAnnuityInfoBeanMutableLiveData.observe(this, userAnnuityInfoBean -> {
+             is_certification=userAnnuityInfoBean.getIs_certification();
 //                mViewBinding.tvCreateTime.setText(userAnnuityInfoBean.getCreate_time());
-                mViewBinding.tvCreateTime.setText(userAnnuityInfoBean.getCreate_time().substring(0,10));
-                if (is_certification.equals("1")) {
-                    //已认证
+            mViewBinding.tvCreateTime.setText(userAnnuityInfoBean.getCreate_time().substring(0,10));
+            if (is_certification.equals("1")) {
+                //已认证
 //                    mViewBinding.tvIsApprove.setText(R.string.authenticated);
 //                    mViewBinding.tvIsApprove.getPaint().setFlags(Paint.UNDERLINE_TEXT_FLAG);
-                    mViewBinding.imgRenzheng.setImageResource(R.mipmap.weirenzheng);
-                    mViewBinding.tvBirthday60.setText(userAnnuityInfoBean.getBirthday60());
-                } else {
-                    //未认证
-                    *//*mViewBinding.tvIsApprove.setText(R.string.real_name_authentication);
-                    mViewBinding.tvIsApprove.getPaint().setFlags(Paint.UNDERLINE_TEXT_FLAG);*//*
-                    mViewBinding.imgRenzheng.setImageResource(R.mipmap.shimingrenzheng);
-                    mViewBinding.tvBirthday60.setText("未实名认证");
-                    CustomDialog.defaultDialog2(AnnuityActivity.this,
-                            R.string.warm_prompt, "实名认证后才可查看获得的\n养老金哦~", R.string.cancel, R.string.go_real_name_authentication, new TwoButtonsListener() {
-                                @Override
-                                public void leftButton() {
+                mViewBinding.imgRenzheng.setImageResource(R.mipmap.weirenzheng);
+                mViewBinding.tvBirthday60.setText(userAnnuityInfoBean.getBirthday60());
+            } else {
+                //未认证
+//                    mViewBinding.tvIsApprove.setText(R.string.real_name_authentication);
+//                    mViewBinding.tvIsApprove.getPaint().setFlags(Paint.UNDERLINE_TEXT_FLAG);
+                mViewBinding.imgRenzheng.setImageResource(R.mipmap.shimingrenzheng);
+                mViewBinding.tvBirthday60.setText("未实名认证");
+                CustomDialog.defaultDialog2(AnnuityActivity.this,
+                        R.string.warm_prompt, "实名认证后才可查看获得的\n养老金哦~", R.string.cancel, R.string.go_real_name_authentication, new TwoButtonsListener() {
+                            @Override
+                            public void leftButton() {
 //                                    AnnuityActivity.this.finish();
-                                }
-
-                                @Override
-                                public void rightButton() {
-                                    RealNameAuthenticationActivity.launch(context);
-                                }
-                            });
-                }
+                            }
+
+                            @Override
+                            public void rightButton() {
+                                RealNameAuthenticationActivity.launch(context);
+                            }
+                        });
             }
         });
         //用户信息
@@ -195,7 +187,6 @@ public class AnnuityActivity extends BaseActivity/* extends ViewBindingChangeTit
         //养老金信息
         mMineViewModel.getYanglaojinInfo();
     }
-*/
     public static void launch(Context context) {
         Intent intent = new Intent(context, AnnuityActivity.class);
         context.startActivity(intent);

app/src/main/java/com/yihucha/hbyhc/presentation/annuity/AnnuityFragment.kt

@@ -6,8 +6,6 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.RelativeLayout
-import androidx.core.view.marginTop
-import androidx.core.view.setMargins
 import androidx.lifecycle.ViewModelProvider
 import com.tencent.mm.opensdk.modelbiz.WXLaunchMiniProgram
 import com.tencent.mm.opensdk.openapi.WXAPIFactory
@@ -18,10 +16,8 @@ import com.yihucha.hbyhc.callback.TwoButtonsListener
 import com.yihucha.hbyhc.config.Constants
 import com.yihucha.hbyhc.config.HttpUrl
 import com.yihucha.hbyhc.databinding.ActivityAnnuityBinding
-import com.yihucha.hbyhc.presentation.mine.ThirdPartyBindingActivity
 import com.yihucha.hbyhc.presentation.mine.view_model.MineViewModel
 import com.yihucha.hbyhc.utils.GlideUtils
-import com.yihucha.hbyhc.utils.ImmersedStatusbarUtils
 import com.yihucha.hbyhc.utils.NumberUtil
 import com.yihucha.hbyhc.utils.ScreenUtils
 import com.yihucha.hbyhc.utils.StringUtils

app/src/main/java/com/yihucha/hbyhc/presentation/annuity/AnnuityRecordsActivity.kt

@@ -11,7 +11,6 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.FrameLayout
 import androidx.constraintlayout.widget.ConstraintLayout
-import androidx.core.content.ContextCompat
 import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.bigkoo.pickerview.R
@@ -25,10 +24,13 @@ import com.yihucha.hbyhc.databinding.ActivityAnnuityRecordsBinding
 import com.yihucha.hbyhc.presentation.annuity.adapter.AnnuityRecordsAdapter
 import com.yihucha.hbyhc.presentation.annuity.model.AnnuityRecordsBean
 import com.yihucha.hbyhc.presentation.mine.view_model.MineViewModel
-import com.yihucha.hbyhc.utils.*
+import com.yihucha.hbyhc.utils.DateUtil
+import com.yihucha.hbyhc.utils.EmptyCheckUtils
+import com.yihucha.hbyhc.utils.NumberUtil
+import com.yihucha.hbyhc.utils.ScreenUtils
+import com.yihucha.hbyhc.utils.StringUtils
 import com.yihucha.hbyhc.view.PopAnnuitySelector
-import com.yihucha.hbyhc.view.PopAnnuitySelector.OnSelectListener
-import java.util.*
+import java.util.Calendar
 
 class AnnuityRecordsActivity : ViewBindingBaseActivity<ActivityAnnuityRecordsBinding>(),
     View.OnClickListener {
@@ -87,7 +89,7 @@ class AnnuityRecordsActivity : ViewBindingBaseActivity<ActivityAnnuityRecordsBin
             }
         }
         mMineViewModel.failed.observe(this) {
-            mViewBinding.refreshLayout?.apply {
+            mViewBinding.refreshLayout.apply {
                 finishLoadmore()
                 finishRefreshing()
             }
@@ -227,7 +229,7 @@ class AnnuityRecordsActivity : ViewBindingBaseActivity<ActivityAnnuityRecordsBin
             mViewBinding.imgvBack -> finish()
             mViewBinding.tvDate -> {
                 //日期筛选
-                pvTime?.apply {
+                pvTime.apply {
                     if (!isShowing) {
                         show()
                     }

app/src/main/java/com/yihucha/hbyhc/presentation/annuity/AutonymSucceedActivity.java

@@ -7,7 +7,6 @@ import android.view.View;
 
 import com.yihucha.hbyhc.base.ViewBindingTitleBaseActivity;
 import com.yihucha.hbyhc.databinding.ActivityAutonymSucceedBinding;
-import com.yihucha.hbyhc.databinding.ActivityRealNameAuthenticationBinding;
 import com.yihucha.hbyhc.network.request_bean.AutonymRequest;
 import com.yihucha.hbyhc.utils.GlideUtils;
 import com.yihucha.hbyhc.utils.StringsUtil;

app/src/main/java/com/yihucha/hbyhc/presentation/annuity/PensionAccountActivity.java

@@ -12,12 +12,12 @@ import com.blankj.utilcode.util.ToastUtils;
 import com.yihucha.hbyhc.R;
 import com.yihucha.hbyhc.base.ViewBindingTitleBaseActivity;
 import com.yihucha.hbyhc.base.WebViewTitleBaseActivity;
+import com.yihucha.hbyhc.config.Constants;
 import com.yihucha.hbyhc.databinding.ActivityPensionAccountBinding;
-import com.yihucha.hbyhc.presentation.mine.model.UserInfoModel;
 import com.yihucha.hbyhc.presentation.mine.model.UserAnnuityInfoBean;
+import com.yihucha.hbyhc.presentation.mine.model.UserInfoModel;
 import com.yihucha.hbyhc.presentation.mine.model.YanglaojinBean;
 import com.yihucha.hbyhc.presentation.mine.view_model.MineViewModel;
-import com.yihucha.hbyhc.config.Constants;
 import com.yihucha.hbyhc.utils.GlideUtils;
 import com.yihucha.hbyhc.utils.NumberUtil;
 

app/src/main/java/com/yihucha/hbyhc/presentation/annuity/PensionChoicePlatformActivity.java

@@ -7,7 +7,6 @@ import android.view.View;
 
 import com.yihucha.hbyhc.base.ViewBindingTitleBaseActivity;
 import com.yihucha.hbyhc.databinding.ActivityPensionChoicePlatformBinding;
-import com.yihucha.hbyhc.databinding.ActivityPensionrecordsBinding;
 
 /**
  * @author qmzh
@@ -29,6 +28,7 @@ public class PensionChoicePlatformActivity extends ViewBindingTitleBaseActivity<
         mViewBinding.llSuning.setOnClickListener(this);
         mViewBinding.llChuxubao.setOnClickListener(this);
         mViewBinding.llDouyin.setOnClickListener(this);
+        mViewBinding.llRecharge.setOnClickListener(this);
     }
 
     @Override
@@ -62,6 +62,8 @@ public class PensionChoicePlatformActivity extends ViewBindingTitleBaseActivity<
             PensionRecordsListActivity.launch(context,"9");
         }else if (v == mViewBinding.llChuxubao){
             PensionRecordsListActivity.launch(context,"90");
+        } else if (v == mViewBinding.llRecharge) {
+            PensionRecordsListActivity.launch(context,"10");
         }
     }
 

app/src/main/java/com/yihucha/hbyhc/presentation/annuity/PensionRecordsActivity.java

@@ -10,7 +10,6 @@ import androidx.lifecycle.ViewModelProvider;
 
 import com.blankj.utilcode.util.ToastUtils;
 import com.yihucha.hbyhc.base.ViewBindingTitleBaseActivity;
-import com.yihucha.hbyhc.databinding.ActivityPensionAccountBinding;
 import com.yihucha.hbyhc.databinding.ActivityPensionrecordsBinding;
 import com.yihucha.hbyhc.presentation.mine.model.YanglaojinBean;
 import com.yihucha.hbyhc.presentation.mine.view_model.MineViewModel;

app/src/main/java/com/yihucha/hbyhc/presentation/annuity/PensionRecordsListActivity.java

@@ -10,6 +10,8 @@ import androidx.lifecycle.Observer;
 import androidx.lifecycle.ViewModelProvider;
 import androidx.recyclerview.widget.LinearLayoutManager;
 
+import com.lcodecore.tkrefreshlayout.RefreshListenerAdapter;
+import com.lcodecore.tkrefreshlayout.TwinklingRefreshLayout;
 import com.yihucha.hbyhc.R;
 import com.yihucha.hbyhc.base.ViewBindingTitleBaseActivity;
 import com.yihucha.hbyhc.databinding.ActivityPensionRecordsListBinding;
@@ -20,8 +22,6 @@ import com.yihucha.hbyhc.presentation.annuity.model.YanglaojinLogXSBean;
 import com.yihucha.hbyhc.presentation.annuity.model.YanglaojinLogXXBean;
 import com.yihucha.hbyhc.presentation.mine.view_model.MineViewModel;
 import com.yihucha.hbyhc.presentation.order.model.ThirdOrderBean;
-import com.lcodecore.tkrefreshlayout.RefreshListenerAdapter;
-import com.lcodecore.tkrefreshlayout.TwinklingRefreshLayout;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -39,12 +39,12 @@ public class PensionRecordsListActivity extends ViewBindingTitleBaseActivity<Act
     private LinearLayoutManager linearLayoutManager;
     //线上
     private  YanglaojinLogXSAdapter  mYanglaojinLogXSAdapter;
-    private List<YanglaojinLogXSBean.YanglaojinLogXSList> mYanglaojinLogXSList=new ArrayList<>();
+    private final List<YanglaojinLogXSBean.YanglaojinLogXSList> mYanglaojinLogXSList=new ArrayList<>();
     //线下
     private  YanglaojinLogXXAdapter   mYanglaojinLogXXAdapter;
-    private List<YanglaojinLogXXBean.YanglaojinLogXXList> mYanglaojinLogXXList=new ArrayList<>();
+    private final List<YanglaojinLogXXBean.YanglaojinLogXXList> mYanglaojinLogXXList=new ArrayList<>();
     //第三方
-    private List<ThirdOrderBean.ThirdOrderList> orderList = new ArrayList<>();
+    private final List<ThirdOrderBean.ThirdOrderList> orderList = new ArrayList<>();
     private ThirdOrderAdapter mThirdOrderAdapter;
     @Override
     protected void onCreate(Bundle savedInstanceState) {

app/src/main/java/com/yihucha/hbyhc/presentation/annuity/RealNameAuthenticationActivity.java

@@ -62,7 +62,7 @@ public class RealNameAuthenticationActivity extends ViewBindingTitleBaseActivity
     private String card_positive;//正面链接
     private String card_reverse;//反面链接
     private AutonymRequest request;
-
+    private String file_provider = Constants.FILE_PROVIDER;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -153,7 +153,8 @@ public class RealNameAuthenticationActivity extends ViewBindingTitleBaseActivity
 
     private void initView() {
         //初始化相机和相册功能
-        EasyPhotos.preLoad(this);
+//        EasyPhotos.preLoad(this);
+//        file_provider = getApplication().getPackageName()+".fileprovider";
     }
 
     @Override
@@ -228,7 +229,7 @@ public class RealNameAuthenticationActivity extends ViewBindingTitleBaseActivity
     public static final int CAMERA = 1001;
     public static final int PHOTO = 1002;
     private File tempFile;
-    private String file_provider = "com.laolaixiang.bjtdba.fileprovider";
+
 
     /**
      * 从相机获取图片
@@ -275,7 +276,7 @@ public class RealNameAuthenticationActivity extends ViewBindingTitleBaseActivity
                     }
                     //拍摄
                     EasyPhotos.createCamera(context, false)//参数说明：上下文,是否使用宽高数据（false时宽高数据为0，扫描速度更快）
-                            .setFileProviderAuthority("com.laolaixiang.bjtdba.fileprovider")//参数说明：见下方`FileProvider的配置`
+                            .setFileProviderAuthority(file_provider)//参数说明：见下方`FileProvider的配置`
                             .start(new SelectCallback() {
                                 @Override
                                 public void onResult(ArrayList<Photo> photos, boolean isOriginal) {

app/src/main/java/com/yihucha/hbyhc/presentation/annuity/adapter/AnnuityRecordsAdapter.kt

@@ -12,7 +12,7 @@ import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView.Adapter
 import androidx.recyclerview.widget.RecyclerView.ViewHolder
 import com.bumptech.glide.Glide
-import com.bytedance.pangle.transform.ZeusTransformUtils.getResources
+//import com.bytedance.pangle.transform.ZeusTransformUtils.getResources
 import com.yihucha.hbyhc.R
 import com.yihucha.hbyhc.databinding.ItemAnnuityRecordsBinding
 import com.yihucha.hbyhc.presentation.annuity.model.AnnuityRecordsBean
@@ -48,11 +48,11 @@ class AnnuityRecordsAdapter(var context: Context, var listDatas: List<AnnuityRec
     }
 
     override fun getItemCount(): Int {
-        return if (EmptyCheckUtils.isEmpty(listDatas)) 0 else listDatas!!.size
+        return if (EmptyCheckUtils.isEmpty(listDatas)) 0 else listDatas.size
     }
 
     override fun onBindViewHolder(holder: ARHolder, position: Int) {
-        listDatas[position]?.apply {
+        listDatas[position].apply {
             setTextContent(holder.binding.tvValueYlj, number)
             Glide.with(context).load(product.product.image).into(holder.binding.imgvProduct)
             holder.binding.tvProductOrderTime.text = "下单时间：${create_time}"

app/src/main/java/com/yihucha/hbyhc/presentation/annuity/adapter/ItemAnnuitySelectorAdapter.kt

@@ -9,7 +9,6 @@ import android.widget.RelativeLayout
 import androidx.recyclerview.widget.RecyclerView.Adapter
 import androidx.recyclerview.widget.RecyclerView.ViewHolder
 import com.yihucha.hbyhc.R
-import com.yihucha.hbyhc.databinding.ItemAnnuityRecordsBinding
 import com.yihucha.hbyhc.databinding.ItemAnnuitySelectorBinding
 import com.yihucha.hbyhc.presentation.annuity.model.SelectorBean
 import com.yihucha.hbyhc.utils.DensityUtils

app/src/main/java/com/yihucha/hbyhc/presentation/annuity/adapter/ThirdOrderAdapter.java

@@ -6,6 +6,7 @@ import android.widget.LinearLayout;
 
 import androidx.annotation.Nullable;
 
+import com.bumptech.glide.Glide;
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
 import com.yihucha.hbyhc.R;
@@ -22,8 +23,8 @@ import java.util.List;
  * note:
  */
 public class ThirdOrderAdapter extends BaseQuickAdapter<ThirdOrderBean.ThirdOrderList, BaseViewHolder> {
-    private Context context;
-    private String type;
+    private final Context context;
+    private final String type;
 
     public ThirdOrderAdapter(Context context, int layoutResId, @Nullable List<ThirdOrderBean.ThirdOrderList> data, String type) {
         super(layoutResId, data);
@@ -34,18 +35,21 @@ public class ThirdOrderAdapter extends BaseQuickAdapter<ThirdOrderBean.ThirdOrde
     @Override
     protected void convert(BaseViewHolder helper, ThirdOrderBean.ThirdOrderList item) {
         RoundCornerImageView riv_mer_avatar = helper.getView(R.id.riv_mer_avatar);
-        GlideUtils.loadImage(context, item.getGoods_img(), riv_mer_avatar);
+
+
 
         helper.setText(R.id.btv_mer_name, item.getGoods_name());
         helper.setText(R.id.tv_number, "获得养老金：" + item.getYanglao());
         helper.setText(R.id.tv_order_sn, item.getOrder_sn());
-        if (type.equals("1")) {
-//            helper.setText(R.id.tv_create_time, "下单时间：" + DateUtil.getYearMonthDayTime(Long.parseLong(item.getCreate_time())));
-            helper.setText(R.id.tv_create_time, "下单时间：" + item.getCreate_time());
-        } else {
-            helper.setText(R.id.tv_create_time, "下单时间：" + item.getCreate_time());
+        helper.setText(R.id.tv_create_time, "下单时间：" + item.getCreate_time());
+        if ("10".equals(type)){
+            helper.setText(R.id.tv_mark, "养老金来源：话费充值");
+            Glide.with(context).load(R.mipmap.icon_recharge).into(riv_mer_avatar);
+        }else {
+            helper.setText(R.id.tv_mark, "养老金来源：购买商品");
+            GlideUtils.loadImage(context, item.getGoods_img(), riv_mer_avatar);
         }
-        helper.setText(R.id.tv_mark, "养老金来源：购买商品");
+
         LinearLayout llRoot = helper.getView(R.id.ll_root);
         llRoot.setOnClickListener(new View.OnClickListener() {
             @Override

app/src/main/java/com/yihucha/hbyhc/presentation/annuity/adapter/YanglaojinLogXSAdapter.java

@@ -22,7 +22,7 @@ import java.util.List;
  * note:线上
  */
 public class YanglaojinLogXSAdapter extends BaseQuickAdapter<YanglaojinLogXSBean.YanglaojinLogXSList, BaseViewHolder> {
-    private Context context;
+    private final Context context;
     public YanglaojinLogXSAdapter(Context context,int layoutResId, @Nullable List<YanglaojinLogXSBean.YanglaojinLogXSList> data) {
         super(layoutResId, data);
         this.context=context;

app/src/main/java/com/yihucha/hbyhc/presentation/annuity/adapter/YanglaojinLogXXAdapter.java

@@ -22,7 +22,7 @@ import java.util.List;
  * note:线上
  */
 public class YanglaojinLogXXAdapter extends BaseQuickAdapter<YanglaojinLogXXBean.YanglaojinLogXXList, BaseViewHolder> {
-    private Context context;
+    private final Context context;
     public YanglaojinLogXXAdapter(Context context, int layoutResId, @Nullable List<YanglaojinLogXXBean.YanglaojinLogXXList> data) {
         super(layoutResId, data);
         this.context=context;

app/src/main/java/com/yihucha/hbyhc/presentation/annuity/view_model/RealNameAuthenticationViewModel.java

@@ -1,14 +1,11 @@
 package com.yihucha.hbyhc.presentation.annuity.view_model;
 
-import static com.blankj.utilcode.util.StringUtils.getString;
-
 import android.annotation.SuppressLint;
 
 import androidx.lifecycle.MutableLiveData;
 
 import com.alibaba.fastjson.JSON;
 import com.blankj.utilcode.util.ToastUtils;
-import com.yihucha.hbyhc.R;
 import com.yihucha.hbyhc.base.BaseViewModel;
 import com.yihucha.hbyhc.network.BaseObserver;
 import com.yihucha.hbyhc.network.DataResponse;

app/src/main/java/com/yihucha/hbyhc/presentation/apply_channel/ApplyChannelActivity.java

@@ -22,7 +22,6 @@ import com.yihucha.hbyhc.base.WebViewTitleBaseActivity;
 import com.yihucha.hbyhc.callback.TwoInputButtonsListener;
 import com.yihucha.hbyhc.config.Constants;
 import com.yihucha.hbyhc.databinding.ActivityApplyChannelBinding;
-import com.yihucha.hbyhc.databinding.ActivityAutonymSucceedBinding;
 import com.yihucha.hbyhc.presentation.apply_channel.model.OrderIdBean;
 import com.yihucha.hbyhc.presentation.apply_channel.view_model.ChannelViewModel;
 import com.yihucha.hbyhc.presentation.pay.PayActivity;

app/src/main/java/com/yihucha/hbyhc/presentation/apply_channel/ChannelOpenSuccessActivity.java

@@ -10,18 +10,17 @@ import android.view.View;
 import androidx.lifecycle.Observer;
 import androidx.lifecycle.ViewModelProvider;
 
+import com.tencent.mm.opensdk.modelbiz.WXLaunchMiniProgram;
+import com.tencent.mm.opensdk.openapi.IWXAPI;
+import com.tencent.mm.opensdk.openapi.WXAPIFactory;
 import com.yihucha.hbyhc.R;
 import com.yihucha.hbyhc.base.ViewBindingTitleBaseActivity;
 import com.yihucha.hbyhc.config.Constants;
 import com.yihucha.hbyhc.config.HttpUrl;
-import com.yihucha.hbyhc.databinding.ActivityApplyChannelBinding;
 import com.yihucha.hbyhc.databinding.ActivityChannelOpenSuccessBinding;
 import com.yihucha.hbyhc.presentation.apply_channel.model.UserInvitationCodeBean;
 import com.yihucha.hbyhc.presentation.apply_channel.view_model.ChannelViewModel;
 import com.yihucha.hbyhc.view.UserInvitationCodeDialog;
-import com.tencent.mm.opensdk.modelbiz.WXLaunchMiniProgram;
-import com.tencent.mm.opensdk.openapi.IWXAPI;
-import com.tencent.mm.opensdk.openapi.WXAPIFactory;
 
 import java.util.List;
 

app/src/main/java/com/yihucha/hbyhc/presentation/apply_channel/adapter/UserInvitationCodeAdapter.java

@@ -21,7 +21,7 @@ import java.util.List;
  * note:
  */
 public class UserInvitationCodeAdapter  extends BaseQuickAdapter<UserInvitationCodeBean, BaseViewHolder> {
-    private Context context;
+    private final Context context;
     public UserInvitationCodeAdapter(Context context,int layoutResId, @Nullable List<UserInvitationCodeBean> data) {
         super(layoutResId, data);
         this.context=context;

app/src/main/java/com/yihucha/hbyhc/presentation/apply_channel/view_model/ChannelViewModel.java

@@ -1,14 +1,11 @@
 package com.yihucha.hbyhc.presentation.apply_channel.view_model;
 
-import static com.blankj.utilcode.util.StringUtils.getString;
-
 import android.annotation.SuppressLint;
 import android.text.TextUtils;
 
 import androidx.lifecycle.MutableLiveData;
 
 import com.blankj.utilcode.util.ToastUtils;
-import com.yihucha.hbyhc.R;
 import com.yihucha.hbyhc.base.BaseViewModel;
 import com.yihucha.hbyhc.network.BaseObserver;
 import com.yihucha.hbyhc.network.DataResponse;

app/src/main/java/com/yihucha/hbyhc/presentation/big_storehouse/BigWarehouseFragment.java

@@ -54,17 +54,17 @@ import java.util.List;
 public class BigWarehouseFragment extends BaseFragment implements View.OnClickListener {
     private FragmentBigWarehouseBinding binding;
     private BigWarehouseViewModel bigWarehouseViewModel;
-    private HashMap<String, Integer> itemPos = new HashMap<>();
-    private HashMap<String, Integer> page = new HashMap<>();
+    private final HashMap<String, Integer> itemPos = new HashMap<>();
+    private final HashMap<String, Integer> page = new HashMap<>();
     //大仓列表
-    private List<DCItemListClassificationBean> mDCItemListClassificationBean = new ArrayList<>();
+    private final List<DCItemListClassificationBean> mDCItemListClassificationBean = new ArrayList<>();
     private DCItemListClassificationAdapter mDCItemListClassificationAdapter;
     //大仓推荐列表
 //    private List<RecommendListBean> mRecommendListBean = new ArrayList<>();
 //    private DcRecommendListAdapter mRecommendListAdapter;
 
     private int mPage = 1;
-    private List<DcProductBean> mDcProductBean = new ArrayList<>();//大仓商品
+    private final List<DcProductBean> mDcProductBean = new ArrayList<>();//大仓商品
     private DcProductAdapter mDcProductAdapter;
 
     private String classify = "";//分类id
@@ -97,53 +97,50 @@ public class BigWarehouseFragment extends BaseFragment implements View.OnClickLi
         mClassifyBean = new DCItemListClassificationBean();
         mClassifyBean.setCate_name("全部");
         mClassifyBean.setStore_category_id("");
-        bigWarehouseViewModel.mDCItemListClassificationData.observe(getActivity(), new Observer<List<DCItemListClassificationBean>>() {
-            @Override
-            public void onChanged(List<DCItemListClassificationBean> dcItemListClassificationBeans) {
-                //判断首页点击进来的是否传入分类的id,如果传入则默认点击
-                binding.rvProductList.setVisibility(View.VISIBLE);
-                binding.rvRecommendedList.setVisibility(View.GONE);
-                mDCItemListClassificationBean.clear();
-                if (TextUtils.isEmpty(MainActivity.storeCategoryId)) {
-                    mClassifyBean.setClick(true);
-                    if (!mDCItemListClassificationBean.contains(mClassifyBean)) {
-                        mDCItemListClassificationBean.add(0, mClassifyBean);
-                    }
+        bigWarehouseViewModel.mDCItemListClassificationData.observe(getActivity(), dcItemListClassificationBeans -> {
+            //判断首页点击进来的是否传入分类的id,如果传入则默认点击
+            binding.rvProductList.setVisibility(View.VISIBLE);
+            binding.rvRecommendedList.setVisibility(View.GONE);
+            mDCItemListClassificationBean.clear();
+            if (TextUtils.isEmpty(MainActivity.storeCategoryId)) {
+                mClassifyBean.setClick(true);
+                if (!mDCItemListClassificationBean.contains(mClassifyBean)) {
+                    mDCItemListClassificationBean.add(0, mClassifyBean);
+                }
 
-                    mDCItemListClassificationBean.addAll(dcItemListClassificationBeans);
-                    //商品列表
-                    mPage = 1;
-                    mDcProductBean.clear();
-                    bigWarehouseViewModel.getDaCangProductList(mPage, "");
-                } else {
-                    mClassifyBean.setClick(false);
-                    if (!mDCItemListClassificationBean.contains(mClassifyBean)) {
-                        mDCItemListClassificationBean.add(0, mClassifyBean);
-                    }
-                    mDCItemListClassificationBean.addAll(dcItemListClassificationBeans);
-
-                    for (int i = 0; i < mDCItemListClassificationBean.size(); i++) {
-                        if (mDCItemListClassificationBean.get(i).getStore_category_id()
-                                .equals(MainActivity.storeCategoryId)) {
-
-                            //设置选中
-                            mDCItemListClassificationBean.get(i).setClick(true);
-                            //设置view的位置
-                            binding.rvKingKongArea.scrollToPosition(i);
-                            //请求分类下的产品
-                            classify = mDCItemListClassificationBean.get(i).getStore_category_id();
-                            mPage = 1;
-                            mDcProductBean.clear();
-                            bigWarehouseViewModel.getDaCangProductList(mPage, classify);
-                            break;
-                        }
+                mDCItemListClassificationBean.addAll(dcItemListClassificationBeans);
+                //商品列表
+                mPage = 1;
+                mDcProductBean.clear();
+                bigWarehouseViewModel.getDaCangProductList(mPage, "");
+            } else {
+                mClassifyBean.setClick(false);
+                if (!mDCItemListClassificationBean.contains(mClassifyBean)) {
+                    mDCItemListClassificationBean.add(0, mClassifyBean);
+                }
+                mDCItemListClassificationBean.addAll(dcItemListClassificationBeans);
+
+                for (int i = 0; i < mDCItemListClassificationBean.size(); i++) {
+                    if (mDCItemListClassificationBean.get(i).getStore_category_id()
+                            .equals(MainActivity.storeCategoryId)) {
+
+                        //设置选中
+                        mDCItemListClassificationBean.get(i).setClick(true);
+                        //设置view的位置
+                        binding.rvKingKongArea.scrollToPosition(i);
+                        //请求分类下的产品
+                        classify = mDCItemListClassificationBean.get(i).getStore_category_id();
+                        mPage = 1;
+                        mDcProductBean.clear();
+                        bigWarehouseViewModel.getDaCangProductList(mPage, classify);
+                        break;
                     }
                 }
-                mDCItemListClassificationAdapter.replaceData(mDCItemListClassificationBean);
+            }
+            mDCItemListClassificationAdapter.replaceData(mDCItemListClassificationBean);
 //                if (rvPosition>0){
 //                    RecyclerViewPositionUtils.smoothMoveToPosition(binding.rvKingKongArea,rvPosition);
 //                }
-            }
         });
 
         bigWarehouseViewModel.mDcProductBean.observe(getActivity(), new Observer<List<DcProductBean>>() {
@@ -151,7 +148,7 @@ public class BigWarehouseFragment extends BaseFragment implements View.OnClickLi
             public void onChanged(List<DcProductBean> dcProductBeans) {
                 mDcProductBean.addAll(dcProductBeans);
 //                mDcProductBean.addAll(dcProductBeans);
-                if (mDcProductBean == null || mDcProductBean.size() == 0) {
+                if (mDcProductBean.isEmpty()) {
                     binding.noSearch.llNotFound.setVisibility(View.VISIBLE);
                     //上划之后的效果
                     return;

app/src/main/java/com/yihucha/hbyhc/presentation/big_storehouse/DacangSeckillActivity.java

@@ -41,10 +41,10 @@ import qiu.niorgai.StatusBarCompat;
 public class DacangSeckillActivity extends BaseActivity implements View.OnClickListener {
     private BigWarehouseViewModel mBigWarehouseViewModel;
     private DcSeckillDateAdapter mDcSeckillDateAdapter;
-    private List<DcSeckillBean> mDcSeckillBean = new ArrayList<>();
+    private final List<DcSeckillBean> mDcSeckillBean = new ArrayList<>();
     private ActivityDacangSeckillBinding mViewBinding;
     private DcSecondsKillProductsAdapter mDcSecondsKillProductsAdapter;
-    private List<DcSeckillBean.Product_data> mProduct_data = new ArrayList<>();
+    private final List<DcSeckillBean.Product_data> mProduct_data = new ArrayList<>();
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {

app/src/main/java/com/yihucha/hbyhc/presentation/big_storehouse/DcHomeActivity.java

@@ -11,6 +11,8 @@ import androidx.lifecycle.ViewModelProvider;
 import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.LinearLayoutManager;
 
+import com.lcodecore.tkrefreshlayout.RefreshListenerAdapter;
+import com.lcodecore.tkrefreshlayout.TwinklingRefreshLayout;
 import com.yihucha.hbyhc.R;
 import com.yihucha.hbyhc.base.ViewBindingChangeTitleColorTitleBaseActivity;
 import com.yihucha.hbyhc.callback.CustomTitleBarClickListener;
@@ -25,8 +27,6 @@ import com.yihucha.hbyhc.presentation.home.adapter.ImageAdapter;
 import com.yihucha.hbyhc.presentation.home.model.BannerDataBean;
 import com.yihucha.hbyhc.presentation.product.ProductDetailsActivity;
 import com.yihucha.hbyhc.utils.GridSpacingItemDecoration;
-import com.lcodecore.tkrefreshlayout.RefreshListenerAdapter;
-import com.lcodecore.tkrefreshlayout.TwinklingRefreshLayout;
 import com.youth.banner.indicator.CircleIndicator;
 import com.youth.banner.listener.OnBannerListener;
 
@@ -42,13 +42,13 @@ public class DcHomeActivity extends ViewBindingChangeTitleColorTitleBaseActivity
     public static final String INTENT_DC_ID = "intentDcId";
     public static final String INENT_SHOP_NAME = "intentShopName";
     private BigWarehouseViewModel mBigWarehouseViewModel;
-    private List<DcHomeMerchantBean> mDcHomeMerchantBean = new ArrayList<>();//金刚区实体类
+    private final List<DcHomeMerchantBean> mDcHomeMerchantBean = new ArrayList<>();//金刚区实体类
     private DcShopAdapter mDcShopAdapter;
     private String dcId;//大仓店铺id
     private String shopName;//大仓名称
 
     //商品列表
-    private List<DcDetailsGoodsListBean> mDcDetailsGoodsListBean = new ArrayList<>();
+    private final List<DcDetailsGoodsListBean> mDcDetailsGoodsListBean = new ArrayList<>();
     private DcDetailsGoodsAdapter mDcDetailsGoodsAdapter;
     private int mPage = 1;
 

app/src/main/java/com/yihucha/hbyhc/presentation/big_storehouse/DcIntroduceActivity.java

@@ -9,7 +9,6 @@ import androidx.lifecycle.Observer;
 import androidx.lifecycle.ViewModelProvider;
 
 import com.yihucha.hbyhc.base.ViewBindingTitleBaseActivity;
-import com.yihucha.hbyhc.databinding.ActivityDcHomeBinding;
 import com.yihucha.hbyhc.databinding.ActivityDcIntroduceBinding;
 import com.yihucha.hbyhc.presentation.big_storehouse.model.DcIntroduceBean;
 import com.yihucha.hbyhc.presentation.big_storehouse.view_model.BigWarehouseViewModel;

app/src/main/java/com/yihucha/hbyhc/presentation/big_storehouse/DcMemberActivity.java

@@ -13,6 +13,8 @@ import androidx.recyclerview.widget.GridLayoutManager;
 
 import com.alibaba.fastjson.JSON;
 import com.blankj.utilcode.util.ToastUtils;
+import com.lcodecore.tkrefreshlayout.RefreshListenerAdapter;
+import com.lcodecore.tkrefreshlayout.TwinklingRefreshLayout;
 import com.yihucha.hbyhc.R;
 import com.yihucha.hbyhc.base.ViewBindingTitleBaseActivity;
 import com.yihucha.hbyhc.databinding.ActivityDcMemberBinding;
@@ -26,8 +28,6 @@ import com.yihucha.hbyhc.utils.DoubleFormatTool;
 import com.yihucha.hbyhc.utils.GridSpacingItemDecoration;
 import com.yihucha.hbyhc.utils.LogUtil;
 import com.yihucha.hbyhc.utils.LoginUtils;
-import com.lcodecore.tkrefreshlayout.RefreshListenerAdapter;
-import com.lcodecore.tkrefreshlayout.TwinklingRefreshLayout;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -41,12 +41,12 @@ import java.util.Map;
  */
 
 public class DcMemberActivity extends ViewBindingTitleBaseActivity<ActivityDcMemberBinding> implements View.OnClickListener {
-    private List<DcMemberProductBean.ProductList> mDcProductBean = new ArrayList<>();
+    private final List<DcMemberProductBean.ProductList> mDcProductBean = new ArrayList<>();
     private DcMemberProductAdapter mDcMemberProductAdapter;
     private BigWarehouseViewModel mBigWarehouseViewModel;
     private int mPage = 1;
     private int ivCheckAll = 0;//0是非全选,1是全选
-    private    List<String> cartId = new ArrayList<>();
+    private final List<String> cartId = new ArrayList<>();
 
     private  int num=1;//条目
     private   String is_da_cang_vip="0";//0不是大仓会员
@@ -101,11 +101,7 @@ public class DcMemberActivity extends ViewBindingTitleBaseActivity<ActivityDcMem
             @Override
             public void onItemClick(int position) {
                 if (LoginUtils.isLogin(context)){
-                    if (mDcProductBean.get(position).isClicks()) {
-                        mDcProductBean.get(position).setClicks(false);
-                    } else {
-                        mDcProductBean.get(position).setClicks(true);
-                    }
+                    mDcProductBean.get(position).setClicks(!mDcProductBean.get(position).isClicks());
                     //费用计算
                     getTotalprices();
                     mDcMemberProductAdapter.notifyDataSetChanged();

app/src/main/java/com/yihucha/hbyhc/presentation/big_storehouse/adapter/DcDetailsGoodsAdapter.java

@@ -21,7 +21,7 @@ import java.util.List;
  * note:
  */
 public class DcDetailsGoodsAdapter extends BaseQuickAdapter<DcDetailsGoodsListBean, BaseViewHolder> {
-    private Context context;
+    private final Context context;
     private OnClickListener mClickListener;
 
     public DcDetailsGoodsAdapter(int layoutResId, @Nullable List<DcDetailsGoodsListBean> data, Context context) {

app/src/main/java/com/yihucha/hbyhc/presentation/big_storehouse/adapter/DcKingKongAreaAdapter.java

@@ -21,7 +21,7 @@ import java.util.List;
  * note:
  */
 public class DcKingKongAreaAdapter extends BaseQuickAdapter<DcListBean, BaseViewHolder> {
-    private Context context;
+    private final Context context;
     private OnClickListener mClickListener;
     public DcKingKongAreaAdapter(int layoutResId, @Nullable List<DcListBean> data, Context context) {
         super(layoutResId, data);

app/src/main/java/com/yihucha/hbyhc/presentation/big_storehouse/adapter/DcMemberProductAdapter.java

@@ -22,7 +22,7 @@ import java.util.List;
  * note:会员商品
  */
 public class DcMemberProductAdapter extends BaseQuickAdapter<DcMemberProductBean.ProductList, BaseViewHolder> {
-    private Context context;
+    private final Context context;
     private OnClickListener mClickListener;
 
 

app/src/main/java/com/yihucha/hbyhc/presentation/big_storehouse/adapter/DcProductAdapter.java

@@ -21,7 +21,7 @@ import java.util.List;
  * note:
  */
 public class DcProductAdapter extends BaseQuickAdapter<DcProductBean, BaseViewHolder> {
-    private Context context;
+    private final Context context;
     private OnClickListener mClickListener;
 
     public DcProductAdapter(int layoutResId, @Nullable List<DcProductBean> data, Context context) {

app/src/main/java/com/yihucha/hbyhc/presentation/big_storehouse/adapter/DcRecommendListAdapter.java

@@ -22,7 +22,7 @@ import java.util.List;
  * note:
  */
 public class DcRecommendListAdapter extends BaseQuickAdapter<RecommendListBean, BaseViewHolder> {
-    private Context context;
+    private final Context context;
 
     public DcRecommendListAdapter(int layoutResId, @Nullable List<RecommendListBean> data, Context context) {
         super(layoutResId, data);

app/src/main/java/com/yihucha/hbyhc/presentation/big_storehouse/adapter/DcRecommendPicAdapter.java

@@ -22,7 +22,7 @@ import java.util.List;
  * note:
  */
 public class DcRecommendPicAdapter extends BaseQuickAdapter<RecommendListBean.RecommendList, BaseViewHolder> {
-    private Context context;
+    private final Context context;
 
     public DcRecommendPicAdapter(Context context, int layoutResId, @Nullable List<RecommendListBean.RecommendList> data) {
         super(layoutResId, data);

app/src/main/java/com/yihucha/hbyhc/presentation/big_storehouse/adapter/DcSeckillDateAdapter.java

@@ -2,7 +2,6 @@ package com.yihucha.hbyhc.presentation.big_storehouse.adapter;
 
 import android.content.Context;
 import android.graphics.Color;
-import android.os.CountDownTimer;
 import android.view.Display;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -11,15 +10,12 @@ import android.view.WindowManager;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.core.content.ContextCompat;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.yihucha.hbyhc.R;
 import com.yihucha.hbyhc.databinding.ItemSeckillBinding;
 import com.yihucha.hbyhc.presentation.big_storehouse.model.DcSeckillBean;
 import com.yihucha.hbyhc.utils.DensityUtils;
-import com.yihucha.hbyhc.utils.StringsUtil;
-import com.yihucha.hbyhc.utils.TimeUtils;
 
 import java.util.List;
 
@@ -32,7 +28,7 @@ public class DcSeckillDateAdapter extends RecyclerView.Adapter<DcSeckillDateAdap
     private OnClickListener mClickListener;
     private List<DcSeckillBean> data;
     private int position = 0;
-    private Context context;
+    private final Context context;
 
     public DcSeckillDateAdapter(int layoutResId, @Nullable List<DcSeckillBean> data, Context context) {
         this.context = context;

app/src/main/java/com/yihucha/hbyhc/presentation/big_storehouse/adapter/DcSecondsKillProductsAdapter.java

@@ -1,7 +1,6 @@
 package com.yihucha.hbyhc.presentation.big_storehouse.adapter;
 
 import android.content.Context;
-import android.view.View;
 import android.widget.ImageView;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
@@ -23,7 +22,7 @@ import java.util.List;
  * note:
  */
 public class DcSecondsKillProductsAdapter extends BaseQuickAdapter<DcSeckillBean.Product_data, BaseViewHolder> {
-    private Context context;
+    private final Context context;
     private int status;//1-抢购中。2-即将开始。3-已结速
 
     private OnClickListener mClickListener;

app/src/main/java/com/yihucha/hbyhc/presentation/big_storehouse/adapter/DcShopAdapter.java

@@ -22,7 +22,7 @@ import java.util.List;
  * note:
  */
 public class DcShopAdapter extends BaseQuickAdapter<DcHomeMerchantBean, BaseViewHolder> {
-    private Context context;
+    private final Context context;
     public DcShopAdapter(int layoutResId, @Nullable List<DcHomeMerchantBean> data, Context context) {
         super(layoutResId, data);
         this.context=context;

app/src/main/java/com/yihucha/hbyhc/presentation/big_storehouse/adapter/HomeMSAdapter.kt

@@ -5,13 +5,13 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.view.WindowManager
+import android.widget.Toast
 import androidx.recyclerview.widget.RecyclerView.Adapter
 import androidx.recyclerview.widget.RecyclerView.ViewHolder
 import com.bumptech.glide.Glide
 import com.yihucha.hbyhc.R
 import com.yihucha.hbyhc.databinding.ItemHomeMiaoshaBinding
 import com.yihucha.hbyhc.presentation.big_storehouse.model.DcSeckillBean
-import com.yihucha.hbyhc.presentation.product.ProductDetailsActivity
 import com.yihucha.hbyhc.utils.DensityUtils
 
 /**
@@ -45,7 +45,8 @@ class HomeMSAdapter(private var dataList: List<DcSeckillBean.Product_data>?,var
             tvYanglaojin.text = "养老金 ${pBean.yanglao}"
             Glide.with(context).load(pBean.image).into(imgvItem)
             layoutParent.setOnClickListener{
-                ProductDetailsActivity.launch(context, pBean.product_id)
+//                ProductDetailsActivity.launch(context, pBean.product_id)
+                Toast.makeText(context,"功能升级中", Toast.LENGTH_LONG).show()
             }
         }
     }

app/src/main/java/com/yihucha/hbyhc/presentation/big_storehouse/adapter/HomeVipAdapter.kt

@@ -9,9 +9,7 @@ import androidx.recyclerview.widget.RecyclerView.Adapter
 import androidx.recyclerview.widget.RecyclerView.ViewHolder
 import com.bumptech.glide.Glide
 import com.yihucha.hbyhc.R
-import com.yihucha.hbyhc.databinding.ItemHomeMiaoshaBinding
 import com.yihucha.hbyhc.databinding.ItemHomeVipBinding
-import com.yihucha.hbyhc.presentation.big_storehouse.model.DcSeckillBean
 import com.yihucha.hbyhc.presentation.product.ProductDetailsActivity
 import com.yihucha.hbyhc.presentation.shop.model.VipAreaBean
 import com.yihucha.hbyhc.utils.DensityUtils

app/src/main/java/com/yihucha/hbyhc/presentation/big_storehouse/model/DcSeckillBean.java

@@ -14,6 +14,15 @@ public class DcSeckillBean {
     private int product_id;
     private int status;//1-抢购中。2-即将开始。3-已结速
     private List<Product_data> product_data;
+    private boolean checked;
+
+    public boolean isChecked() {
+        return checked;
+    }
+
+    public void setChecked(boolean checked) {
+        this.checked = checked;
+    }
 
     public String getSeckill_date() {
         return seckill_date == null ? "" : seckill_date;

app/src/main/java/com/yihucha/hbyhc/presentation/big_storehouse/repository/DcRepository.java

@@ -1,10 +1,7 @@
 package com.yihucha.hbyhc.presentation.big_storehouse.repository;
 
-import static com.blankj.utilcode.util.StringUtils.getString;
-
 import android.annotation.SuppressLint;
 
-import com.yihucha.hbyhc.R;
 import com.yihucha.hbyhc.callback.NormalListener;
 import com.yihucha.hbyhc.network.BaseObserver;
 import com.yihucha.hbyhc.network.DataResponse;