diff --git a/build.gradle.kts b/build.gradle.kts index db5719b..a2366ff 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -56,4 +56,7 @@ dependencies { implementation ("com.baidu.lbsyun:BaiduMapSDK_Map:7.5.4") implementation ("com.baidu.lbsyun:BaiduMapSDK_Location:9.3.7") implementation ("com.guolindev.permissionx:permissionx:1.7.1") + + implementation ("com.geyifeng.immersionbar:immersionbar:3.2.2") + implementation ("com.geyifeng.immersionbar:immersionbar-components:3.2.2") } \ No newline at end of file diff --git a/src/main/java/com/hnucm/c202201020117/coffee/AddLocationActivity.java b/src/main/java/com/hnucm/c202201020117/coffee/AddLocationActivity.java index b2ec989..536a8a5 100644 --- a/src/main/java/com/hnucm/c202201020117/coffee/AddLocationActivity.java +++ b/src/main/java/com/hnucm/c202201020117/coffee/AddLocationActivity.java @@ -11,6 +11,8 @@ import android.widget.ImageView; import android.widget.RadioButton; import android.widget.RadioGroup; +import com.gyf.immersionbar.ImmersionBar; + public class AddLocationActivity extends AppCompatActivity { @Override diff --git a/src/main/java/com/hnucm/c202201020117/coffee/LocationActivity.java b/src/main/java/com/hnucm/c202201020117/coffee/LocationActivity.java index 34c1d09..f418c87 100644 --- a/src/main/java/com/hnucm/c202201020117/coffee/LocationActivity.java +++ b/src/main/java/com/hnucm/c202201020117/coffee/LocationActivity.java @@ -10,6 +10,8 @@ import android.os.Bundle; import android.view.View; import android.widget.ImageView; +import com.gyf.immersionbar.ImmersionBar; + import org.greenrobot.eventbus.EventBus; public class LocationActivity extends AppCompatActivity { diff --git a/src/main/java/com/hnucm/c202201020117/coffee/MainActivity.java b/src/main/java/com/hnucm/c202201020117/coffee/MainActivity.java index 02a608d..52d9d68 100644 --- a/src/main/java/com/hnucm/c202201020117/coffee/MainActivity.java +++ b/src/main/java/com/hnucm/c202201020117/coffee/MainActivity.java @@ -7,6 +7,8 @@ import androidx.fragment.app.Fragment; import android.os.Bundle; import android.view.View; +import com.gyf.immersionbar.ImmersionBar; + public class MainActivity extends AppCompatActivity { private int fragment_flag; @Override @@ -14,6 +16,8 @@ public class MainActivity extends AppCompatActivity { super.onCreate(savedInstanceState); setContentView(R.layout.activity_main); + ImmersionBar.with(this).init(); + fragment_flag = getIntent().getIntExtra("index",0); ConstraintLayout constraintLayout = findViewById(R.id.constraintLayout3); diff --git a/src/main/java/com/hnucm/c202201020117/coffee/RemarkActivity.java b/src/main/java/com/hnucm/c202201020117/coffee/RemarkActivity.java index d75e10c..2a099a0 100644 --- a/src/main/java/com/hnucm/c202201020117/coffee/RemarkActivity.java +++ b/src/main/java/com/hnucm/c202201020117/coffee/RemarkActivity.java @@ -9,6 +9,8 @@ import android.telecom.Call; import android.view.View; import android.widget.ImageView; +import com.gyf.immersionbar.ImmersionBar; + public class RemarkActivity extends AppCompatActivity { @Override @@ -16,6 +18,8 @@ public class RemarkActivity extends AppCompatActivity { super.onCreate(savedInstanceState); setContentView(R.layout.activity_remark); + ImmersionBar.with(this).init(); + ImageView imageView = findViewById(R.id.imageView57); ConstraintLayout constraintLayout = findViewById(R.id.keep); diff --git a/src/main/java/com/hnucm/c202201020117/coffee/SpecificationActivity.java b/src/main/java/com/hnucm/c202201020117/coffee/SpecificationActivity.java index 7ffba71..b7d7f52 100644 --- a/src/main/java/com/hnucm/c202201020117/coffee/SpecificationActivity.java +++ b/src/main/java/com/hnucm/c202201020117/coffee/SpecificationActivity.java @@ -9,6 +9,7 @@ import android.view.View; import android.widget.ImageView; import com.bumptech.glide.Glide; +import com.gyf.immersionbar.ImmersionBar; public class SpecificationActivity extends AppCompatActivity { public int x; @@ -19,6 +20,8 @@ public class SpecificationActivity extends AppCompatActivity { super.onCreate(savedInstanceState); setContentView(R.layout.activity_specification); + ImmersionBar.with(this).init(); + ImageView imageView = findViewById(R.id.imageView52); Glide.with(SpecificationActivity.this) .load("http://106.53.194.250:30089/i/2024/06/16/666ed1e60a4f3.png") diff --git a/src/main/java/com/hnucm/c202201020117/coffee/StatementActivity.java b/src/main/java/com/hnucm/c202201020117/coffee/StatementActivity.java index cbc40e7..e01a312 100644 --- a/src/main/java/com/hnucm/c202201020117/coffee/StatementActivity.java +++ b/src/main/java/com/hnucm/c202201020117/coffee/StatementActivity.java @@ -18,6 +18,7 @@ import android.widget.TextView; import com.bumptech.glide.Glide; import com.google.gson.Gson; +import com.gyf.immersionbar.ImmersionBar; import java.io.IOException; import java.util.ArrayList; @@ -39,6 +40,8 @@ public class StatementActivity extends AppCompatActivity { super.onCreate(savedInstanceState); setContentView(R.layout.activity_statement); + ImmersionBar.with(this).init(); + ImageView imageView = findViewById(R.id.imageView55); ConstraintLayout constraintLayout = findViewById(R.id.remark); ConstraintLayout constraintLayout1 = findViewById(R.id.End); diff --git a/src/main/java/com/hnucm/c202201020117/coffee/WalletActivity.java b/src/main/java/com/hnucm/c202201020117/coffee/WalletActivity.java index b38be20..67b99e5 100644 --- a/src/main/java/com/hnucm/c202201020117/coffee/WalletActivity.java +++ b/src/main/java/com/hnucm/c202201020117/coffee/WalletActivity.java @@ -8,6 +8,8 @@ import android.os.Bundle; import android.view.View; import android.widget.ImageView; +import com.gyf.immersionbar.ImmersionBar; + public class WalletActivity extends AppCompatActivity { @Override diff --git a/src/main/java/com/hnucm/c202201020117/coffee/WalletActivity2.java b/src/main/java/com/hnucm/c202201020117/coffee/WalletActivity2.java index 74d9d0b..4499ba0 100644 --- a/src/main/java/com/hnucm/c202201020117/coffee/WalletActivity2.java +++ b/src/main/java/com/hnucm/c202201020117/coffee/WalletActivity2.java @@ -8,6 +8,8 @@ import android.os.Bundle; import android.view.View; import android.widget.ImageView; +import com.gyf.immersionbar.ImmersionBar; + public class WalletActivity2 extends AppCompatActivity { @Override diff --git a/src/main/res/layout/activity_statement.xml b/src/main/res/layout/activity_statement.xml index 8cd81db..19e9b5f 100644 --- a/src/main/res/layout/activity_statement.xml +++ b/src/main/res/layout/activity_statement.xml @@ -164,7 +164,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginEnd="8dp" - android:text="共2件商品,小计" + android:text="共X件商品,小计" app:layout_constraintBottom_toBottomOf="@+id/textView157" app:layout_constraintEnd_toStartOf="@+id/textView157" app:layout_constraintTop_toTopOf="@+id/textView157" /> diff --git a/src/main/res/layout/order_item_layout.xml b/src/main/res/layout/order_item_layout.xml index fcdffdd..ff747e1 100644 --- a/src/main/res/layout/order_item_layout.xml +++ b/src/main/res/layout/order_item_layout.xml @@ -30,7 +30,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="16dp" - android:text="leix" + android:text="类型" app:layout_constraintStart_toStartOf="@+id/textView169" app:layout_constraintTop_toBottomOf="@+id/textView169" />