drew 6 жил өмнө
parent
commit
d3d7dbdfe1

+ 5 - 0
app/src/main/java/com/ht/gate/DoorService.java

@@ -5,6 +5,7 @@ import android.content.Intent;
 import android.content.SharedPreferences;
 import android.os.Binder;
 import android.os.Handler;
+import android.text.TextUtils;
 import android.util.Log;
 import android.widget.Toast;
 
@@ -58,6 +59,10 @@ public class DoorService extends Service {
             socket.close();
         }
         String address = sharedPreferences.getString(SettingsActivity.PREF_KEY_ADDRESS, "");
+        if (TextUtils.isEmpty(address)) {
+            address = "127.0.0.1:8000";
+            sharedPreferences.edit().putString(SettingsActivity.PREF_KEY_ADDRESS, address).apply();
+        }
         try {
             host = address.split(":")[0];
             port = Integer.parseInt(address.split(":")[1]);

+ 1 - 5
app/src/main/java/com/ht/gate/MainActivity.java

@@ -175,7 +175,7 @@ public class MainActivity extends AppCompatActivity {
     void clickArrow() {
         ViewGroup.LayoutParams layoutParams = rlMeetings.getLayoutParams();
         int dp36 = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 36, getResources().getDisplayMetrics());
-        int dp108 = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 108, getResources().getDisplayMetrics());
+        int dp108 = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 126, getResources().getDisplayMetrics());
         int height = layoutParams.height;
 
         ValueAnimator anim = ValueAnimator.ofInt(height, height < dp108 ? dp108 : dp36);
@@ -299,10 +299,6 @@ public class MainActivity extends AppCompatActivity {
                     | View.SYSTEM_UI_FLAG_FULLSCREEN
                     | View.SYSTEM_UI_FLAG_IMMERSIVE;
             decorView.setSystemUiVisibility(uiOptions);
-            if (MyApplication.roomInfo != null) {
-                tvRoomName.setText(MyApplication.roomInfo.getRoomName());
-                tvRoomNum.setText(MyApplication.roomInfo.getRoomBizNum());
-            }
         }
         return super.dispatchTouchEvent(me);
     }

+ 2 - 6
app/src/main/java/com/ht/gate/WelcomeActivity.java

@@ -195,7 +195,7 @@ public class WelcomeActivity extends AppCompatActivity {
         }
         tvAdviserName.setText(empInfo.getUserName());
         if (empInfo.getDescription() == null) {
-            tvIntro.setText("20年从业经验,经历多次牛转换磨练,对市场具有一定的敏感度,注重价值投资,资产配置,秉承专业的头次理念服务客户");
+            tvIntro.setText("20年从业经验,经历多次牛转换磨练,对市场具有一定的敏感度,注重价值投资,资产配置,秉承专业的投资理念服务客户");
         } else {
             tvIntro.setText(empInfo.getDescription());
         }
@@ -260,7 +260,7 @@ public class WelcomeActivity extends AppCompatActivity {
     void clickArrow() {
         ViewGroup.LayoutParams layoutParams = rlMeetings.getLayoutParams();
         int dp36 = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 36, getResources().getDisplayMetrics());
-        int dp108 = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 108, getResources().getDisplayMetrics());
+        int dp108 = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 126, getResources().getDisplayMetrics());
         int height = layoutParams.height;
 
         ValueAnimator anim = ValueAnimator.ofInt(height, height < dp108 ? dp108 : dp36);
@@ -353,10 +353,6 @@ public class WelcomeActivity extends AppCompatActivity {
                     | View.SYSTEM_UI_FLAG_FULLSCREEN
                     | View.SYSTEM_UI_FLAG_IMMERSIVE;
             decorView.setSystemUiVisibility(uiOptions);
-            if (MyApplication.roomInfo != null) {
-                tvRoomName.setText(MyApplication.roomInfo.getRoomName());
-                tvRoomNum.setText(MyApplication.roomInfo.getRoomBizNum());
-            }
         }
         return super.dispatchTouchEvent(me);
     }