提交代码

app/src/main/java/com/edufound/android/xyyf/activity/AgreementActivity.java

@@ -0,0 +1,180 @@
+package com.edufound.android.xyyf.activity;
+
+import android.content.Intent;
+import android.graphics.Color;
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.text.Spannable;
+import android.text.SpannableStringBuilder;
+import android.text.TextPaint;
+import android.text.method.LinkMovementMethod;
+import android.text.style.ClickableSpan;
+import android.view.KeyEvent;
+import android.view.View;
+import android.view.ViewGroup;
+import android.webkit.WebSettings;
+import android.webkit.WebView;
+import android.widget.FrameLayout;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import com.edufound.android.xyyf.R;
+import com.edufound.android.xyyf.application.EApplication;
+import com.edufound.android.xyyf.base.BaseActivity;
+import com.edufound.android.xyyf.useragreement.UserAgreementPersenter;
+import com.edufound.android.xyyf.useragreement.UserAgreementView;
+import com.edufound.android.xyyf.util.ContextUtil;
+import com.edufound.android.xyyf.util.Logger;
+import com.edufound.android.xyyf.util.SPutil;
+import com.edufound.android.xyyf.util.ToastUtil;
+import com.mobile.auth.gatewayauth.activity.AuthWebVeiwActivity;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class AgreementActivity extends BaseActivity implements UserAgreementView {
+
+    UserAgreementPersenter mPersenter;
+    FrameLayout mRoot;
+    TextView mTextContext;
+    TextView mCancel;
+    TextView mAgree;
+    LinearLayout mPrivacFrame;
+    String spKey = "privacy";
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_privacypolicy);
+        if (EApplication.getAppCode().equals("2001")) {
+            if (SPutil.getPrefBoolean(this, spKey, false)) {
+                toMain();
+            } else {
+                init();
+            }
+        } else {
+            toMain();
+        }
+
+    }
+
+    void init() {
+        mPersenter = new UserAgreementPersenter(this);
+        mRoot = findViewById(R.id.privacy_root);
+        mPrivacFrame = findViewById(R.id.privacy_text_frame);
+        mTextContext = findViewById(R.id.privacy_context);
+        setContext();
+        mCancel = findViewById(R.id.privacy_cancel);
+        mAgree = findViewById(R.id.privacy_ok);
+        mCancel.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                finish();
+            }
+        });
+        mAgree.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                setSP();
+                toMain();
+            }
+        });
+    }
+
+    List<Integer> leftBrackets = new ArrayList<>();
+    List<Integer> rightBrackets = new ArrayList<>();
+    String text = "请你务必审慎阅读、充分理解“服务协议”和“隐私政策”各条款，包括但不限于：为了向你提供内容等服务，我们需要收集你的设备信息、操作日志等个人信息。" +
+            "\n你可以阅读《服务协议》和《隐私政策》了解详细信息。如你同意，请点击“同意”开始接受我们的服务。";
+
+    void setContext() {
+        leftBrackets = getChildIndexFromString(text, "《");
+        rightBrackets = getChildIndexFromString(text, "》");
+        SpannableStringBuilder style = new SpannableStringBuilder();
+        style.append(text);
+        for (int i = 0; i < leftBrackets.size(); i++) {
+            final int finalI = i;
+            style.setSpan(new ClickableSpan() {
+                @Override
+                public void onClick(@NonNull View widget) {
+                    lookPrivacy(finalI);
+                }
+
+                @Override
+                public void updateDrawState(@NonNull TextPaint ds) {
+                    ds.setUnderlineText(false);
+                    ds.setColor(Color.parseColor("#68a5dc"));
+                }
+
+            }, leftBrackets.get(i), rightBrackets.get(i) + 1, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+
+        }
+        mTextContext.setMovementMethod(LinkMovementMethod.getInstance());
+        mTextContext.setHighlightColor(Color.parseColor("#ffffff"));
+        mTextContext.setText(style);
+
+    }
+
+    void toMain() {
+        Intent intent = new Intent(this, MainActivity.class);
+        startActivity(intent);
+        finish();
+    }
+
+
+    /**
+     * @param parent
+     * @param child
+     * @return
+     */
+    private List<Integer> getChildIndexFromString(String parent, String child) {
+        int startIndex = 0;
+        List<Integer> ids = new ArrayList<>();
+        while (parent.indexOf(child, startIndex) != -1) {
+            //ids.add(startIndex);
+            startIndex = parent.indexOf(child, startIndex);
+            ids.add(startIndex);
+            startIndex = startIndex + child.length();
+        }
+        return ids;
+    }
+
+
+    void lookPrivacy(int index) {
+        WebView webview = new WebView(ContextUtil.getContext());
+        webview.setLayoutParams(new FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
+        String url = "";
+        switch (index) {
+            case 0:
+                url = "http://m-xyyf-web.ai160.com/res/protocol/service.htm";
+                break;
+            case 1:
+                url = "http://m-xyyf-web.ai160.com/res/protocol/private.htm";
+                break;
+        }
+        webview.getSettings().setUseWideViewPort(true);
+        webview.getSettings().setLoadWithOverviewMode(true);
+        webview.getSettings().setJavaScriptEnabled(true);
+        webview.getSettings().setDomStorageEnabled(true);
+        webview.loadUrl(url);
+        mRoot.addView(webview);
+    }
+
+    void setSP() {
+        SPutil.setPrefBoolean(this, spKey, true);
+    }
+
+    @Override
+    public boolean onKeyDown(int keyCode, KeyEvent event) {
+        switch (keyCode) {
+            case KeyEvent.KEYCODE_ESCAPE:
+            case KeyEvent.KEYCODE_BACK:
+                if (mRoot.getChildAt(1) != null) {
+                    mRoot.removeViewAt(1);
+                    return true;
+                }
+                break;
+        }
+        return super.onKeyDown(keyCode, event);
+    }
+}

app/src/main/java/com/edufound/android/xyyf/main/MainPersenter.java

@@ -11,6 +11,7 @@ import android.graphics.BitmapFactory;
 import android.graphics.Color;
 import android.media.MediaMetadataRetriever;
 import android.media.ThumbnailUtils;
+import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
@@ -228,7 +229,13 @@ public class MainPersenter implements MainIPersenter {
         getIntent = intent;
         mView.loadUrl("");
         mLoadUrl = mModel.getDefaultLoadUrl();
-        String intent_url = intent.getStringExtra("url");
+        Uri uri = intent.getData();
+        String intent_url = "";
+        if (uri != null) {
+            intent_url = uri.getQueryParameter("url");
+        } else {
+            intent_url = intent.getStringExtra("url");
+        }
         Logger.e("-----------------------------");
         Logger.e("intent_url:" + intent_url);
         Logger.e("-----------------------------");

app/src/main/java/com/edufound/android/xyyf/pay/PayPersenter.java

@@ -71,6 +71,11 @@ public class PayPersenter implements PayIPersenter {
         payThread.start();
     }
 
+    @Override
+    public void HuaWeiPay(String json) {
+        
+    }
+
     Handler resultHandler = new Handler(new Handler.Callback() {
         @Override
         public boolean handleMessage(Message msg) {
@@ -151,4 +156,7 @@ interface PayIPersenter extends BasePersenter {
     void WeChatPay(String json);
 
     void ALIPay(String orderInfo);
+
+    void HuaWeiPay(String json);
+
 }

app/src/main/java/com/edufound/android/xyyf/useragreement/UserAgreementModel.java

@@ -0,0 +1,32 @@
+package com.edufound.android.xyyf.useragreement;
+
+import com.edufound.android.xyyf.base.BaseModel;
+
+//做请求操作之类的
+public class UserAgreementModel implements BaseModel {
+
+    private final String MEMBER_URL = "http://m-xyyf-api.ai160.com/member/";
+
+    public UserAgreementModel() {
+
+    }
+
+    @Override
+    public void LoadData(LoadDataBack callback) {
+        if (true) {
+            callback.success("12333333");
+        } else {
+            callback.failure();
+        }
+    }
+
+
+    public String getVerificationCodeUrl() {
+        return MEMBER_URL + "verificationCode/";
+    }
+
+    public String getVCodeLoginUrl() {
+        return MEMBER_URL + "registerMobile";
+    }
+
+}

app/src/main/java/com/edufound/android/xyyf/useragreement/UserAgreementPersenter.java

@@ -0,0 +1,63 @@
+package com.edufound.android.xyyf.useragreement;
+
+import android.animation.ValueAnimator;
+import android.content.Intent;
+import android.os.Handler;
+import android.os.Message;
+import android.text.TextUtils;
+import android.util.Base64;
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.edufound.android.xyyf.activity.MainActivity;
+import com.edufound.android.xyyf.application.EApplication;
+import com.edufound.android.xyyf.base.BasePersenter;
+import com.edufound.android.xyyf.util.ContextUtil;
+import com.edufound.android.xyyf.util.DeviceUuidFactory;
+import com.edufound.android.xyyf.util.Logger;
+import com.edufound.android.xyyf.util.OKHttpUtil;
+import com.edufound.android.xyyf.util.SPutil;
+import com.edufound.android.xyyf.util.ToastUtil;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.io.IOException;
+
+import okhttp3.Call;
+import okhttp3.Callback;
+import okhttp3.Request;
+import okhttp3.Response;
+
+public class UserAgreementPersenter implements BasePersenter {
+
+    UserAgreementModel mModel;
+    UserAgreementView mView;
+
+    public UserAgreementPersenter(UserAgreementView view) {
+        mModel = new UserAgreementModel();
+        mView = view;
+    }
+
+
+    @Override
+    public void loadData() {
+
+    }
+
+    @Override
+    public void onDisConnNetWork() {
+
+    }
+
+    @Override
+    public void onConnNetWork() {
+
+    }
+
+
+
+}
+
+
+

app/src/main/java/com/edufound/android/xyyf/useragreement/UserAgreementView.java

@@ -0,0 +1,10 @@
+package com.edufound.android.xyyf.useragreement;
+
+import com.edufound.android.xyyf.base.BaseView;
+
+
+public interface UserAgreementView extends BaseView {
+    //把View拋出給Presenter調用
+
+
+}

app/src/main/res/values/projectstring.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!--8.0生产环境前端地址 http://ott80-web.ai160.com/stage/index/index.html-->
-    <!--    <string name="default_url">http://192.168.1.126:8080/efunbox-xyyf-web/1.0.0/stage/index/index.html</string>-->
-    <string name="default_url">http://m-xyyf-web.ai160.com/stage/index/index.html</string>
+    <string name="default_url">http://m-xyyf-web.efunbox.cn/stage/index/index.html</string>
+    <!--    <string name="default_url">http://m-xyyf-web.ai160.com/stage/index/index.html</string>-->
     <!--义方渠道-->
     <string name="app_code_yf">2006</string>
     <!--应用宝-->

push/build/intermediates/blame/res/release/single/layout.json

@@ -0,0 +1,10 @@
+[
+    {
+        "merged": "G:\\WorkSpace\\Git_WorkSpace\\efunbox-xyyf-mobile-android\\efunbox-xyyf-mobile-android-master\\push\\build\\intermediates\\res\\merged\\release\\layout\\upush_notification.xml",
+        "source": "G:\\WorkSpace\\Git_WorkSpace\\efunbox-xyyf-mobile-android\\efunbox-xyyf-mobile-android-master\\push\\res\\layout\\upush_notification.xml"
+    },
+    {
+        "merged": "G:\\WorkSpace\\Git_WorkSpace\\efunbox-xyyf-mobile-android\\efunbox-xyyf-mobile-android-master\\push\\build\\intermediates\\res\\merged\\release\\layout\\upush_bar_image_notification.xml",
+        "source": "G:\\WorkSpace\\Git_WorkSpace\\efunbox-xyyf-mobile-android\\efunbox-xyyf-mobile-android-master\\push\\res\\layout\\upush_bar_image_notification.xml"
+    }
+]

push/build/intermediates/incremental/mergeReleaseResources/compile-file-map.properties

@@ -0,0 +1,3 @@
+#Tue Jan 26 09:27:04 CST 2021
+G\:\\WorkSpace\\Git_WorkSpace\\efunbox-xyyf-mobile-android\\efunbox-xyyf-mobile-android-master\\push\\res\\layout\\upush_bar_image_notification.xml=G\:\\WorkSpace\\Git_WorkSpace\\efunbox-xyyf-mobile-android\\efunbox-xyyf-mobile-android-master\\push\\build\\intermediates\\res\\merged\\release\\layout\\upush_bar_image_notification.xml
+G\:\\WorkSpace\\Git_WorkSpace\\efunbox-xyyf-mobile-android\\efunbox-xyyf-mobile-android-master\\push\\res\\layout\\upush_notification.xml=G\:\\WorkSpace\\Git_WorkSpace\\efunbox-xyyf-mobile-android\\efunbox-xyyf-mobile-android-master\\push\\build\\intermediates\\res\\merged\\release\\layout\\upush_notification.xml

push/build/intermediates/res/merged/release/layout/upush_bar_image_notification.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:orientation="vertical"
+              android:layout_width="match_parent"
+              android:layout_height="64dp">
+
+    <ImageView
+        android:id="@+id/notification_bar_image"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:scaleType="fitCenter"/>
+
+</LinearLayout>

push/build/intermediates/res/merged/release/layout/upush_notification.xml

@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:background="#ffffff"
+    android:layout_height="64dp">
+
+    <RelativeLayout
+        android:id="@+id/upush_notification1"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginBottom="10dp"
+        android:layout_marginTop="10dp">
+
+        <ImageView
+            android:id="@+id/notification_large_icon1"
+            android:layout_width="48dp"
+            android:layout_height="48dp"
+            android:scaleType="fitXY" />
+
+        <TextView
+            android:id="@+id/notification_title"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="10dp"
+            android:layout_marginTop="3dp"
+            android:layout_toRightOf="@+id/notification_large_icon1"
+            android:maxLines="1"
+            android:text="Title"
+            android:textColor="#000000"
+            android:textSize="16sp" />
+
+        <TextView
+            android:id="@+id/notification_text"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/notification_title"
+            android:layout_marginLeft="10dp"
+            android:layout_marginTop="3dp"
+            android:layout_toRightOf="@+id/notification_large_icon1"
+            android:ellipsize="marquee"
+            android:focusable="true"
+            android:focusableInTouchMode="true"
+            android:marqueeRepeatLimit="marquee_forever"
+            android:scrollHorizontally="false"
+            android:fadingEdge="horizontal"
+            android:singleLine="true"
+            android:text="Message"
+            android:textColor="#000000" />
+
+        <requestFocus />
+
+
+    </RelativeLayout>
+
+    <RelativeLayout
+        android:id="@+id/upush_notification2"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:visibility="gone">
+
+        <ImageView
+            android:id="@+id/notification_large_icon2"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:scaleType="fitXY" />
+    </RelativeLayout>
+</RelativeLayout>