diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/auth/FaceSuccActivity.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/auth/FaceSuccActivity.java index 5c9f7f0..ced3ebb 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/auth/FaceSuccActivity.java +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/auth/FaceSuccActivity.java @@ -32,11 +32,11 @@ public class FaceSuccActivity extends BaseAppCompatActivity { Button btnAddCar = findViewById(R.id.btnAddCar); boolean isGoCar = getIntent().getBooleanExtra("isGoCar", false); if (isGoCar){ - btnHome.setText("返回"); - btnAddCar.setVisibility(View.GONE); - }else{ btnHome.setText("返回首页"); btnAddCar.setVisibility(View.VISIBLE); + }else{ + btnHome.setText("返回"); + btnAddCar.setVisibility(View.GONE); } btnHome.setOnClickListener(v -> finish()); @@ -44,6 +44,7 @@ public class FaceSuccActivity extends BaseAppCompatActivity { Intent in = new Intent(con, CertificatesActivity.class); in.putExtra("index", 2); startActivity(in); + finish(); }); } diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/my/SetupActivity.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/my/SetupActivity.java index 041408d..7581ec4 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/my/SetupActivity.java +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/my/SetupActivity.java @@ -13,6 +13,7 @@ import android.widget.Toast; import androidx.annotation.Nullable; import com.arpa.hndahesudintocctmsdriver.parts.ConfigParts; +import com.arpa.hndahesudintocctmsdriver.ui.web.WebOnlyOneActivity; import com.google.gson.Gson; import com.lxj.xpopup.XPopup; import com.arpa.hndahesudintocctmsdriver.R; @@ -94,19 +95,19 @@ public class SetupActivity extends BaseActivity { public void initView(Object obj) { super.initView(obj); r1.setOnClickListener(v12 -> { - Intent in=new Intent(con,WebActivity.class); + Intent in=new Intent(con, WebOnlyOneActivity.class); in.putExtra("title","隐私政策"); in.putExtra("url",url2); startActivity(in); }); r2.setOnClickListener(v12 -> { - Intent in=new Intent(con,WebActivity.class); + Intent in=new Intent(con,WebOnlyOneActivity.class); in.putExtra("title","用户协议"); in.putExtra("url",url1); startActivity(in); }); r3.setOnClickListener(v12 -> { - Intent in=new Intent(con,WebActivity.class); + Intent in=new Intent(con,WebOnlyOneActivity.class); in.putExtra("title","运输安全责任书"); in.putExtra("url",url3); startActivity(in); @@ -121,7 +122,7 @@ public class SetupActivity extends BaseActivity { startActivity(in); }); r8.setOnClickListener(v12 -> { - Intent in=new Intent(con,WebActivity.class); + Intent in=new Intent(con,WebOnlyOneActivity.class); in.putExtra("title","交易规则"); in.putExtra("url","http://agreement.dahehuoyun.com/rule/transactionRules/dist/index.html#/"); startActivity(in); diff --git a/app/src/main/res/drawable/bg_btn_deepgreen16.xml b/app/src/main/res/drawable/bg_btn_deepgreen16.xml index 666df07..dac80e3 100644 --- a/app/src/main/res/drawable/bg_btn_deepgreen16.xml +++ b/app/src/main/res/drawable/bg_btn_deepgreen16.xml @@ -6,7 +6,7 @@ android:startColor="#0b64f6 " android:endColor="#5cb3fd" android:centerX="0" android:centerY="0" android:gradientRadius="@dimen/dp_63" /> - + diff --git a/app/src/main/res/drawable/bg_btn_green16.xml b/app/src/main/res/drawable/bg_btn_green16.xml index 103bbd9..b006f86 100644 --- a/app/src/main/res/drawable/bg_btn_green16.xml +++ b/app/src/main/res/drawable/bg_btn_green16.xml @@ -3,7 +3,7 @@ - + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_face_succ_result.xml b/app/src/main/res/layout/activity_face_succ_result.xml index 7e6a3d2..b0855fe 100644 --- a/app/src/main/res/layout/activity_face_succ_result.xml +++ b/app/src/main/res/layout/activity_face_succ_result.xml @@ -46,15 +46,15 @@