billyyoyo лет назад: 6
Родитель
Сommit
dde2b31218

+ 6 - 0
app/src/main/AndroidManifest.xml

@@ -101,6 +101,12 @@
             android:screenOrientation="portrait"
             android:theme="@style/AppThemeMain"></activity>
 
+        <activity
+            android:name="com.sheep.gamegroup.module.qrcode.ScanQRCodeActivity"
+            android:configChanges="keyboardHidden|navigation|orientation|screenSize"
+            android:screenOrientation="portrait"
+            android:theme="@style/AppThemeMain"></activity>
+
         <service
             android:name=".service.SyncCheckService"
             android:enabled="true"

+ 2 - 2
app/src/main/java/com/sheep/gamegroup/module/home/fragment/FgtMainHeader.java

@@ -15,6 +15,7 @@ import com.sheep.gamegroup.model.entity.MessageUnReadEntity;
 import com.sheep.gamegroup.model.entity.UserEntity;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
 import com.sheep.gamegroup.module.qrcode.QRCodeActivity;
+import com.sheep.gamegroup.module.qrcode.ScanQRCodeActivity;
 import com.sheep.gamegroup.util.CommonUtil;
 import com.sheep.gamegroup.util.Constant;
 import com.sheep.gamegroup.util.DataUtil;
@@ -30,7 +31,6 @@ import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.base.BaseFragment;
 import com.sheep.jiuyan.samllsheep.utils.SpUtils;
 import com.sheep.gamegroup.util.DownloadUtil;
-import com.uuzuche.lib_zxing.activity.CaptureActivity;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
@@ -175,7 +175,7 @@ public class FgtMainHeader extends BaseFragment {
     @OnClick(R.id.iv_scan)
     public void onScanQR() {
         if (!CameraUtil.checkCameraPermission(getActivity())) return;
-        Intent intent = new Intent(getActivity(), CaptureActivity.class);
+        Intent intent = new Intent(getActivity(), ScanQRCodeActivity.class);
         getActivity().startActivityForResult(intent, Constant.INTENT_CAPTURE_QRCODE);
     }
 

+ 15 - 0
app/src/main/java/com/sheep/gamegroup/module/qrcode/ScanQRCodeActivity.java

@@ -0,0 +1,15 @@
+package com.sheep.gamegroup.module.qrcode;
+
+import android.os.Bundle;
+
+import com.uuzuche.lib_zxing.activity.CaptureActivity;
+import com.uuzuche.lib_zxing.activity.ZXingLibrary;
+
+public class ScanQRCodeActivity extends CaptureActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        ZXingLibrary.initDisplayOpinion(this);
+        super.onCreate(savedInstanceState);
+    }
+}

+ 2 - 3
app/src/main/java/com/sheep/gamegroup/util/js/KFZSJs.java

@@ -31,6 +31,7 @@ import com.sheep.gamegroup.model.util.SheepSubscriber;
 import com.sheep.gamegroup.module.find.activity.ActFind;
 import com.sheep.gamegroup.module.login.fragments.AbsLoginFgt;
 import com.sheep.gamegroup.module.pay.activity.ActPayPassword;
+import com.sheep.gamegroup.module.qrcode.ScanQRCodeActivity;
 import com.sheep.gamegroup.module.user.activity.ActVip;
 import com.sheep.gamegroup.module.user.model.BuyVipReq;
 import com.sheep.gamegroup.module.user.model.TempUserResp;
@@ -71,8 +72,6 @@ import com.umeng.socialize.UMAuthListener;
 import com.umeng.socialize.UMShareAPI;
 import com.umeng.socialize.UMShareListener;
 import com.umeng.socialize.bean.SHARE_MEDIA;
-import com.umeng.socialize.media.UMImage;
-import com.uuzuche.lib_zxing.activity.CaptureActivity;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
@@ -208,7 +207,7 @@ public class KFZSJs {
     @JavascriptInterface
     public void captureQRCode() {
         if (!CameraUtil.checkCameraPermission(activity)) return;
-        Intent intent = new Intent(activity, CaptureActivity.class);
+        Intent intent = new Intent(activity, ScanQRCodeActivity.class);
         activity.startActivityForResult(intent, Constant.INTENT_CAPTURE_QRCODE);
     }