Skip to content

唐文 / AiyoZhuaWaWa

Go to a project
Commit 71375129 by chengfengpiaopiao
Options

增加友盟统计

parent 51d8488e
Inline Side-by-side
Showing with 66 additions and 29 deletions
.idea/misc.xml
......@@ -55,7 +55,7 @@
</profile-state>
</entry>
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
<component name="ProjectType">
......
app/build.gradle
......@@ -9,10 +9,12 @@ android {
targetSdkVersion 25
versionCode 1
versionName "1.0"
manifestPlaceholders = [UMENG_CHANNEL_VALUE: "test"] //默认名称
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
}
//配置keystore签名
signingConfigs {
release {
......@@ -23,6 +25,18 @@ android {
}
}
// productFlavors {
// wandoujia {}
// baidu {}
// c360 {}
// uc {}
// xiaomi {}
// huawei {}
// productFlavors.all { flavor ->
// flavor.manifestPlaceholders = [UMENG_CHANNEL_VALUE: name]
// }
// }
buildTypes {
release {
minifyEnabled false
......
app/src/main/AndroidManifest.xml
......@@ -12,6 +12,8 @@
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
<uses-permission android:name="android.permission.READ_PHONE_STATE"/>
<application
android:name=".DuoBaoApplication"
android:allowBackup="true"
......@@ -19,16 +21,16 @@
android:label="@string/app_name"
android:supportsRtl="true"
android:theme="@style/AppTheme">
<!--58c25576c895767d61000ec7 -->
<meta-data
android:name="UMENG_APPKEY"
android:value="58c25576c895767d61000ec7" />
<meta-data
android:name="UMENG_MESSAGE_SECRET"
android:value="771f0753ec80810bfced1e7347520fe7"/>
android:value="5a0abb218f4a9d05b0000036" />
<!--<meta-data-->
<!--android:name="UMENG_MESSAGE_SECRET"-->
<!--android:value="771f0753ec80810bfced1e7347520fe7"/>-->
<meta-data
android:name="UMENG_CHANNEL"
android:value="android-app" />
android:value="${UMENG_CHANNEL_VALUE}" />
<meta-data
android:name="TD_CHANNEL_ID"
android:value="maile" />
......
app/src/main/java/com/maile/jingcai/base/BaseApplication.java
......@@ -9,6 +9,7 @@ import android.util.Log;
import com.maile.jingcai.util.DrawUtil;
import com.tencent.mm.opensdk.openapi.IWXAPI;
import com.tencent.mm.opensdk.openapi.WXAPIFactory;
import com.umeng.analytics.MobclickAgent;
/**
......
app/src/main/java/com/maile/jingcai/view/activity/LoginActivity.java
......@@ -30,6 +30,7 @@ import com.maile.jingcai.util.preferences.PreferencesManager;
import com.maile.jingcai.view.iview.ILoginView;
import com.maile.jingcai.view.layer.LoginMainLayer;
import com.maile.jingcai.view.layer.PhoneLayer;
import com.umeng.analytics.MobclickAgent;
import butterknife.ButterKnife;
import butterknife.InjectView;
......@@ -103,7 +104,6 @@ public class LoginActivity extends Activity implements ILoginView {
alphaAnimIn.setAnimationListener(new Animation.AnimationListener() {
@Override
public void onAnimationStart(Animation animation) {
}
@Override
......@@ -124,6 +124,13 @@ public class LoginActivity extends Activity implements ILoginView {
if (mainLayer != null) {
mainLayer.onResume();
}
MobclickAgent.onResume(getApplicationContext());
}
@Override
protected void onPause() {
super.onPause();
MobclickAgent.onPause(mContext);
}
//检测用户是否登录
......
app/src/main/java/com/maile/jingcai/view/activity/MainActivity.java
......@@ -87,7 +87,7 @@ public class MainActivity extends FragmentActivity {
mDecorView = getWindow().getDecorView();
mViewPager = ViewFindUtils.find(mDecorView, R.id.vp_2);
mViewPager.setOffscreenPageLimit(1);
mViewPager.setOffscreenPageLimit(2);
mViewPager.setAdapter(new MyPagerAdapter(getSupportFragmentManager()));
/** with nothing */
/** with ViewPager */
......
app/src/main/java/com/maile/jingcai/view/fragment/SimpleCardFragment.java
......@@ -69,7 +69,6 @@ public class SimpleCardFragment extends BaseFragment {
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
View view = inflater.inflate(R.layout.fr_simple_card, container, false);
ButterKnife.inject(this, view);
mLoading.setVisibility(View.VISIBLE);
loadWebView(mUrl);
return view;
}
......@@ -88,9 +87,10 @@ public class SimpleCardFragment extends BaseFragment {
@Override
public void setUserVisibleHint(boolean isVisibleToUser) {
super.setUserVisibleHint(isVisibleToUser);
if (isVisibleToUser) {
Log.i("tangwen", "onResume: " + mUrl);
if (mUrl.equals("http://192.168.1.250:81/shop")) {
if (mUrl.equals("http://192.168.1.250:81/shop") || mUrl.equals("http://h5.test.7peng.cn/profile.html")) {
Log.i("tangwen", "onResume: " + "第二页");
mWebView.loadUrl(mUrl);
}
......@@ -104,11 +104,19 @@ public class SimpleCardFragment extends BaseFragment {
// loadWebView(mUrl);
}
@Override
public void onResume() {
super.onResume();
}
//加载webview
@RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
@SuppressLint("AddJavascriptInterface")
private void loadWebView(String url) {
mLoading.setVisibility(View.VISIBLE);
mWebView.setVisibility(View.VISIBLE);
WebSettings webSettings = mWebView.getSettings();
webSettings.setSavePassword(false);
webSettings.setSaveFormData(false);
......@@ -186,19 +194,21 @@ public class SimpleCardFragment extends BaseFragment {
mLoading.setVisibility(View.INVISIBLE);
}
// super.onPageFinished(view, url);
if (!mUrl.equals("http://h5.test.7peng.cn/")) {
return;
}
// if (!mUrl.equals("http://h5.test.7peng.cn/")) {
// return;
// }
isLoading = true;
Log.i("ggg", "onPageFinished: " + "ggg");
new Handler().postDelayed(new Runnable() {
public void run() {
//mWebView.loadUrl("javascript:console.log('ggg'); (function(){localStorage.setItem(\"__token__\", '"+token+"');})();");
mWebView.loadUrl("javascript:console.log('type：'+ typeof(window.h5AutoLogin));h5AutoLogin('" + token + "')");
}
}, 2000);
// new Handler().postDelayed(new Runnable() {
// public void run() {
// //mWebView.loadUrl("javascript:console.log('ggg'); (function(){localStorage.setItem(\"__token__\", '"+token+"');})();");
// mWebView.loadUrl("javascript:console.log('type：'+ typeof(window.h5AutoLogin));h5AutoLogin('" + token + "')");
// }
// }, 2000);
// mWebView.loadUrl("javascript:console.log('type：'+ typeof(window.h5AutoLogin));h5AutoLogin('" + token + "')");
//mWebView.loadUrl("javascript:console.log('ggg');h5AutoLogin('"+token+"')");
......
app/src/main/res/drawable/login_btn.xml
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="25dp" />
<solid android:color="#f3d800" />
<solid android:color="#af6d8b" />
</shape>
\ No newline at end of file
app/src/main/res/drawable/login_input_bg.xml
......@@ -4,5 +4,5 @@
<stroke
android:width="1dp"
android:color="#e8e8e9" />
<solid android:color="#00FFFFFF" />
<solid android:color="#ffffff" />
</shape>
\ No newline at end of file
app/src/main/res/layout/fr_simple_card.xml
......@@ -5,7 +5,8 @@
android:layout_height="match_parent">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:orientation="vertical">
<ProgressBar
android:id="@+id/webView_progress"
style="@style/ProgressBar_Mini"
......
app/src/main/res/layout/layer_login_phone.xml
......@@ -5,7 +5,7 @@
android:gravity="center"
android:paddingLeft="40dp"
android:paddingRight="40dp"
android:background="#ffffff"
android:background="#4c443f"
android:layout_width="match_parent"
android:layout_height="match_parent">
......@@ -13,7 +13,7 @@
android:id="@+id/input_phone_layout"
android:layout_width="match_parent"
android:layout_height="46dp"
android:layout_marginTop="66dp"
android:layout_marginTop="40dp"
android:orientation="horizontal"
android:gravity="center_vertical"
android:background="@drawable/login_input_bg"
......@@ -83,15 +83,15 @@
android:layout_marginLeft="7dp"
android:textSize="17sp" />
<!-- android:background="@drawable/input_send_checkcode_bg"-->
<com.maile.jingcai.commponent.LoginClickTextView
android:id="@+id/tv_checkcode_send"
android:layout_width="122dp"
android:layout_height="match_parent"
android:text="@string/login_input_checkcode_send"
android:background="@drawable/input_send_checkcode_bg"
android:gravity="center"
android:textSize="17sp"
android:textColor="#ffffff"
android:textColor="#2ebb4f"
/>
</LinearLayout>
......@@ -102,8 +102,8 @@
android:layout_height="50dp"
android:background="@drawable/login_btn"
android:layout_below="@+id/login_input_view"
android:layout_marginLeft="30dp"
android:layout_marginRight="30dp"
android:layout_marginLeft="15dp"
android:layout_marginRight="15dp"
android:text="@string/login"
android:gravity="center"
android:textColor="#ffffff"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment