扫码充电图标更新

app/src/main/java/com/electric/chargingpile/activity/NewZhanDetailsActivity.java

@@ -399,7 +399,12 @@ public class NewZhanDetailsActivity extends AppCompatActivity implements View.On
        addDetailsFragment.setOnUpdateScanChargeFragmentListener(new DetailsFragment.OnDetailsFragmentListener() {
            @Override
            public void updateScanCharge(String ownPay) {
                rl_detail_scan.setVisibility("1".equals(ownPay) ? View.VISIBLE : View.GONE);
//                rl_detail_scan.setVisibility("1".equals(ownPay) ? View.VISIBLE : View.GONE);
            }
            @Override
            public void scanCharge() {
                scanChargeFunc();
            }
        });
        addZhanCommentFragment = new ZhanCommentFragment();
@@ -849,31 +854,7 @@ public class NewZhanDetailsActivity extends AppCompatActivity implements View.On
                break;
            case R.id.rl_detail_scan:
                MobclickAgent.onEvent(getApplicationContext(), "1124");
                if (!MainApplication.isLogin()) {
                    startActivity(new Intent(getApplication(), LoginActivity.class));
                } else if (!cameraTask()) {
                    EasyPermissions.requestPermissions(
                            this,
                            "该功能需要开启摄像头权限，是否前往开启？",
                            RC_CAMERA_PERM,
                            Manifest.permission.CAMERA);
                } else {
                    Intent iintent = new Intent(getApplicationContext(), com.google.zxing.client.android.CaptureActivity.class);
                    iintent.putExtra("url", MainApplication.url);
                    iintent.putExtra("user_id", MainApplication.userId);
                    iintent.putExtra("user_password", MainApplication.userPassword);
                    iintent.putExtra("user_phone", ProfileManager.getInstance().getUsername(getApplicationContext()));
                    LogUtils.e(ProfileManager.getInstance().getUsername(getApplicationContext()));
                    iintent.putExtra("cha", MainMapActivity.cha);
                    iintent.setFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION);
                    startActivity(iintent);
                    overridePendingTransition(0, 0);
                    if (count == 1) {
                        MobclickAgent.onEvent(getApplicationContext(), "0104");
                        count = 2;
                    }
                }
                scanChargeFunc();
                break;
            case R.id.iv_share:
@@ -939,6 +920,34 @@ public class NewZhanDetailsActivity extends AppCompatActivity implements View.On
        }
    }
    private void scanChargeFunc() {
        MobclickAgent.onEvent(getApplicationContext(), "1124");
        if (!MainApplication.isLogin()) {
            startActivity(new Intent(getApplication(), LoginActivity.class));
        } else if (!cameraTask()) {
            EasyPermissions.requestPermissions(
                    this,
                    "该功能需要开启摄像头权限，是否前往开启？",
                    RC_CAMERA_PERM,
                    Manifest.permission.CAMERA);
        } else {
            Intent iintent = new Intent(getApplicationContext(), com.google.zxing.client.android.CaptureActivity.class);
            iintent.putExtra("url", MainApplication.url);
            iintent.putExtra("user_id", MainApplication.userId);
            iintent.putExtra("user_password", MainApplication.userPassword);
            iintent.putExtra("user_phone", ProfileManager.getInstance().getUsername(getApplicationContext()));
            LogUtils.e(ProfileManager.getInstance().getUsername(getApplicationContext()));
            iintent.putExtra("cha", MainMapActivity.cha);
            iintent.setFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION);
            startActivity(iintent);
            overridePendingTransition(0, 0);
            if (count == 1) {
                MobclickAgent.onEvent(getApplicationContext(), "0104");
                count = 2;
            }
        }
    }
    @AfterPermissionGranted(RC_CAMERA_PERM)
    public boolean cameraTask() {
        if (hasCameraPermission()) {

app/src/main/java/com/electric/chargingpile/fragment/DetailsFragment.java

@@ -11,9 +11,6 @@ import android.os.Build;
import android.os.Bundle;
import android.os.Handler;
import android.os.Message;
import androidx.fragment.app.Fragment;
import android.text.SpannableString;
import android.text.Spanned;
import android.text.style.ForegroundColorSpan;
@@ -25,9 +22,12 @@ import android.view.ViewTreeObserver;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.RelativeLayout;
import android.widget.Space;
import android.widget.TextView;
import android.widget.Toast;
import androidx.fragment.app.Fragment;
import com.amap.api.maps.AMapUtils;
import com.amap.api.maps.model.LatLng;
import com.electric.chargingpile.R;
@@ -44,16 +44,13 @@ import com.electric.chargingpile.data.MyOtto;
import com.electric.chargingpile.data.PileData;
import com.electric.chargingpile.data.RankinglistRefreshEvent;
import com.electric.chargingpile.data.Zhan;
import com.electric.chargingpile.util.CommonParams;
import com.electric.chargingpile.util.DES;
import com.electric.chargingpile.util.DES3;
import com.electric.chargingpile.util.DES3S;
import com.electric.chargingpile.util.DateUtils;
import com.electric.chargingpile.util.JsonUtils;
import com.electric.chargingpile.util.LoadingDialog;
import com.electric.chargingpile.util.Md5Util;
import com.electric.chargingpile.util.OkHttpUtil;
import com.electric.chargingpile.util.ToastUtil;
import com.electric.chargingpile.util.Util;
import com.electric.chargingpile.view.CircleImageView;
import com.electric.chargingpile.view.CustomProgressDialog;
@@ -90,17 +87,12 @@ import java.io.BufferedWriter;
import java.io.InputStreamReader;
import java.io.OutputStreamWriter;
import java.io.PrintWriter;
import java.math.BigDecimal;
import java.net.Socket;
import java.net.URLEncoder;
import java.security.MessageDigest;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.regex.PatternSyntaxException;
@@ -269,6 +261,15 @@ public class DetailsFragment extends Fragment implements View.OnClickListener, O
                        if (detailsFragmentListener != null) {
                            detailsFragmentListener.updateScanCharge(own_pay);
                        }
                        if ("1".equals(own_pay)) {
                            scan_charge_btn.setVisibility(View.VISIBLE);
                            scan_charge_space.setVisibility(View.VISIBLE);
                        } else {
                            scan_charge_btn.setVisibility(View.GONE);
                            scan_charge_space.setVisibility(View.GONE);
                        }
                        String fenshi_info = JsonUtils.getKeyResult(info_decode, "fenshi_info");
                        String fenshi_is = JsonUtils.getKeyResult(info_decode, "fenshi_is");
@@ -789,6 +790,8 @@ public class DetailsFragment extends Fragment implements View.OnClickListener, O
        }
    };
    private String zongjia;
    private ImageView scan_charge_btn;
    private Space scan_charge_space;
    @Override
    public View onCreateView(LayoutInflater inflater, ViewGroup container,
@@ -891,8 +894,6 @@ public class DetailsFragment extends Fragment implements View.OnClickListener, O
        detail_zhan_pic = (ImageView) v.findViewById(R.id.detail_zhan_pic);
        detail_zhan_name = (AlignTextView) v.findViewById(R.id.detail_zhan_name);
//        chat_share_bar = v.findViewById(R.id.chat_share_bar);
//        chat_share_bar.setOnClickListener(this);
        red_paper_bag_top = v.findViewById(R.id.red_paper_bag_top);
        detail_grade = (TextView) v.findViewById(R.id.detail_grade);
        detail_picnum = (TextView) v.findViewById(R.id.detail_picnum);
@@ -931,6 +932,9 @@ public class DetailsFragment extends Fragment implements View.OnClickListener, O
        iv_new_icon = (CircleImageView) v.findViewById(R.id.iv_new_icon);
        ll_yunyingshang = (LinearLayout) v.findViewById(R.id.ll_yunyingshang);
        view_789 = v.findViewById(R.id.view_789);
        scan_charge_btn = v.findViewById(R.id.scan_charge_btn);
        scan_charge_btn.setOnClickListener(this);
        scan_charge_space = v.findViewById(R.id.scan_charge_space);
    }
    @Override
@@ -969,6 +973,11 @@ public class DetailsFragment extends Fragment implements View.OnClickListener, O
                MobclickAgent.onEvent(getActivity(), "0209");
                startActivity(new Intent(getActivity(), ChargingQianDaoActivity.class));
                break;
            case R.id.scan_charge_btn:
                if (detailsFragmentListener != null) {
                    detailsFragmentListener.scanCharge();
                }
                break;
        }
    }
@@ -1501,6 +1510,8 @@ public class DetailsFragment extends Fragment implements View.OnClickListener, O
    public interface OnDetailsFragmentListener {
        void updateScanCharge(String ownPay);
        void scanCharge();
    }
    public void setOnUpdateScanChargeFragmentListener(OnDetailsFragmentListener listener) {

app/src/main/res/layout/fragmen_details_new.xml

@@ -827,6 +827,24 @@
            </RelativeLayout>
            <Space
                android:id="@+id/scan_charge_space"
                android:layout_width="match_parent"
                android:layout_height="110dp"
                android:visibility="gone"
                tools:visibility="visible" />
        </LinearLayout>
    </com.electric.chargingpile.view.CustomScrollView>
    <ImageView
        android:id="@+id/scan_charge_btn"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_marginRight="15dp"
        android:layout_marginBottom="15dp"
        android:src="@drawable/scan_charge_btn"
        android:visibility="gone"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintRight_toRightOf="parent"
        tools:visibility="visible" />
</androidx.constraintlayout.widget.ConstraintLayout>