詹子聪 5 vuotta sitten
vanhempi
commit
2891500d8b

+ 11 - 0
app/src/main/java/com/miekir/ym/tool/StringTool.java

@@ -1,8 +1,11 @@
 package com.miekir.ym.tool;
 
+import android.content.Context;
 import android.text.TextUtils;
 import android.util.Base64;
 
+import com.miekir.common.utils.ContextManager;
+
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.nio.charset.StandardCharsets;
@@ -71,4 +74,12 @@ public class StringTool {
         tokenArray[len-1] = temp;
         return new String(tokenArray);
     }
+
+    public static String getString(int stringId) {
+        Context context = ContextManager.getInstance().getContext();
+        if (context == null) {
+            return "";
+        }
+        return context.getString(stringId);
+    }
 }

+ 54 - 0
app/src/main/java/com/miekir/ym/tool/TimeTool.java

@@ -0,0 +1,54 @@
+package com.miekir.ym.tool;
+
+
+import com.miekir.ym.R;
+
+import java.util.Calendar;
+
+/**
+ *
+ *
+ * @author Miekir
+ * @date 2020/7/24 9:15
+ * Description: 时间相关工具类
+ */
+public class TimeTool {
+    /**
+     *
+     * @return 返回当前是上午、中午、下午
+     */
+    public static String getCurrentTimePeriod() {
+        Calendar cal = Calendar.getInstance();
+        int hour = cal.get(Calendar.HOUR_OF_DAY);
+
+        if (hour >= 3 && hour < 6) {
+            return StringTool.getString(R.string.hello_lingchen);
+        }
+
+        if (hour >= 6 && hour < 8) {
+            return StringTool.getString(R.string.hell_zaoshang);
+        }
+
+        if (hour >= 8 && hour < 11) {
+            return StringTool.getString(R.string.hello_shangwu);
+        }
+
+        if (hour >= 11 && hour < 13) {
+            return StringTool.getString(R.string.hello_zhongwu);
+        }
+
+        if (hour >= 13 && hour < 17) {
+            return StringTool.getString(R.string.hello_xiawu);
+        }
+
+        if (hour >= 17 && hour < 19) {
+            return StringTool.getString(R.string.hello_bangwan);
+        }
+
+        if (hour >= 19 && hour < 23) {
+            return StringTool.getString(R.string.hello_wanshang);
+        }
+
+        return StringTool.getString(R.string.hello_shenye);
+    }
+}

+ 6 - 1
app/src/main/java/com/miekir/ym/ui/home/more/MineActivity.java

@@ -6,6 +6,7 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.view.View;
+import android.widget.TextView;
 
 import androidx.appcompat.app.AlertDialog;
 
@@ -14,6 +15,7 @@ import com.miekir.ym.R;
 import com.miekir.ym.base.YangActivity;
 import com.miekir.ym.bean.BeiUser;
 import com.miekir.ym.manager.UserInfoManager;
+import com.miekir.ym.tool.TimeTool;
 import com.miekir.ym.ui.home.more.add.AddCouponActivity;
 
 public class MineActivity extends YangActivity implements View.OnClickListener {
@@ -27,7 +29,10 @@ public class MineActivity extends YangActivity implements View.OnClickListener {
     @Override
     public void initViews(Bundle savedInstanceState) {
         mUser = UserInfoManager.getInstance().getBeiUser();
-        setTitle("个人中心");
+        setTitle(String.format("%s好", TimeTool.getCurrentTimePeriod()));
+        TextView tv_account = findViewById(R.id.tv_account);
+        tv_account.setText(mUser.nickName);
+
         ViewTool.setOnClickListener(this, this,
                 new int[]{R.id.tv_my_fav, R.id.btn_exit_login, R.id.tv_add_coupon});
 

+ 31 - 4
app/src/main/res/layout/activity_mine.xml

@@ -9,6 +9,35 @@
 
     <include layout="@layout/view_toolbar"/>
 
+    <LinearLayout
+        android:id="@+id/ll_current_account"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:background="?attr/selectableItemBackground"
+        android:paddingStart="@dimen/activity_horizontal_margin"
+        android:paddingEnd="@dimen/activity_horizontal_margin">
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="@dimen/height_tab_bar"
+            android:text="当前账号"
+            android:textColor="@color/black_text"
+            android:gravity="center_vertical" />
+        <Space
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"/>
+        <TextView
+            android:id="@+id/tv_account"
+            android:layout_width="wrap_content"
+            android:layout_height="@dimen/height_tool_bar"
+            android:layout_marginStart="@dimen/margin_default"
+            android:textColor="@color/gray_text_hint"
+            android:gravity="center_vertical" />
+    </LinearLayout>
+
+    <include layout="@layout/view_divider"/>
+
     <!--我的收藏-->
     <TextView
         android:id="@+id/tv_my_fav"
@@ -19,11 +48,9 @@
         android:paddingStart="@dimen/activity_horizontal_margin"
         android:paddingEnd="@dimen/activity_horizontal_margin"
         android:text="我的收藏"
-        android:textColor="@color/black_text"
-        android:visibility="gone"/>
+        android:textColor="@color/black_text"/>
 
-    <include layout="@layout/view_divider"
-        android:visibility="gone"/>
+    <include layout="@layout/view_divider"/>
 
     <!--管理员才能看到此界面-->
     <LinearLayout

+ 9 - 0
app/src/main/res/values/strings.xml

@@ -1,3 +1,12 @@
 <resources>
     <string name="app_name">羊毛党</string>
+
+    <string name="hello_lingchen">凌晨</string>
+    <string name="hell_zaoshang">早上</string>
+    <string name="hello_shangwu">上午</string>
+    <string name="hello_zhongwu">中午</string>
+    <string name="hello_xiawu">下午</string>
+    <string name="hello_bangwan">傍晚</string>
+    <string name="hello_wanshang">晚上</string>
+    <string name="hello_shenye">深夜</string>
 </resources>