2024-12-18

第一次备份

.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/gradle.xml

@@ -4,10 +4,8 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="testRunner" value="GRADLE" />
-        <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="Embedded JDK" />
+        <option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
@@ -17,7 +15,9 @@
             <option value="$PROJECT_DIR$/jd_sdk_lib" />
           </set>
         </option>
+        <option name="resolveExternalAnnotations" value="false" />
       </GradleProjectSettings>
     </option>
+    <option name="offlineMode" value="true" />
   </component>
 </project>

.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="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>

.idea/vcs.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+    <mapping directory="" vcs="Git" />
   </component>
 </project>

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

@@ -5,13 +5,13 @@ package com.yihucha.hbyhc.config;
  */
 public class HttpUrl {
     // 生产还是测试
-    public static boolean IS_RELEASE = false;
+    public static boolean IS_RELEASE = true;
     //生成·
-    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://app.bjtdba.com/";
+    public static String BASE_URL_RELEASE = "https://api.hebeiyhc.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://test.bjtdba.com/";
+    public static String BASE_URL_DEBUG="https://test.hebeiyhc.com";
     //预生产
 //    public static String BASE_URL_DEBUG = "https://pre.bjtdba.com/";
     public static String CHANNEL_NAME = "友盟";

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

@@ -34,6 +34,7 @@ import retrofit2.http.POST;
 import retrofit2.http.Part;
 import retrofit2.http.Path;
 import retrofit2.http.QueryMap;
+import retrofit2.http.Url;
 
 public interface ApiService {
 
@@ -65,7 +66,8 @@ public interface ApiService {
     @GET("api/newhome/nologin/banner/gongchang_banner")
     Observable<DataResponse<List<BannerDataBean>>> gongchangBanner();
 
-
+    @GET("api/newhome/nologin/banner/{type}")
+    Observable<DataResponse<List<BannerDataBean>>> loadBanner(@Path("type") String type);
 
     /**
      * 获取热门搜索关键字

app/src/main/java/com/yihucha/hbyhc/presentation/home/HomeFragment.java

@@ -187,7 +187,8 @@ HomeFragment extends BaseFragment implements View.OnClickListener {
             public void onChanged(UserInfoModel uesrInfoMpdel) {
                 Log.i("qmz", "235");
                 GlideUtils.loadCircleImage(getActivity(), uesrInfoMpdel.getAvatar(), binding.headView.ivHead, R.mipmap.home_default_avatar_220614);
-                binding.headView.btvName.setText(uesrInfoMpdel.getNickname());
+                binding.headView.btvName.setText(uesrInfoMpdel.getNickname()+'\n'+
+                        uesrInfoMpdel.getAnnuity()+"元养老金");
             }
         });
 
@@ -462,6 +463,7 @@ HomeFragment extends BaseFragment implements View.OnClickListener {
     }
     private void setTitleColor(){
         binding.headView.btvName.setTextColor(!isScrolled?Color.WHITE:Color.parseColor("#333333"));
+        binding.headView.ivMessage.setImageResource(!isScrolled?R.mipmap.message:R.mipmap.message_dark);
         binding.headView.tvMessage.setTextColor(!isScrolled?Color.WHITE:Color.parseColor("#333333"));
         binding.headView.viewTop.setVisibility(isScrolled?View.VISIBLE:View.INVISIBLE);
         binding.headView.viewHeaderBg.setVisibility(isScrolled?View.VISIBLE:View.INVISIBLE);

app/src/main/java/com/yihucha/hbyhc/presentation/home/view_model/HomeViewModel.java

@@ -76,7 +76,7 @@ public class HomeViewModel extends BaseViewModel {
     @SuppressLint("CheckResult")
     public void getBannerData() {
         ApiService apiService = NetworkApi.createService(ApiService.class);
-        apiService.homeBanner().compose(NetworkApi.applySchedulers(new BaseObserver<DataResponse<List<BannerDataBean>>>() {
+        apiService.loadBanner("home_banner_new").compose(NetworkApi.applySchedulers(new BaseObserver<DataResponse<List<BannerDataBean>>>() {
             @Override
             public void onSuccess(DataResponse<List<BannerDataBean>> listDataResponse) {
                 if (listDataResponse.responseCode == 200) {

app/src/main/java/com/yihucha/hbyhc/utils/pic33/ActivityCallBacks.java

@@ -40,7 +40,7 @@ public class ActivityCallBacks implements Application.ActivityLifecycleCallbacks
                 Field layout = aClass.getDeclaredField("permissionView");
                 layout.setAccessible(true);
                 RelativeLayout view = (RelativeLayout) layout.get(activity);
-                if (PermissionUtil.checkAndRequestPermissionsInActivity(activity, new String[]{Manifest.permission.READ_MEDIA_IMAGES,Manifest.permission.CAMERA})) {
+                if (PermissionUtil.checkAndRequestPermissionsInActivity(activity, Manifest.permission.READ_MEDIA_IMAGES,Manifest.permission.CAMERA)) {
                     view.setVisibility(View.GONE);
                 }else{
                     view.setVisibility(View.VISIBLE);

app/src/main/res/layout/home_head.xml

@@ -61,9 +61,10 @@
 
                 <ImageView
                     android:id="@+id/iv_message"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:src="@mipmap/icon_home_msg"
+                    android:layout_width="20dp"
+                    android:layout_height="20dp"
+                    android:src="@mipmap/message"
+                    android:scaleType="centerCrop"
                     />
 
                 <TextView