zhanghongrui 3 дней назад
Родитель
Сommit
69daf34909

+ 2 - 0
app/src/main/AndroidManifest.xml

@@ -49,6 +49,8 @@
         android:allowBackup="true"
         android:resizeableActivity="true"
         android:hardwareAccelerated="true"
+        android:icon="@drawable/icon_logo"
+        android:roundIcon="@drawable/icon_logo"
         android:maxAspectRatio="2.4"
         android:label="@string/app_name"
         android:networkSecurityConfig="@xml/network_security_config"

+ 9 - 0
app/src/main/java/com/sjkj/appthreefloor_tsgz/bean/ProFileBean.java

@@ -13,6 +13,15 @@ public class ProFileBean {
   private String deptName;
   private String nickName;
   private String phonenumber;
+  private String sex;
+
+    public String getSex() {
+        return sex;
+    }
+
+    public void setSex(String sex) {
+        this.sex = sex;
+    }
 
     public String getAvatar() {
         return avatar;

+ 19 - 5
app/src/main/java/com/sjkj/appthreefloor_tsgz/fragment/MineFragment.java

@@ -5,11 +5,11 @@ import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.TextView;
 
 import androidx.lifecycle.ViewModelProvider;
 
 import com.bumptech.glide.Glide;
+import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
 import com.bumptech.glide.request.RequestOptions;
 import com.sjkj.appthreefloor_tsgz.BuildConfig;
 import com.sjkj.appthreefloor_tsgz.R;
@@ -18,7 +18,7 @@ import com.sjkj.appthreefloor_tsgz.bean.ProFileBean;
 import com.sjkj.appthreefloor_tsgz.databinding.FragmentMineBinding;
 import com.sjkj.appthreefloor_tsgz.fragment.viewModel.MineViewModel;
 import com.sjkj.appthreefloor_tsgz.net.GetProfileMessageRequest;
-import com.sjkj.base_lib.entity.Params;
+import com.sjkj.appthreefloor_tsgz.utils.AppSystemUtils;
 import com.sjkj.base_lib.net.domain.interactor.ProcessErrorSubscriber;
 import com.sjkj.base_lib.utils.AppTools;
 import com.sjkj.base_lib.utils.ToastUtils;
@@ -50,6 +50,12 @@ public class MineFragment extends BaseFragment {
 
     @Override
     public void initListener() {
+        binding.tvSignOut.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                AppSystemUtils.exitApp();
+            }
+        });
 
     }
 
@@ -68,15 +74,23 @@ public class MineFragment extends BaseFragment {
             @Override
             public void onNext(ProFileBean bean) {
                 super.onNext(bean);
-                if (bean!=null){
+                if (bean!=null) {
                     viewModel.deptName.set(bean.getDeptName());
                     viewModel.nickname.set(bean.getNickName());
                     viewModel.phone.set(bean.getPhonenumber());
                     viewModel.time.set(bean.getCreateTime());
                     viewModel.role.set(bean.getRoles());
-                    if (!TextUtils.isEmpty(bean.getAvatar())){
+                    viewModel.sex.set(bean.getSex());
+                    if (bean.getSex().equals("0")) {
+                        binding.ivSex.setBackground(getActivity().getResources().getDrawable(R.drawable.icon_sex01));
+                    } else {
+                        binding.ivSex.setBackground(getActivity().getResources().getDrawable(R.drawable.icon_sex02));
+                    }
+                    if (!TextUtils.isEmpty(bean.getAvatar())) {
                         Glide.with(getActivity())
-                                .load(AppTools.getImageBaseUrl()+bean.getAvatar())
+                                .load(AppTools.getImageBaseUrl() + bean.getAvatar())
+                                .placeholder(R.drawable.icon_head)
+                                .error(R.drawable.icon_head)
                                 .apply(RequestOptions.circleCropTransform())
                                 .into(binding.ivHead);
                     }

+ 1 - 0
app/src/main/java/com/sjkj/appthreefloor_tsgz/fragment/viewModel/MineViewModel.java

@@ -12,4 +12,5 @@ public class MineViewModel extends BaseViewModel {
     public ObservableField<String> deptName=new ObservableField<>("");
     public ObservableField<String> versionName=new ObservableField<>("");
     public ObservableField<String> time=new ObservableField<>("");
+    public ObservableField<String> sex=new ObservableField<>("");
 }

BIN
app/src/main/res/drawable-xxhdpi/ic_launcher_logo_siping_tsgz.png


BIN
app/src/main/res/drawable-xxhdpi/icon_logo.png


+ 0 - 1
app/src/main/res/layout/custom_marker.xml

@@ -11,7 +11,6 @@
         android:id="@+id/markerImage"
         android:layout_width="40dp"
         android:layout_height="40dp"
-        android:src="@drawable/ic_launcher_logo_siping_tsgz"
         android:visibility="gone" />
 
     <TextView

+ 1 - 1
app/src/main/res/layout/drawer_item.xml

@@ -7,7 +7,7 @@
         android:id="@+id/icon"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:src="@drawable/ic_launcher_logo_siping_tsgz" />
+        android:src="@drawable/icon_logo" />
 
     <TextView
         android:id="@+id/title"

+ 0 - 5
app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_logo_siping_tsgz" />
-    <foreground android:drawable="@drawable/ic_launcher_logo_siping_tsgz" />
-</adaptive-icon>

+ 1 - 1
base-lib/src/main/java/com/sjkj/base_lib/utils/AppTools.java

@@ -479,7 +479,7 @@ public class AppTools {
 
     public static String getBaseUrl() {
       // return mmkv.decodeString("baseUrl", "http://192.168.4.82:8080/api/");
-        return mmkv.decodeString("baseUrl", "http://192.168.4.26/api/");
+        return mmkv.decodeString("baseUrl", "http://192.168.4.26:8080/api/");
     }
 
     public static String getImageBaseUrl() {

+ 2 - 2
config.gradle

@@ -5,8 +5,8 @@ ext {
             minSdkVersion    : 21,
             targetSdkVersion : 31,
             compileSdkVersion: 30,
-            versionCode      : 10404,
-            versionName      : "1.4.4",
+            versionCode      : 10000,
+            versionName      : "1.0.0",
     ]
 
     //Libraries