Merge remote-tracking branch 'origin/master' into baotou_medical_school

# Conflicts:
#	app/build.gradle

app/src/main/java/xn/hxp/ui/MainActivity.java

@@ -17,6 +17,7 @@ import android.util.Log;
 import android.view.KeyEvent;
 import android.view.View;
 import android.widget.EditText;
+import android.widget.TextView;
 
 import androidx.viewbinding.ViewBinding;
 
@@ -278,10 +279,20 @@ public class MainActivity extends BaseActivity {
                     ChemicalApp.confs = data;
                     mLoginType = data.getLoginType();
                     if (data.getLevelName() != null) {
-                        String result = data.getLevelName().chars()
-                                .mapToObj(c -> String.valueOf((char) c))
-                                .reduce("", (s1, s2) -> s1 + "\n" + s2);
-                        viewBinding.tvNoName.setText(result);
+                        // 一行一字
+                        if (!TextUtils.isEmpty(data.getLevelName())) {
+                            String text = data.getLevelName();
+                            StringBuilder sb = new StringBuilder();
+                            char[] chars = text.toCharArray();
+                            for (int i = 0; i < chars.length; i++) {
+                                sb.append(chars[i]);
+                                if (i < chars.length - 1) {
+                                    sb.append("\n");
+                                }
+                            }
+                            viewBinding.tvNoName.setText(sb.toString());
+                        }
+
                         GradientDrawable shapes = new GradientDrawable();
                         shapes.setShape(GradientDrawable.RECTANGLE);
                         shapes.setColor(Color.parseColor(data.getLevelColor()));