新一次提交

BoomZhang · Apr 26, 2019 · bf4e00a · bf4e00a
1 parent 048789e
commit bf4e00a
Show file tree

Hide file tree

Showing 10 changed files with 74 additions and 30 deletions.
diff --git a/.idea/caches/gradle_models.ser b/.idea/caches/gradle_models.ser
diff --git a/app/build.gradle b/app/build.gradle
@@ -29,10 +29,15 @@ android {
 }
 
 dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
-    //implementation 'com.android.support:appcompat-v7:28.0.0'
-    implementation 'com.roughike:bottom-bar:2.0.2'
-    testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+  implementation fileTree(dir: 'libs', include: ['*.jar'])
+  //implementation 'com.android.support:appcompat-v7:28.0.0'
+  implementation 'com.roughike:bottom-bar:2.0.2'
+  testImplementation 'junit:junit:4.12'
+  androidTestImplementation 'com.android.support.test:runner:1.0.2'
+  androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+  implementation 'com.android.support:support-annotations:23.1.1'
+  implementation files('libs/common-lang3.jar')
+  implementation files('libs/photo-view.jar')
+  implementation files('libs/umeng-analytics-v5.6.1.jar')
+  implementation files('libs/universal-image-loader-1.9.5.jar')
 }
diff --git a/app/libs/common-lang3.jar b/app/libs/common-lang3.jar
diff --git a/app/libs/photo-view.jar b/app/libs/photo-view.jar
diff --git a/app/libs/umeng-analytics-v5.6.1.jar b/app/libs/umeng-analytics-v5.6.1.jar
diff --git a/app/libs/universal-image-loader-1.9.5.jar b/app/libs/universal-image-loader-1.9.5.jar
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -2,6 +2,16 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
   package="zc.neu.com.securitystorage">
 
+  <uses-permission android:name="android.permission.CAMERA" />
+  <uses-permission android:name="android.permission.INTERNET" />
+  <uses-permission android:name="android.permission.READ_PHONE_STATE" />
+  <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+  <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+  <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+
+  <uses-feature android:name="android.hardware.camera" />
+  <uses-feature android:name="android.hardware.camera.autofocus" />
+
   <application
     android:allowBackup="true"
     android:icon="@mipmap/ic_launcher"
@@ -20,6 +30,4 @@
     <activity android:name=".Activity.TextActivity"/>
   </application>
 
-  <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"></uses-permission>
-
 </manifest>
diff --git a/app/src/main/java/zc/neu/com/securitystorage/Activity/MainActivity.java b/app/src/main/java/zc/neu/com/securitystorage/Activity/MainActivity.java
@@ -5,11 +5,11 @@
 import android.support.v4.view.ViewPager;
 import android.support.v7.app.ActionBar;
 import android.support.v7.app.AppCompatActivity;
-import android.view.Menu;
-import android.view.MenuItem;
 import android.view.View;
 import android.widget.Button;
+import java.util.Arrays;
 import zc.neu.com.securitystorage.Adapter.MainFragmentAdapter;
+import zc.neu.com.securitystorage.Encrypt.AES;
 import zc.neu.com.securitystorage.R;
 
 import static zc.neu.com.securitystorage.Util.ConstantUtil.CREAT;
@@ -37,7 +37,8 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
   protected void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
     setContentView(R.layout.activity_main);
-    initViews();
+
+    //initViews();
   }
 
   private void initViews(){
@@ -75,22 +76,22 @@ public void onClick(View v) {
     }
   }
 
-  @Override
-  public boolean onCreateOptionsMenu(Menu menu) {
-    super.onCreateOptionsMenu(menu);
-    getMenuInflater().inflate(R.menu.main,menu);
-    return true;
-  }
-
-  @Override
-  public boolean onOptionsItemSelected(MenuItem item) {
-    switch (item.getItemId()){
-      case R.id.main_bt_add:
-        gotoCreateNewFile();
-        break;
-    }
-    return super.onOptionsItemSelected(item);
-  }
+  //@Override
+  //public boolean onCreateOptionsMenu(Menu menu) {
+  //  super.onCreateOptionsMenu(menu);
+  //  getMenuInflater().inflate(R.menu.main,menu);
+  //  return true;
+  //}
+  //
+  //@Override
+  //public boolean onOptionsItemSelected(MenuItem item) {
+  //  switch (item.getItemId()){
+  //    case R.id.main_bt_add:
+  //      gotoCreateNewFile();
+  //      break;
+  //  }
+  //  return super.onOptionsItemSelected(item);
+  //}
 
   private void gotoCreateNewFile(){
     Intent intent = new Intent(MainActivity.this, TextActivity.class);

diff --git a/app/src/main/java/zc/neu/com/securitystorage/Adapter/MainFragmentAdapter.java b/app/src/main/java/zc/neu/com/securitystorage/Adapter/MainFragmentAdapter.java
@@ -8,6 +8,10 @@
 import zc.neu.com.securitystorage.Fragment.ImageFragment;
 import zc.neu.com.securitystorage.Fragment.SettingFragment;
 
+import static zc.neu.com.securitystorage.Util.ConstantUtil.FILE;
+import static zc.neu.com.securitystorage.Util.ConstantUtil.IMAGE;
+import static zc.neu.com.securitystorage.Util.ConstantUtil.SETTING;
+
 /**
  * 创建时间：2019/2/20
  * 作者：zhangchao
@@ -24,11 +28,11 @@ public MainFragmentAdapter(FragmentManager fm) {
   @Override
   public Fragment getItem(int position) {
 
-    if(position == MainActivity.FILE){
+    if(position == FILE){
       return new FileFragment();
-    }else if(position == MainActivity.IMAGE){
+    }else if(position == IMAGE){
       return new ImageFragment();
-    }else if(position == MainActivity.SETTING){
+    }else if(position == SETTING){
       return new SettingFragment();
     }
 

diff --git a/app/src/main/java/zc/neu/com/securitystorage/Util/LogUtil.java b/app/src/main/java/zc/neu/com/securitystorage/Util/LogUtil.java
@@ -0,0 +1,26 @@
+package zc.neu.com.securitystorage.Util;
+
+import android.util.Log;
+
+/**
+ * 创建时间：2019/4/25
+ * 作者：zhangchao
+ * 描述：Log的工具类
+ */
+public class LogUtil {
+
+  private static String tag = "zhang";
+
+  public static void d(String message){
+    Log.d(tag, message);
+  }
+
+  public static void i(String message){
+    Log.i(tag,message);
+  }
+
+  public static void e(String message){
+    Log.e(tag,message);
+  }
+
+}