add resources

yiwent · Sep 14, 2017 · 9cc8350 · 9cc8350
1 parent 5e55ce6
commit 9cc8350
Show file tree

Hide file tree

Showing 14 changed files with 71 additions and 35 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -18,7 +18,7 @@ android {
         useLibrary "org.apache.http.legacy"
         ndk {
             //设置支持的SO库架构
-            abiFilters 'armeabi'//, 'x86', 'armeabi-v7a', 'x86_64', 'arm64-v8a'
+            abiFilters 'armeabi', 'x86'//, 'armeabi-v7a', 'x86_64', 'arm64-v8a'
         }
     }
     buildTypes {
@@ -89,6 +89,9 @@ dependencies {
     compile 'com.patrickpissurno:ripple-effect:1.3.1'
     compile 'com.github.yiwent:PhysicsLayout:1.1.1'
     compile 'com.github.yiwent:ShiftyTextview:1.1.0'
+    compile 'com.tencent.bugly:crashreport:2.6.5'
+    compile 'com.tencent.bugly:nativecrashreport:3.3.0'
+    //compile 'com.umeng.analytics:analytics:latest.integration'
     testCompile 'junit:junit:4.12'
     apt 'com.jakewharton:butterknife-compiler:8.4.0'
 }
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
@@ -110,3 +110,6 @@
 -keep class org.apache.http.**{*;}
 
 -keep class com.iflytek.**{*;}
+##tencent.bugly
+-dontwarn com.tencent.bugly.**
+-keep public class com.tencent.bugly.**{*;}
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -13,6 +13,7 @@
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"/>
     <uses-permission android:name="android.permission.WAKE_LOCK"/>
+    <uses-permission android:name="android.permission.READ_LOGS" />
 
     <!-- sns -->
     <uses-permission android:name="android.permission.READ_CONTACTS"/>

diff --git a/app/src/main/java/com/yiwen/mobike/MyApplication.java b/app/src/main/java/com/yiwen/mobike/MyApplication.java
@@ -11,6 +11,7 @@
 import com.facebook.imagepipeline.decoder.SimpleProgressiveJpegConfig;
 import com.orhanobut.logger.AndroidLogAdapter;
 import com.orhanobut.logger.Logger;
+import com.tencent.bugly.crashreport.CrashReport;
 import com.yiwen.mobike.bean.MyUser;
 import com.yiwen.mobike.utils.UserLocalData;
 
@@ -33,6 +34,7 @@ public class MyApplication extends Application {
     @Override
     public void onCreate() {
         super.onCreate();
+        CrashReport.initCrashReport(getApplicationContext(), "e1a62089c6", false);
         ImagePipelineConfig config = ImagePipelineConfig.newBuilder(this)
                 .setProgressiveJpegConfig(new SimpleProgressiveJpegConfig())
                 .build();

diff --git a/app/src/main/java/com/yiwen/mobike/api/getUrl.java b/app/src/main/java/com/yiwen/mobike/api/getUrl.java
@@ -9,7 +9,7 @@ public class getUrl {
     public static boolean c = false;
     public static boolean d = true;
 
-    public static String a(String addUrl)//getUrl
+    public static String getUrl(String addUrl)//a
     {
         String protocol = null;
         if (d)
@@ -42,7 +42,7 @@ private static String getBaseUrl(String paramString)//b
         return "api.mobike.com/mobike-api";
     }
 
-    //  public static abstract interface getUrl
+    //  public static abstract interface a
     //  {
     //    public static final int A = 350;
     //    public static final int B = 404;
@@ -54,7 +54,7 @@ private static String getBaseUrl(String paramString)//b
     //    public static final int H = 548;
     //    public static final int I = 600;
     //    public static final int J = 601;
-    //    public static final int getUrl = 0;
+    //    public static final int a = 0;
     //    public static final int b = 0;
     //    public static final int c = 200;
     //    public static final int d = 201;

diff --git a/app/src/main/java/com/yiwen/mobike/bean/CountryEnum.java b/app/src/main/java/com/yiwen/mobike/bean/CountryEnum.java
@@ -15,22 +15,6 @@ public enum  CountryEnum {
     public final String iso;
     public final String mobileCode;
 
-//    static
-//    {
-//        America = new CountryEnum("America", 2, 2, "+1", "US");
-//        UnitedKingdom = new CountryEnum("UnitedKingdom", 3, 3, "+44", "GB");
-//        Malaysia = new CountryEnum("Malaysia", 4, 4, "+60", "MY");
-//        Taiwan = new CountryEnum("Taiwan", 5, 5, "+886", "TW");
-//        CountryEnum[] arrayOfCountryEnum = new CountryEnum[6];
-//        arrayOfCountryEnum[0] = China;
-//        arrayOfCountryEnum[1] = Singapore;
-//        arrayOfCountryEnum[2] = America;
-//        arrayOfCountryEnum[3] = UnitedKingdom;
-//        arrayOfCountryEnum[4] = Malaysia;
-//        arrayOfCountryEnum[5] = Taiwan;
-//        $VALUES = arrayOfCountryEnum;
-//    }
-
     private CountryEnum(int id, String mobileCode, String iso)
     {
         this.id = id;

diff --git a/app/src/main/java/com/yiwen/mobike/qrcode/CaptureActivity.java b/app/src/main/java/com/yiwen/mobike/qrcode/CaptureActivity.java
@@ -447,7 +447,7 @@ public void onCompletion(MediaPlayer mediaPlayer) {
      * yiwen add
      * @param context
      * @param isOnlyNub
-     * @return
+     * @return Intent
      */
 
     public static Intent getMyIntent(Context context, boolean isOnlyNub) {

diff --git a/app/src/main/java/com/yiwen/mobike/utils/BuidUrl.java b/app/src/main/java/com/yiwen/mobike/utils/BuidUrl.java
@@ -69,7 +69,7 @@ public static String getUrl(String addUrl, RequestParams paramRequestParams)//ge
     {
         if (paramRequestParams != null)
             try {
-                // paramRequestParams = new RequestParams();
+                paramRequestParams = new RequestParams();
                 //if (GeoRange.inCHINA());
                 for (String str = "0"; ; str = "1") {
                     paramRequestParams.add("countryid", str);

diff --git a/app/src/main/java/com/yiwen/mobike/views/SelectDialog.java b/app/src/main/java/com/yiwen/mobike/views/SelectDialog.java
@@ -6,11 +6,13 @@
 import android.view.View;
 import android.widget.TextView;
 
+import com.yiwen.mobike.R;
+
 
 public class SelectDialog extends Dialog implements View.OnClickListener {
-    private TextView confirm;
+    private TextView                confirm;
     private IDialogOnclickInterface dialogOnclickInterface;
-    private Context context;
+    private Context                 context;
 
     public SelectDialog(Context context, int theme) {
         super(context, theme);
@@ -22,25 +24,25 @@ public SelectDialog(Context context, int theme) {
     protected void onCreate(Bundle savedInstanceState) {
 
         super.onCreate(savedInstanceState);
-      //  setContentView(R.layout.dialog_confirm);
+        setContentView(R.layout.dialog_confirm);
 
-     //   confirm = (TextView) findViewById(R.id.confirm);
+        confirm = (TextView) findViewById(R.id.confirm);
         confirm.setOnClickListener(this);
     }
 
     @Override
     public void onClick(View v) {
 
-//        dialogOnclickInterface = (IDialogOnclickInterface) context;
+        //        dialogOnclickInterface = (IDialogOnclickInterface) context;
         switch (v.getId()) {
-//            case R.id.confirm:
-////                dialogOnclickInterface.confirmOnclick();
-////                turnGPSOn(getContext());
-//                Intent intent = new Intent(
-//                        Settings.ACTION_LOCATION_SOURCE_SETTINGS);
-//                context.startActivity(intent);
-//              cancel();
-//                break;
+            //            case R.id.confirm:
+            ////                dialogOnclickInterface.confirmOnclick();
+            ////                turnGPSOn(getContext());
+            //                Intent intent = new Intent(
+            //                        Settings.ACTION_LOCATION_SOURCE_SETTINGS);
+            //                context.startActivity(intent);
+            //              cancel();
+            //                break;
 
             default:
                 break;

diff --git a/app/src/main/res/drawable-xxhdpi/scan_unlock_press.9.png b/app/src/main/res/drawable-xxhdpi/scan_unlock_press.9.png
diff --git a/app/src/main/res/drawable/scan_unlock_button.xml b/app/src/main/res/drawable/scan_unlock_button.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/scan_unlock" android:state_pressed="false"/>
+    <item android:drawable="@drawable/scan_unlock_press" android:state_pressed="true"/>
+</selector>
diff --git a/app/src/main/res/drawable/setting_bg.xml b/app/src/main/res/drawable/setting_bg.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@color/gray" android:state_pressed="true"/>
+</selector>
diff --git a/app/src/main/res/layout/dialog_confirm.xml b/app/src/main/res/layout/dialog_confirm.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:text="@string/open_gps"
+        android:textColor="@color/black"
+        android:padding="20dp"
+        android:textSize="16sp" />
+
+
+
+    <TextView
+        android:id="@+id/confirm"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:padding="18dp"
+        android:text="@string/confirm"
+        android:textColor="@color/black"
+        android:clickable="true"
+        android:textSize="18sp" />
+
+
+</LinearLayout>
diff --git a/build.gradle b/build.gradle
@@ -17,6 +17,7 @@ allprojects {
     repositories {
         jcenter()
         maven { url 'https://jitpack.io' }
+        mavenCentral()
         maven{
             url "https://raw.github.com/bmob/bmob-android-sdk/master"
         }