6a6bba94eacL1231">1231 
     */
1232
1233 
    public static Map<String, Object> getMap(String jsonString) {
1234 
        JSONObject jsonObject;
1235 
        Map<String, Object> valueMap = new HashMap<String, Object>();
1236 
        if (TextUtils.isEmpty(jsonString)) {
1237 
            return valueMap;
1238 
        }
1239 
        try {
1240 
            jsonObject = new JSONObject(jsonString);
1241 
            @SuppressWarnings("unchecked")
1242 
            Iterator<String> keyIter = jsonObject.keys();
1243 
            String key;
1244 
            Object value;
1245
1246 
            while (keyIter.hasNext()) {
1247 
                key = (String) keyIter.next();
1248 
                value = jsonObject.get(key);
1249 
                valueMap.put(key, value);
1250 
            }
1251 
            return valueMap;
1252 
        } catch (JSONException e) {
1253 
            e.printStackTrace();
1254 
        }
1255
1256 
        return valueMap;
1257
1258 
    }
1259 
    public String getFileExtension(String path) {
1260 
        String extension = "";
1261 
        File file = new File(path);
1262 
        try {
1263 
            if (file != null && file.exists()) {
1264 
                String name = file.getName();
1265 
                extension = name.substring(name.lastIndexOf("."));
1266 
            }
1267 
        } catch (Exception e) {
1268 
            extension = "";
1269 
        }
1270 
        return extension;
1271 
    }
1272 1227 
}

+ 1 - 1
app/src/main/java/com/electric/chargingpile/adapter/GridImageAdapter.java
Näytä tiedosto 

@ -107,7 +107,7 @@ public class GridImageAdapter extends RecyclerView.Adapter<GridImageAdapter.View
107 107 
            holder.remove.setOnClickListener(v->{
108 108 
                //删除
109 109 
                mDatas.remove(position);
110 
                notifyItemRemoved(position);
110 
                notifyDataSetChanged();
111 111 
                if (mListener!=null){
112 112 
                    mListener.remove(position);
113 113 
                }

BIN
app/src/main/res/drawable-xxhdpi/ic_topic_no_data.webp
Näytä tiedosto


+ 61 - 14
app/src/main/res/layout/activity_charging_comment.xml
Näytä tiedosto 

@ -66,8 +66,9 @@
66 66
67 67 
    <com.electric.chargingpile.view.ObservableScrollView
68 68 
        android:id="@+id/sv"
69 
        android:background="@color/white"
69 70 
        android:layout_width="match_parent"
70 
        android:layout_height="wrap_content"
71 
        android:layout_height="match_parent"
71 72 
        android:layout_below="@+id/view_title"
72 73 
        android:layout_alignParentLeft="true"
73 74 
        android:layout_alignParentStart="true">
 
@ -75,11 +76,11 @@
75 76 
        <com.zhy.autolayout.AutoLinearLayout
76 77 
            android:id="@+id/ll_pingfen"
77 78 
            android:layout_width="match_parent"
78 
            android:layout_height="wrap_content"
79 
            android:layout_height="match_parent"
79 80 
            android:focusable="true"
80 81 
            android:focusableInTouchMode="true"
81 82 
            android:orientation="vertical"
82 
            android:background="@color/white"
83
83 84 
            android:layout_alignParentLeft="true"
84 85 
            android:layout_alignParentStart="true">
85 86 
@ -190,25 +191,71 @@
190 191 
                android:visibility="visible"
191 192 
                android:layout_marginBottom="7dp"/>
192 193
193 
            <GridView
194 
            <TextView
195 
                android:paddingEnd="11dp"
196 
                android:paddingStart="11dp"
197 
                android:paddingBottom="6dp"
198 
                android:paddingTop="6dp"
199 
                android:layout_marginBottom="13dp"
200 
                android:id="@+id/topicText"
201 
                android:background="@drawable/bg_topic_tab"
202 
                android:layout_width="wrap_content"
203 
                android:layout_height="wrap_content"
204 
                android:layout_marginStart="15dp"
205 
                android:gravity="center"
206 
                android:text="╋  话题"
207 
                android:textColor="#ff0e0e0e"
208 
                android:textSize="13sp" />
209 
            <LinearLayout
210 
                android:id="@+id/layoutHint"
211 
                android:layout_marginEnd="15dp"
212 
                android:layout_marginStart="15dp"
213 
                android:layout_width="wrap_content"
214 
                android:layout_height="wrap_content">
215
216 
                <ImageView
217 
                    android:id="@+id/imgUpload"
218 
                    android:src="@drawable/icon_comment_upload"
219 
                    android:layout_width="wrap_content"
220 
                    android:layout_height="wrap_content"/>
221
222 
                <ImageView
223 
                    android:id="@+id/videoUpLoad"
224 
                    android:layout_marginStart="12dp"
225 
                    android:src="@drawable/ic_comment_video_upload"
226 
                    android:layout_width="wrap_content"
227 
                    android:layout_height="wrap_content"/>
228
229 
                <TextView
230 
                    android:id="@+id/commentHint"
231 
                    android:layout_marginStart="12dp"
232 
                    android:gravity="bottom"
233 
                    android:layout_width="wrap_content"
234 
                    android:layout_height="match_parent"
235 
                    tools:text="30字以上+图片或15s视频有机会被评为优质评论获得充电优惠券"
236 
                    android:textColor="#ff7a7a7a"
237 
                    android:textSize="12sp"
238 
                    />
239 
            </LinearLayout>
240
241 
            <androidx.recyclerview.widget.RecyclerView
242 
                android:visibility="gone"
194 243 
                android:id="@+id/noScrollgridview"
195 244 
                android:layout_width="match_parent"
196 245 
                android:layout_height="wrap_content"
197 246 
                android:layout_marginLeft="15dp"
198 247 
                android:layout_marginRight="15dp"
199 
                android:horizontalSpacing="3dp"
200 
                android:numColumns="3"
201 248 
                android:scrollbars="none"
202 
                android:verticalSpacing="5dp" >
203 
            </GridView>
204
205 
            <View
206 
                android:layout_width="match_parent"
207 
                android:layout_height="0.5dp"
208 
                android:background="@color/Line"
209 
                android:layout_marginTop="15dp"
210 249 
                />
211 250
251 
            <ImageView
252 
                android:visibility="gone"
253 
                android:id="@+id/imgAd"
254 
                android:layout_marginTop="30dp"
255 
                android:layout_gravity="center"
256 
                android:layout_width="wrap_content"
257 
                android:layout_height="wrap_content"/>
258
212 259 
        </com.zhy.autolayout.AutoLinearLayout>
213 260
214 261 
    </com.electric.chargingpile.view.ObservableScrollView>

+ 2 - 1
app/src/main/res/layout/activity_main_map.xml
Näytä tiedosto 

@ -1532,6 +1532,7 @@
1532 1532 
            android:visibility="gone">
1533 1533
1534 1534 
            <TextView
1535 
                android:layout_centerInParent="true"
1535 1536 
                android:paddingStart="20dp"
1536 1537 
                android:id="@+id/tvNotification"
1537 1538 
                android:paddingEnd="25dp"
 
@ -1540,7 +1541,7 @@
1540 1541 
                android:layout_width="wrap_content"
1541 1542 
                android:layout_height="34dp"
1542 1543 
                android:gravity="center"
1543 
                android:text="您有一笔订单正在进行中您有一笔订单正在进行中，点击查看详情..."
1544 
                tools:text="您有一笔订，点击查看详情..."
1544 1545 
                android:textColor="@color/huimain"
1545 1546 
                android:textSize="13sp" />
1546 1547

+ 17 - 6
app/src/main/res/layout/activity_slelect_topic.xml
Näytä tiedosto 

@ -51,17 +51,28 @@
51 51 
        app:layout_constraintStart_toStartOf="parent"
52 52 
        app:layout_constraintTop_toBottomOf="@+id/rl_title"
53 53 
        tools:listitem="@layout/layout_item_topic" />
54
54 
    <ImageView
55 
        tools:visibility="visible"
56 
        android:visibility="gone"
57 
        android:id="@+id/imgNoData"
58 
        android:src="@drawable/ic_topic_no_data"
59 
        android:layout_width="wrap_content"
60 
        android:layout_height="wrap_content"
61 
        app:layout_constraintBottom_toBottomOf="parent"
62 
        app:layout_constraintEnd_toEndOf="parent"
63 
        app:layout_constraintStart_toStartOf="parent"
64 
        app:layout_constraintTop_toBottomOf="@+id/rl_title" />
55 65 
    <TextView
56 
        android:visibility="visible"
66 
        tools:visibility="visible"
67 
        android:layout_marginTop="20dp"
68 
        android:visibility="gone"
57 69 
        android:id="@+id/noDataText"
58 70 
        android:layout_width="wrap_content"
59 71 
        android:layout_height="wrap_content"
60 72 
        android:text="没有相关话题"
61 73 
        android:textColor="#ff7b7b7b"
62 74 
        android:textSize="14sp"
63 
        app:layout_constraintBottom_toBottomOf="parent"
64 
        app:layout_constraintEnd_toEndOf="parent"
65 
        app:layout_constraintStart_toStartOf="parent"
66 
        app:layout_constraintTop_toBottomOf="@+id/rl_title" />
75 
        android:layout_marginEnd="12dp"
76 
        app:layout_constraintEnd_toEndOf="@+id/imgNoData"
77 
        app:layout_constraintTop_toBottomOf="@+id/imgNoData" />
67 78 
</androidx.constraintlayout.widget.ConstraintLayout>

gradle 升级 · 58251b6308 - Gogs: Go Git Service
Startseite Erkunden Hilfe
Registrieren Anmelden
dudu
/
cdzApp
Beobachten 2
Favorit hinzufügen 1
Fork 0
Code Issues 0 Pull-Requests 0 Commits 237 Releases 18 Wiki
Quellcode durchsuchen

gradle 升级

huyuguo vor 6 Jahren
Ursprung
3c4e220b78
Commit
58251b6308
17 geänderte Dateien mit 74 neuen und 77 gelöschten Zeilen
Geteilte Ansicht Diff-Statistik anzeigen
  1. BIN
      app/.DS_Store
  2. 70 71
      app/build.gradle
  3. BIN
      app/libs/android-support-multidex.jar
  4. BIN
      app/libs/armeabi/libiconv.so
  5. BIN
      app/libs/armeabi/libijkffmpeg.so
  6. BIN
      app/libs/armeabi/libijkplayer.so
  7. BIN
      app/libs/armeabi/libijksdl.so
  8. BIN
      app/libs/armeabi/libjcore113.so
  9. BIN
      app/libs/armeabi/libtpnsSecurity.so
  10. BIN
      app/libs/armeabi/libtpnsWatchdog.so
  11. BIN
      app/libs/armeabi/libzbarjni.so
  12. BIN
      app/libs/umeng-analytics-v5.2.4.jar
  13. 1 1
      app/src/main/java/com/electric/chargingpile/activity/UserCenterMoreActivity.java
  14. 1 1
      build.gradle
  15. 1 1
      gradle/wrapper/gradle-wrapper.properties
  16. 1 1
      settings.gradle
  17. 0 2
      zxing/src/main/AndroidManifest.xml

BIN
app/.DS_Store
Datei anzeigen


+ 70 - 71
app/build.gradle
Datei anzeigen 

@ -18,24 +18,35 @@ android {
18 18 
            storePassword 'd1ev123'
19 19 
        }
20 20 
    }
21 
    compileSdkVersion 26
21 
    compileSdkVersion 27
22 22 
//    buildToolsVersion '28.0.3'
23 23 
    buildToolsVersion '29.0.0'
24 24
25 25 
    aaptOptions.cruncherEnabled = false
26 26 
    aaptOptions.useNewCruncher = false
27 27
28 
//    compileOptions {
29 
//        sourceCompatibility JavaVersion.VERSION_1_8
30 
//        targetCompatibility JavaVersion.VERSION_1_8
31 
//    }
32
28 33 
    defaultConfig {
29 34 
        applicationId "com.electric.chargingpile"
30 35 
        minSdkVersion 19
31 
        targetSdkVersion 26
36 
        targetSdkVersion 27
32 37
33 38 
        multiDexEnabled true
34 39
35 40 
        ndk {
36 41 
            abiFilters "armeabi"
37 42 
        }
43 
        flavorDimensions "default"
44
45 
//        jackOptions {
46 
//            enabled true
47 
//        }
38 48 
    }
49
39 50 
    sourceSets.main {
40 51 
        jniLibs.srcDirs 'src/main/libs'
41 52 
    }
 
@ -55,7 +66,7 @@ android {
55 66 
            // 移除无用的resource文件
56 67 
//            shrinkResources true
57 68 
            //启用代码混淆  debug 模式下需要设置为false，否则无法看到局部变量的值
58 
            minifyEnabled true
69 
            minifyEnabled false
59 70 
            //混淆规则配置文件
60 71 
            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
61 72 
            signingConfig signingConfigs.release
 
@ -92,11 +103,11 @@ android {
92 103 
    }
93 104
94 105 
    productFlavors {
95 
        yingyongbao {}
96 
        c360 {}
97 
        xiaomi {}
98 
        huawei {}
99 
        oppo {}
106 
//        yingyongbao {}
107 
//        c360 {}
108 
//        xiaomi {}
109 
//        huawei {}
110 
//        oppo {}
100 111 
        cdz {}
101 112
102 113 
@ -155,76 +166,64 @@ MobSDK {
155 166 
}
156 167
157 168 
dependencies {
158 
    compile files('libs/mframework.jar')
159 
    compile files('libs/picasso-2.5.2.jar')
160 
    compile project(':autolayout')
161 
    compile files('libs/universal-image-loader-1.9.1.jar')
162 
    compile files('libs/bugly_1.2.9_release.jar')
163 
    //noinspection GradleCompatible
164 
    compile files('libs/jg_filter_sdk_1.1.jar')
165 
    compile files('libs/wup-1.0.0.E-SNAPSHOT.jar')
166 
    compile files('libs/pinyin4j-2.5.0.jar')
167 
    compile files('libs/pinyin4android1.0.jar')
168 
    compile files('libs/Msc.jar')
169 
    compile files('libs/libammsdk.jar')
170 
    compile files('libs/alipaySdk-20160427.jar')
169 
    implementation fileTree(dir: 'libs', include: ['*.jar'])
170 
    implementation project(':autolayout')
171 
    implementation project(':library')
172 
    implementation project(':zxing')
173 
    implementation project(':XRefreshView')
174 
    implementation project(':videolibrary:picture_library')
171 175 
//    compile 'com.google.zxing:core:+'
172 176 
//    compile 'com.google.zxing:android-core:+'
173 
    compile project(':library')
174 
    compile files('libs/ZBarDecoder.jar')
175 
    compile files('libs/jpush-android_v3.0.6.jar')
176 
    compile files('libs/jcore-android_v1.1.3.jar')
177 
    compile 'com.blankj:utilcode:1.9.8'
178 
    //    compile project(':xrichtextt')
179 
    compile 'com.android.support:multidex:1.0.1'
180 
    compile 'com.umeng.analytics:analytics:latest.integration'
181 
    compile 'com.google.code.gson:gson:2.2.4'
177
178 
    implementation 'com.blankj:utilcode:1.9.8'
179 
    implementation 'com.android.support:multidex:1.0.1'
180 
    implementation 'com.umeng.analytics:analytics:latest.integration'
181 
    implementation 'com.google.code.gson:gson:2.2.4'
182 182 
    //    compile 'com.squareup.okhttp:okhttp:3.14.0'
183 
    compile 'com.squareup.okhttp:okhttp:2.0.0'
184 
    compile 'com.zhy:okhttputils:2.4.1'
185 
    compile 'com.android.support:support-v4:26.1.0'
186 
    compile 'com.google.android.gms:play-services-appindexing:9.4.0'
187 
    compile 'com.android.support.constraint:constraint-layout:1.0.2'
188 
    compile 'com.zhy:flowlayout-lib:1.0.3'
189 
    compile 'com.squareup:otto:+'
190 
    compile 'org.greenrobot:greendao:3.2.0'
191 
    compile 'org.greenrobot:greendao-generator:3.2.0'
192 
    compile 'com.github.yuweiguocn:GreenDaoUpgradeHelper:v2.1.0'
193 
    compile 'com.github.ksoichiro:android-observablescrollview:+'
194 
    compile 'me.codeboy.android:align-text-view:2.3.0'
195 
    compile 'me.itangqi.waveloadingview:library:0.3.5'
196 
    compile 'com.yinglan.scrolllayout:scrolllayout:1.0.0'
197 
    compile 'com.android.support:appcompat-v7:26.1.0'
198 
    compile 'com.android.support:design:26.1.0'
183 
    implementation 'com.squareup.okhttp:okhttp:2.0.0'
184 
    implementation 'com.zhy:okhttputils:2.4.1'
185 
    implementation 'com.android.support:support-v4:27.1.1'
186 
    implementation 'com.google.android.gms:play-services-appindexing:9.4.0'
187 
    implementation 'com.android.support.constraint:constraint-layout:1.1.2'
188 
    implementation 'com.zhy:flowlayout-lib:1.0.3'
189 
    implementation 'com.squareup:otto:+'
190 
    implementation 'org.greenrobot:greendao:3.2.0'
191 
    implementation 'org.greenrobot:greendao-generator:3.2.0'
192 
    implementation 'com.github.yuweiguocn:GreenDaoUpgradeHelper:v2.1.0'
193 
    implementation 'com.github.ksoichiro:android-observablescrollview:+'
194 
    implementation 'me.codeboy.android:align-text-view:2.3.0'
195 
    implementation 'me.itangqi.waveloadingview:library:0.3.5'
196 
    implementation 'com.yinglan.scrolllayout:scrolllayout:1.0.0'
197 
    implementation 'com.android.support:appcompat-v7:27.1.1'
198 
    implementation 'com.android.support:design:27.1.1'
199 199 
    //    compile 'com.nineoldandroids:library:2.4.0'
200 200 
//    compile 'com.github.bumptech.glide:glide:4.1.1'
201 
    compile 'com.github.bumptech.glide:glide:4.2.0'
202 
    compile 'me.iwf.photopicker:PhotoPicker:0.9.12@aar'
203 
    compile 'top.zibin:Luban:1.1.2'
204 
    compile 'com.ms-square:expandableTextView:0.1.4'
205
206 
    compile 'io.reactivex.rxjava2:rxjava:2.0.5'
207 
    compile 'io.reactivex.rxjava2:rxandroid:2.0.1'
208 
    compile 'com.cjj.materialrefeshlayout:library:1.3.0'
209 
    compile project(':zxing')
210 
    compile 'com.alibaba:fastjson:1.1.64.android'
211 
    compile 'pub.devrel:easypermissions:0.2.0'
212 
    compile 'com.github.PhilJay:MPAndroidChart:v3.0.3'
213 
    compile 'com.github.promeg:tinypinyin:1.0.0'
214 
    compile 'org.greenrobot:eventbus:3.0.0'
215 
    compile files('libs/AMap3DMap_6.9.2_AMapNavi_6.9.0_AMapSearch_6.9.2_AMapLocation_4.7.0_20190710.jar')
216 
    compile 'com.qmuiteam:qmui:1.2.0'
217 
    compile 'org.zackratos:ultimatebar:1.1.1'
218 
    compile project(':XRefreshView')
219 
    compile 'com.github.Aspsine:IRecyclerView:0.0.7'
220 
    compile 'com.upyun:upyun-android-sdk:+'
221 
    compile project(':videolibrary:picture_library')
201 
    implementation 'com.github.bumptech.glide:glide:4.2.0'
202 
    implementation 'me.iwf.photopicker:PhotoPicker:0.9.12@aar'
203 
    implementation 'top.zibin:Luban:1.1.2'
204 
    implementation 'com.ms-square:expandableTextView:0.1.4'
205
206 
    implementation 'io.reactivex.rxjava2:rxjava:2.0.5'
207 
    implementation 'io.reactivex.rxjava2:rxandroid:2.0.1'
208 
    implementation 'com.cjj.materialrefeshlayout:library:1.3.0'
209
210 
    implementation 'com.alibaba:fastjson:1.1.64.android'
211 
    implementation 'pub.devrel:easypermissions:0.2.0'
212 
    implementation 'com.github.PhilJay:MPAndroidChart:v3.0.3'
213 
    implementation 'com.github.promeg:tinypinyin:1.0.0'
214 
    implementation 'org.greenrobot:eventbus:3.0.0'
215 
    implementation 'com.qmuiteam:qmui:1.2.0'
216 
    implementation 'org.zackratos:ultimatebar:1.1.1'
217
218 
    implementation 'com.github.Aspsine:IRecyclerView:0.0.7'
219 
    implementation 'com.upyun:upyun-android-sdk:+'
220
222 221 
    // 上下翻页
223 
    compile 'com.github.castorflex.verticalviewpager:library:19.0.1'
222 
    implementation 'com.github.castorflex.verticalviewpager:library:19.0.1'
224 223 
    // sqlite异常结局
225 
    compile 'net.zetetic:android-database-sqlcipher:3.5.7@aar'
224 
    implementation 'net.zetetic:android-database-sqlcipher:3.5.7@aar'
226 225
227 
    compile 'com.shuyu:GSYVideoPlayer:5.0.2'
226 
    implementation 'com.shuyu:GSYVideoPlayer:5.0.2'
228 227 
    //compile 'com.github.chrisbanes:PhotoView:2.0.0'
229 
    compile 'com.wang.avi:library:2.1.3'
228 
    implementation 'com.wang.avi:library:2.1.3'
230 229 
}

BIN
app/libs/android-support-multidex.jar
Datei anzeigen


BIN
app/libs/armeabi/libiconv.so
Datei anzeigen


BIN
app/libs/armeabi/libijkffmpeg.so
Datei anzeigen


BIN
app/libs/armeabi/libijkplayer.so
Datei anzeigen


BIN
app/libs/armeabi/libijksdl.so
Datei anzeigen


BIN
app/libs/armeabi/libjcore113.so
Datei anzeigen


BIN
app/libs/armeabi/libtpnsSecurity.so
Datei anzeigen


BIN
app/libs/armeabi/libtpnsWatchdog.so
Datei anzeigen


BIN
app/libs/armeabi/libzbarjni.so
Datei anzeigen


BIN
app/libs/umeng-analytics-v5.2.4.jar
Datei anzeigen


+ 1 - 1
app/src/main/java/com/electric/chargingpile/activity/UserCenterMoreActivity.java
Datei anzeigen 

@ -357,7 +357,7 @@ public class UserCenterMoreActivity extends Activity implements View.OnClickList
357 357 
                builder.setPositiveButton("确定", new DialogInterface.OnClickListener() {
358 358 
                    @Override
359 359 
                    public void onClick(DialogInterface dialog, int which) {
360 
                        MobclickAgent.onProfileSignOff();
360 
//                        MobclickAgent.onProfileSignOff();
361 361 
                        try {
362 362 
                            sendLoginStatus();
363 363 
                        } catch (Exception e) {

+ 1 - 1
build.gradle
Datei anzeigen 

@ -14,7 +14,7 @@ buildscript {
14 14 
    }
15 15
16 16 
    dependencies {
17 
        classpath 'com.android.tools.build:gradle:2.3.3'
17 
        classpath 'com.android.tools.build:gradle:3.2.1'
18 18 
        classpath 'org.greenrobot:greendao-gradle-plugin:3.2.2'
19 19 
        classpath 'com.tencent.bugly:symtabfileuploader:latest.release'
20 20

+ 1 - 1
gradle/wrapper/gradle-wrapper.properties
Datei anzeigen 

@ -4,4 +4,4 @@ distributionPath=wrapper/dists
4 4 
zipStoreBase=GRADLE_USER_HOME
5 5 
org.gradle.jvmargs=-Xmx5120m -XX\:MaxPermSize\=5120m
6 6 
zipStorePath=wrapper/dists
7 
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
7 
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip

+ 1 - 1
settings.gradle
Datei anzeigen 

@ -1,2 +1,2 @@
1 1 
include ':app', ':autolayout', ':zxing', ':XRefreshView',':library'
2 
include ':videolibrary:picture_library', ':videolibrary:SmallVideoLib2'
2 
include ':videolibrary:picture_library', ':videolibrary:SmallVideoLib2'

+ 0 - 2
zxing/src/main/AndroidManifest.xml
Datei anzeigen 

@ -13,8 +13,6 @@
13 13 
    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/>
14 14 
    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
15 15
16 
    <uses-sdk android:minSdkVersion="15" android:targetSdkVersion="22"/>
17
18 16 
    <!-- Don't require camera, as this requires a rear camera. This allows it to work on the Nexus 7 -->
19 17 
    <uses-feature android:name="android.hardware.camera" android:required="false"/>
20 18 
    <uses-feature android:name="android.hardware.camera.front" android:required="false"/>