From c728e759dfd3d7d77211f05d07e7dab45459c361 Mon Sep 17 00:00:00 2001 From: jinyuer <454386664@qq.com> Date: Tue, 14 Dec 2021 16:24:00 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E6=89=93=E5=9B=9E=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/misc.xml | 1 + app/build.gradle | 4 +- app/release/output-metadata.json | 4 +- app/src/main/AndroidManifest.xml | 4 +- .../com/sl/house_property/LogoActivity.java | 55 ++++++++++++------ .../com/sl/house_property/MainActivity.java | 16 +++--- .../discovery/AddDiscoveryActivity.java | 8 ++- .../user/AddAnewGranteeActivity.java | 7 ++- app/src/main/res/layout/activity_login.xml | 56 ------------------- app/src/main/res/layout/activity_main.xml | 1 - 10 files changed, 62 insertions(+), 94 deletions(-) diff --git a/.idea/misc.xml b/.idea/misc.xml index 4da7b85..aa2fbba 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -28,6 +28,7 @@ + diff --git a/app/build.gradle b/app/build.gradle index ad00e28..3154dc1 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -38,8 +38,8 @@ android { minSdkVersion 21 targetSdkVersion 29 // multiDexEnabled true - versionCode 2 - versionName "1.1.3" + versionCode 5 + versionName "1.1.5" testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' ndk { diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json index 6f06e1b..d317e3c 100644 --- a/app/release/output-metadata.json +++ b/app/release/output-metadata.json @@ -10,8 +10,8 @@ { "type": "SINGLE", "filters": [], - "versionCode": 2, - "versionName": "1.1.3", + "versionCode": 5, + "versionName": "1.1.5", "outputFile": "app-release.apk" } ] diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 576c17b..e4672ec 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -118,7 +118,7 @@ @@ -156,7 +156,7 @@ android:screenOrientation="portrait" android:theme="@style/TAppTheme" /> diff --git a/app/src/main/java/com/sl/house_property/LogoActivity.java b/app/src/main/java/com/sl/house_property/LogoActivity.java index de31a0e..95c7be4 100644 --- a/app/src/main/java/com/sl/house_property/LogoActivity.java +++ b/app/src/main/java/com/sl/house_property/LogoActivity.java @@ -24,9 +24,10 @@ import com.tencent.bugly.Bugly; import cn.jpush.android.api.JPushInterface; import tools.Config; +import utils.ConfigTitiles; -public class LogoActivity extends Activity{ +public class LogoActivity extends Activity { int delaytime = 2000; @@ -35,11 +36,11 @@ public class LogoActivity extends Activity{ protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_logo); - RelativeLayout imaloder= findViewById(R.id.imaloder); + RelativeLayout imaloder = findViewById(R.id.imaloder); ImageView tipImage = findViewById(R.id.tip_image); RelativeLayout.LayoutParams tipLP = (RelativeLayout.LayoutParams) tipImage.getLayoutParams(); int screenHigh = ScreenUtils.getScreenHeight(); - tipLP.topMargin = (int) (screenHigh*0.28); + tipLP.topMargin = (int) (screenHigh * 0.28); tipImage.setLayoutParams(tipLP); @@ -47,17 +48,18 @@ public class LogoActivity extends Activity{ imaloder.postDelayed(new Runnable() { @Override public void run() { + onceOrNot(); finish(); - if( (Config.getInstance(LogoActivity.this).getUser()==null)){ - Intent intent =new Intent(LogoActivity.this,LoginActivity.class); - startActivity(intent); - }else { - startActivity( new Intent(LogoActivity.this, MainTabActivity.class)); - } +// if( (Config.getInstance(LogoActivity.this).getUser()==null)){ +// Intent intent =new Intent(LogoActivity.this,LoginActivity.class); +// startActivity(intent); +// }else { +// startActivity( new Intent(LogoActivity.this, MainTabActivity.class)); +// } } - },delaytime); + }, delaytime); } else { startDialog(); @@ -65,6 +67,30 @@ public class LogoActivity extends Activity{ } + private void onceOrNot() { +// // TODO Auto-generated method stub +// int once = Config.getInstance(LogoActivity.this).getInt(ConfigTitiles.ONCEORNOT, 0); +// if (once == 0) { +// Config.getInstance(getApplicationContext()).put(ConfigTitiles.ONCEORNOT, 1); +// startActivity(new Intent(LogoActivity.this, MainActivity.class)); +// +// } else { +// if ((Config.getInstance(LogoActivity.this).getUser() == null)) { +// Intent intent = new Intent(LogoActivity.this, LoginActivity.class); +// startActivity(intent); +// } else { +// startActivity(new Intent(LogoActivity.this, MainTabActivity.class)); +// } +// +// +// } + if ((Config.getInstance(LogoActivity.this).getUser() == null)) { + Intent intent = new Intent(LogoActivity.this, LoginActivity.class); + startActivity(intent); + } else { + startActivity(new Intent(LogoActivity.this, MainTabActivity.class)); + } + } private void startDialog() { AlertDialog alertDialog = new AlertDialog.Builder(this).create(); @@ -131,15 +157,10 @@ public class LogoActivity extends Activity{ getSharedPreferences("first", Context.MODE_PRIVATE).edit().putInt("first", 1).apply(); JPushInterface.init(getApplication()); - Bugly.init(getApplication(),"d45325664f",false); + Bugly.init(getApplication(), "d45325664f", false); alertDialog.cancel(); + onceOrNot(); finish(); - if( (Config.getInstance(LogoActivity.this).getUser()==null)){ - Intent intent =new Intent(LogoActivity.this,LoginActivity.class); - startActivity(intent); - }else { - startActivity( new Intent(LogoActivity.this, MainTabActivity.class)); - } } }); } diff --git a/app/src/main/java/com/sl/house_property/MainActivity.java b/app/src/main/java/com/sl/house_property/MainActivity.java index 3b88cdf..d255811 100644 --- a/app/src/main/java/com/sl/house_property/MainActivity.java +++ b/app/src/main/java/com/sl/house_property/MainActivity.java @@ -94,7 +94,7 @@ public class MainActivity extends Activity { return; } else { //onceStart(); - otherStart(); + // otherStart(); return; } @@ -162,8 +162,12 @@ public class MainActivity extends Activity { image2.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - startActivity(new Intent(MainActivity.this, LogoActivity.class)); - finish(); + if ((Config.getInstance(MainActivity.this).getUser() == null)) { + Intent intent = new Intent(MainActivity.this, LoginActivity.class); + startActivity(intent); + } else { + startActivity(new Intent(MainActivity.this, MainTabActivity.class)); + } } }); ArrayList viewlist = new ArrayList(); @@ -231,12 +235,6 @@ public class MainActivity extends Activity { } - private void otherStart() { - // TODO Auto-generated method stub - Intent intent = new Intent(MainActivity.this, LogoActivity.class); - startActivity(intent); - finish(); - } @Override public boolean dispatchTouchEvent(MotionEvent ev) {//分发事件 diff --git a/app/src/main/java/com/sl/house_property/discovery/AddDiscoveryActivity.java b/app/src/main/java/com/sl/house_property/discovery/AddDiscoveryActivity.java index 97cb94e..aa5655b 100644 --- a/app/src/main/java/com/sl/house_property/discovery/AddDiscoveryActivity.java +++ b/app/src/main/java/com/sl/house_property/discovery/AddDiscoveryActivity.java @@ -200,6 +200,7 @@ public class AddDiscoveryActivity extends BaseActivity files = new ArrayList<>(); private void goToSelect() { - ArrayList files = new ArrayList<>(); int postType = PictureMimeType.ofAll(); if (additionImageWrapper.getImageList().size() > 0) { postType = PictureMimeType.ofImage(); @@ -278,7 +279,7 @@ public class AddDiscoveryActivity extends BaseActivity map, String msg, final int requstecode) { progressDialog.setMessage(msg); progressDialog.setCancelable(false); @@ -466,6 +466,8 @@ public class AddAnewGranteeActivity extends BaseActivity - - - - - - - - - - diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 3b274cd..df59366 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -6,7 +6,6 @@