Intro 베가에서 안되던 부분 수정완료!

jangwonseo · Nov 6, 2015 · 1d035ae · 1d035ae
1 parent 6994d74
commit 1d035ae
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 15 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -15,7 +15,7 @@
     <uses-permission android:name="android.permission.WRITE_OWNER_DATA" />
     <uses-permission android:name="android.permission.READ_OWNER_DATA" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
-
+    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
     <application
         android:name=".sign.MyApplication"
         android:allowBackup="true"

diff --git a/app/src/main/java/vivz/slidenerd/agriculture/home/IntroActivity.java b/app/src/main/java/vivz/slidenerd/agriculture/home/IntroActivity.java
@@ -40,6 +40,8 @@ public class IntroActivity extends Activity {
     AlertDialog.Builder alt_bld;
     Boolean isUpdate = false;
 
+    Runnable irun;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -119,6 +121,18 @@ public void onClick(DialogInterface dialog, int id) {
                 AlertDialog alert = alt_bld.create();
                 alert.setTitle("안 내");
                 alert.show();
+            }else{
+                irun = new Runnable() {
+                    @Override
+                    public void run() {
+                        if(!isUpdate) {
+                            Intent introIntent = new Intent(IntroActivity.this, HomeActivity.class);
+                            startActivity(introIntent);
+                            overridePendingTransition(android.R.anim.fade_in, android.R.anim.fade_out);
+                            finish();
+                        }
+                    }
+                };
             }
             super.onPostExecute(result);
 
@@ -127,17 +141,7 @@ public void onClick(DialogInterface dialog, int id) {
     }
 
 
-    Runnable irun = new Runnable() {
-        @Override
-        public void run() {
-            if(!isUpdate) {
-                Intent introIntent = new Intent(IntroActivity.this, HomeActivity.class);
-                startActivity(introIntent);
-                overridePendingTransition(android.R.anim.fade_in, android.R.anim.fade_out);
-                finish();
-            }
-        }
-    };
+
     @Override
     protected void onDestroy() {
 

diff --git a/settings.gradle b/settings.gradle
@@ -1 +1 @@
-include 'ImageSliderLibrary', ':jsoup-1.7.3', ':MarketVersionChecker', ':ImageSliderLibrary', ':app', ':com.skp.Tmap_1.0.33'
+include 'ImageSliderLibrary', ':jsoup-1.7.3', ':MarketVersionChecker',':ImageSliderLibrary', ':app', ':com.skp.Tmap_1.0.33'
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		include 'ImageSliderLibrary', ':jsoup-1.7.3', ':MarketVersionChecker', ':ImageSliderLibrary', ':app', ':com.skp.Tmap_1.0.33'
		include 'ImageSliderLibrary', ':jsoup-1.7.3', ':MarketVersionChecker',':ImageSliderLibrary', ':app', ':com.skp.Tmap_1.0.33'